diff --git a/Examples/DemoWinForm/ConvertProjectionAndCoordinatesForm.cs b/Examples/DemoWinForm/ConvertProjectionAndCoordinatesForm.cs
index eff34d2e..ab60a6e4 100644
--- a/Examples/DemoWinForm/ConvertProjectionAndCoordinatesForm.cs
+++ b/Examples/DemoWinForm/ConvertProjectionAndCoordinatesForm.cs
@@ -1,25 +1,20 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace DemoWinForm
 {
-	public partial class ConvertProjectionAndCoordinatesForm : Form
-	{
-		public ConvertProjectionAndCoordinatesForm()
-		{
-			InitializeComponent();
-		}
+    public partial class ConvertProjectionAndCoordinatesForm : Form
+    {
+        public ConvertProjectionAndCoordinatesForm()
+        {
+            InitializeComponent();
+        }
 
-		protected override void OnResize(EventArgs e)
-		{
-			base.OnResize(e);
+        protected override void OnResize(EventArgs e)
+        {
+            base.OnResize(e);
 
-			MainSplitContainer.SplitterDistance = (Width - MainSplitContainer.SplitterWidth) / 2;
-		}
-	}
+            MainSplitContainer.SplitterDistance = (Width - MainSplitContainer.SplitterWidth) / 2;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Examples/DemoWinForm/DemoWinForm.csproj b/Examples/DemoWinForm/DemoWinForm.csproj
index 01500ab5..60310ecc 100644
--- a/Examples/DemoWinForm/DemoWinForm.csproj
+++ b/Examples/DemoWinForm/DemoWinForm.csproj
@@ -22,10 +22,6 @@
         <Reference Include="System.Windows.Forms" />
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="ProjNet4GeoAPI" Version="1.4.1" />
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\..\SharpMap\SharpMap.csproj" />
         <ProjectReference Include="..\..\SharpMap.UI\SharpMap.UI.csproj" />
@@ -37,4 +33,8 @@
         </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/Examples/DemoWinForm/MainForm.cs b/Examples/DemoWinForm/MainForm.cs
index cc058361..39a4cc91 100644
--- a/Examples/DemoWinForm/MainForm.cs
+++ b/Examples/DemoWinForm/MainForm.cs
@@ -15,20 +15,19 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
 using DemoWinForm.Properties;
 using NetTopologySuite.Geometries;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Forms;
-using GeoAPI.Geometries;
 using SharpMap.Layers;
-using GeoPoint = GeoAPI.Geometries.Coordinate;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using GeoPoint = NetTopologySuite.Geometries.Coordinate;
 
 namespace DemoWinForm
 {
@@ -67,16 +66,16 @@ private void registerSymbols()
 
         private static void registerKnownColors(Dictionary<string, Color> colorTable)
         {
-            foreach (string colorName in Enum.GetNames(typeof (KnownColor)))
+            foreach (string colorName in Enum.GetNames(typeof(KnownColor)))
             {
-                KnownColor color = (KnownColor) Enum.Parse(typeof (KnownColor), colorName);
+                KnownColor color = (KnownColor)Enum.Parse(typeof(KnownColor), colorName);
                 colorTable[colorName] = Color.FromKnownColor(color);
             }
         }
 
         private void registerLayerFactories()
         {
-//			ConfigurationManager.GetSection("LayerFactories");
+            //			ConfigurationManager.GetSection("LayerFactories");
             _layerFactoryCatalog[".shp"] = new ShapeFileLayerFactory();
         }
 
@@ -90,7 +89,7 @@ private void addLayer(ILayer layer)
         private void addNewRandomGeometryLayer()
         {
             Random rndGen = new Random();
-            Collection<IGeometry> geometry = new Collection<IGeometry>();
+            Collection<Geometry> geometry = new Collection<Geometry>();
 
             VectorLayer layer = new VectorLayer(String.Empty);
             var gf = new GeometryFactory();
@@ -157,14 +156,14 @@ private Color GetRandomColor(Random rndGen)
             return Color.FromArgb(rndGen.Next(255), rndGen.Next(255), rndGen.Next(255));
         }
 
-        private static void GeneratePolygons(IGeometryFactory factory, ICollection<IGeometry> geometry, Random rndGen)
+        private static void GeneratePolygons(GeometryFactory factory, ICollection<Geometry> geometry, Random rndGen)
         {
             int numPolygons = rndGen.Next(10, 100);
             for (var polyIndex = 0; polyIndex < numPolygons; polyIndex++)
             {
                 var vertices = new GeoPoint[5];
-                var upperLeft = new GeoPoint(rndGen.NextDouble()*1000, rndGen.NextDouble()*1000);
-                var sideLength = rndGen.NextDouble()*50;
+                var upperLeft = new GeoPoint(rndGen.NextDouble() * 1000, rndGen.NextDouble() * 1000);
+                var sideLength = rndGen.NextDouble() * 50;
 
                 // Make a square
                 vertices[0] = new GeoPoint(upperLeft.X, upperLeft.Y);
@@ -172,12 +171,12 @@ private static void GeneratePolygons(IGeometryFactory factory, ICollection<IGeom
                 vertices[2] = new GeoPoint(upperLeft.X + sideLength, upperLeft.Y - sideLength);
                 vertices[3] = new GeoPoint(upperLeft.X, upperLeft.Y - sideLength);
                 vertices[4] = upperLeft;
-                
+
                 geometry.Add(factory.CreatePolygon(factory.CreateLinearRing(vertices), null));
             }
         }
 
-        private static void GenerateLines(IGeometryFactory factory, ICollection<IGeometry> geometry, Random rndGen)
+        private static void GenerateLines(GeometryFactory factory, ICollection<Geometry> geometry, Random rndGen)
         {
             var numLines = rndGen.Next(10, 100);
             for (var lineIndex = 0; lineIndex < numLines; lineIndex++)
@@ -185,7 +184,7 @@ private static void GenerateLines(IGeometryFactory factory, ICollection<IGeometr
                 var numVerticies = rndGen.Next(4, 15);
                 var vertices = new GeoPoint[numVerticies];
 
-                var lastPoint = new GeoPoint(rndGen.NextDouble()*1000, rndGen.NextDouble()*1000);
+                var lastPoint = new GeoPoint(rndGen.NextDouble() * 1000, rndGen.NextDouble() * 1000);
                 vertices[0] = lastPoint;
 
                 for (var vertexIndex = 1; vertexIndex < numVerticies; vertexIndex++)
@@ -200,12 +199,12 @@ private static void GenerateLines(IGeometryFactory factory, ICollection<IGeometr
             }
         }
 
-        private static void GeneratePoints(IGeometryFactory factory, ICollection<IGeometry> geometry, Random rndGen)
+        private static void GeneratePoints(GeometryFactory factory, ICollection<Geometry> geometry, Random rndGen)
         {
             var numPoints = rndGen.Next(10, 100);
             for (var pointIndex = 0; pointIndex < numPoints; pointIndex++)
             {
-                var point = new GeoPoint(rndGen.NextDouble()*1000, rndGen.NextDouble()*1000);
+                var point = new GeoPoint(rndGen.NextDouble() * 1000, rndGen.NextDouble() * 1000);
                 geometry.Add(factory.CreatePoint(point));
             }
         }
@@ -273,7 +272,7 @@ private void changeMode(MapBox.Tools tool)
 
         private object getLayerTypeIcon(Type type)
         {
-            if (type == typeof (VectorLayer))
+            if (type == typeof(VectorLayer))
             {
                 return Resources.polygon;
             }
@@ -335,32 +334,32 @@ private void MainMapImage_MapQueried(FeatureDataTable data)
 
         private void AddLayerToolStripButton_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { LoadLayer(); });
+            BeginInvoke((MethodInvoker)delegate { LoadLayer(); });
         }
 
         private void RemoveLayerToolStripButton_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { RemoveLayer(); });
+            BeginInvoke((MethodInvoker)delegate { RemoveLayer(); });
         }
 
         private void AddLayerToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { LoadLayer(); });
+            BeginInvoke((MethodInvoker)delegate { LoadLayer(); });
         }
 
         private void RemoveLayerToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { RemoveLayer(); });
+            BeginInvoke((MethodInvoker)delegate { RemoveLayer(); });
         }
 
         private void ZoomToExtentsToolStripButton_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { zoomToExtents(); });
+            BeginInvoke((MethodInvoker)delegate { zoomToExtents(); });
         }
 
         private void PanToolStripButton_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { changeMode(MapBox.Tools.Pan); });
+            BeginInvoke((MethodInvoker)delegate { changeMode(MapBox.Tools.Pan); });
         }
 
         private void QueryModeToolStripButton_Click(object sender, EventArgs e)
@@ -418,7 +417,7 @@ private void MoveDownToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void LayersDataGridView_SelectionChanged(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate
+            BeginInvoke((MethodInvoker)delegate
                                             {
                                                 changeUIOnLayerSelectionChange();
 
@@ -437,7 +436,7 @@ private void MainMapImage_MouseMove(GeoPoint WorldPos, MouseEventArgs ImagePos)
 
         private void AddNewRandomGeometryLayer_Click(object sender, EventArgs e)
         {
-            BeginInvoke((MethodInvoker) delegate { addNewRandomGeometryLayer(); });
+            BeginInvoke((MethodInvoker)delegate { addNewRandomGeometryLayer(); });
         }
     }
 }
\ No newline at end of file
diff --git a/Examples/DemoWinForm/Program.cs b/Examples/DemoWinForm/Program.cs
index a6c2a4bc..74fbee82 100644
--- a/Examples/DemoWinForm/Program.cs
+++ b/Examples/DemoWinForm/Program.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Text;
-using System.Windows.Forms;
 using NetTopologySuite;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.CoordinateSystems;
+using System;
+using System.Windows.Forms;
 
 namespace DemoWinForm
 {
@@ -32,13 +32,11 @@ internal static class Program
         [STAThread]
         private static void Main()
         {
-            var gss = new NtsGeometryServices();
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
+            var gss = NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
                 new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
-
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
@@ -49,4 +47,4 @@ private static void Main()
             Application.Run(new MainForm());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/ExampleCodeSnippets/ClipLabelPosition.cs b/Examples/ExampleCodeSnippets/ClipLabelPosition.cs
index d7b00d46..ff910180 100644
--- a/Examples/ExampleCodeSnippets/ClipLabelPosition.cs
+++ b/Examples/ExampleCodeSnippets/ClipLabelPosition.cs
@@ -5,8 +5,8 @@
     /// </summary>
     public class ClipLabelPosition
     {
-        private GeoAPI.Geometries.IGeometry _clip;
-        private GeoAPI.Geometries.Prepared.IPreparedGeometry _prepClip;
+        private NetTopologySuite.Geometries.Geometry _clip;
+        private NetTopologySuite.Geometries.Prepared.IPreparedGeometry _prepClip;
 
         /// <summary>
         /// Creates an instance of this class
@@ -27,7 +27,7 @@ public ClipLabelPosition(SharpMap.Map map)
         /// </summary>
         /// <param name="row">A feature</param>
         /// <returns>A label position</returns>
-        public GeoAPI.Geometries.Coordinate GetClippedPosition(SharpMap.Data.FeatureDataRow row)
+        public NetTopologySuite.Geometries.Coordinate GetClippedPosition(SharpMap.Data.FeatureDataRow row)
         {
             var g = _prepClip.Contains(row.Geometry)
                 ? row.Geometry
diff --git a/Examples/ExampleCodeSnippets/CreatingData.cs b/Examples/ExampleCodeSnippets/CreatingData.cs
index 8c4e250f..8fba29b5 100644
--- a/Examples/ExampleCodeSnippets/CreatingData.cs
+++ b/Examples/ExampleCodeSnippets/CreatingData.cs
@@ -32,7 +32,7 @@ public static System.Double[] GetRandomOrdinates(System.Int32 size, System.Doubl
             return arr;
         }
 
-        
+
         /// <summary>
         /// Creates a FeatureDataTable from arrays of x, y and z components
         /// </summary>
@@ -40,7 +40,7 @@ public static System.Double[] GetRandomOrdinates(System.Int32 size, System.Doubl
         /// <param name="ycomponents">an array of doubles representing the y ordinate values</param>
         /// <param name="zcomponents">an array of doubles representing the z ordinate values</param>
         /// <returns></returns>
-        public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArrays(double[] xcomponents, 
+        public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArrays(double[] xcomponents,
                                                                  double[] ycomponents,
                                                                  double[] zcomponents, double[] data = null)
         {
@@ -60,18 +60,18 @@ public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArra
             }
 
             var fdt = new SharpMap.Data.FeatureDataTable();
-            fdt.Columns.Add("TimeStamp", typeof (System.DateTime)); // add example timestamp attribute
+            fdt.Columns.Add("TimeStamp", typeof(System.DateTime)); // add example timestamp attribute
             if (data != null)
                 fdt.Columns.Add("Data", typeof(System.Double)); // add example timestamp attribute
 
-            
+
             for (var i = 0; i < xcomponents.Length; i++)
             {
                 SharpMap.Data.FeatureDataRow fdr = fdt.NewRow();
 
                 fdr.Geometry = factory.CreatePoint(threedee
-                                   ? new GeoAPI.Geometries.Coordinate(xcomponents[i], ycomponents[i], zcomponents[i])
-                                   : new GeoAPI.Geometries.Coordinate(xcomponents[i], ycomponents[i]));
+                                   ? new NetTopologySuite.Geometries.CoordinateZ(xcomponents[i], ycomponents[i], zcomponents[i])
+                                   : new NetTopologySuite.Geometries.Coordinate(xcomponents[i], ycomponents[i]));
 
                 fdr["TimeStamp"] = System.DateTime.Now; //set the timestamp property
                 if (data != null)
@@ -86,48 +86,48 @@ public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArra
 
     public static class ShapeFactory
     {
-        public static GeoAPI.Geometries.ILinearRing CreateRectangle(GeoAPI.Geometries.IGeometryFactory factory, 
-            GeoAPI.Geometries.Coordinate leftTop, GeoAPI.Geometries.Coordinate rightBottom)
+        public static NetTopologySuite.Geometries.LinearRing CreateRectangle(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate leftTop, NetTopologySuite.Geometries.Coordinate rightBottom)
         {
             var pts = new[]
                             {
-                                leftTop, 
-                                new GeoAPI.Geometries.Coordinate(rightBottom.X, leftTop.Y), 
+                                leftTop,
+                                new NetTopologySuite.Geometries.Coordinate(rightBottom.X, leftTop.Y),
                                 rightBottom,
-                                new GeoAPI.Geometries.Coordinate(leftTop.X, rightBottom.Y), 
+                                new NetTopologySuite.Geometries.Coordinate(leftTop.X, rightBottom.Y),
                                 leftTop
                             };
             return factory.CreateLinearRing(pts);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateRectangle(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size)
+        public static NetTopologySuite.Geometries.LinearRing CreateRectangle(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size)
         {
             var wh = new System.Drawing.SizeF(size.Width * 0.5f, size.Height * 0.5f);
-            var lt = new GeoAPI.Geometries.Coordinate(center.X - wh.Width, center.Y + wh.Height);
-            var rb = new GeoAPI.Geometries.Coordinate(center.X + wh.Width, center.Y - wh.Height);
+            var lt = new NetTopologySuite.Geometries.Coordinate(center.X - wh.Width, center.Y + wh.Height);
+            var rb = new NetTopologySuite.Geometries.Coordinate(center.X + wh.Width, center.Y - wh.Height);
 
             return CreateRectangle(factory, lt, rb);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size)
+        public static NetTopologySuite.Geometries.LinearRing CreateEllipse(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size)
         {
             return CreateEllipse(factory, center, size, 12);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size, int segmentsPerQuadrant)
+        public static NetTopologySuite.Geometries.LinearRing CreateEllipse(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size, int segmentsPerQuadrant)
         {
             const double piHalf = System.Math.PI * 0.5d;
 
             var step = piHalf / segmentsPerQuadrant;
 
-            var pts = new GeoAPI.Geometries.Coordinate[4 * segmentsPerQuadrant + 1];
+            var pts = new NetTopologySuite.Geometries.Coordinate[4 * segmentsPerQuadrant + 1];
             var angle = 0d;
             for (var i = 0; i < 4 * segmentsPerQuadrant; i++)
             {
-                pts[i] = new GeoAPI.Geometries.Coordinate(center.X + System.Math.Cos(angle) * size.Width,
+                pts[i] = new NetTopologySuite.Geometries.Coordinate(center.X + System.Math.Cos(angle) * size.Width,
                                                           center.Y + System.Math.Sin(angle) * size.Height);
                 angle += step;
             }
@@ -138,17 +138,17 @@ public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeo
 
     public class TestShapeFactory
     {
-        public static readonly GeoAPI.Geometries.IGeometryFactory Factory =
+        public static readonly NetTopologySuite.Geometries.GeometryFactory Factory =
             new NetTopologySuite.Geometries.GeometryFactory(new NetTopologySuite.Geometries.PrecisionModel(1000));
-        
+
         [NUnit.Framework.Test]
         public void TestRectangle()
         {
-            var rect = ShapeFactory.CreateRectangle(Factory, new GeoAPI.Geometries.Coordinate(1, 2), new GeoAPI.Geometries.Coordinate(2, 1));
+            var rect = ShapeFactory.CreateRectangle(Factory, new NetTopologySuite.Geometries.Coordinate(1, 2), new NetTopologySuite.Geometries.Coordinate(2, 1));
             NUnit.Framework.Assert.AreEqual(rect.StartPoint, rect.EndPoint);
             NUnit.Framework.Assert.AreEqual(4, rect.Length);
 
-            var rect2 = ShapeFactory.CreateRectangle(Factory, new GeoAPI.Geometries.Coordinate(1.5, 1.5), new System.Drawing.SizeF(1f, 1f));
+            var rect2 = ShapeFactory.CreateRectangle(Factory, new NetTopologySuite.Geometries.Coordinate(1.5, 1.5), new System.Drawing.SizeF(1f, 1f));
             NUnit.Framework.Assert.AreEqual(rect, rect2);
 
             NUnit.Framework.Assert.AreEqual("LINEARRING (1 2, 2 2, 2 1, 1 1, 1 2)", rect.ToString());
@@ -157,13 +157,13 @@ public void TestRectangle()
         [NUnit.Framework.Test]
         public void TestEllipse()
         {
-            var ell = ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1), 1);
+            var ell = ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1), 1);
             NUnit.Framework.Assert.AreEqual(ell.StartPoint, ell.EndPoint);
             NUnit.Framework.Assert.LessOrEqual(System.Math.Abs(4 * System.Math.Sqrt(2) - ell.Length), 0.00001d);
 
 
             NUnit.Framework.Assert.AreEqual("LINEARRING (2 1, 1 2, 0 1, 1 0, 2 1)", ell.ToString());
-            var ell2 = ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1));
+            var ell2 = ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1));
             System.Console.WriteLine(ell2.ToString());
         }
 
@@ -175,17 +175,17 @@ public void TestLayer()
                 new[]
                     {
                         Factory.CreatePolygon(
-                            ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(0, 0),
+                            ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(0, 0),
                                                        new System.Drawing.SizeF(40, 30)),
                             new[]
                                 {
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(90, 55),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(90, 55),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(77, 24),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(77, 24),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(-80, 41),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(-80, 41),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(-45, -36),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(-45, -36),
                                                                new System.Drawing.SizeF(40, 30)),
                                 })
                     });
@@ -196,4 +196,4 @@ public void TestLayer()
             mapimage.Save("ellipse.png", System.Drawing.Imaging.ImageFormat.Png);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/ExampleCodeSnippets/EnsureVisibleSample.cs b/Examples/ExampleCodeSnippets/EnsureVisibleSample.cs
index 0c71c0cd..9f6a4af9 100644
--- a/Examples/ExampleCodeSnippets/EnsureVisibleSample.cs
+++ b/Examples/ExampleCodeSnippets/EnsureVisibleSample.cs
@@ -1,69 +1,89 @@
 
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpMap;
+using SharpMap.CoordinateSystems;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
-using NUnit.Framework;
+using System.IO;
 
 namespace ExampleCodeSnippets
 {
     using cd = CreatingData;
-        [NUnit.Framework.TestFixture]
+    [NUnit.Framework.TestFixture]
     public class EnsureVisibleSample
     {
-public static void EnsureVisible(SharpMap.Map map, GeoAPI.Geometries.Coordinate pt)
-{
-    const double ensureVisibleRatio = 0.1d;
-            
-    //Get current map envelope
-    var bb = map.Envelope;
-    System.Console.WriteLine(string.Format("Map envelope: {0}", bb));
-            
-    //Set valid envelope
-    var evbb = bb.Grow(- ensureVisibleRatio * bb.Width, -ensureVisibleRatio * bb.Height );
-    System.Console.WriteLine(string.Format("Valid envelope: {0}", evbb));
-            
-    //Test if Point is in valid envelope
-    if (evbb.Contains(pt)) return;
-
-    //It is not
-    System.Console.WriteLine(string.Format("Valid envelope does not contain {0}", pt));
-
-    //LineString from Map.Center -> to Point
-    var ls = map.Factory.CreateLineString(new[] {evbb.Centre, pt});
-    System.Console.WriteLine(string.Format("LineString Map.Center -> Point: {0}", ls));
-
-    //Setup Linestring from BoundingBox
-    var evbbpts = new [] {evbb.TopLeft(), evbb.TopRight(), evbb.BottomRight(), evbb.BottomLeft(), evbb.TopLeft() };
-    var evbblinearring = map.Factory.CreateLineString(evbbpts);
-    System.Console.WriteLine(string.Format("Linestring of valid envelope: {0}", evbblinearring));
-
-    //// convert geometries to NTS
-    //var ntsevbb = (NetTopologySuite.Geometries.LineString)
-    //    SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(evbblinearring, gf);
-    //var ntsls = (NetTopologySuite.Geometries.LineString)
-    //    SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(ls, gf);
-
-    // Get intersection point
-    var intGeo = evbblinearring.Intersection(ls);
-    var intPt = (NetTopologySuite.Geometries.Point)intGeo;
-    System.Console.WriteLine(string.Format("Intersection point is: {0}", intPt));
-
-    //Compute offset
-    var dx = pt.X - intPt.X;
-    var dy = pt.Y - intPt.Y;
-    System.Console.WriteLine(string.Format("Map.Center needs to be shifted by: [{0}, {1}]", dx, dy));
-
-    //Set new center Center
-    map.Center = new GeoAPI.Geometries.Coordinate(map.Center.X + dx, map.Center.Y + dy);
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            var gss = NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
+                new CoordinateSystemFactory(),
+                new CoordinateTransformationFactory(),
+                SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
+            Session.Instance
+                .SetGeometryServices(gss)
+                .SetCoordinateSystemServices(css)
+                .SetCoordinateSystemRepository(css);
+        }
 
-}
+        public static void EnsureVisible(SharpMap.Map map, NetTopologySuite.Geometries.Coordinate pt)
+        {
+            const double ensureVisibleRatio = 0.1d;
+
+            //Get current map envelope
+            var bb = map.Envelope;
+            System.Console.WriteLine(string.Format("Map envelope: {0}", bb));
+
+            //Set valid envelope
+            var evbb = bb.Grow(-ensureVisibleRatio * bb.Width, -ensureVisibleRatio * bb.Height);
+            System.Console.WriteLine(string.Format("Valid envelope: {0}", evbb));
+
+            //Test if Point is in valid envelope
+            if (evbb.Contains(pt)) return;
+
+            //It is not
+            System.Console.WriteLine(string.Format("Valid envelope does not contain {0}", pt));
+
+            //LineString from Map.Center -> to Point
+            var ls = map.Factory.CreateLineString(new[] { evbb.Centre, pt });
+            System.Console.WriteLine(string.Format("LineString Map.Center -> Point: {0}", ls));
+
+            //Setup Linestring from BoundingBox
+            var evbbpts = new[] { evbb.TopLeft(), evbb.TopRight(), evbb.BottomRight(), evbb.BottomLeft(), evbb.TopLeft() };
+            var evbblinearring = map.Factory.CreateLineString(evbbpts);
+            System.Console.WriteLine(string.Format("Linestring of valid envelope: {0}", evbblinearring));
+
+            //// convert geometries to NTS
+            //var ntsevbb = (NetTopologySuite.Geometries.LineString)
+            //    SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(evbblinearring, gf);
+            //var ntsls = (NetTopologySuite.Geometries.LineString)
+            //    SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(ls, gf);
+
+            // Get intersection point
+            var intGeo = evbblinearring.Intersection(ls);
+            var intPt = (NetTopologySuite.Geometries.Point)intGeo;
+            System.Console.WriteLine(string.Format("Intersection point is: {0}", intPt));
+
+            //Compute offset
+            var dx = pt.X - intPt.X;
+            var dy = pt.Y - intPt.Y;
+            System.Console.WriteLine(string.Format("Map.Center needs to be shifted by: [{0}, {1}]", dx, dy));
+
+            //Set new center Center
+            map.Center = new NetTopologySuite.Geometries.Coordinate(map.Center.X + dx, map.Center.Y + dy);
+
+        }
 
         [NUnit.Framework.Test]
         public void TestEnsureVisible()
         {
             //Create a map
-            SharpMap.Map map = new SharpMap.Map(new System.Drawing.Size(720,360));
-            
+            SharpMap.Map map = new SharpMap.Map(new System.Drawing.Size(720, 360));
+
             //Create some random sample data
             SharpMap.Data.FeatureDataTable fdt =
                 cd.CreatePointFeatureDataTableFromArrays(cd.GetRandomOrdinates(80, -180, 180),
@@ -71,10 +91,14 @@ public void TestEnsureVisible()
 
             //Create layer and datasource
             SharpMap.Layers.VectorLayer vl = new SharpMap.Layers.VectorLayer("Points", new SharpMap.Data.Providers.GeometryFeatureProvider(fdt));
-            
+
             //Create default style
             SharpMap.Styles.VectorStyle defaultStyle = new SharpMap.Styles.VectorStyle();
-            defaultStyle.Symbol = new System.Drawing.Bitmap(@"..\..\..\DemoWinForm\Resources\flag.png");
+            var stylePath = Path.GetFullPath(
+                Path.Combine(
+                    Path.GetDirectoryName(GetType().Assembly.Location),
+                    "..\\..\\..\\..\\DemoWinForm\\Resources\\flag.png"));
+            defaultStyle.Symbol = new System.Drawing.Bitmap(stylePath);
             defaultStyle.SymbolScale = 0.5f;
 
             //Create theming class and apply to layer
@@ -85,16 +109,16 @@ public void TestEnsureVisible()
             map.Layers.Add(vl);
             map.ZoomToExtents();
             map.Zoom = 60; //2*30
-            map.Center = new GeoAPI.Geometries.Coordinate(0,0);
+            map.Center = new NetTopologySuite.Geometries.Coordinate(0, 0);
 
             System.Console.WriteLine(map.Center);
-            EnsureVisible(map, new GeoAPI.Geometries.Coordinate(-30, 0));
+            EnsureVisible(map, new NetTopologySuite.Geometries.Coordinate(-30, 0));
             System.Console.WriteLine(map.Center);
             System.Console.WriteLine();
-            EnsureVisible(map, new GeoAPI.Geometries.Coordinate(15, 20));
+            EnsureVisible(map, new NetTopologySuite.Geometries.Coordinate(15, 20));
             System.Console.WriteLine(map.Center);
             System.Console.WriteLine();
-            EnsureVisible(map, new GeoAPI.Geometries.Coordinate(15, -20));
+            EnsureVisible(map, new NetTopologySuite.Geometries.Coordinate(15, -20));
             System.Console.WriteLine(map.Center);
         }
 
diff --git a/Examples/ExampleCodeSnippets/ExampleCodeSession.cs b/Examples/ExampleCodeSnippets/ExampleCodeSession.cs
index a83045d6..713d1188 100644
--- a/Examples/ExampleCodeSnippets/ExampleCodeSession.cs
+++ b/Examples/ExampleCodeSnippets/ExampleCodeSession.cs
@@ -1,22 +1,21 @@
-namespace ExampleCodeSnippets
+using SharpMap.CoordinateSystems;
+
+namespace ExampleCodeSnippets
 {
-    [NUnit.Framework.SetUpFixture]
     public class ExampleCodeSession
     {
-        [NUnit.Framework.SetUp]
+        [NUnit.Framework.OneTimeSetUp]
         public void SetUp()
         {
-            var gss = new NetTopologySuite.NtsGeometryServices();
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
+            var gss = NetTopologySuite.NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
                 new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
                 new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
-
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/ExampleCodeSnippets/ExampleCodeSnippets.csproj b/Examples/ExampleCodeSnippets/ExampleCodeSnippets.csproj
index b8005dc1..5e4ddf9f 100644
--- a/Examples/ExampleCodeSnippets/ExampleCodeSnippets.csproj
+++ b/Examples/ExampleCodeSnippets/ExampleCodeSnippets.csproj
@@ -16,10 +16,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="NetTopologySuite.Core" Version="1.15.3" />
-        <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="1.15.5" />
-        <PackageReference Include="ProjNet4GeoAPI" Version="1.4.1" />
-        <PackageReference Include="NUnit" Version="3.12.0" />
+        <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
     </ItemGroup>
 
     <ItemGroup>
@@ -29,4 +27,8 @@
         <ProjectReference Include="..\..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/Examples/ExampleCodeSnippets/GeoJsonExample.cs b/Examples/ExampleCodeSnippets/GeoJsonExample.cs
index 9bb156b8..fa4ab2ae 100644
--- a/Examples/ExampleCodeSnippets/GeoJsonExample.cs
+++ b/Examples/ExampleCodeSnippets/GeoJsonExample.cs
@@ -30,7 +30,7 @@ public void TestGeoJson(System.Collections.Generic.IEnumerable<string> jsons)
         {
             var gjr = new NetTopologySuite.IO.GeoJsonReader();
 
-            var geom = jsons.Select(json => gjr.Read<GeoAPI.Geometries.IGeometry>(json)).ToList();
+            var geom = jsons.Select(json => gjr.Read<NetTopologySuite.Geometries.Geometry>(json)).ToList();
 
             var fp = new SharpMap.Data.Providers.GeometryFeatureProvider(geom);
             var l = new SharpMap.Layers.VectorLayer("geojson", fp);
diff --git a/Examples/ExampleCodeSnippets/HeatLayerExample.cs b/Examples/ExampleCodeSnippets/HeatLayerExample.cs
index 8096e30b..da0845da 100644
--- a/Examples/ExampleCodeSnippets/HeatLayerExample.cs
+++ b/Examples/ExampleCodeSnippets/HeatLayerExample.cs
@@ -1,22 +1,18 @@
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Drawing.Imaging;
-using GeoAPI.Geometries;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
-using NetTopologySuite;
 using SharpMap.Data;
 using SharpMap.Layers;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace ExampleCodeSnippets
 {
     [TestFixture]
     public class HeatLayerExample
     {
-        static HeatLayerExample ()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NtsGeometryServices();
-        }
         [Test]
         public void HeatLayerTest()
         {
@@ -82,8 +78,8 @@ public void TestRealData()
         private static FeatureDataTable GetRealFeatureDataTable()
         {
             var res = new FeatureDataTable();
-            res.Columns.Add("Oid", typeof (uint));
-            res.Columns.Add("Data", typeof (int));
+            res.Columns.Add("Oid", typeof(uint));
+            res.Columns.Add("Data", typeof(int));
 
             return res;
         }
@@ -91,12 +87,12 @@ private static FeatureDataTable GetRealFeatureDataTable()
         private static void FillRealDataTable(FeatureDataTable table)
         {
             table.BeginLoadData();
-            var factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4326);
+            var factory = NtsGeometryServices.Instance.CreateGeometryFactory(4326);
 
             uint id = 0;
             foreach (var datas in PointData())
             {
-                var row = (FeatureDataRow) table.LoadDataRow(new object[] {id++, datas[0]}, LoadOption.OverwriteChanges);
+                var row = (FeatureDataRow)table.LoadDataRow(new object[] { id++, datas[0] }, LoadOption.OverwriteChanges);
                 row.Geometry = factory.CreatePoint(new Coordinate(datas[2], datas[1]));
             }
             table.EndLoadData();
diff --git a/Examples/ExampleCodeSnippets/LengthIndexedLineSample.cs b/Examples/ExampleCodeSnippets/LengthIndexedLineSample.cs
index 79fff1d5..b98589c8 100644
--- a/Examples/ExampleCodeSnippets/LengthIndexedLineSample.cs
+++ b/Examples/ExampleCodeSnippets/LengthIndexedLineSample.cs
@@ -5,41 +5,41 @@ namespace ExampleCodeSnippets
     [NUnit.Framework.TestFixture]
     public class LengthIndexedLineSample
     {
-public GeoAPI.Geometries.IMultiLineString SplitLineString(
-    GeoAPI.Geometries.ILineString lineString, 
-    System.Double length)
-{
-    if (lineString == null || lineString.IsEmpty)
-        throw new System.ArgumentException("Linestring is null or Empty", "lineString");
+        public NetTopologySuite.Geometries.MultiLineString SplitLineString(
+            NetTopologySuite.Geometries.LineString lineString,
+            System.Double length)
+        {
+            if (lineString == null || lineString.IsEmpty)
+                throw new System.ArgumentException("Linestring is null or Empty", "lineString");
 
-    //var gf = new NetTopologySuite.Geometries.GeometryFactory();
-    //var ntsLine = (NetTopologySuite.Geometries.LineString)
-    //                SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(lineString, gf);
+            //var gf = new NetTopologySuite.Geometries.GeometryFactory();
+            //var ntsLine = (NetTopologySuite.Geometries.LineString)
+            //                SharpMap.Converters.NTS.GeometryConverter.ToNTSGeometry(lineString, gf);
 
-    var ret = new System.Collections.Generic.List<GeoAPI.Geometries.ILineString>();
-    var lil = new NetTopologySuite.LinearReferencing.LengthIndexedLine(lineString);
+            var ret = new System.Collections.Generic.List<NetTopologySuite.Geometries.LineString>();
+            var lil = new NetTopologySuite.LinearReferencing.LengthIndexedLine(lineString);
 
-    double currentLength = 0d;
-    while (currentLength  < lineString.Length)
-    {
-        var tmpLine = (GeoAPI.Geometries.ILineString)
-            lil.ExtractLine(currentLength, currentLength + length);
-        ret.Add(tmpLine);
-        currentLength += length;
-    }
-    return lineString.Factory.CreateMultiLineString(ret.ToArray());
-}
+            double currentLength = 0d;
+            while (currentLength < lineString.Length)
+            {
+                var tmpLine = (NetTopologySuite.Geometries.LineString)
+                    lil.ExtractLine(currentLength, currentLength + length);
+                ret.Add(tmpLine);
+                currentLength += length;
+            }
+            return lineString.Factory.CreateMultiLineString(ret.ToArray());
+        }
 
         [NUnit.Framework.Test]
         public void TestLengthIndexedLine()
         {
             var gf = new NetTopologySuite.Geometries.GeometryFactory();
             var l = gf.CreateLineString(
-                new []
-                    {   new GeoAPI.Geometries.Coordinate(0, 0), 
-                        new GeoAPI.Geometries.Coordinate(300, 100),});
+                new[]
+                    {   new NetTopologySuite.Geometries.Coordinate(0, 0),
+                        new NetTopologySuite.Geometries.Coordinate(300, 100),});
 
             System.Console.WriteLine(SplitLineString(l, 20d));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/ExampleCodeSnippets/LineSymbolizerTest.cs b/Examples/ExampleCodeSnippets/LineSymbolizerTest.cs
index df68789d..c7fe3ad9 100644
--- a/Examples/ExampleCodeSnippets/LineSymbolizerTest.cs
+++ b/Examples/ExampleCodeSnippets/LineSymbolizerTest.cs
@@ -1,134 +1,129 @@
 namespace ExampleCodeSnippets
 {
 
-/// <summary>
-/// A (simple) street direction symbolizer
-/// </summary>
-public class StreetDirectionSymbolizer : SharpMap.Rendering.Symbolizer.BaseSymbolizer,
-    SharpMap.Rendering.Symbolizer.ILineSymbolizer
-{
     /// <summary>
-    /// Creates an instance of this class
+    /// A (simple) street direction symbolizer
     /// </summary>
-    public StreetDirectionSymbolizer()
+    public class StreetDirectionSymbolizer : SharpMap.Rendering.Symbolizer.BaseSymbolizer,
+    SharpMap.Rendering.Symbolizer.ILineSymbolizer
     {
-        RepeatInterval = 500;
-        ArrowLength = 100;
-        ArrowPen = new System.Drawing.Pen(System.Drawing.Color.Black, 2)
+        /// <summary>
+        /// Creates an instance of this class
+        /// </summary>
+        public StreetDirectionSymbolizer()
         {
-            EndCap = System.Drawing.Drawing2D.LineCap.ArrowAnchor
-        };
-    }
-
-    /// <summary>
-    /// Method to place the street direction symbols
-    /// </summary>
-    /// <param name="map"></param>
-    /// <param name="lineString"></param>
-    /// <param name="graphics"></param>
-    private void OnRenderInternal(SharpMap.MapViewport map, GeoAPI.Geometries.ILineString lineString,
-        System.Drawing.Graphics graphics)
-    {
+            RepeatInterval = 500;
+            ArrowLength = 100;
+            ArrowPen = new System.Drawing.Pen(System.Drawing.Color.Black, 2)
+            {
+                EndCap = System.Drawing.Drawing2D.LineCap.ArrowAnchor
+            };
+        }
 
-        var length = lineString.Length;
-        var lil = new NetTopologySuite.LinearReferencing.LengthIndexedLine(lineString);
-        if (length < RepeatInterval + ArrowLength)
+        /// <summary>
+        /// Method to place the street direction symbols
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="lineString"></param>
+        /// <param name="graphics"></param>
+        private void OnRenderInternal(SharpMap.MapViewport map, NetTopologySuite.Geometries.LineString lineString,
+            System.Drawing.Graphics graphics)
         {
-            var start = System.Math.Max(0, (length - ArrowLength)/2);
-            var end = System.Math.Min(length, (length + ArrowLength)/2);
-            var arrow = (GeoAPI.Geometries.ILineString) lil.ExtractLine(start, end);
 
-            RenderArrow(map, graphics, arrow);
+            var length = lineString.Length;
+            var lil = new NetTopologySuite.LinearReferencing.LengthIndexedLine(lineString);
+            if (length < RepeatInterval + ArrowLength)
+            {
+                var start = System.Math.Max(0, (length - ArrowLength) / 2);
+                var end = System.Math.Min(length, (length + ArrowLength) / 2);
+                var arrow = (NetTopologySuite.Geometries.LineString)lil.ExtractLine(start, end);
 
-            return;
-        }
+                RenderArrow(map, graphics, arrow);
 
-        var numArrows = (int) ((lineString.Length - ArrowLength)/RepeatInterval);
-        var offset = (lineString.Length - numArrows*RepeatInterval - ArrowLength)*0.5;
+                return;
+            }
 
-        while (offset + ArrowLength < lineString.Length)
-        {
-            var arrow = (GeoAPI.Geometries.ILineString) lil.ExtractLine(offset, offset + ArrowLength);
-            RenderArrow(map, graphics, arrow);
-            offset += RepeatInterval;
-        }
+            var numArrows = (int)((lineString.Length - ArrowLength) / RepeatInterval);
+            var offset = (lineString.Length - numArrows * RepeatInterval - ArrowLength) * 0.5;
 
-    }
+            while (offset + ArrowLength < lineString.Length)
+            {
+                var arrow = (NetTopologySuite.Geometries.LineString)lil.ExtractLine(offset, offset + ArrowLength);
+                RenderArrow(map, graphics, arrow);
+                offset += RepeatInterval;
+            }
 
-    /// <summary>
-    /// Method to render the arrow
-    /// </summary>
-    /// <param name="map">The map</param>
-    /// <param name="graphics">The graphics object</param>
-    /// <param name="arrow">The arrow</param>
-    private void RenderArrow(SharpMap.MapViewport map, System.Drawing.Graphics graphics, GeoAPI.Geometries.ILineString arrow)
-    {
-        var pts = new System.Drawing.PointF[arrow.Coordinates.Length];
-        for (var i = 0; i < pts.Length; i++)
-            pts[i] = map.WorldToImage(arrow.GetCoordinateN(i));
-        graphics.DrawLines(ArrowPen, pts);
-    }
+        }
 
-    /// <summary>
-    /// Gets or sets a value indicating at which distances a street direction marker should be drawn.
-    /// </summary>
-    public double RepeatInterval { get; set; }
+        /// <summary>
+        /// Method to render the arrow
+        /// </summary>
+        /// <param name="map">The map</param>
+        /// <param name="graphics">The graphics object</param>
+        /// <param name="arrow">The arrow</param>
+        private void RenderArrow(SharpMap.MapViewport map, System.Drawing.Graphics graphics, NetTopologySuite.Geometries.LineString arrow)
+        {
+            var pts = new System.Drawing.PointF[arrow.Coordinates.Length];
+            for (var i = 0; i < pts.Length; i++)
+                pts[i] = map.WorldToImage(arrow.GetCoordinateN(i));
+            graphics.DrawLines(ArrowPen, pts);
+        }
 
-    /// <summary>
-    /// Gets or sets a value indicating the length of the street direction arrow.
-    /// </summary>
-    public double ArrowLength { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating at which distances a street direction marker should be drawn.
+        /// </summary>
+        public double RepeatInterval { get; set; }
 
-    /// <summary>
-    /// Gets or sets a value indicating the pen to use when drawing the marker
-    /// </summary>
-    public System.Drawing.Pen ArrowPen { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating the length of the street direction arrow.
+        /// </summary>
+        public double ArrowLength { get; set; }
 
-    public override void Begin(System.Drawing.Graphics g, SharpMap.MapViewport map, int aproximateNumberOfGeometries)
-    {
-        base.Begin(g, map, aproximateNumberOfGeometries);
+        /// <summary>
+        /// Gets or sets a value indicating the pen to use when drawing the marker
+        /// </summary>
+        public System.Drawing.Pen ArrowPen { get; set; }
 
-        //Adjust Arrow cap
-        var size = (float) (ArrowLength/5/map.PixelWidth);
-        ArrowPen.CustomEndCap = new System.Drawing.Drawing2D.AdjustableArrowCap(size, size);
-    }
+        public override void Begin(System.Drawing.Graphics g, SharpMap.MapViewport map, int aproximateNumberOfGeometries)
+        {
+            base.Begin(g, map, aproximateNumberOfGeometries);
 
-    public void Render(SharpMap.MapViewport map, GeoAPI.Geometries.ILineal geometry, System.Drawing.Graphics graphics)
-    {
-        if (geometry is GeoAPI.Geometries.IMultiLineString)
+            //Adjust Arrow cap
+            var size = (float)(ArrowLength / 5 / map.PixelWidth);
+            ArrowPen.CustomEndCap = new System.Drawing.Drawing2D.AdjustableArrowCap(size, size);
+        }
+
+        public void Render(SharpMap.MapViewport map, NetTopologySuite.Geometries.ILineal geometry, System.Drawing.Graphics graphics)
         {
-            var mls = (GeoAPI.Geometries.IMultiLineString) geometry;
-            for (var i = 0; i < mls.Count; i++)
+            if (geometry is NetTopologySuite.Geometries.MultiLineString)
             {
-                OnRenderInternal(map, (GeoAPI.Geometries.ILineString) mls.GetGeometryN(i), graphics);
+                var mls = (NetTopologySuite.Geometries.MultiLineString)geometry;
+                for (var i = 0; i < mls.Count; i++)
+                {
+                    OnRenderInternal(map, (NetTopologySuite.Geometries.LineString)mls.GetGeometryN(i), graphics);
+                }
+                return;
             }
-            return;
+            OnRenderInternal(map, (NetTopologySuite.Geometries.LineString)geometry, graphics);
         }
-        OnRenderInternal(map, (GeoAPI.Geometries.ILineString) geometry, graphics);
-    }
 
-    protected override void ReleaseManagedResources()
-    {
-        base.ReleaseManagedResources();
-        ArrowPen.Dispose();
-    }
+        protected override void ReleaseManagedResources()
+        {
+            base.ReleaseManagedResources();
+            ArrowPen.Dispose();
+        }
 
-    public override object Clone()
-    {
-        var res = (StreetDirectionSymbolizer) MemberwiseClone();
-        res.ArrowPen = new System.Drawing.Pen(((System.Drawing.SolidBrush) ArrowPen.Brush).Color, ArrowPen.Width);
-        return res;
+        public override object Clone()
+        {
+            var res = (StreetDirectionSymbolizer)MemberwiseClone();
+            res.ArrowPen = new System.Drawing.Pen(((System.Drawing.SolidBrush)ArrowPen.Brush).Color, ArrowPen.Width);
+            return res;
+        }
     }
-}
 
     public class LineSymbolizerTest
     {
-        [NUnit.Framework.OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = NetTopologySuite.NtsGeometryServices.Instance;
-        }
-        [NUnit.Framework.Test] 
+        [NUnit.Framework.Test]
         public void TestBasicLineSymbolizer()
         {
             if (!System.IO.File.Exists("d:\\daten\\GeoFabrik\\roads.shp"))
@@ -139,7 +134,7 @@ public void TestBasicLineSymbolizer()
             //l.Style.Outline = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 5);
             l.Style.Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 1);
             l.Style.EnableOutline = false;
-            var m = new SharpMap.Map(new System.Drawing.Size(1440,1080)) {BackColor = System.Drawing.Color.Cornsilk};
+            var m = new SharpMap.Map(new System.Drawing.Size(1440, 1080)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
 
             m.ZoomToExtents();
@@ -184,7 +179,8 @@ public void TestStreetDirectionSymbolizer()
             l.Style.EnableOutline = true;
             var sd = new SharpMap.Layers.Symbolizer.LinealVectorLayer("streetd", p, new StreetDirectionSymbolizer()
             {
-                ArrowLength = 100, RepeatInterval = 500
+                ArrowLength = 100,
+                RepeatInterval = 500
             });
             var m = new SharpMap.Map(new System.Drawing.Size(1440, 1080)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
@@ -210,23 +206,24 @@ public void TestWarpedLineSymbolizer()
             var p = new SharpMap.Data.Providers.ShapeFile(@"d:\\daten\\GeoFabrik\\Aurich\\roads.shp", false);
 
             var l = new SharpMap.Layers.VectorLayer("roads", p);
-            
+
             var cls = new SharpMap.Rendering.Symbolizer.CachedLineSymbolizer();
             cls.LineSymbolizeHandlers.Add(new SharpMap.Rendering.Symbolizer.PlainLineSymbolizeHandler
-                                              {Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 2)});
+            { Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 2) });
 
             var wls = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                          {
-                              Pattern =
+            {
+                Pattern =
                                   SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.
                                   GetGreaterSeries(3, 3),
-                              Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
-                              , Interval = 20
-                          };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
+                              ,
+                Interval = 20
+            };
             cls.LineSymbolizeHandlers.Add(wls);
             l.Style.LineSymbolizer = cls;
 
-            var m = new SharpMap.Map(new System.Drawing.Size(720, 540)) {BackColor = System.Drawing.Color.Cornsilk};
+            var m = new SharpMap.Map(new System.Drawing.Size(720, 540)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
 
             m.ZoomToExtents();
@@ -240,14 +237,15 @@ public void TestWarpedLineSymbolizer()
             bmp.Save("AurichRoads1.bmp");
 
             cls.LineSymbolizeHandlers[1] = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                                               {
-                                                   Pattern =
+            {
+                Pattern =
                                                        SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.
                                                        GetTriangle(4, 0),
-                                                   Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
-                                                   Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
-                                                   ,Interval = 10
-                                               };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
+                Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
+                                                   ,
+                Interval = 10
+            };
             sw.Reset(); sw.Start();
             bmp = m.GetMap();
             sw.Stop();
@@ -304,12 +302,12 @@ public void TestWarpedLineSymbolizer()
 
             //cls.LineSymbolizeHandlers[0] = cls.LineSymbolizeHandlers[1];
             cls.LineSymbolizeHandlers[1] = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                                               {
-                                                   Pattern =
+            {
+                Pattern =
                                                        SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.GetZigZag(4, 4),
-                                                   Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
-                                                   //Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
-                                               };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
+                //Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
+            };
             sw.Reset(); sw.Start();
             bmp = m.GetMap();
             sw.Stop();
@@ -373,7 +371,7 @@ public SharpMap.Styles.IStyle GetStyle(SharpMap.Data.FeatureDataRow attribute)
                     Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
                     ,
                     Interval = 20
-                    
+
                 };
                 cls.LineSymbolizeHandlers.Add(wls);
                 cls.ImmediateMode = true;
@@ -392,18 +390,18 @@ public void TestTransformation()
             var m = new SharpMap.Map(new System.Drawing.Size(640, 320));
 
             var l = new SharpMap.Layers.Symbolizer.PuntalVectorLayer("l",
-            new SharpMap.Data.Providers.GeometryProvider(m.Factory.CreatePoint(new GeoAPI.Geometries.Coordinate(0, 51.478885))),
+            new SharpMap.Data.Providers.GeometryProvider(m.Factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(0, 51.478885))),
             SharpMap.Rendering.Symbolizer.PathPointSymbolizer.CreateCircle(System.Drawing.Pens.Aquamarine, System.Drawing.Brushes.BurlyWood, 24));
 
             var ctFact = new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
             l.CoordinateTransformation = ctFact.CreateFromCoordinateSystems(ProjNet.CoordinateSystems.GeographicCoordinateSystem.WGS84, ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator);
             l.ReverseCoordinateTransformation = ctFact.CreateFromCoordinateSystems(ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator, ProjNet.CoordinateSystems.GeographicCoordinateSystem.WGS84);
 
-            m.Layers.Add(new SharpMap.Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(),"b"));
+            m.Layers.Add(new SharpMap.Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(), "b"));
             m.Layers.Add(l);
 
-            var e = new GeoAPI.Geometries.Envelope(-0.02, 0.02, 51.478885 - 0.01, 51.478885 + 0.01);
-            e = GeoAPI.CoordinateSystems.Transformations.GeometryTransform.TransformBox(e,
+            var e = new NetTopologySuite.Geometries.Envelope(-0.02, 0.02, 51.478885 - 0.01, 51.478885 + 0.01);
+            e = NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform.TransformBox(e,
                 l.CoordinateTransformation.MathTransform);
             m.ZoomToBox(e);
             m.GetMap().Save("Greenwich.png", System.Drawing.Imaging.ImageFormat.Png);
diff --git a/Examples/ExampleCodeSnippets/NtsTests.cs b/Examples/ExampleCodeSnippets/NtsTests.cs
index 1d0521fc..ac8bd382 100644
--- a/Examples/ExampleCodeSnippets/NtsTests.cs
+++ b/Examples/ExampleCodeSnippets/NtsTests.cs
@@ -1,18 +1,11 @@
-using System.Data.OleDb;
-using SharpMap.Data.Providers;
+using SharpMap.Data.Providers;
+using System.Data.OleDb;
 
 namespace ExampleCodeSnippets
 {
     [NUnit.Framework.TestFixture]
     public class NtsTests
     {
-        [NUnit.Framework.OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance =
-                NetTopologySuite.NtsGeometryServices.Instance;
-        }
-
         [NUnit.Framework.Test]
         public void TestDiscussionNtsAndBaffeled()
         {
@@ -22,15 +15,15 @@ public void TestDiscussionNtsAndBaffeled()
 429023.1119599645 360406.75878171506, 429004.52340613387 360451.71714446822, 
 429004.52340613387 360451.71714446822, 428999.76819468878 360451.93329044303))");
 
-            var points = new System.Collections.Generic.List<GeoAPI.Geometries.IGeometry>(new []
+            var points = new System.Collections.Generic.List<NetTopologySuite.Geometries.Geometry>(new[]
                 {
-                    reader.Factory.CreatePoint(new GeoAPI.Geometries.Coordinate(429012.5, 360443.18)),
-                    reader.Factory.CreatePoint(new GeoAPI.Geometries.Coordinate(429001.59, 360446.98)),
-                    reader.Factory.CreatePoint(new GeoAPI.Geometries.Coordinate(429003.31, 360425.45)),
-                    reader.Factory.CreatePoint(new GeoAPI.Geometries.Coordinate(429016.9, 360413.04))
+                    reader.Factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(429012.5, 360443.18)),
+                    reader.Factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(429001.59, 360446.98)),
+                    reader.Factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(429003.31, 360425.45)),
+                    reader.Factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(429016.9, 360413.04))
                 });
 
-            var inside = new System.Collections.Generic.List<bool>(new[] {false, true, true, true});
+            var inside = new System.Collections.Generic.List<bool>(new[] { false, true, true, true });
 
             for (var i = 0; i < points.Count; i++)
             {
@@ -55,7 +48,7 @@ public void TestDiscussionNtsAndBaffeledOleDb()
 
             var table = WriteCsv();
 
-            var p = new DbPoint(OleDbFactory.Instance, 
+            var p = new DbPoint(OleDbFactory.Instance,
                 "Provider=" + Properties.Settings.Default.OleDbProvider + ";Data Source=\"" + System.IO.Path.GetTempPath() + "\";" +
                 "Extended Properties=\"text;HDR=Yes;FMT=Delimited\"", table, "ID", "X", "Y");
 
@@ -83,7 +76,7 @@ public void TestDiscussionNtsAndBaffeledOleDb()
             var ext = p.GetExtents();
             var oids = p.GetObjectIDsInView(ext);
             NUnit.Framework.Assert.AreEqual(4, oids.Count);
-            
+
             System.IO.File.Delete(System.IO.Path.Combine(System.IO.Path.GetTempPath(), table));
         }
 
@@ -103,10 +96,10 @@ private static string WriteCsv()
             using (var sr = new System.IO.StreamWriter(System.IO.File.OpenWrite(filename)))
             {
                 sr.WriteLine("ID;Name;X;Y");
-                sr.WriteLine("1;One;{0};{1}", 429012.5,360443.18);
-                sr.WriteLine("2;Two;{0};{1}",429001.59,360446.98);
-                sr.WriteLine("3;Three;{0};{1}",429003.31,360425.45);
-                sr.WriteLine("4;Four;{0};{1}",429016.9,360413.04);
+                sr.WriteLine("1;One;{0};{1}", 429012.5, 360443.18);
+                sr.WriteLine("2;Two;{0};{1}", 429001.59, 360446.98);
+                sr.WriteLine("3;Three;{0};{1}", 429003.31, 360425.45);
+                sr.WriteLine("4;Four;{0};{1}", 429016.9, 360413.04);
             }
 
             return System.IO.Path.GetFileName(filename);
diff --git a/Examples/ExampleCodeSnippets/PointSymbolizerTest.cs b/Examples/ExampleCodeSnippets/PointSymbolizerTest.cs
index 9a6d5eef..05035306 100644
--- a/Examples/ExampleCodeSnippets/PointSymbolizerTest.cs
+++ b/Examples/ExampleCodeSnippets/PointSymbolizerTest.cs
@@ -1,3 +1,5 @@
+using System.IO;
+
 namespace ExampleCodeSnippets
 {
     /// <summary>
@@ -12,16 +14,16 @@ public void TestCharacterPointSymbolizer()
                 CreatingData.GetRandomOrdinates(50, -180, 180), CreatingData.GetRandomOrdinates(50, -90, 90), null);
             var geometryFeatureProvider = new SharpMap.Data.Providers.GeometryFeatureProvider(fdt);
             var layer = new SharpMap.Layers.VectorLayer("randompoints", geometryFeatureProvider);
-            var cps  = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
-                                              {
-                                                  Halo = 1,
-                                                  HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
-                                                  //Font = new System.Drawing.Font("Arial", 12),
-                                                  CharacterIndex = 0xcc,
-                                              };
+            var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
+            {
+                Halo = 1,
+                HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
+                //Font = new System.Drawing.Font("Arial", 12),
+                CharacterIndex = 0xcc,
+            };
             layer.Style.PointSymbolizer = cps;
             var map = new SharpMap.Map(new System.Drawing.Size(720, 360));
-            
+
             map.Layers.Add(layer);
             map.ZoomToExtents();
             map.GetMap().Save("CharacterPointSymbolizer1.bmp");
@@ -63,7 +65,7 @@ public void TestPathPointSymbolizer()
             map.GetMap().Save("PathPointSymbolizer3.bmp");
 
             var gpTriangle1 = new System.Drawing.Drawing2D.GraphicsPath();
-            gpTriangle1.AddPolygon(new [] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
+            gpTriangle1.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
             var gpTriangle2 = new System.Drawing.Drawing2D.GraphicsPath();
             gpTriangle2.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(-5, -10), new System.Drawing.Point(-10, 0), new System.Drawing.Point(0, 0), });
             pps = new
@@ -90,7 +92,8 @@ public void TestPathPointSymbolizer()
                                                                         System.Drawing.Color.Red)
                                                                 }
 
-                                                        }){ Rotation = 45 };
+                                                        })
+            { Rotation = 45 };
 
             layer.Style.PointSymbolizer = pps;
             map.GetMap().Save("PathPointSymbolizer4.bmp");
@@ -106,8 +109,12 @@ public void TestRasterPointSymbolizer()
                 CreatingData.GetRandomOrdinates(50, -180, 180), CreatingData.GetRandomOrdinates(50, -90, 90), null);
             var geometryFeatureProvider = new SharpMap.Data.Providers.GeometryFeatureProvider(fdt);
             var layer = new SharpMap.Layers.VectorLayer("randompoints", geometryFeatureProvider);
+            var stylePath = Path.GetFullPath(
+                Path.Combine(
+                    Path.GetDirectoryName(GetType().Assembly.Location),
+                    "..\\..\\..\\..\\DemoWinForm\\Resources\\women.png"));
             var rps =
-                new SharpMap.Rendering.Symbolizer.RasterPointSymbolizer {Symbol = new System.Drawing.Bitmap("women.png")};
+                new SharpMap.Rendering.Symbolizer.RasterPointSymbolizer { Symbol = new System.Drawing.Bitmap(stylePath) };
 
             layer.Style.PointSymbolizer = rps;
             var map = new SharpMap.Map(new System.Drawing.Size(720, 360));
@@ -120,14 +127,14 @@ public void TestRasterPointSymbolizer()
             rps.Rotation = 0;
 
             var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
-                          {
-                              Halo = 1,
-                              HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.WhiteSmoke),
-                              Foreground = new System.Drawing.SolidBrush(System.Drawing.Color.Black),
-                              Font = new System.Drawing.Font("Arial", 12),
-                              Text = "Anne",
-                              Offset = new System.Drawing.PointF(0, rps.Size.Height*0.5f)
-                
+            {
+                Halo = 1,
+                HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.WhiteSmoke),
+                Foreground = new System.Drawing.SolidBrush(System.Drawing.Color.Black),
+                Font = new System.Drawing.Font("Arial", 12),
+                Text = "Anne",
+                Offset = new System.Drawing.PointF(0, rps.Size.Height * 0.5f)
+
             };
 
             var lps = new SharpMap.Rendering.Symbolizer.ListPointSymbolizer { rps, cps };
@@ -171,4 +178,4 @@ public void TestListPointSymbolizer()
 }
 //D:\Development\Codeplex\_SharpMap\Repository\Trunk\DemoWinForm\Resources
 //D:\Development\Codeplex\_SharpMap\Repository\Trunk\DemoWinForm\Resources\Women.png
-//
\ No newline at end of file
+//
diff --git a/Examples/ExampleCodeSnippets/PolygonSymbolizerTest.cs b/Examples/ExampleCodeSnippets/PolygonSymbolizerTest.cs
index a186d33a..4d457d60 100644
--- a/Examples/ExampleCodeSnippets/PolygonSymbolizerTest.cs
+++ b/Examples/ExampleCodeSnippets/PolygonSymbolizerTest.cs
@@ -1,3 +1,6 @@
+using SharpMap.CoordinateSystems;
+using System.IO;
+
 namespace ExampleCodeSnippets
 {
     [NUnit.Framework.TestFixture]
@@ -12,10 +15,10 @@ public override void Begin(System.Drawing.Graphics g, SharpMap.MapViewport map,
                 base.Begin(g, map, aproximateNumberOfGeometries);
                 _oldRenderOrigin = g.RenderingOrigin;
             }
-            protected override void OnRenderInternal(SharpMap.MapViewport map, GeoAPI.Geometries.IPolygon polygon, System.Drawing.Graphics g)
+            protected override void OnRenderInternal(SharpMap.MapViewport map, NetTopologySuite.Geometries.Polygon polygon, System.Drawing.Graphics g)
             {
                 var pt = polygon.Centroid;
-                g.RenderingOrigin = 
+                g.RenderingOrigin =
                     System.Drawing.Point.Truncate(map.WorldToImage(pt.Coordinate));
                 base.OnRenderInternal(map, polygon, g);
             }
@@ -28,23 +31,36 @@ public override void End(System.Drawing.Graphics g, SharpMap.MapViewport map)
 
         [NUnit.Framework.OneTimeSetUp]
         public void OneTimeSetUp()
-        { }
+        {
+            var gss = NetTopologySuite.NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
+                new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
+                new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory(),
+                SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
+            SharpMap.Session.Instance
+                .SetGeometryServices(gss)
+                .SetCoordinateSystemServices(css)
+                .SetCoordinateSystemRepository(css);
+        }
 
         [NUnit.Framework.Test]
         public void TestPlainPolygonSymbolizer()
         {
-            var provider = new SharpMap.Data.Providers.ShapeFile(
-                "..\\..\\..\\WinFormSamples\\GeoData\\World\\countries.shp", true);
+            var shapePath = Path.GetFullPath(
+                Path.Combine(
+                    Path.GetDirectoryName(GetType().Assembly.Location),
+                    "..\\..\\..\\..\\WinFormSamples\\GeoData\\World\\countries.shp"));
+            var provider = new SharpMap.Data.Providers.ShapeFile(shapePath, true);
             var l = new SharpMap.Layers.Symbolizer.PolygonalVectorLayer("Countries", provider);
             l.Symbolizer = new ModifiedBasicPolygonSymbolizer
-                {
-                    Fill = new System.Drawing.Drawing2D.HatchBrush(
-                            System.Drawing.Drawing2D.HatchStyle.WideDownwardDiagonal, 
+            {
+                Fill = new System.Drawing.Drawing2D.HatchBrush(
+                            System.Drawing.Drawing2D.HatchStyle.WideDownwardDiagonal,
                             System.Drawing.Color.Red /*,
                             System.Drawing.Color.LightPink*/),
-                    UseClipping = false,
-                    //Outline = System.Drawing.Pens.AliceBlue
-                };
+                UseClipping = false,
+                //Outline = System.Drawing.Pens.AliceBlue
+            };
 
             var m = new SharpMap.Map(new System.Drawing.Size(1440, 1080)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
@@ -53,7 +69,7 @@ public void TestPlainPolygonSymbolizer()
 
             var sw = new System.Diagnostics.Stopwatch();
             var img = m.GetMap();
-            
+
             sw.Start();
             img = m.GetMap();
             img.Save("PolygonSymbolizer-1.bmp", System.Drawing.Imaging.ImageFormat.Bmp);
@@ -75,7 +91,7 @@ public void TestPlainPolygonSymbolizer()
             img.Save("PolygonSymbolizer-2.bmp", System.Drawing.Imaging.ImageFormat.Bmp);
             sw.Stop();
             System.Console.WriteLine(string.Format("Rendering new method:{0}ms", sw.ElapsedMilliseconds));
-        
+
         }
     }
 
diff --git a/Examples/ExampleCodeSnippets/ProjectionExamples.cs b/Examples/ExampleCodeSnippets/ProjectionExamples.cs
index 1ceacf0c..71e137ee 100644
--- a/Examples/ExampleCodeSnippets/ProjectionExamples.cs
+++ b/Examples/ExampleCodeSnippets/ProjectionExamples.cs
@@ -1,8 +1,11 @@
 //#define alglib
 
+using NetTopologySuite;
+using ProjNet.CoordinateSystems;
+
 namespace ExampleCodeSnippets
 {
-    
+
     [NUnit.Framework.TestFixture]
     public class ProjectionExamples
     {
@@ -33,7 +36,7 @@ public void TestConversionProjNet()
     /// X' = _a*X + _b*Y + _c
     /// Y' = _d*X + _e*Y + _f
     /// </summary>
-    public class AffineCoordinateTransformation2D : ProjNet.CoordinateSystems.Transformations.MathTransform, GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation
+    public class AffineCoordinateTransformation2D : ProjNet.CoordinateSystems.Transformations.MathTransform, NetTopologySuite.CoordinateSystems.Transformations.ICoordinateTransformation
     {
         private readonly double _a, _b, _c, _d, _e, _f;
         private readonly double _ainv, _binv, _cinv, _dinv, _einv, _finv;
@@ -110,7 +113,7 @@ public AffineCoordinateTransformation2D(double[,] matrix)
 
         #region Overrides of MathTransform
 
-        public override GeoAPI.CoordinateSystems.Transformations.IMathTransform Inverse()
+        public override NetTopologySuite.CoordinateSystems.Transformations.MathTransform Inverse()
         {
             //#warning(System.Drawing.Drawing2D.Matrix uses single precision floating point numbers. This involves reduction of precision, not at all accurate!)
 
@@ -201,7 +204,7 @@ public long AuthorityCode
             get { throw new System.NotImplementedException(); }
         }
 
-        public GeoAPI.CoordinateSystems.Transformations.IMathTransform MathTransform
+        public NetTopologySuite.CoordinateSystems.Transformations.MathTransform MathTransform
         {
             get { return this; }
         }
@@ -216,19 +219,19 @@ public string Remarks
             get { return ""; }
         }
 
-        public GeoAPI.CoordinateSystems.ICoordinateSystem SourceCS
+        public NetTopologySuite.CoordinateSystems.ICoordinateSystem SourceCS
         {
             get { return null; }
         }
 
-        public GeoAPI.CoordinateSystems.ICoordinateSystem TargetCS
+        public NetTopologySuite.CoordinateSystems.ICoordinateSystem TargetCS
         {
             get { return null; }
         }
 
-        public GeoAPI.CoordinateSystems.Transformations.TransformType TransformType
+        public NetTopologySuite.CoordinateSystems.Transformations.TransformType TransformType
         {
-            get { return GeoAPI.CoordinateSystems.Transformations.TransformType.Transformation; }
+            get { return NetTopologySuite.CoordinateSystems.Transformations.TransformType.Transformation; }
         }
 
         #endregion
@@ -262,7 +265,7 @@ private static SharpMap.Data.FeatureDataTable TransformedFeatureDataTable(
                 for (System.Int32 i = 0; i < fdtClone.Columns.Count; i++)
                     newRow[i] = row[i];
 
-                GeoAPI.Geometries.IPoint smpt = (GeoAPI.Geometries.IPoint)row.Geometry;
+                NetTopologySuite.Geometries.Point smpt = (NetTopologySuite.Geometries.Point)row.Geometry;
                 System.Drawing.PointF[] pts = new System.Drawing.PointF[] 
                     { new System.Drawing.PointF((float)smpt.X, (float)smpt.Y) };
                 matrix.TransformPoints(pts);
@@ -369,8 +372,8 @@ public void TestAffineTransform2D()
             //Get affine transformation calculates mean points to improve accuaracy
             //Unfortunately the result is not very good, so, since I know better I manually set these
             //mean points.
-            lst.SetMeanPoints(new GeoAPI.Geometries.IPoint(0, 0), 
-                              new GeoAPI.Geometries.IPoint(matrix.OffsetX, matrix.OffsetY));
+            lst.SetMeanPoints(new NetTopologySuite.Geometries.Point(0, 0), 
+                              new NetTopologySuite.Geometries.Point(matrix.OffsetX, matrix.OffsetY));
              */
 
             //Create Affine
@@ -383,13 +386,13 @@ public void TestAffineTransform2D()
             map.Layers.Add(new SharpMap.Layers.VectorLayer("L1",
                                                            new SharpMap.Data.Providers.GeometryFeatureProvider(fdt1)));
             ((SharpMap.Layers.VectorLayer) map.Layers[0]).Style.Symbol =
-                new System.Drawing.Bitmap(@"..\..\..\DemoWinForm\Resources\flag.png");
+                new System.Drawing.Bitmap("Examples\\DemoWinForm\\Resources\\flag.png");
 
             //Add transformed layer
             map.Layers.Add(new SharpMap.Layers.VectorLayer("L2",
                                                            new SharpMap.Data.Providers.GeometryFeatureProvider(fdt2)));
             ((SharpMap.Layers.VectorLayer) map.Layers[1]).Style.Symbol =
-                new System.Drawing.Bitmap(@"..\..\..\DemoWinForm\Resources\women.png");
+                new System.Drawing.Bitmap("Examples\DemoWinForm\\Resources\\women.png");
 
             //Render map
             map.ZoomToExtents();
@@ -412,7 +415,7 @@ public void TestAffineTransform2D()
         }
     }
     
-    #endif
+#endif
 
         [NUnit.Framework.Test]
         public void TestGdalRasterLayer()
@@ -428,7 +431,7 @@ public void TestGdalRasterLayer()
             var p1 = ecw1.GetProjection();
             ecw2.ReprojectToCoordinateSystem(p1);
 
-            var m = new SharpMap.Map(new System.Drawing.Size( 1024, 768));
+            var m = new SharpMap.Map(new System.Drawing.Size(1024, 768));
             m.Layers.Add(ecw1);
             m.Layers.Add(ecw2);
 
@@ -439,34 +442,34 @@ public void TestGdalRasterLayer()
             }
         }
 
-public static void ReprojectFeatureDataSet(SharpMap.Data.FeatureDataSet fds,
-    GeoAPI.CoordinateSystems.ICoordinateSystem target)
-{
-    for (var i = 0; i < fds.Tables.Count; i ++)
-    {
-        var fdt = fds.Tables[i];
-        ReprojectFeatureDataTable(fdt, target);
-    }
+        public static void ReprojectFeatureDataSet(SharpMap.Data.FeatureDataSet fds,
+            CoordinateSystem target)
+        {
+            for (var i = 0; i < fds.Tables.Count; i++)
+            {
+                var fdt = fds.Tables[i];
+                ReprojectFeatureDataTable(fdt, target);
+            }
 
-}
+        }
 
-public static void ReprojectFeatureDataTable(SharpMap.Data.FeatureDataTable fdt,
-    GeoAPI.CoordinateSystems.ICoordinateSystem target)
-{
-    var source = SharpMap.CoordinateSystems.CoordinateSystemExtensions.GetCoordinateSystem(fdt[0].Geometry);
+        public static void ReprojectFeatureDataTable(SharpMap.Data.FeatureDataTable fdt,
+            CoordinateSystem target)
+        {
+            var source = SharpMap.CoordinateSystems.CoordinateSystemExtensions.GetCoordinateSystem(fdt[0].Geometry);
 
-    var ctFactory = new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
-    var ct = ctFactory.CreateFromCoordinateSystems(source, target);
-            
-    var geomFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory((int)target.AuthorityCode);
+            var ctFactory = new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
+            var ct = ctFactory.CreateFromCoordinateSystems(source, target);
 
-    for (var i = 0; i < fdt.Rows.Count; i++)
-    {
-        var fdr = fdt[i];
-        fdr.Geometry =
-            GeoAPI.CoordinateSystems.Transformations.GeometryTransform.TransformGeometry(fdr.Geometry,
-                ct.MathTransform, geomFactory);
-    }
-}
+            var geomFactory = NtsGeometryServices.Instance.CreateGeometryFactory((int)target.AuthorityCode);
+
+            for (var i = 0; i < fdt.Rows.Count; i++)
+            {
+                var fdr = fdt[i];
+                fdr.Geometry =
+                    NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform.TransformGeometry(fdr.Geometry,
+                        ct.MathTransform, geomFactory);
+            }
+        }
     }
 }
diff --git a/Examples/ExampleCodeSnippets/ReadXmlExample.cs b/Examples/ExampleCodeSnippets/ReadXmlExample.cs
index 9357326e..34397b18 100644
--- a/Examples/ExampleCodeSnippets/ReadXmlExample.cs
+++ b/Examples/ExampleCodeSnippets/ReadXmlExample.cs
@@ -3,13 +3,13 @@
     public class ReadXmlExample
     {
         /// <summary>
-        /// Creates an enumeration of <see cref="GeoAPI.Geometries.Coordinate"/>s from an xml string
+        /// Creates an enumeration of <see cref="NetTopologySuite.Geometries.Coordinate"/>s from an xml string
         /// </summary>
         /// <param name="factory"></param>
         /// <param name="xml">the xml string</param>
         /// <returns>Coordinates</returns>
-        public static System.Collections.Generic.IEnumerable<GeoAPI.Geometries.IGeometry> PointsFromXml(
-            GeoAPI.Geometries.IGeometryFactory factory,
+        public static System.Collections.Generic.IEnumerable<NetTopologySuite.Geometries.Geometry> PointsFromXml(
+            NetTopologySuite.Geometries.GeometryFactory factory,
             System.IO.Stream xml)
         {
             foreach (var coordinate in CoordinatesFromXml(xml))
@@ -17,11 +17,11 @@ public class ReadXmlExample
         }
 
         /// <summary>
-        /// Creates an enumeration of <see cref="GeoAPI.Geometries.Coordinate"/>s from an xml string
+        /// Creates an enumeration of <see cref="NetTopologySuite.Geometries.Coordinate"/>s from an xml string
         /// </summary>
         /// <param name="xml">the xml string</param>
         /// <returns>Coordinates</returns>
-        public static System.Collections.Generic.IEnumerable<GeoAPI.Geometries.Coordinate> CoordinatesFromXml(System.IO.Stream xml)
+        public static System.Collections.Generic.IEnumerable<NetTopologySuite.Geometries.Coordinate> CoordinatesFromXml(System.IO.Stream xml)
         {
             var reader = System.Xml.XmlReader.Create(xml);
             var doc = System.Xml.Linq.XDocument.Load(reader);
@@ -47,11 +47,11 @@ public class ReadXmlExample
                     var y = double.Parse(element.Value,
                                          System.Globalization.NumberFormatInfo.InvariantInfo);
 
-                    yield return new GeoAPI.Geometries.Coordinate(x, y);
+                    yield return new NetTopologySuite.Geometries.Coordinate(x, y);
                 }
             }
         }
-        
+
         [NUnit.Framework.Test]
         public void TestXml1()
         {
@@ -65,7 +65,7 @@ public void TestXml1()
   </Points>
 </root>";
             var xmlFileName = System.IO.Path.ChangeExtension(System.IO.Path.GetTempFileName(), "xml");
-            
+
             using (var sw = new System.IO.StreamWriter(System.IO.File.OpenWrite(xmlFileName)))
                 sw.Write(xml);
 
diff --git a/Examples/ExampleCodeSnippets/Theming.cs b/Examples/ExampleCodeSnippets/Theming.cs
index ce23d3fa..9f9ccc3f 100644
--- a/Examples/ExampleCodeSnippets/Theming.cs
+++ b/Examples/ExampleCodeSnippets/Theming.cs
@@ -1,5 +1,6 @@
 namespace ExampleCodeSnippets
 {
+    using System.IO;
     using cd = CreatingData;
 
     public class SymbolRotationTheming
@@ -19,7 +20,7 @@ public class SymbolRotationTheming
         /// </summary>
         /// <param name="styleRotationColumn">Name of the column, which contains the rotation angle in degrees [0°, 360°]</param>
         public SymbolRotationTheming(System.String styleRotationColumn)
-            :this(styleRotationColumn, new SharpMap.Styles.VectorStyle())
+            : this(styleRotationColumn, new SharpMap.Styles.VectorStyle())
         {
         }
 
@@ -38,19 +39,19 @@ private static SharpMap.Styles.VectorStyle CloneStyle(SharpMap.Styles.VectorStyl
         {
             SharpMap.Styles.VectorStyle style =
                 new SharpMap.Styles.VectorStyle
-                    {
-                        Enabled = styleToClone.Enabled,
-                        MinVisible = styleToClone.MinVisible,
-                        MaxVisible = styleToClone.MaxVisible,
-                        Line = styleToClone.Line.Clone() as System.Drawing.Pen,
-                        Fill = styleToClone.Fill.Clone() as System.Drawing.Brush,
-                        Outline = styleToClone.Outline.Clone() as System.Drawing.Pen,
-                        EnableOutline = styleToClone.EnableOutline,
-                        Symbol = styleToClone.Symbol.Clone() as System.Drawing.Bitmap,
-                        SymbolOffset = styleToClone.SymbolOffset,
-                        SymbolRotation = styleToClone.SymbolRotation,
-                        SymbolScale = styleToClone.SymbolScale
-                    };
+                {
+                    Enabled = styleToClone.Enabled,
+                    MinVisible = styleToClone.MinVisible,
+                    MaxVisible = styleToClone.MaxVisible,
+                    Line = styleToClone.Line.Clone() as System.Drawing.Pen,
+                    Fill = styleToClone.Fill.Clone() as System.Drawing.Brush,
+                    Outline = styleToClone.Outline.Clone() as System.Drawing.Pen,
+                    EnableOutline = styleToClone.EnableOutline,
+                    Symbol = styleToClone.Symbol.Clone() as System.Drawing.Bitmap,
+                    SymbolOffset = styleToClone.SymbolOffset,
+                    SymbolRotation = styleToClone.SymbolRotation,
+                    SymbolScale = styleToClone.SymbolScale
+                };
 
             return style;
         }
@@ -132,7 +133,7 @@ public SharpMap.Styles.VectorStyle GetRotatedSymol(SharpMap.Data.FeatureDataRow
                     if (!row.IsNull(SymbolColumn))
                     {
                         dataStyle.Symbol = new System.Drawing.Bitmap(
-                            new System.IO.MemoryStream((byte[]) row[SymbolColumn]));
+                            new System.IO.MemoryStream((byte[])row[SymbolColumn]));
                     }
                     return dataStyle;
                 }
@@ -150,37 +151,41 @@ static System.Double[] GetRandomOrdinates(System.Int32 size, System.Double min,
         {
             System.Double[] arr = new System.Double[size];
             System.Double width = max - min;
-            for(System.Int32 i = 0; i < size; i++)
+            for (System.Int32 i = 0; i < size; i++)
             {
                 System.Double randomValue = _randomNumberGenerator.NextDouble();
-                arr[i] = min + randomValue*width;
+                arr[i] = min + randomValue * width;
             }
             return arr;
         }
-        
+
         [NUnit.Framework.Test]
         public void TestSymbolRotationTheming()
         {
             //Create a map
-            SharpMap.Map map = new SharpMap.Map(new System.Drawing.Size(720,360));
-            
+            SharpMap.Map map = new SharpMap.Map(new System.Drawing.Size(720, 360));
+
             //Create some random sample data
             SharpMap.Data.FeatureDataTable fdt =
                 cd.CreatePointFeatureDataTableFromArrays(cd.GetRandomOrdinates(80, -180, 180),
                                                          cd.GetRandomOrdinates(80, -90, 90), null);
 
             //Add rotation column and fill with random rotation values
-            fdt.Columns.Add("Rotation", typeof (System.Double));
+            fdt.Columns.Add("Rotation", typeof(System.Double));
             foreach (SharpMap.Data.FeatureDataRow row in fdt.Rows)
-                row["Rotation"] = _randomNumberGenerator.NextDouble()*360d;
+                row["Rotation"] = _randomNumberGenerator.NextDouble() * 360d;
 
 
             //Create layer and datasource
             SharpMap.Layers.VectorLayer vl = new SharpMap.Layers.VectorLayer("Points", new SharpMap.Data.Providers.GeometryFeatureProvider(fdt));
-            
+
             //Create default style
             SharpMap.Styles.VectorStyle defaultStyle = new SharpMap.Styles.VectorStyle();
-            defaultStyle.Symbol = new System.Drawing.Bitmap(@"..\..\..\DemoWinForm\Resources\flag.png");
+            var stylePath = Path.GetFullPath(
+                Path.Combine(
+                    Path.GetDirectoryName(GetType().Assembly.Location),
+                    "..\\..\\..\\..\\DemoWinForm\\Resources\\flag.png"));
+            defaultStyle.Symbol = new System.Drawing.Bitmap(stylePath);
             defaultStyle.SymbolScale = 0.5f;
 
             //Create theming class and apply to layer
@@ -232,7 +237,11 @@ public void TestSymbolSelectionTheming()
 
             //Create default style
             SharpMap.Styles.VectorStyle defaultStyle = new SharpMap.Styles.VectorStyle();
-            defaultStyle.Symbol = new System.Drawing.Bitmap(@"..\..\..\DemoWinForm\Resources\flag.png");
+            var resPath = Path.GetFullPath(
+                Path.Combine(
+                    Path.GetDirectoryName(GetType().Assembly.Location),
+                    "..\\..\\..\\..\\DemoWinForm\\Resources\\flag.png"));
+            defaultStyle.Symbol = new System.Drawing.Bitmap(resPath);
             defaultStyle.SymbolScale = 0.5f;
 
             //Create theming class and apply to layer
@@ -247,8 +256,8 @@ public void TestSymbolSelectionTheming()
 
         private byte[] RandomSymbol(int number)
         {
-            number = number%360;
-            string text ="";
+            number = number % 360;
+            string text = "";
             System.Drawing.Brush brush = null;
             if (number < 60)
                 return null;
@@ -257,7 +266,7 @@ private byte[] RandomSymbol(int number)
                 text = "<120";
                 brush = System.Drawing.Brushes.DarkGreen;
             }
-            else if(number < 240)
+            else if (number < 240)
             {
                 text = number.ToString();
                 brush = System.Drawing.Brushes.Orange;
@@ -273,7 +282,7 @@ private byte[] RandomSymbol(int number)
             System.Drawing.RectangleF size = new System.Drawing.RectangleF(0f, 0f, 120f, 60f);
             g.FillRectangle(System.Drawing.Brushes.White, size);
             var sf = new System.Drawing.StringFormat(System.Drawing.StringFormatFlags.NoWrap)
-                         {Alignment = System.Drawing.StringAlignment.Center};
+            { Alignment = System.Drawing.StringAlignment.Center };
 
             g.DrawString(text, new System.Drawing.Font("Arial", 24), brush, size, sf);
             g.Flush();
@@ -296,11 +305,11 @@ public void DoTest()
                 new SharpMap.Data.Providers.GeometryFeatureProvider(fds.Tables[0]);
 
             System.Data.DataTable dt = new System.Data.DataTable("external");
-            dt.Columns.Add("city", typeof (string));
-            dt.Columns.Add("males", typeof (int));
-            dt.Columns.Add("females", typeof (int));
+            dt.Columns.Add("city", typeof(string));
+            dt.Columns.Add("males", typeof(int));
+            dt.Columns.Add("females", typeof(int));
 
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/ExampleCodeSnippets/app.config b/Examples/ExampleCodeSnippets/app.config
index 4913f2e5..6fa6f181 100644
--- a/Examples/ExampleCodeSnippets/app.config
+++ b/Examples/ExampleCodeSnippets/app.config
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<configSections>
-  <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-   <section name="ExampleCodeSnippets.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </sectionGroup>
- </configSections>
-  <applicationSettings>
-    <ExampleCodeSnippets.Properties.Settings>
-      <setting name="OleDbProvider" serializeAs="String">
-        <value>Microsoft.ACE.OLEDB.15.0</value>
-      </setting>
-    </ExampleCodeSnippets.Properties.Settings>
-  </applicationSettings>
+    <configSections>
+        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="ExampleCodeSnippets.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <applicationSettings>
+        <ExampleCodeSnippets.Properties.Settings>
+            <setting name="OleDbProvider" serializeAs="String">
+                <value>Microsoft.ACE.OLEDB.12.0</value>
+            </setting>
+        </ExampleCodeSnippets.Properties.Settings>
+    </applicationSettings>
+    <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly>
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+            </dependentAssembly>            
+        </assemblyBinding>
+    </runtime>
 </configuration>
diff --git a/Examples/ExampleCodeSnipplets.VB/CustomThemeExample.vb b/Examples/ExampleCodeSnipplets.VB/CustomThemeExample.vb
index a209e1c2..bc2b00af 100644
--- a/Examples/ExampleCodeSnipplets.VB/CustomThemeExample.vb
+++ b/Examples/ExampleCodeSnipplets.VB/CustomThemeExample.vb
@@ -11,7 +11,7 @@
 
     Protected Overrides Sub Finalize()
 
-        For Each kvp as KeyValuePair(Of String, SharpMap.Styles.IStyle) in  _styles
+        For Each kvp as KeyValuePair(Of String, SharpMap.Styles.IStyle) in _styles
             kvp.Value.Dispose()
         Next
 
@@ -52,23 +52,23 @@ End Class
 
 public Class UniqueValuesThemeTest
 
- Private delObjektLabelBez As SharpMap.Layers.LabelLayer.GetLabelMethod
-  Private delObjektLabelPos As SharpMap.Layers.LabelLayer.GetLocationMethod
-  Private delObjektLabelStyle As SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod
-  Private delObjektStyle As SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod
-  '
+    Private delObjektLabelBez As SharpMap.Layers.LabelLayer.GetLabelMethod
+    Private delObjektLabelPos As SharpMap.Layers.LabelLayer.GetLocationMethod
+    Private delObjektLabelStyle As SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod
+    Private delObjektStyle As SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod
+    '
     Private _map As SharpMap.Map
- 
+
     public class OtherClassItem
-        public Property Name  () As String
+        public Property Name() As String
         Public Property Datasource() As string
         Public Property Table() As string
         Public Property Field() As string
     End Class
 
-    public class OtherClass 
+    public class OtherClass
         Inherits System.Collections.Generic.List(Of OtherClassItem)
-        public Property Name  () As String
+        public Property Name() As String
     End Class
 
     Private _polygonTheme As SharpMap.Rendering.Thematics.UniqueValuesTheme(Of Int32) = CreatePolygonTheme()
@@ -84,14 +84,14 @@ public Class UniqueValuesThemeTest
         s.EnableOutline = True
         styleMap.Add(1, s)
         '2
-        s = New SharpMap.Styles. VectorStyle()
-        s.Outline=new Drawing.Pen(Drawing.Color.Black, 1)
+        s = New SharpMap.Styles.VectorStyle()
+        s.Outline = new Drawing.Pen(Drawing.Color.Black, 1)
         s.Fill = New Drawing.SolidBrush(Drawing.Color.Blue)
         s.EnableOutline = True
         styleMap.Add(2, s)
         '3
         s = New SharpMap.Styles.VectorStyle()
-        s.Outline =new Drawing.Pen(Drawing.Color.Black, 1)
+        s.Outline = new Drawing.Pen(Drawing.Color.Black, 1)
         s.Fill = New Drawing.SolidBrush(Drawing.Color.Red)
         s.EnableOutline = True
         styleMap.Add(2, s)
@@ -100,103 +100,103 @@ public Class UniqueValuesThemeTest
         Return new SharpMap.Rendering.Thematics.UniqueValuesTheme(Of Integer)("FilterColumn", styleMap, SharpMap.Styles.VectorStyle.CreateRandomPolygonalStyle())
     End Function
 
- Public Sub CreateLayers(ByVal config as OtherClass)
-     '
-     delObjektLabelBez = New SharpMap.Layers.LabelLayer.GetLabelMethod(AddressOf LabelObjektBezeichnung)
-     delObjektLabelPos = New SharpMap.Layers.LabelLayer.GetLocationMethod(AddressOf LabelBezeichnungPos)
-     delObjektStyle = New SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod(AddressOf GetObjektStyle)
-     delObjektLabelStyle = New SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod(AddressOf GetObjektLabelStyle)
-     '
-     For each itm as OtherClassItem in config
-        Select Case itm.Name
-           Case "Name1"
-              Dim smp as New SharpMap.Data.Providers.PostGIS(itm.Datasource, itm.Table, itm.Field)
-              Dim vLay as New SharpMap.Layers.VectorLayer(itm.Name, smp)
-              'Dim layTheme = New SharpMap.Rendering.Thematics.CustomTheme(delObjektStyle)
-              vLay.Theme = Me._polygonTheme 'layTheme
-              '
-              Dim labLay As New SharpMap.Layers.LabelLayer("Lable: " & itm.Name)
-              Dim labTheme as New SharpMap.Rendering.Thematics.CustomTheme(delObjektLabelStyle)
-              labLay.DataSource = vLay.DataSource
-          labLay.Theme = labTheme
-              labLay.LabelStringDelegate = delObjektLabelBez
-          labLay.LabelPositionDelegate = delObjektLabelPos
-              '
-              _map.Layers.Add(vLay)
-              _Map.Layers.Add(labLay)
-              '
-           Case "Name2"
-              Dim smp as New SharpMap.Data.Providers.PostGIS(itm.Datasource, itm.Table, itm.Field)
-              Dim vLay as New SharpMap.Layers.VectorLayer(itm.Name, smp)
-              '
-              'other code
-              '
-              Dim labLay As New SharpMap.Layers.LabelLayer("Lable: " & itm.Name)
-              Dim labTheme as New SharpMap.Rendering.Thematics.CustomTheme(delObjektLabelStyle)
-              labLay.DataSource = vLay.DataSource
-          labLay.Theme = labTheme
-              labLay.LabelStringDelegate = delObjektLabelBez
-          labLay.LabelPositionDelegate = delObjektLabelPos
-              '
-              _map.Layers.Add(vLay)
-              _map.Layers.Add(labLay)
+    Public Sub CreateLayers(ByVal config as OtherClass)
+        '
+        delObjektLabelBez = New SharpMap.Layers.LabelLayer.GetLabelMethod(AddressOf LabelObjektBezeichnung)
+        delObjektLabelPos = New SharpMap.Layers.LabelLayer.GetLocationMethod(AddressOf LabelBezeichnungPos)
+        delObjektStyle = New SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod(AddressOf GetObjektStyle)
+        delObjektLabelStyle = New SharpMap.Rendering.Thematics.CustomTheme.GetStyleMethod(AddressOf GetObjektLabelStyle)
+        '
+        For each itm as OtherClassItem in config
+            Select Case itm.Name
+                Case "Name1"
+                    Dim smp as New SharpMap.Data.Providers.PostGIS(itm.Datasource, itm.Table, itm.Field)
+                    Dim vLay as New SharpMap.Layers.VectorLayer(itm.Name, smp)
+                    'Dim layTheme = New SharpMap.Rendering.Thematics.CustomTheme(delObjektStyle)
+                    vLay.Theme = Me._polygonTheme 'layTheme
+                    '
+                    Dim labLay As New SharpMap.Layers.LabelLayer("Lable: " & itm.Name)
+                    Dim labTheme as New SharpMap.Rendering.Thematics.CustomTheme(delObjektLabelStyle)
+                    labLay.DataSource = vLay.DataSource
+                    labLay.Theme = labTheme
+                    labLay.LabelStringDelegate = delObjektLabelBez
+                    labLay.LabelPositionDelegate = delObjektLabelPos
+                    '
+                    _map.Layers.Add(vLay)
+                    _Map.Layers.Add(labLay)
               '
-        End Select
+                Case "Name2"
+                    Dim smp as New SharpMap.Data.Providers.PostGIS(itm.Datasource, itm.Table, itm.Field)
+                    Dim vLay as New SharpMap.Layers.VectorLayer(itm.Name, smp)
+                    '
+                    'other code
+                    '
+                    Dim labLay As New SharpMap.Layers.LabelLayer("Lable: " & itm.Name)
+                    Dim labTheme as New SharpMap.Rendering.Thematics.CustomTheme(delObjektLabelStyle)
+                    labLay.DataSource = vLay.DataSource
+                    labLay.Theme = labTheme
+                    labLay.LabelStringDelegate = delObjektLabelBez
+                    labLay.LabelPositionDelegate = delObjektLabelPos
+                    '
+                    _map.Layers.Add(vLay)
+                    _map.Layers.Add(labLay)
+                    '
+            End Select
+            '
+        Next
+        '
+        'Other Code .....
         '
-     Next
-     '
-     'Other Code .....
-     '
-  End Sub
-  
+    End Sub
+
     Private Shared function LabelObjektBezeichnung(fdr As SharpMap.Data.FeatureDataRow) As String
         return "The quick brown fox ..."
-    End function
+    End Function
 
-    Private Shared Function LabelBezeichnungPos(fdr As SharpMap.Data.FeatureDataRow) As GeoAPI.Geometries.Coordinate
-        return new GeoAPI.Geometries.Coordinate(0, 0)
+    Private Shared Function LabelBezeichnungPos(fdr As SharpMap.Data.FeatureDataRow) As NetTopologySuite.Geometries.Coordinate
+        Return New NetTopologySuite.Geometries.Coordinate(0, 0)
     End Function
-    
+
     Private shared function GetObjektLabelStyle(fdr As SharpMap.Data.FeatureDataRow) As SharpMap.Styles.LabelStyle
 
     End function
-  Private shared Function GetObjektStyle(fdr As SharpMap.Data.FeatureDataRow) As SharpMap.Styles.VectorStyle
-    '
-    Dim style As New SharpMap.Styles.VectorStyle
-    Dim c as Drawing.Color
-    Dim p as Drawing.Pen
-    Dim b as Drawing.Brush
-    '
-    Select Case fdr.Table.TableName
-       Case "Name1"  '-- Polygon
-          Select Case fdr("FilterColumn")
-             Case 1
-               c = Drawing.Color.Green
-               p = New Drawing.Pen(Drawing.Color.Black, 1)
-           b = New Drawing.SolidBrush(c)
-             Case 2
-               c = Drawing.Color.Blue
-               p = New Drawing.Pen(Drawing.Color.Black, 1)
-           b = New Drawing.SolidBrush(c)
-             Case Else
-               c = Drawing.Color.Red
-               p = New Drawing.Pen(Drawing.Color.Black, 1)
-           b = New Drawing.SolidBrush(c)
-          End Select
-          '
-          style.Fill = b
-      style.Outline = p
+    Private shared Function GetObjektStyle(fdr As SharpMap.Data.FeatureDataRow) As SharpMap.Styles.VectorStyle
+        '
+        Dim style As New SharpMap.Styles.VectorStyle
+        Dim c as Drawing.Color
+        Dim p as Drawing.Pen
+        Dim b as Drawing.Brush
+        '
+        Select Case fdr.Table.TableName
+            Case "Name1"  '-- Polygon
+                Select Case fdr("FilterColumn")
+                    Case 1
+                        c = Drawing.Color.Green
+                        p = New Drawing.Pen(Drawing.Color.Black, 1)
+                        b = New Drawing.SolidBrush(c)
+                    Case 2
+                        c = Drawing.Color.Blue
+                        p = New Drawing.Pen(Drawing.Color.Black, 1)
+                        b = New Drawing.SolidBrush(c)
+                    Case Else
+                        c = Drawing.Color.Red
+                        p = New Drawing.Pen(Drawing.Color.Black, 1)
+                        b = New Drawing.SolidBrush(c)
+                End Select
+                '
+                style.Fill = b
+                style.Outline = p
           '
-       Case "Name2"' -- Lines
-         '
-         ' this Code will not Run
-         '
-       Case Else
-    End Select
-    '
-    Return style  
+            Case "Name2" ' -- Lines
+                '
+                ' this Code will not Run
+                '
+            Case Else
+        End Select
+        '
+        Return style
+        '
+    End Function
     '
-  End Function
-  '
 
 End Class
diff --git a/Examples/ExampleCodeSnipplets.VB/ExampleCodeSnipplets.VB.vbproj b/Examples/ExampleCodeSnipplets.VB/ExampleCodeSnipplets.VB.vbproj
index eaccd23e..ecc65b16 100644
--- a/Examples/ExampleCodeSnipplets.VB/ExampleCodeSnipplets.VB.vbproj
+++ b/Examples/ExampleCodeSnipplets.VB/ExampleCodeSnipplets.VB.vbproj
@@ -21,8 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="ProjNet4GeoAPI" Version="1.4.1" />
-        <PackageReference Include="NUnit" Version="3.12.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
     </ItemGroup>
 
     <ItemGroup>
@@ -36,5 +35,9 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 
 </Project>
diff --git a/Examples/SharpMap.Demo.Wms/Controllers/BuildingsController.cs b/Examples/SharpMap.Demo.Wms/Controllers/BuildingsController.cs
index 0934fbc6..36635da6 100644
--- a/Examples/SharpMap.Demo.Wms/Controllers/BuildingsController.cs
+++ b/Examples/SharpMap.Demo.Wms/Controllers/BuildingsController.cs
@@ -1,19 +1,13 @@
 namespace SharpMap.Demo.Wms.Controllers
 {
+    using NetTopologySuite.Geometries;
+    using SharpMap.Data;
+    using SharpMap.Data.Providers;
     using System;
     using System.Collections.Generic;
     using System.IO;
-    using System.Linq;
     using System.Web.Mvc;
-
-    using GeoAPI;
-    using GeoAPI.Geometries;
-
-    using NetTopologySuite;
-    using NetTopologySuite.Geometries;
-
-    using SharpMap.Data;
-    using SharpMap.Data.Providers;
+    using Point = System.Drawing.Point;
 
     public class BuildingsController : Controller
     {
@@ -21,10 +15,7 @@ public class BuildingsController : Controller
         private const int TileSize = 256;
         private const int MaxZoom = 18;
 
-        public BuildingsController()
-        {
-            GeometryServiceProvider.SetInstanceIfNotAlreadySetDirectly(new NtsGeometryServices());
-        }
+        public BuildingsController() { }
 
         private Point GeoToPixel(double lat, double lon, int zoom)
         {
@@ -70,10 +61,10 @@ public JsonResult GetData(float w, float n, float e, float s, int z)
                 if (c == 0)
                     c = 5; // default value for "null" (zero) heights
                 int h = c * ScaleZ >> zz;
-                if (h <= 1) 
+                if (h <= 1)
                     h = 1;
 
-                IGeometry geometry = row.Geometry;
+                Geometry geometry = row.Geometry;
                 Coordinate[] coords = geometry.Coordinates;
                 int total = coords.Length;
                 double[] values = new double[total * 2];
diff --git a/Examples/SharpMap.Demo.Wms/Controllers/HomeController.cs b/Examples/SharpMap.Demo.Wms/Controllers/HomeController.cs
index c3e899f9..981c82f5 100644
--- a/Examples/SharpMap.Demo.Wms/Controllers/HomeController.cs
+++ b/Examples/SharpMap.Demo.Wms/Controllers/HomeController.cs
@@ -1,26 +1,25 @@
 namespace SharpMap.Demo.Wms.Controllers
 {
+    using SharpMap.Demo.Wms.Models;
     using System;
     using System.Collections.Generic;
     using System.Reflection;
     using System.Web.Mvc;
 
-    using SharpMap.Demo.Wms.Models;
-
     public class HomeController : Controller
     {
         private List<DemoItem> GetDemoItems()
         {
             List<DemoItem> items = new List<DemoItem>();
-            Type type = this.GetType();
+            Type type = GetType();
 
             // how to retrieve all public instance methods? 
             // BindingFlags.Public | BindingFlags.DeclaredOnly returns an empty array...
             MethodInfo[] methods = type.GetMethods();
             foreach (MethodInfo method in methods)
-            {                
+            {
                 bool valid = method.ReturnType == typeof(ActionResult);
-                if (!valid) 
+                if (!valid)
                     continue;
 
                 object[] attributes = method.GetCustomAttributes(typeof(ObsoleteAttribute), false);
@@ -30,70 +29,73 @@ private List<DemoItem> GetDemoItems()
                 int i = type.Name.IndexOf("Controller", StringComparison.Ordinal);
                 string url = String.Format("{0}/{1}", type.Name.Substring(0, i), method.Name);
                 items.Add(new DemoItem(method.Name, url));
-            }            
+            }
             return items;
         }
-        
+
         [Obsolete]
         public ActionResult Index()
         {
-            this.ViewData["DemoItems"] = this.GetDemoItems();
-            return this.View();
+            ViewData["DemoItems"] = GetDemoItems();
+            return View();
         }
 
         public ActionResult Default()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult Openlayers()
         {
-            return this.View();
+            return View();
         }
 
+        [Obsolete]
         public ActionResult Polymaps()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult Leaflet()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult Geojson()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult Editor()
         {
-            return this.View();
+            return View();
         }
 
+        [Obsolete]
         public ActionResult Offline()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult TileCanvas()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult Buildings()
         {
-            return this.View();
+            return View();
         }
 
+        [Obsolete]
         public ActionResult UtfGrid()
         {
-            return this.View();
+            return View();
         }
 
         public ActionResult D3()
         {
-            return this.View();
-        } 
+            return View();
+        }
     }
 }
diff --git a/Examples/SharpMap.Demo.Wms/Controllers/ProcessController.cs b/Examples/SharpMap.Demo.Wms/Controllers/ProcessController.cs
index f9fbd36c..aaa2dfb5 100644
--- a/Examples/SharpMap.Demo.Wms/Controllers/ProcessController.cs
+++ b/Examples/SharpMap.Demo.Wms/Controllers/ProcessController.cs
@@ -1,73 +1,66 @@
 namespace SharpMap.Demo.Wms.Controllers
 {
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Collections.ObjectModel;
-    using System.IO;
-    using System.Linq;
-    using System.Web.Mvc;
-
-    using GeoAPI.Geometries;
-
     using NetTopologySuite.Geometries;
     using NetTopologySuite.Geometries.Utilities;
     using NetTopologySuite.IO;
-    using NetTopologySuite.Operation.Linemerge;
     using NetTopologySuite.Operation.Polygonize;
     using NetTopologySuite.Operation.Union;
     using NetTopologySuite.Simplify;
-
     using SharpMap.Converters.GeoJSON;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Web.Mvc;
 
     public class ProcessController : Controller
     {
-        private readonly IGeometryFactory factory = GeometryFactory.Default;
+        private readonly GeometryFactory factory = GeometryFactory.Default;
 
-        private IGeometryCollection ValidateGeo(string geo)
+        private GeometryCollection ValidateGeo(string geo)
         {
             if (String.IsNullOrEmpty(geo))
                 throw new ArgumentException("invalid argument 'geo': empty string");
 
-            WKTReader reader = new WKTReader(this.factory);
-            IGeometry data = reader.Read(geo);
+            WKTReader reader = new WKTReader(NetTopologySuite.NtsGeometryServices.Instance);
+            Geometry data = reader.Read(geo);
 
             // we should expect a GeometryCollection object
-            if (data is IGeometryCollection)
-                return data as IGeometryCollection;
-            throw new ArgumentException("invalid argument 'geo': IGeometryCollection expected");
+            if (data is GeometryCollection)
+                return data as GeometryCollection;
+            throw new ArgumentException("invalid argument 'geo': GeometryCollection expected");
         }
 
-        private ILineString ValidateCut(string cut)
+        private LineString ValidateCut(string cut)
         {
             if (String.IsNullOrEmpty(cut))
                 throw new ArgumentException("invalid argument 'cut': empty string");
 
             WKTReader reader = new WKTReader(this.factory);
-            IGeometry data = reader.Read(cut);
+            Geometry data = reader.Read(cut);
 
             // we should expect a GeometryCollection object
-            if (data is ILineString)
-                return data as ILineString;
-            throw new ArgumentException("invalid argument 'cut': ILineString expected");
+            if (data is LineString)
+                return data as LineString;
+            throw new ArgumentException("invalid argument 'cut': LineString expected");
         }
 
-        private ActionResult MakeResponse(IEnumerable<IGeometry> geometries)
+        private ActionResult MakeResponse(IEnumerable<Geometry> geometries)
         {
             if (geometries == null)
                 throw new ArgumentNullException("geometries");
 
             // we should return a GeometryCollection object
-            IGeometry[] array = geometries.ToArray();
-            IGeometryCollection result = this.factory.CreateGeometryCollection(array);
+            Geometry[] array = geometries.ToArray();
+            GeometryCollection result = this.factory.CreateGeometryCollection(array);
             StringWriter writer = new StringWriter();
             GeoJSONWriter.Write(result, writer);
             return this.Json(new { geo = writer.ToString() });
         }
 
-        private static IEnumerable<IGeometry> GetItems(IGeometry coll)
+        private static IEnumerable<Geometry> GetItems(Geometry coll)
         {
-            if (coll == null) 
+            if (coll == null)
                 throw new ArgumentNullException("coll");
 
             for (int i = 0; i < coll.NumGeometries; i++)
@@ -77,52 +70,52 @@ private static IEnumerable<IGeometry> GetItems(IGeometry coll)
         [HttpPost]
         public ActionResult Clean(string geo)
         {
-            IGeometryCollection coll = this.ValidateGeo(geo);
-            IEnumerable<IGeometry> data = DoClean(coll);
+            GeometryCollection coll = this.ValidateGeo(geo);
+            IEnumerable<Geometry> data = DoClean(coll);
             return this.MakeResponse(data);
         }
 
-        private static IEnumerable<IGeometry> DoClean(IGeometryCollection coll)
+        private static IEnumerable<Geometry> DoClean(GeometryCollection coll)
         {
             if (coll == null)
                 throw new ArgumentNullException("coll");
 
-            IEnumerable<IGeometry> items = GetItems(coll);
-            foreach (IGeometry geom in items)
+            IEnumerable<Geometry> items = GetItems(coll);
+            foreach (Geometry geom in items)
             {
                 DouglasPeuckerSimplifier simplifier = new DouglasPeuckerSimplifier(geom);
-                IGeometry clean = simplifier.GetResultGeometry();
+                Geometry clean = simplifier.GetResultGeometry();
                 yield return clean;
             }
-        }       
+        }
 
         [HttpPost]
         public ActionResult Merge(string geo)
         {
-            IGeometryCollection coll = this.ValidateGeo(geo);
-            IEnumerable<IGeometry> data = DoMerge(coll);
+            GeometryCollection coll = this.ValidateGeo(geo);
+            IEnumerable<Geometry> data = DoMerge(coll);
             return this.MakeResponse(data);
         }
 
-        private static IEnumerable<IGeometry> DoMerge(IGeometryCollection coll)
+        private static IEnumerable<Geometry> DoMerge(GeometryCollection coll)
         {
             if (coll == null)
                 throw new ArgumentNullException("coll");
 
-            IEnumerable<IGeometry> items = GetItems(coll);
+            IEnumerable<Geometry> items = GetItems(coll);
             yield return UnaryUnionOp.Union(items.ToArray());
         }
 
         [HttpPost]
         public ActionResult Split(string geo, string cut)
         {
-            IGeometryCollection coll = this.ValidateGeo(geo);
-            ILineString split = this.ValidateCut(cut);
-            IEnumerable<IGeometry> data = DoSplit(coll, split);
+            GeometryCollection coll = this.ValidateGeo(geo);
+            LineString split = this.ValidateCut(cut);
+            IEnumerable<Geometry> data = DoSplit(coll, split);
             return this.MakeResponse(data);
         }
 
-        public static IGeometry Polygonize(IGeometry geometry)
+        public static Geometry Polygonize(Geometry geometry)
         {
             if (geometry == null)
                 throw new ArgumentNullException("geometry");
@@ -130,13 +123,13 @@ public static IGeometry Polygonize(IGeometry geometry)
             var lines = LineStringExtracter.GetLines(geometry);
             var geoms = lines.ToList();
 
-            var polygonizer = new Polygonizer();            
+            var polygonizer = new Polygonizer();
             polygonizer.Add(geoms);
             var polys = polygonizer.GetPolygons();
             return geometry.Factory.BuildGeometry(polys);
         }
 
-        private static IEnumerable<IGeometry> DoSplit(IGeometryCollection coll, ILineString cut)
+        private static IEnumerable<Geometry> DoSplit(GeometryCollection coll, LineString cut)
         {
             if (coll == null)
                 throw new ArgumentNullException("coll");
@@ -146,36 +139,36 @@ private static IEnumerable<IGeometry> DoSplit(IGeometryCollection coll, ILineStr
             // adapted from 'SplitPolygon WPS' GeoServer extension:
             // https://github.com/mdavisog/wps-splitpoly/tree/master/src
 
-            IList<IGeometry> output = new List<IGeometry>();
-            IEnumerable<IGeometry> items = GetItems(coll);
-            IEnumerable<IGeometry> valid = items.Where(i => i is IPolygon);
-            foreach (IGeometry item in valid)
+            IList<Geometry> output = new List<Geometry>();
+            IEnumerable<Geometry> items = GetItems(coll);
+            IEnumerable<Geometry> valid = items.Where(i => i is Polygon);
+            foreach (Geometry item in valid)
             {
-                IGeometry nodedLinework = item.Boundary.Union(cut);
-                IGeometry polygons = Polygonize(nodedLinework);
+                Geometry nodedLinework = item.Boundary.Union(cut);
+                Geometry polygons = Polygonize(nodedLinework);
 
                 // only keep polygons which are inside the input                
                 for (int i = 0; i < polygons.NumGeometries; i++)
                 {
-                    IPolygon candpoly = (IPolygon)polygons.GetGeometryN(i);
+                    Polygon candpoly = (Polygon)polygons.GetGeometryN(i);
                     if (item.Contains(candpoly.InteriorPoint))
                         output.Add(candpoly);
-                }                
+                }
             }
             return output;
 
             /*
-            IEnumerable<IGeometry> items = GetItems(coll);
+            IEnumerable<Geometry> items = GetItems(coll);
             LineMerger merger = new LineMerger();            
             merger.Add(items);
             merger.Add(cut);
-            IList<IGeometry> list = merger.GetMergedLineStrings();
+            IList<Geometry> list = merger.GetMergedLineStrings();
 
-            IGeometry union = UnaryUnionOp.Union(list);
+            Geometry union = UnaryUnionOp.Union(list);
 
             Polygonizer polygonizer = new Polygonizer();
             polygonizer.Add(union);
-            ICollection<IGeometry> split = polygonizer.GetPolygons();
+            ICollection<Geometry> split = polygonizer.GetPolygons();
             return split;
              * */
         }
diff --git a/Examples/SharpMap.Demo.Wms/Controllers/UtfGridController.cs b/Examples/SharpMap.Demo.Wms/Controllers/UtfGridController.cs
index 3c0a402d..fc41a3ca 100644
--- a/Examples/SharpMap.Demo.Wms/Controllers/UtfGridController.cs
+++ b/Examples/SharpMap.Demo.Wms/Controllers/UtfGridController.cs
@@ -1,22 +1,19 @@
 // code adapted from: https://github.com/awcoats/mapstache
 namespace SharpMap.Demo.Wms.Controllers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Drawing;
-    using System.Linq;
-    using System.Web.Mvc;
-
-    using GeoAPI.Geometries;
-
     using Mapstache;
-
-    using GeoAPI.CoordinateSystems.Transformations;
-
+    using NetTopologySuite.Geometries;
+    using ProjNet.CoordinateSystems.Transformations;
     using SharpMap.Converters.GeoJSON;
     using SharpMap.Data;
     using SharpMap.Demo.Wms.Helpers;
     using SharpMap.Layers;
+    using System;
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Linq;
+    using System.Web.Mvc;
+    using Point = System.Drawing.Point;
 
     public class UtfGridController : Controller
     {
@@ -74,7 +71,7 @@ public JsonResult GetData(string layer, int z, int x, int y)
                 int i = 1;
                 foreach (GeoJSON val in data)
                 {
-                    IGeometry geom = val.Geometry;
+                    Geometry geom = val.Geometry;
                     IDictionary<string, object> dict = val.Values;
                     grid.FillPolygon(geom, i, dict);
                     i = i + 1;
@@ -85,4 +82,4 @@ public JsonResult GetData(string layer, int z, int x, int y)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/SharpMap.Demo.Wms/Global.asax.cs b/Examples/SharpMap.Demo.Wms/Global.asax.cs
index c88bfce2..e5b6c298 100644
--- a/Examples/SharpMap.Demo.Wms/Global.asax.cs
+++ b/Examples/SharpMap.Demo.Wms/Global.asax.cs
@@ -1,5 +1,6 @@
 namespace SharpMap.Demo.Wms
 {
+    using SharpMap.CoordinateSystems;
     using System.Web;
     using System.Web.Mvc;
     using System.Web.Routing;
@@ -15,11 +16,15 @@ public static void RegisterRoutes(RouteCollection routes)
 
         protected void Application_Start()
         {
+            var gss = NetTopologySuite.NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
+                new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
+                new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory(),
+                Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
             SharpMap.Session.Instance
-                .SetGeometryServices(NetTopologySuite.NtsGeometryServices.Instance)
-                .SetCoordinateSystemServices(CoordinateSystems.CoordinateSystemServices
-                    .FromSpatialRefSys(new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
-                        new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory()));
+                .SetGeometryServices(gss)
+                .SetCoordinateSystemServices(css)
+                .SetCoordinateSystemRepository(css);
 
             AreaRegistration.RegisterAllAreas();
             RegisterRoutes(RouteTable.Routes);
diff --git a/Examples/SharpMap.Demo.Wms/Handlers/AbstractStdMapHandler.cs b/Examples/SharpMap.Demo.Wms/Handlers/AbstractStdMapHandler.cs
index db07b875..b9311089 100644
--- a/Examples/SharpMap.Demo.Wms/Handlers/AbstractStdMapHandler.cs
+++ b/Examples/SharpMap.Demo.Wms/Handlers/AbstractStdMapHandler.cs
@@ -1,23 +1,13 @@
 namespace SharpMap.Demo.Wms.Handlers
 {
+    using SharpMap.Demo.Wms.Helpers;
     using System;
     using System.Web;
 
-    using GeoAPI;
-
-    using NetTopologySuite;
-
-    using SharpMap.Demo.Wms.Helpers;
-
     public abstract class AbstractStdMapHandler : IHttpHandler
     {
         private static readonly object SyncLock = new object();
 
-        static AbstractStdMapHandler()
-        {
-            GeometryServiceProvider.SetInstanceIfNotAlreadySetDirectly(NtsGeometryServices.Instance);
-        }
-
         public abstract void ProcessRequest(HttpContext context);
 
         protected string GetFixedUrl(HttpRequest request)
@@ -27,7 +17,7 @@ protected string GetFixedUrl(HttpRequest request)
             return uri.Query.Length <= 0 ? absoluteUri : absoluteUri.Replace(uri.Query, String.Empty);
         }
 
-        protected Web.Wms.Capabilities.WmsServiceDescription GetDescription(string url) 
+        protected Web.Wms.Capabilities.WmsServiceDescription GetDescription(string url)
         {
             var description = new Web.Wms.Capabilities.WmsServiceDescription("Acme Corp. Map Server", url);
             description.MaxWidth = 500;
@@ -44,7 +34,7 @@ protected Web.Wms.Capabilities.WmsServiceDescription GetDescription(string url)
 
         protected Map GetMap(HttpRequest request)
         {
-            string type = request.Params["MAP_TYPE"];            
+            string type = request.Params["MAP_TYPE"];
             if (String.Equals(type, "DEF", StringComparison.InvariantCultureIgnoreCase))
                 return ShapefileHelper.Default();
             if (String.Equals(type, "SPH", StringComparison.InvariantCultureIgnoreCase))
@@ -53,7 +43,7 @@ protected Map GetMap(HttpRequest request)
                 return DatabaseHelper.SqlServer();
             string format = String.Format("unsupported map type: '{0}'", type);
             throw new NotSupportedException(format);
-        }        
+        }
 
         public bool IsReusable
         {
diff --git a/Examples/SharpMap.Demo.Wms/Handlers/StdJsonMapHandler.cs b/Examples/SharpMap.Demo.Wms/Handlers/StdJsonMapHandler.cs
index 5caac04b..5c02548f 100644
--- a/Examples/SharpMap.Demo.Wms/Handlers/StdJsonMapHandler.cs
+++ b/Examples/SharpMap.Demo.Wms/Handlers/StdJsonMapHandler.cs
@@ -1,23 +1,19 @@
 namespace SharpMap.Demo.Wms.Handlers
 {
+    using NetTopologySuite.CoordinateSystems.Transformations;
+    using ProjNet.CoordinateSystems.Transformations;
+    using SharpMap.Converters.GeoJSON;
+    using SharpMap.Data;
+    using SharpMap.Layers;
+    using SharpMap.Web.Wms;
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Web;
-
-    using NetTopologySuite.Geometries;
-
-    using GeoAPI.CoordinateSystems.Transformations;
-
-    using SharpMap.Converters.GeoJSON;
-    using SharpMap.Data;
-    using SharpMap.Layers;
-    using SharpMap.Web.Wms;
-
-    using Geometry = GeoAPI.Geometries.IGeometry;
-    using BoundingBox = GeoAPI.Geometries.Envelope;
+    using BoundingBox = NetTopologySuite.Geometries.Envelope;
+    using Geometry = NetTopologySuite.Geometries.Geometry;
 
     public class StdJsonMapHandler : AbstractStdMapHandler
     {
@@ -47,10 +43,10 @@ public override void ProcessRequest(HttpContext context)
                     string[] layers = ls.Split(',');
                     foreach (ILayer layer in map.Layers)
                         if (!layers.Contains(layer.LayerName))
-                             layer.Enabled = false;
+                            layer.Enabled = false;
                 }
 
-                IEnumerable<GeoJSON> items = GetData(map, bbox);                
+                IEnumerable<GeoJSON> items = GetData(map, bbox);
                 StringWriter writer = new StringWriter();
                 GeoJSONWriter.Write(items, writer);
                 string buffer = writer.ToString();
@@ -75,11 +71,11 @@ private static IEnumerable<GeoJSON> GetData(Map map, BoundingBox bbox)
         {
             if (map == null)
                 throw new ArgumentNullException("map");
-            
+
             // Only queryable data!
             IQueryable<ICanQueryLayer> coll = map.Layers
                 .AsQueryable()
-                .Where(l => l.Enabled) 
+                .Where(l => l.Enabled)
                 .OfType<ICanQueryLayer>()
                 .Where(l => l.IsQueryEnabled);
 
@@ -103,7 +99,7 @@ private static IEnumerable<GeoJSON> QueryData(BoundingBox bbox, ICanQueryLayer l
             IEnumerable<GeoJSON> data = GeoJSONHelper.GetData(ds);
 
             // Reproject geometries if needed
-            IMathTransform transform = null;
+            MathTransform transform = null;
             if (layer is VectorLayer)
             {
                 ICoordinateTransformation transformation = (layer as VectorLayer).CoordinateTransformation;
@@ -111,10 +107,9 @@ private static IEnumerable<GeoJSON> QueryData(BoundingBox bbox, ICanQueryLayer l
             }
             if (transform != null)
             {
-                GeometryFactory gf = new GeometryFactory();
                 data = data.Select(d =>
                     {
-                        Geometry converted = GeometryTransform.TransformGeometry(d.Geometry, transform, gf);
+                        Geometry converted = GeometryTransform.TransformGeometry(d.Geometry, transform, d.Geometry.Factory);
                         d.SetGeometry(converted);
                         return d;
                     });
diff --git a/Examples/SharpMap.Demo.Wms/Handlers/StdWmsMapHandler.cs b/Examples/SharpMap.Demo.Wms/Handlers/StdWmsMapHandler.cs
index 987adde5..0de19062 100644
--- a/Examples/SharpMap.Demo.Wms/Handlers/StdWmsMapHandler.cs
+++ b/Examples/SharpMap.Demo.Wms/Handlers/StdWmsMapHandler.cs
@@ -1,11 +1,10 @@
 namespace SharpMap.Demo.Wms.Handlers
 {
+    using SharpMap.Web.Wms;
     using System;
     using System.Diagnostics;
     using System.Web;
 
-    using SharpMap.Web.Wms;
-
     public class StdWmsMapHandler : AbstractStdMapHandler
     {
         public override void ProcessRequest(HttpContext context)
diff --git a/Examples/SharpMap.Demo.Wms/Helpers/DatabaseHelper.cs b/Examples/SharpMap.Demo.Wms/Helpers/DatabaseHelper.cs
index ef33acc0..46f050b8 100644
--- a/Examples/SharpMap.Demo.Wms/Helpers/DatabaseHelper.cs
+++ b/Examples/SharpMap.Demo.Wms/Helpers/DatabaseHelper.cs
@@ -1,26 +1,23 @@
 namespace SharpMap.Demo.Wms.Helpers
 {
-    using System;
-    using System.Drawing;
-    using System.Drawing.Drawing2D;
-
-    using GeoAPI.CoordinateSystems.Transformations;
-
     using SharpMap.Data.Providers;
     using SharpMap.Layers;
     using SharpMap.Styles;
+    using System;
+    using System.Drawing;
+    using System.Drawing.Drawing2D;
 
     public static class DatabaseHelper
     {
         public static Map SqlServer()
         {
             const string connstr = "Data Source=.\\SQL2008R2;Initial Catalog=SampleData;Integrated Security=SSPI;";
-            Map map = new Map(new Size(1, 1));            
+            Map map = new Map(new Size(1, 1));
 
             VectorStyle style0 = new VectorStyle { Line = new Pen(Color.DarkGray, 2) };
             VectorLayer layer0 = CreateLayer(connstr, "osm_boundaries", style0);
             map.Layers.Add(layer0);
-            
+
             VectorStyle style1 = new VectorStyle { Line = new Pen(Color.DarkRed, 2.5f) };
             VectorLayer layer1 = CreateLayer(connstr, "osm_roads_major", style1);
             map.Layers.Add(layer1);
@@ -28,7 +25,7 @@ public static Map SqlServer()
             VectorStyle style2 = new VectorStyle { Line = new Pen(Color.DarkBlue, 1.5f) };
             VectorLayer layer2 = CreateLayer(connstr, "osm_roads_minor", style2);
             map.Layers.Add(layer2);
-            
+
             return map;
         }
 
@@ -39,9 +36,10 @@ private static VectorLayer CreateLayer(string connstr, string name, VectorStyle
             if (name == null)
                 throw new ArgumentNullException("name");
 
-            
-            var source = new SqlServer2008(connstr, name, "geom", "ID", 
-                SqlServerSpatialObjectType.Geometry, 0, SqlServer2008ExtentsMode.QueryIndividualFeatures) { ValidateGeometries = true };
+
+            var source = new SqlServer2008(connstr, name, "geom", "ID",
+                SqlServerSpatialObjectType.Geometry, 0, SqlServer2008ExtentsMode.QueryIndividualFeatures)
+            { ValidateGeometries = true };
             var transformation = ProjHelper.LatLonToGoogle();
             var item = new VectorLayer(name, source)
             {
diff --git a/Examples/SharpMap.Demo.Wms/Helpers/ExtensionMethods.cs b/Examples/SharpMap.Demo.Wms/Helpers/ExtensionMethods.cs
index bc866cb2..84201f15 100644
--- a/Examples/SharpMap.Demo.Wms/Helpers/ExtensionMethods.cs
+++ b/Examples/SharpMap.Demo.Wms/Helpers/ExtensionMethods.cs
@@ -13,11 +13,11 @@ public static string Join(this IEnumerable<string> strings)
 
         public static string Join(this IEnumerable<string> strings, char separator)
         {
-            if (strings == null) 
+            if (strings == null)
                 return String.Empty;
 
             var sb = new StringBuilder();
-            foreach (var s in strings) 
+            foreach (var s in strings)
                 sb.Append(s).Append(separator);
             return sb.ToString().TrimEnd(separator);
         }
@@ -33,7 +33,7 @@ public static string Fix(this string bbox)
             return arr.Join(',');
         }
 
-        private static void Flip(IList<string> arr, int first, int second) 
+        private static void Flip(IList<string> arr, int first, int second)
         {
             var temp = arr[first];
             arr[first] = arr[second];
diff --git a/Examples/SharpMap.Demo.Wms/Helpers/ProjHelper.cs b/Examples/SharpMap.Demo.Wms/Helpers/ProjHelper.cs
index 328b656d..5e252526 100644
--- a/Examples/SharpMap.Demo.Wms/Helpers/ProjHelper.cs
+++ b/Examples/SharpMap.Demo.Wms/Helpers/ProjHelper.cs
@@ -1,17 +1,13 @@
 namespace SharpMap.Demo.Wms.Helpers
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Drawing;
-    using System.Drawing.Drawing2D;
-
-    using GeoAPI.CoordinateSystems;
     using ProjNet.CoordinateSystems;
-    using GeoAPI.CoordinateSystems.Transformations;
     using ProjNet.CoordinateSystems.Transformations;
-
     using SharpMap.Layers;
     using SharpMap.Rendering;
+    using System;
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Drawing.Drawing2D;
 
     public static class ProjHelper
     {
@@ -19,7 +15,7 @@ public static ICoordinateTransformation LatLonToGoogle()
         {
             CoordinateSystemFactory csFac = new CoordinateSystemFactory();
             CoordinateTransformationFactory ctFac = new CoordinateTransformationFactory();
-            IGeographicCoordinateSystem sourceCs = csFac.CreateGeographicCoordinateSystem(
+            GeographicCoordinateSystem sourceCs = csFac.CreateGeographicCoordinateSystem(
                 "WGS 84",
                 AngularUnit.Degrees,
                 HorizontalDatum.WGS84,
@@ -38,7 +34,7 @@ public static ICoordinateTransformation LatLonToGoogle()
                 new ProjectionParameter("false_northing", 0.0)
             };
             IProjection projection = csFac.CreateProjection("Google Mercator", "mercator_1sp", parameters);
-            IProjectedCoordinateSystem targetCs = csFac.CreateProjectedCoordinateSystem(
+            ProjectedCoordinateSystem targetCs = csFac.CreateProjectedCoordinateSystem(
                 "Google Mercator",
                 sourceCs,
                 projection,
@@ -56,14 +52,14 @@ public static LabelLayer CreateLabelLayer(VectorLayer src, string column)
         {
             string name = String.Format("{0}:Labels", src.LayerName);
             LabelLayer layer = new LabelLayer(name)
-                {
-                    DataSource = src.DataSource,
-                    LabelColumn = column,
-                    LabelFilter = LabelCollisionDetection.ThoroughCollisionDetection,
-                    MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.CommonCenter,
-                    MaxVisible = src.MaxVisible,
-                    MinVisible = src.MinVisible,
-                    Style =
+            {
+                DataSource = src.DataSource,
+                LabelColumn = column,
+                LabelFilter = LabelCollisionDetection.ThoroughCollisionDetection,
+                MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.CommonCenter,
+                MaxVisible = src.MaxVisible,
+                MinVisible = src.MinVisible,
+                Style =
                         {
                             CollisionDetection = true,
                             CollisionBuffer = new SizeF(10F, 10F),
@@ -71,10 +67,10 @@ public static LabelLayer CreateLabelLayer(VectorLayer src, string column)
                             Font = new Font(FontFamily.GenericSansSerif, 12),
                             Halo = new Pen(Color.White, 2)
                         },
-                    SmoothingMode = SmoothingMode.HighQuality,
-                    CoordinateTransformation = src.CoordinateTransformation
-                };
+                SmoothingMode = SmoothingMode.HighQuality,
+                CoordinateTransformation = src.CoordinateTransformation
+            };
             return layer;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/SharpMap.Demo.Wms/Helpers/ShapefileHelper.cs b/Examples/SharpMap.Demo.Wms/Helpers/ShapefileHelper.cs
index 47cd69d9..2a281857 100644
--- a/Examples/SharpMap.Demo.Wms/Helpers/ShapefileHelper.cs
+++ b/Examples/SharpMap.Demo.Wms/Helpers/ShapefileHelper.cs
@@ -1,7 +1,10 @@
-using ProjNet.CoordinateSystems;
-
 namespace SharpMap.Demo.Wms.Helpers
 {
+    using ProjNet.CoordinateSystems;
+    using SharpMap.Data.Providers;
+    using SharpMap.Demo.Wms.Models;
+    using SharpMap.Layers;
+    using SharpMap.Styles;
     using System;
     using System.Collections.Generic;
     using System.Drawing;
@@ -9,13 +12,6 @@ namespace SharpMap.Demo.Wms.Helpers
     using System.IO;
     using System.Web;
 
-    using GeoAPI.CoordinateSystems.Transformations;
-
-    using SharpMap.Data.Providers;
-    using SharpMap.Demo.Wms.Models;
-    using SharpMap.Layers;
-    using SharpMap.Styles;
-
     public static class ShapefileHelper
     {
         private static readonly IDictionary<string, LayerData> Nyc;
diff --git a/Examples/SharpMap.Demo.Wms/Models/DemoItem.cs b/Examples/SharpMap.Demo.Wms/Models/DemoItem.cs
index acce6e14..4597c58d 100644
--- a/Examples/SharpMap.Demo.Wms/Models/DemoItem.cs
+++ b/Examples/SharpMap.Demo.Wms/Models/DemoItem.cs
@@ -6,9 +6,9 @@ public class DemoItem : IEquatable<DemoItem>
     {
         public DemoItem(string name, string url)
         {
-            if (name == null) 
+            if (name == null)
                 throw new ArgumentNullException("name");
-            if (url == null) 
+            if (url == null)
                 throw new ArgumentNullException("url");
             this.Name = name;
             this.Url = url;
@@ -25,20 +25,20 @@ public override string ToString()
 
         public bool Equals(DemoItem other)
         {
-            if (ReferenceEquals(null, other)) 
+            if (ReferenceEquals(null, other))
                 return false;
-            if (ReferenceEquals(this, other)) 
+            if (ReferenceEquals(this, other))
                 return true;
             return Equals(other.Name, this.Name) && Equals(other.Url, this.Url);
         }
 
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) 
+            if (ReferenceEquals(null, obj))
                 return false;
-            if (ReferenceEquals(this, obj)) 
+            if (ReferenceEquals(this, obj))
                 return true;
-            if (obj.GetType() != typeof(DemoItem)) 
+            if (obj.GetType() != typeof(DemoItem))
                 return false;
             return this.Equals((DemoItem)obj);
         }
@@ -49,6 +49,6 @@ public override int GetHashCode()
             {
                 return (this.Name.GetHashCode() * 397) ^ this.Url.GetHashCode();
             }
-        }    
+        }
     }
 }
\ No newline at end of file
diff --git a/Examples/SharpMap.Demo.Wms/Plugins/GraphicsPathBuilder.cs b/Examples/SharpMap.Demo.Wms/Plugins/GraphicsPathBuilder.cs
index 6f29674f..68312562 100644
--- a/Examples/SharpMap.Demo.Wms/Plugins/GraphicsPathBuilder.cs
+++ b/Examples/SharpMap.Demo.Wms/Plugins/GraphicsPathBuilder.cs
@@ -1,13 +1,13 @@
 // code adapted from: https://github.com/awcoats/mapstache
 namespace Mapstache
 {
+    using NetTopologySuite.Geometries;
     using System;
     using System.Collections.Generic;
     using System.Drawing;
     using System.Drawing.Drawing2D;
     using System.Linq;
-
-    using GeoAPI.Geometries;
+    using Point = System.Drawing.Point;
 
     public class GraphicsPathBuilder
     {
@@ -22,36 +22,36 @@ public GraphicsPathBuilder(RectangleF bounds, Size size)
             if (size.IsEmpty)
                 throw new ArgumentException("Size is empty.", "size");
 
-            this.metersToPixel = bounds.Width/size.Width;
-            this.topLeft = new Point((int) bounds.Left, (int) (bounds.Top));
+            this.metersToPixel = bounds.Width / size.Width;
+            this.topLeft = new Point((int)bounds.Left, (int)(bounds.Top));
             this.size = size;
         }
 
-        public GraphicsPath Build(IGeometry geometry)
+        public GraphicsPath Build(Geometry geometry)
         {
             GraphicsPath graphicsPath = new GraphicsPath { FillMode = FillMode.Alternate };
             string geometryType = geometry.GeometryType;
             switch (geometryType)
             {
                 case "Polygon":
-                    this.AddPolygon((IPolygon)geometry, graphicsPath);
+                    this.AddPolygon((Polygon)geometry, graphicsPath);
                     break;
 
                 case "MultiPolygon":
-                    this.AddMultiPolygon((IMultiPolygon)geometry, graphicsPath);
+                    this.AddMultiPolygon((MultiPolygon)geometry, graphicsPath);
                     break;
 
                 case "GeometryCollection":
                     for (int i = 0; i < geometry.NumGeometries; i++)
                     {
-                        IGeometry geom = geometry.GetGeometryN(i + 1);
+                        Geometry geom = geometry.GetGeometryN(i + 1);
                         switch (geom.GeometryType)
                         {
                             case "Polygon":
-                                this.AddPolygon((IPolygon)geom, graphicsPath);
+                                this.AddPolygon((Polygon)geom, graphicsPath);
                                 break;
                             case "MultiPolygon":
-                                this.AddMultiPolygon((IMultiPolygon)geom, graphicsPath);
+                                this.AddMultiPolygon((MultiPolygon)geom, graphicsPath);
                                 break;
                         }
                     }
@@ -64,32 +64,32 @@ public GraphicsPath Build(IGeometry geometry)
             return graphicsPath;
         }
 
-        private void AddMultiPolygon(IMultiPolygon geometry, GraphicsPath graphicsPath)
+        private void AddMultiPolygon(MultiPolygon geometry, GraphicsPath graphicsPath)
         {
             if (geometry == null)
                 throw new ArgumentNullException("geometry");
 
             foreach (var geom in geometry.Geometries)
-                this.AddPolygon((IPolygon)geom, graphicsPath);
+                this.AddPolygon((Polygon)geom, graphicsPath);
         }
 
-        private void AddPolygon(IPolygon polygon, GraphicsPath graphicsPath)
+        private void AddPolygon(Polygon polygon, GraphicsPath graphicsPath)
         {
             if (polygon == null)
                 throw new ArgumentNullException("polygon");
 
-            ILineString exterior = polygon.ExteriorRing;
+            LineString exterior = polygon.ExteriorRing;
             IEnumerable<PointF> coords = this.GetCoords(exterior);
             graphicsPath.AddPolygon(coords.ToArray());
 
-            foreach (ILineString ring in polygon.InteriorRings)
+            foreach (LineString ring in polygon.InteriorRings)
             {
                 coords = this.GetCoords(ring);
                 graphicsPath.AddPolygon(coords.ToArray());
             }
         }
 
-        private IEnumerable<PointF> GetCoords(IGeometry lineString)
+        private IEnumerable<PointF> GetCoords(Geometry lineString)
         {
             if (lineString == null)
                 throw new ArgumentNullException("lineString");
@@ -102,8 +102,8 @@ private IEnumerable<PointF> GetCoords(IGeometry lineString)
         private PointF GetPixel(PointF ll)
         {
             Point meters = SphericalMercator.FromLonLat(ll);
-            float x = (meters.X - this.topLeft.X)/this.metersToPixel;
-            float y = (meters.Y - this.topLeft.Y)/this.metersToPixel;
+            float x = (meters.X - this.topLeft.X) / this.metersToPixel;
+            float y = (meters.Y - this.topLeft.Y) / this.metersToPixel;
             y = this.size.Height - y;
             return new PointF(x, y);
         }
diff --git a/Examples/SharpMap.Demo.Wms/Plugins/Utf8Grid.cs b/Examples/SharpMap.Demo.Wms/Plugins/Utf8Grid.cs
index c1d8c4ed..34b8e9aa 100644
--- a/Examples/SharpMap.Demo.Wms/Plugins/Utf8Grid.cs
+++ b/Examples/SharpMap.Demo.Wms/Plugins/Utf8Grid.cs
@@ -1,6 +1,7 @@
 // code adapted from: https://github.com/awcoats/mapstache
 namespace Mapstache
 {
+    using NetTopologySuite.Geometries;
     using System;
     using System.Collections.Generic;
     using System.Drawing;
@@ -9,8 +10,7 @@ namespace Mapstache
     using System.Globalization;
     using System.Runtime.InteropServices;
     using System.Text;
-
-    using GeoAPI.Geometries;
+    using Point = System.Drawing.Point;
 
     public class Utf8GridResults
     {
@@ -29,11 +29,11 @@ public Utf8GridResults()
     }
 
     public class Utf8Grid : IDisposable
-    {        
+    {
         private Bitmap bitmap;
         private Graphics graphics;
 
-        private readonly Utf8GridResults results;        
+        private readonly Utf8GridResults results;
         private readonly GraphicsPathBuilder graphicsPathBuilder;
 
         public Utf8Grid(int utfGridResolution, int tileX, int tileY, int zoom)
@@ -42,7 +42,7 @@ public Utf8Grid(int utfGridResolution, int tileX, int tileY, int zoom)
             this.bitmap = new Bitmap(size.Width, size.Height, PixelFormat.Format32bppRgb);
             this.graphics = Graphics.FromImage(this.bitmap);
             RectangleF bbox = this.GetBoundingBoxInLatLngWithMargin(tileX, tileY, zoom);
-            this.graphicsPathBuilder = new GraphicsPathBuilder(SphericalMercator.FromLonLat(bbox), size);            
+            this.graphicsPathBuilder = new GraphicsPathBuilder(SphericalMercator.FromLonLat(bbox), size);
             this.results = new Utf8GridResults();
         }
 
@@ -53,7 +53,7 @@ public RectangleF GetBoundingBoxInLatLngWithMargin(int tileX, int tileY, int zoo
             return RectangleF.FromLTRB(lonlat1.X, lonlat2.Y, lonlat2.X, lonlat1.Y);
         }
 
-        public void FillPolygon(IGeometry geometry, int i, object data = null)
+        public void FillPolygon(Geometry geometry, int i, object data = null)
         {
             using (GraphicsPath gp = this.graphicsPathBuilder.Build(geometry))
             using (Brush brush = CreateBrush(i))
@@ -65,7 +65,7 @@ public void FillPolygon(IGeometry geometry, int i, object data = null)
         public Utf8GridResults CreateUtfGridJson()
         {
             BitmapData bitmapData = this.bitmap.LockBits(
-                new Rectangle(0, 0, this.bitmap.Width, this.bitmap.Height), 
+                new Rectangle(0, 0, this.bitmap.Width, this.bitmap.Height),
                 ImageLockMode.ReadOnly, this.bitmap.PixelFormat);
             IntPtr ptr = bitmapData.Scan0;
             int bytes = Math.Abs(bitmapData.Stride) * this.bitmap.Height;
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/leaflet.js b/Examples/SharpMap.Demo.Wms/Scripts/leaflet.js
index fb79a997..8f5765b3 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/leaflet.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/leaflet.js
@@ -7616,4 +7616,4 @@ L.Map.include({
 
 
 
-}(this));
\ No newline at end of file
+}(this));
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_buildings.js b/Examples/SharpMap.Demo.Wms/Scripts/script_buildings.js
index 732c770d..bd0f5dd1 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_buildings.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_buildings.js
@@ -1,11 +1,10 @@
 $(document).ready(function () {
-    var map = new L.Map('map'), zoom = 16, cloudmade, buildings;
-    cloudmade = new L.TileLayer(['http://{s}tile.cloudmade.com', '/1a235b638b614b458deeb77c7dae4f80', '/998/256/{z}/{x}/{y}.png'].join(''), {
-        maxZoom: 18,
-        subdomains: ['a.', 'b.', 'c.', '']
-    });
-    map.addLayer(cloudmade);
-
+    var map = new L.Map('map'), zoom = 16;
+    var osm = new L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    })
+    map.addLayer(osm);
+    
     $('#link1').click(function () {
         map.setView(new L.LatLng(52.52111, 13.40988), zoom);
     }).click();
@@ -16,6 +15,6 @@
         map.setView(new L.LatLng(52.50983, 13.37455), zoom);
     });
 
-    buildings = new OSMBuildings(map);
+    var buildings = new OSMBuildings(map);
     buildings.loadData('/buildings/getdata?w={w}&n={n}&e={e}&s={s}&z={z}');    
-});
\ No newline at end of file
+});
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_editor.js b/Examples/SharpMap.Demo.Wms/Scripts/script_editor.js
index a106154c..a2002875 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_editor.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_editor.js
@@ -63,4 +63,4 @@
         editor.startEditMode();
     };
     init();
-});
\ No newline at end of file
+});
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_geojs.js b/Examples/SharpMap.Demo.Wms/Scripts/script_geojs.js
index 7a231337..50e9dcb8 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_geojs.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_geojs.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
     options = {
         wms: 'WMS',
         controls: [],
-        projection: 'EPSG:900913',
+        projection: 'EPSG:3857',
         displayProjection: 'EPSG:4326',
         format: 'text/json'
     };
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_ll.js b/Examples/SharpMap.Demo.Wms/Scripts/script_ll.js
index ba935259..508839c1 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_ll.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_ll.js
@@ -3,9 +3,8 @@
         map = new L.Map('map'), center, url, cloudmade;
 
     map.on('load', function (e) {
-        var bounds, jsurl, options, layer;
-        bounds = e.target.getBounds();
-        jsurl = [
+        var bounds = e.target.getBounds();
+        var jsurl = [
             '/json.ashx?MAP_TYPE=DEF&BBOX=',
             bounds._southWest.lat, ',',
             bounds._southWest.lng, ',',
@@ -13,7 +12,7 @@
             bounds._northEast.lng
         ].join('');
 
-        options = {
+        var options = {
             radius: 8,
             fillColor: "#FF7800",
             color: "#000000",
@@ -21,7 +20,7 @@
             opacity: 1,
             fillOpacity: 0.8
         };
-        layer = new L.GeoJSON(null, {
+        var layer = new L.GeoJSON(null, {
             pointToLayer: function (f) {
                 var raw = f.geometry.coordinates;
                 var ll = new L.LatLng(raw[1], raw[0]);
@@ -50,15 +49,11 @@
         });
     });
 
-    center = new L.LatLng(lat, lon);
+    var center = new L.LatLng(lat, lon);
     map.setView(center, zoom);
 
-    url = ['http://{s}tile.cloudmade.com', '/1a235b638b614b458deeb77c7dae4f80', '/998/256/{z}/{x}/{y}.png'].join('');
-    cloudmade = new L.TileLayer(url, {
-        maxZoom: 18,
-        subdomains: ['a.', 'b.', 'c.', '']
-    });
-    map.addLayer(cloudmade);
-
-
-});
\ No newline at end of file
+    var osm = new L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    })
+    map.addLayer(osm);
+});
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_tc.js b/Examples/SharpMap.Demo.Wms/Scripts/script_tc.js
index 02ab3bdd..15ce3a79 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_tc.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_tc.js
@@ -4,12 +4,10 @@
     var zoom = 10;
 
     var map = new L.Map('map');
-    var cmurl = ['http://{s}tile.cloudmade.com', '/1a235b638b614b458deeb77c7dae4f80', '/997/256/{z}/{x}/{y}.png'].join('');
-    var cloudmade = new L.TileLayer(cmurl, {
-         maxZoom: 18,
-         subdomains: ['a.', 'b.', 'c.', '']
-    });
-    map.addLayer(cloudmade);
+    var osm = new L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+        attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'
+    })
+    map.addLayer(osm);
 
     var tile = new L.TileLayer.TileJSON({
         debug: false,
@@ -60,4 +58,4 @@
 
     var center = new L.LatLng(lat, lon);
     map.setView(center, zoom);
-});
\ No newline at end of file
+});
diff --git a/Examples/SharpMap.Demo.Wms/Scripts/script_utfgrid.js b/Examples/SharpMap.Demo.Wms/Scripts/script_utfgrid.js
index 5b2068a3..646930a6 100644
--- a/Examples/SharpMap.Demo.Wms/Scripts/script_utfgrid.js
+++ b/Examples/SharpMap.Demo.Wms/Scripts/script_utfgrid.js
@@ -83,4 +83,4 @@ $(document).ready(function () {
         map.setCenter(center, zoom);
     };
     init();
-});
\ No newline at end of file
+});
diff --git a/Examples/SharpMap.Demo.Wms/SharpMap.Demo.Wms.csproj b/Examples/SharpMap.Demo.Wms/SharpMap.Demo.Wms.csproj
index 69545110..2b6863a8 100644
--- a/Examples/SharpMap.Demo.Wms/SharpMap.Demo.Wms.csproj
+++ b/Examples/SharpMap.Demo.Wms/SharpMap.Demo.Wms.csproj
@@ -58,33 +58,40 @@
     <Reference Include="Common.Logging.Core, Version=3.4.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Common.Logging.Core.3.4.1\lib\net40\Common.Logging.Core.dll</HintPath>
     </Reference>
-    <Reference Include="GeoAPI, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GeoAPI.Core.1.7.5\lib\net40-client\GeoAPI.dll</HintPath>
-    </Reference>
-    <Reference Include="GeoAPI.CoordinateSystems, Version=1.7.5.0, Culture=neutral, PublicKeyToken=a1a0da7def465678, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\GeoAPI.CoordinateSystems.1.7.5\lib\net40-client\GeoAPI.CoordinateSystems.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NetTopologySuite, Version=1.15.3.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.Core.1.15.3\lib\net45\NetTopologySuite.dll</HintPath>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
-    <Reference Include="NetTopologySuite.CoordinateSystems, Version=1.15.3.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NetTopologySuite.CoordinateSystems.1.15.3\lib\net45\NetTopologySuite.CoordinateSystems.dll</HintPath>
+    <Reference Include="NetTopologySuite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=f580a05016ebada1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NetTopologySuite.2.5.0\lib\netstandard2.0\NetTopologySuite.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="ProjNET, Version=1.4.0.0, Culture=neutral, PublicKeyToken=a1f5bdcd9c6f5740, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\ProjNET4GeoAPI.1.4.1\lib\net40-client\ProjNET.dll</HintPath>
+    <Reference Include="ProjNET, Version=2.0.0.0, Culture=neutral, PublicKeyToken=a1f5bdcd9c6f5740, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ProjNET.2.0.0\lib\netstandard2.0\ProjNET.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.116.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing.Common, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Drawing.Common.6.0.0\lib\net461\System.Drawing.Common.dll</HintPath>
     </Reference>
-    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Drawing.Common.4.6.0\lib\net461\System.Drawing.Common.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.ApplicationServices" />
     <Reference Include="System.Web.DynamicData" />
@@ -95,34 +102,30 @@
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Extensions.Design" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.9\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.Routing">
     </Reference>
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Web.Mobile" />
-    <Reference Include="Microsoft.Web.Infrastructure">
-      <HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
@@ -758,11 +761,11 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
-  <Import Project="..\..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\System.Data.SQLite.Core.1.0.112.0\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.116.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Examples/SharpMap.Demo.Wms/Web.config b/Examples/SharpMap.Demo.Wms/Web.config
index f1efc51d..197989a6 100644
--- a/Examples/SharpMap.Demo.Wms/Web.config
+++ b/Examples/SharpMap.Demo.Wms/Web.config
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
-    <add key="CacheDirectory" value="c:\temp\SharpMapCache"/>
+    <add key="CacheDirectory" value="c:\temp\SharpMapCache" />
   </appSettings>
   <connectionStrings>
-    <add name="LocalSqlConnectionString" providerName="System.Data.SqlClient"
-      connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=SHARPMAPDATA;Integrated Security=SSPI;"/>
-    <add name="LocalPgisConnectionString" providerName="System.Data.SqlClient"
-      connectionString="Server=127.0.0.1;Port=5432;Database=SHARPMAPDATA;User Id=postgres;Password=postgres;"/>
+    <add name="LocalSqlConnectionString" providerName="System.Data.SqlClient" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=SHARPMAPDATA;Integrated Security=SSPI;" />
+    <add name="LocalPgisConnectionString" providerName="System.Data.SqlClient" connectionString="Server=127.0.0.1;Port=5432;Database=SHARPMAPDATA;User Id=postgres;Password=postgres;" />
   </connectionStrings>
   <!--
     For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
@@ -20,55 +18,73 @@
   <system.web>
     <compilation debug="true" targetFramework="4.7.2">
       <assemblies>
-        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
-        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+        <add assembly="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+        <add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+        <add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
       </assemblies>
     </compilation>
     <pages clientIDMode="AutoID" controlRenderingCompatibilityVersion="4.0">
       <namespaces>
-        <add namespace="System.Web.Mvc"/>
-        <add namespace="System.Web.Mvc.Ajax"/>
-        <add namespace="System.Web.Mvc.Html"/>
-        <add namespace="System.Web.Routing"/>
-        <add namespace="System.Linq"/>
-        <add namespace="System.Collections.Generic"/>
+        <add namespace="System.Web.Mvc" />
+        <add namespace="System.Web.Mvc.Ajax" />
+        <add namespace="System.Web.Mvc.Html" />
+        <add namespace="System.Web.Routing" />
+        <add namespace="System.Linq" />
+        <add namespace="System.Collections.Generic" />
       </namespaces>
     </pages>
     <httpHandlers>
-      <add verb="*" path="*.mvc" validate="false"
-        type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+      <add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     </httpHandlers>
   </system.web>
-  <system.web.extensions/>
+  <system.web.extensions />
   <system.webServer>
-    <validation validateIntegratedModeConfiguration="false"/>
-    <modules runAllManagedModulesForAllRequests="true"/>
+    <validation validateIntegratedModeConfiguration="false" />
+    <modules runAllManagedModulesForAllRequests="true" />
     <handlers>
-      <remove name="MvcHttpHandler"/>
-      <remove name="UrlRoutingHandler"/>
-      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc"
-        type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"/>
+      <remove name="MvcHttpHandler" />
+      <remove name="UrlRoutingHandler" />
+      <add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     </handlers>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.0.109.0" newVersion="1.0.109.0"/>
+        <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.0.109.0" newVersion="1.0.109.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Examples/SharpMap.Demo.Wms/packages.config b/Examples/SharpMap.Demo.Wms/packages.config
index 4e514e94..2a2219b6 100644
--- a/Examples/SharpMap.Demo.Wms/packages.config
+++ b/Examples/SharpMap.Demo.Wms/packages.config
@@ -2,19 +2,19 @@
 <packages>
   <package id="Common.Logging" version="3.4.1" targetFramework="net472" />
   <package id="Common.Logging.Core" version="3.4.1" targetFramework="net472" />
-  <package id="GeoAPI" version="1.7.5" targetFramework="net452" />
-  <package id="GeoAPI.CoordinateSystems" version="1.7.5" targetFramework="net452" />
-  <package id="GeoAPI.Core" version="1.7.5" targetFramework="net452" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net472" />
-  <package id="Microsoft.CSharp" version="4.0.1" targetFramework="net472" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="NetTopologySuite" version="1.15.3" targetFramework="net472" />
-  <package id="NetTopologySuite.CoordinateSystems" version="1.15.3" targetFramework="net472" />
-  <package id="NetTopologySuite.Core" version="1.15.3" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net472" />
-  <package id="ProjNET4GeoAPI" version="1.4.1" targetFramework="net452" />
-  <package id="System.Data.SQLite.Core" version="1.0.112.0" targetFramework="net472" />
-  <package id="System.Drawing.Common" version="4.6.0" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.9" targetFramework="net472" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net472" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
+  <package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net472" />
+  <package id="NetTopologySuite" version="2.5.0" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="ProjNET" version="2.0.0" targetFramework="net472" />
+  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.116.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Data.SQLite.Core" version="1.0.116.0" targetFramework="net472" />
+  <package id="System.Drawing.Common" version="6.0.0" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/Examples/WPFSamples/App.xaml.cs b/Examples/WPFSamples/App.xaml.cs
index 3c3b5b59..707cdd33 100644
--- a/Examples/WPFSamples/App.xaml.cs
+++ b/Examples/WPFSamples/App.xaml.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Windows;
+using System.Windows;
 
 namespace WPFSamples
 {
diff --git a/Examples/WPFSamples/MainWindow.xaml.cs b/Examples/WPFSamples/MainWindow.xaml.cs
index 0b178ae6..f7e38c61 100644
--- a/Examples/WPFSamples/MainWindow.xaml.cs
+++ b/Examples/WPFSamples/MainWindow.xaml.cs
@@ -1,9 +1,9 @@
-using System;
+using NetTopologySuite.Geometries;
+using SharpMap.CoordinateSystems;
 using System.Globalization;
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
 using Application = System.Windows.Application;
 using MenuItem = System.Windows.Controls.MenuItem;
 
@@ -16,20 +16,17 @@ public partial class MainWindow
     {
         public MainWindow()
         {
-            InitializeComponent();
-
-            var gss = GeoAPI.GeometryServiceProvider.Instance;
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
+            var gss = NetTopologySuite.NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
                 new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
                 new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
-
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
 
+            InitializeComponent();
         }
 
         private void MenuItem_OnClick(object sender, RoutedEventArgs e)
@@ -77,7 +74,7 @@ private void AddShapeLayer_OnClick(object sender, RoutedEventArgs e)
                 var lay = new SharpMap.Layers.VectorLayer(System.IO.Path.GetFileNameWithoutExtension(ofd.FileName), ds);
                 if (ds.CoordinateSystem != null)
                 {
-                    GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformationFactory fact =
+                    ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory fact =
                         new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
 
                     lay.CoordinateTransformation = fact.CreateFromCoordinateSystems(ds.CoordinateSystem,
diff --git a/Examples/WPFSamples/Properties/AssemblyInfoSupplement.cs b/Examples/WPFSamples/Properties/AssemblyInfoSupplement.cs
index 1b39c94f..a4f7f388 100644
--- a/Examples/WPFSamples/Properties/AssemblyInfoSupplement.cs
+++ b/Examples/WPFSamples/Properties/AssemblyInfoSupplement.cs
@@ -2,6 +2,6 @@
     //where theme specific resource dictionaries are located (used if a resource is not found in the page, or application resource dictionaries)
     System.Windows.ResourceDictionaryLocation.None,
     //where the generic resource dictionary is located (used if a resource is not found in the page,  app, or any theme specific resource dictionaries)
-    System.Windows.ResourceDictionaryLocation.SourceAssembly 
+    System.Windows.ResourceDictionaryLocation.SourceAssembly
 )]
 
diff --git a/Examples/WPFSamples/WPFSamples.csproj b/Examples/WPFSamples/WPFSamples.csproj
index 09bcf3db..fd4a9b34 100644
--- a/Examples/WPFSamples/WPFSamples.csproj
+++ b/Examples/WPFSamples/WPFSamples.csproj
@@ -19,10 +19,6 @@
         <ProjectReference Include="..\..\SharpMap.UI.WPF\SharpMap.UI.WPF.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <PackageReference Include="ProjNet4GeoAPI" Version="1.4.1" />
-    </ItemGroup>
-
     <ItemGroup>
         <Reference Include="PresentationCore" />
         <Reference Include="PresentationFramework" />
@@ -43,4 +39,8 @@
         <SubType>Designer</SubType>
     </Page>
     </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
 </Project>
diff --git a/Examples/WinFormSamples/DlgSamplesMenu.cs b/Examples/WinFormSamples/DlgSamplesMenu.cs
index ad43a3ab..a964adc4 100644
--- a/Examples/WinFormSamples/DlgSamplesMenu.cs
+++ b/Examples/WinFormSamples/DlgSamplesMenu.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
+using SharpMap.Forms;
+using System;
 using System.Windows.Forms;
-using SharpMap.Forms;
 
 namespace WinFormSamples
 {
@@ -28,25 +23,25 @@ private void button2_Click(object sender, EventArgs e)
 
         private void button4_Click(object sender, EventArgs e)
         {
-            using(var f = new  DockAreaForm())
+            using (var f = new DockAreaForm())
                 f.ShowDialog();
         }
 
         private void button5_Click(object sender, EventArgs e)
         {
-            using(var f = new FormDemoDrawGeometries())
+            using (var f = new FormDemoDrawGeometries())
                 f.ShowDialog();
         }
 
         private void button6_Click(object sender, EventArgs e)
         {
-            using(var f = new FormAnimation())
+            using (var f = new FormAnimation())
                 f.ShowDialog();
         }
 
         private void button1_Click(object sender, EventArgs e)
         {
-            using(var f = new FormMovingObjectOverTileLayer())
+            using (var f = new FormMovingObjectOverTileLayer())
                 f.ShowDialog();
         }
 
@@ -59,7 +54,7 @@ private void checkBox1_CheckedChanged(object sender, EventArgs e)
         {
             if (checkBox1.Checked)
                 MapBox.MapImageGeneratorFunction = null;
-            else 
+            else
                 MapBox.MapImageGeneratorFunction = MapBox.LayerListImageGenerator;
         }
 
diff --git a/Examples/WinFormSamples/DockAreaForm.cs b/Examples/WinFormSamples/DockAreaForm.cs
index c2e93ed0..d62201b5 100644
--- a/Examples/WinFormSamples/DockAreaForm.cs
+++ b/Examples/WinFormSamples/DockAreaForm.cs
@@ -1,9 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace WinFormSamples
@@ -25,7 +20,7 @@ private void toolStripButton1_Click(object sender, EventArgs e)
             Form2 form = new Form2();
             form.MdiParent = this;
             form.Show();
-            
+
         }
 
         private void toolStripButton2_Click(object sender, EventArgs e)
@@ -36,7 +31,7 @@ private void toolStripButton2_Click(object sender, EventArgs e)
         private void toolStripButton3_Click(object sender, EventArgs e)
         {
             this.LayoutMdi(MdiLayout.TileHorizontal);
-            
+
         }
 
     }
diff --git a/Examples/WinFormSamples/Form2.cs b/Examples/WinFormSamples/Form2.cs
index 6269b3f7..44e3b9fb 100644
--- a/Examples/WinFormSamples/Form2.cs
+++ b/Examples/WinFormSamples/Form2.cs
@@ -1,7 +1,4 @@
-using System.Data;
-using System.Linq;
-using BruTile.Predefined;
-using SharpMap.Data;
+using BruTile.Predefined;
 using SharpMap.Rendering.Decoration;
 using SharpMap.Rendering.Decoration.Graticule;
 using SharpMap.Rendering.Decoration.ScaleBar;
@@ -9,21 +6,21 @@
 
 namespace WinFormSamples
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Drawing;
-    using System.Drawing.Drawing2D;
-    using System.IO;
-    using System.Windows.Forms;
     using BruTile;
+    using NetTopologySuite.CoordinateSystems.Transformations;
     //using BruTile.PreDefined;
-    using GeoAPI.Geometries;
     using NetTopologySuite.Geometries;
-    using GeoAPI.CoordinateSystems.Transformations;
+    using ProjNet.CoordinateSystems.Transformations;
     using SharpMap.Data.Providers;
     using SharpMap.Forms;
     using SharpMap.Layers;
     using SharpMap.Styles;
+    using System;
+    using System.Collections.Generic;
+    using System.Drawing;
+    using System.Drawing.Drawing2D;
+    using System.IO;
+    using System.Windows.Forms;
 
     public partial class Form2 : Form
     {
@@ -37,19 +34,19 @@ public Form2()
 
         private void Form2_Load(object sender, EventArgs e)
         {
-            var tileLayer = new TileAsyncLayer(KnownTileSources.Create(KnownTileSource.BingRoadsStaging, userAgent:TileLayerSample.DefaultUserAgent), "TileLayer");
+            var tileLayer = new TileAsyncLayer(KnownTileSources.Create(KnownTileSource.BingRoadsStaging, userAgent: TileLayerSample.DefaultUserAgent), "TileLayer");
 
             this.mapBox1.Map.BackgroundLayer.Add(tileLayer);
             GeometryFactory gf = new GeometryFactory(new PrecisionModel(), 3857);
 
-            IMathTransform mathTransform = LayerTools.Wgs84toGoogleMercator.MathTransform;
+            MathTransform mathTransform = LayerTools.Wgs84toGoogleMercator.MathTransform;
             Envelope geom = GeometryTransform.TransformBox(
                 new Envelope(-9.205626, -9.123736, 38.690993, 38.740837),
                 mathTransform);
 
             //Adds a pushpin layer
             VectorLayer pushPinLayer = new VectorLayer("PushPins");
-            List<IGeometry> geos = new List<IGeometry>();
+            List<Geometry> geos = new List<Geometry>();
             geos.Add(gf.CreatePoint(geom.Centre));
             GeometryProvider geoProvider = new GeometryProvider(geos);
             pushPinLayer.DataSource = geoProvider;
@@ -67,14 +64,14 @@ private void Form2_Load(object sender, EventArgs e)
             // Graticule
             this.mapBox1.Map.Decorations.Add(new Graticule()
             {
-                Enabled =  chkGraticule.Checked,
+                Enabled = chkGraticule.Checked,
                 PcsGraticuleMode = PcsGraticuleMode.WebMercatorScaleLines,
                 PcsGraticuleStyle =
                 {
                     NumSubdivisions = 2
                 }
             });
-            
+
             this.mapBox1.Map.ZoomToBox(geom);
             this.mapBox1.Map.Zoom = 8500;
             this.mapBox1.Refresh();
@@ -141,10 +138,10 @@ private void button7_Click(object sender, EventArgs e)
         private static ILayer[] CreateLayers()
         {
             ILayer countries = CreateLayer("GeoData/World/countries.shp",
-                new VectorStyle {EnableOutline = true, Fill = new SolidBrush(Color.Green)});
-            ILayer rivers = CreateLayer("GeoData/World/rivers.shp", new VectorStyle {Line = new Pen(Color.Blue)});
+                new VectorStyle { EnableOutline = true, Fill = new SolidBrush(Color.Green) });
+            ILayer rivers = CreateLayer("GeoData/World/rivers.shp", new VectorStyle { Line = new Pen(Color.Blue) });
             ILayer cities = CreateLayer("GeoData/World/cities.shp", new VectorStyle());
-            return new[] {countries, rivers, cities};
+            return new[] { countries, rivers, cities };
         }
 
         private static ILayer CreateLayer(string path, VectorStyle style)
diff --git a/Examples/WinFormSamples/FormAnimation.cs b/Examples/WinFormSamples/FormAnimation.cs
index c6c04bc3..78ae6c39 100644
--- a/Examples/WinFormSamples/FormAnimation.cs
+++ b/Examples/WinFormSamples/FormAnimation.cs
@@ -1,20 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers;
 using SharpMap.Layers;
-using SharpMap.Data;
-using SharpMap.Styles;
-using SharpMap.Rendering.Thematics;
-using BruTile.Web;
+using System;
+using System.Drawing;
 using System.IO;
-using System.Drawing.Drawing2D;
-using SharpMap.Data.Providers;
-using System.Threading;
+using System.Windows.Forms;
 
 namespace WinFormSamples
 {
@@ -23,7 +13,7 @@ public partial class FormAnimation : Form
 
         public FormAnimation()
         {
-   
+
             InitializeComponent();
             this.SetStyle(ControlStyles.DoubleBuffer | ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
             this.UpdateStyles();
@@ -45,14 +35,14 @@ private void FormAnimation_Load(object sender, EventArgs e)
 
             this.mapBox1.Map.Layers.Add(layCountries);
 
-            
 
-            this.mapBox1.Map.ZoomToExtents(); 
+
+            this.mapBox1.Map.ZoomToExtents();
             this.mapBox1.Refresh();
 
 
-            
-            
+
+
         }
 
 
@@ -68,10 +58,10 @@ private void button1_Click(object sender, EventArgs e)
             {
                 var bb = this.mapBox1.Map.Envelope;
 
-                for (int i = 0; i < 50; i=i+5)
+                for (int i = 0; i < 50; i = i + 5)
                 {
 
-                    this.mapBox1.Map.ZoomToBox(new Envelope(bb.MinX - i, bb.MaxX + i, bb.MinY - i, bb.MaxY+ i));
+                    this.mapBox1.Map.ZoomToBox(new Envelope(bb.MinX - i, bb.MaxX + i, bb.MinY - i, bb.MaxY + i));
                     this.mapBox1.Refresh();
 
                     Image image = mapBox1.Image;
@@ -82,7 +72,7 @@ private void button1_Click(object sender, EventArgs e)
                 this.mapBox1.Refresh();
 
             }
-            
+
         }
 
     }
diff --git a/Examples/WinFormSamples/FormCreateTilesSample.cs b/Examples/WinFormSamples/FormCreateTilesSample.cs
index 4040469f..b61ce6bf 100644
--- a/Examples/WinFormSamples/FormCreateTilesSample.cs
+++ b/Examples/WinFormSamples/FormCreateTilesSample.cs
@@ -1,12 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Configuration;
-using System.Data;
 using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace WinFormSamples
@@ -24,8 +18,8 @@ protected override void OnLoad(EventArgs e)
         {
             lblFolder.Text = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "tiles");
             var asr = new AppSettingsReader();
-            txtGoogleMapsApiKey.Text = (string) asr.GetValue("GoogleMapsApiKey", typeof(string));
-            
+            txtGoogleMapsApiKey.Text = (string)asr.GetValue("GoogleMapsApiKey", typeof(string));
+
             base.OnLoad(e);
         }
 
diff --git a/Examples/WinFormSamples/FormDemoDrawGeometries.cs b/Examples/WinFormSamples/FormDemoDrawGeometries.cs
index b1da5b62..34cf3916 100644
--- a/Examples/WinFormSamples/FormDemoDrawGeometries.cs
+++ b/Examples/WinFormSamples/FormDemoDrawGeometries.cs
@@ -1,20 +1,10 @@
+using BruTile.Predefined;
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
-using SharpMap.Layers;
-using SharpMap.Data;
-using SharpMap.Styles;
-using SharpMap.Rendering.Thematics;
-using BruTile.Web;
-using BruTile.Predefined;
-using SharpMap.Data.Providers;
-
-using GeometryTransform = GeoAPI.CoordinateSystems.Transformations.GeometryTransform;
+using GeometryTransform = NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform;
 
 namespace WinFormSamples
 {
@@ -25,7 +15,7 @@ public partial class FormDemoDrawGeometries : Form
 
         public FormDemoDrawGeometries()
         {
-   
+
             InitializeComponent();
             this.SetStyle(ControlStyles.DoubleBuffer | ControlStyles.UserPaint | ControlStyles.AllPaintingInWmPaint, true);
             this.UpdateStyles();
@@ -43,7 +33,7 @@ private void FormDemoDrawGeometries_Load(object sender, EventArgs e)
 
 
             SharpMap.Layers.VectorLayer vl = new VectorLayer("My Geometries");
-            geoProvider = new SharpMap.Data.Providers.GeometryProvider(new List<IGeometry>());
+            geoProvider = new SharpMap.Data.Providers.GeometryProvider(new List<Geometry>());
             vl.DataSource = geoProvider;
             this.mapBox1.Map.Layers.Add(vl);
 
@@ -62,7 +52,7 @@ private void FormDemoDrawGeometries_Load(object sender, EventArgs e)
             this.mapBox1.MouseMove += new SharpMap.Forms.MapBox.MouseEventHandler(mapBox1_MouseMove);
         }
 
-        void mapBox1_MouseMove(GeoAPI.Geometries.Coordinate worldPos, MouseEventArgs imagePos)
+        void mapBox1_MouseMove(NetTopologySuite.Geometries.Coordinate worldPos, MouseEventArgs imagePos)
         {
             this.label2.Text = worldPos.X.ToString("N4") + "/" + worldPos.Y.ToString("N4");
         }
@@ -72,9 +62,9 @@ void mapBox1_ActiveToolChanged(SharpMap.Forms.MapBox.Tools tool)
             this.label1.Text = this.mapBox1.ActiveTool.ToString();
         }
 
-        void mapBox1_GeometryDefined(GeoAPI.Geometries.IGeometry geometry)
+        void mapBox1_GeometryDefined(NetTopologySuite.Geometries.Geometry geometry)
         {
-            MessageBox.Show("Geometry defined!\r\n"+geometry);
+            MessageBox.Show("Geometry defined!\r\n" + geometry);
 
             geoProvider.Geometries.Add(geometry);
 
@@ -105,7 +95,7 @@ private void Form2_SizeChanged(object sender, EventArgs e)
             this.mapBox1.Refresh();
         }
 
-          private void button7_Click(object sender, EventArgs e)
+        private void button7_Click(object sender, EventArgs e)
         {
             this.mapBox1.ActiveTool = SharpMap.Forms.MapBox.Tools.DrawPoint;
         }
@@ -133,7 +123,7 @@ private void button5_Click(object sender, EventArgs e)
 
         private void button6_Click(object sender, EventArgs e)
         {
-            
+
         }
     }
 }
diff --git a/Examples/WinFormSamples/FormInteractiveVectorLayerRendering.cs b/Examples/WinFormSamples/FormInteractiveVectorLayerRendering.cs
index 887e8a11..fafbc2f9 100644
--- a/Examples/WinFormSamples/FormInteractiveVectorLayerRendering.cs
+++ b/Examples/WinFormSamples/FormInteractiveVectorLayerRendering.cs
@@ -1,6 +1,5 @@
 using BruTile.Predefined;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
+using NetTopologySuite.CoordinateSystems.Transformations;
 using NetTopologySuite.Geometries;
 using SharpMap;
 using SharpMap.Data;
@@ -13,9 +12,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Text;
-using System.Linq;
-using System.Runtime.Remoting.Channels;
 using System.Windows.Forms;
 using WinFormSamples.Properties;
 using Point = NetTopologySuite.Geometries.Point;
@@ -30,7 +26,7 @@ public partial class FormLayerListImageGenerator : Form
         private static Image _boat;
 
         private Layer _contextLayer;
-        
+
         // Context Menu actions
         private enum enumMenuItem
         {
@@ -50,11 +46,11 @@ private enum enumMenuItem
             SymbolOffsetBR,      // Basic Vector Style Point Size
             AlignHz,             // Regenerate Map Point layer data  
             AlignVt,             // Regenerate Map Point layer data
-            AlignDiagonal ,      // Regenerate Map Point layer data
+            AlignDiagonal,      // Regenerate Map Point layer data
             IncrementLineWidth,  // Rectangle layers
             DecrementLineWidth   // Rectangle layers
         }
-        
+
         public FormLayerListImageGenerator()
         {
             InitializeComponent();
@@ -79,7 +75,7 @@ private void FormLayerListImageGenerator_Load(object sender, System.EventArgs e)
             }
 
             _boat = Resources.vessel_01;
-            
+
             var map = InitMap();
             InitBackground(map);
             InitLayers(map);
@@ -108,7 +104,7 @@ private void FormLayerListImageGenerator_Closing(object sender, EventArgs e)
             _timer.Stop();
             _timer.Tick -= TimerTick;
             _timer.Dispose();
-            
+
         }
 
         private void Form_SizeChanged(object sender, EventArgs e)
@@ -168,7 +164,7 @@ private void tv_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
             }
             else if (vlyr != null && (e.Node.FullPath.StartsWith("Map Layers", StringComparison.OrdinalIgnoreCase)))
             {
-                if (vlyr.LayerName.StartsWith("Point", StringComparison.OrdinalIgnoreCase) )
+                if (vlyr.LayerName.StartsWith("Point", StringComparison.OrdinalIgnoreCase))
                 {
                     if (vlyr.Theme == null)
                     {
@@ -220,7 +216,7 @@ private MenuItem CreateMenuItem(enumMenuItem eMenuItem, string text)
             return mi;
         }
 
-        private void MenuItemClick (Object sender, EventArgs e)
+        private void MenuItemClick(Object sender, EventArgs e)
         {
             var mi = sender as MenuItem;
             if (mi == null) return;
@@ -267,7 +263,7 @@ private void MenuItemClick (Object sender, EventArgs e)
                     vectorLyr.Style.PointSize += 2;
                     break;
                 case enumMenuItem.DecreaseSymbolSize:
-                    vectorLyr.Style.PointSize-= 2;
+                    vectorLyr.Style.PointSize -= 2;
                     break;
                 case enumMenuItem.SymbolOffsetTL:
                     vectorLyr.Style.SymbolOffset = new PointF(vectorLyr.Style.SymbolOffset.X - 10f, vectorLyr.Style.SymbolOffset.Y - 10f);
@@ -294,13 +290,13 @@ private void MenuItemClick (Object sender, EventArgs e)
                     if (vectorLyr.Theme == null)
                         PopulateGeomFeatureLayer(mb.Map, vectorLyr, 1);
                     else
-                        PopulateCharacterPointSymbolizerLayer(mb.Map, (GeometryFeatureProvider)vectorLyr.DataSource, 1); 
+                        PopulateCharacterPointSymbolizerLayer(mb.Map, (GeometryFeatureProvider)vectorLyr.DataSource, 1);
                     break;
                 case enumMenuItem.AlignDiagonal:
                     if (vectorLyr.Theme == null)
                         PopulateGeomFeatureLayer(mb.Map, vectorLyr, 2);
                     else
-                        PopulateCharacterPointSymbolizerLayer(mb.Map, (GeometryFeatureProvider)vectorLyr.DataSource, 2); 
+                        PopulateCharacterPointSymbolizerLayer(mb.Map, (GeometryFeatureProvider)vectorLyr.DataSource, 2);
                     break;
                 case enumMenuItem.IncrementLineWidth:
                     vectorLyr.Style.Line.Width += 1;
@@ -322,7 +318,7 @@ private void InitTreeView(Map map)
         {
             var font = new System.Drawing.Font(tv.Font.FontFamily, tv.Font.Size, System.Drawing.FontStyle.Bold);
 
-            tv.Nodes.Add(new TreeNode("Variable Layers") {NodeFont = font});
+            tv.Nodes.Add(new TreeNode("Variable Layers") { NodeFont = font });
             tv.Nodes.Add(new TreeNode("Map Layers") { NodeFont = font });
             tv.Nodes.Add(new TreeNode("Background Layers") { NodeFont = font });
 
@@ -359,18 +355,18 @@ private void InitRotations()
             ddlRotation.DisplayMember = "Text";
             ddlRotation.ValueMember = "Value";
 
-            ddlRotation.Items.Add(new {Text = "North up", Value = 0f});
-            ddlRotation.Items.Add(new {Text = "30°", Value = 30f});
-            ddlRotation.Items.Add(new {Text = "60°", Value = 60f});
-            ddlRotation.Items.Add(new {Text = "90°", Value = 90f});
-            ddlRotation.Items.Add(new {Text = "120°", Value = 120f});
-            ddlRotation.Items.Add(new {Text = "150°", Value = 150f});
-            ddlRotation.Items.Add(new {Text = "180°", Value = 180f});
-            ddlRotation.Items.Add(new {Text = "210°", Value = 210f});
-            ddlRotation.Items.Add(new {Text = "240°", Value = 240f});
-            ddlRotation.Items.Add(new {Text = "270°", Value = 270f});
-            ddlRotation.Items.Add(new {Text = "300°", Value = 300f});
-            ddlRotation.Items.Add(new {Text = "330°", Value = 330f});
+            ddlRotation.Items.Add(new { Text = "North up", Value = 0f });
+            ddlRotation.Items.Add(new { Text = "30°", Value = 30f });
+            ddlRotation.Items.Add(new { Text = "60°", Value = 60f });
+            ddlRotation.Items.Add(new { Text = "90°", Value = 90f });
+            ddlRotation.Items.Add(new { Text = "120°", Value = 120f });
+            ddlRotation.Items.Add(new { Text = "150°", Value = 150f });
+            ddlRotation.Items.Add(new { Text = "180°", Value = 180f });
+            ddlRotation.Items.Add(new { Text = "210°", Value = 210f });
+            ddlRotation.Items.Add(new { Text = "240°", Value = 240f });
+            ddlRotation.Items.Add(new { Text = "270°", Value = 270f });
+            ddlRotation.Items.Add(new { Text = "300°", Value = 300f });
+            ddlRotation.Items.Add(new { Text = "330°", Value = 330f });
 
             ddlRotation.SelectedIndex = 0;
         }
@@ -380,7 +376,7 @@ private void ddlRotation_SelectedIndexChanged(object sender, EventArgs e)
             var deg = (ddlRotation.SelectedItem as dynamic).Value;
             var matrix = new System.Drawing.Drawing2D.Matrix();
             if (deg != 0f)
-                matrix.RotateAt((float) deg, new PointF(this.mb.Width / 2f, this.mb.Height / 2f));
+                matrix.RotateAt((float)deg, new PointF(this.mb.Width / 2f, this.mb.Height / 2f));
             this.mb.Map.MapTransform = matrix;
             this.mb.Refresh();
         }
@@ -401,12 +397,12 @@ private Map InitMap()
             //geom.ExpandBy(2500);
             res.ZoomToBox(geom);
 
-            res.Decorations.Add(new NorthArrow {ForeColor = Color.DarkSlateBlue});
+            res.Decorations.Add(new NorthArrow { ForeColor = Color.DarkSlateBlue });
             return res;
         }
 
         private const int Interval = 50; // = 1000 / 25;
-        private readonly Timer _timer = new Timer {Interval = Interval, Enabled = true};
+        private readonly Timer _timer = new Timer { Interval = Interval, Enabled = true };
 
         private void TimerTick(object sender, EventArgs e)
         {
@@ -440,7 +436,7 @@ private void InitVariableLayers(Map map)
             lyrGrp.Layers.Add(lyr);
             lyrGrp.Layers.Add(llyr);
             map.VariableLayers.Add(lyrGrp);
-            
+
             // group layer with multiple targets + labels
             lyrGrp = new LayerGroup("Medium Boats Group");
             lyr = CreateGeometryFeatureProviderLayer("Medium Boats", new[] {
@@ -458,7 +454,7 @@ private void InitVariableLayers(Map map)
             lyrGrp.Layers.Add(lyr);
             lyrGrp.Layers.Add(llyr);
             map.VariableLayers.Add(lyrGrp);
-            
+
             // group layer with multiple targets + labels
             lyrGrp = new LayerGroup("Slow Boats Group");
             lyr = CreateGeometryFeatureProviderLayer("Slow Boats", new[] {
@@ -482,7 +478,7 @@ private void InitVariableLayers(Map map)
 
         private LabelLayer CreateLabelLayer(VectorLayer lyr, string column, bool enabled)
         {
-            var lblLayer = new LabelLayer( lyr.LayerName + " Labels");
+            var lblLayer = new LabelLayer(lyr.LayerName + " Labels");
             lblLayer.DataSource = lyr.DataSource;
             lblLayer.LabelColumn = column;
             //lblLayer.Style.BackColor = Brushes.LightPink;
@@ -524,7 +520,7 @@ private void InitLayers(Map map)
             map.Layers.Add(lyr);
 
             // Char Symbol Layer with Thematic rendering
-            lyr = CreateGeometryFeatureProviderLayer("Points with thematic CPS", new [] {
+            lyr = CreateGeometryFeatureProviderLayer("Points with thematic CPS", new[] {
                 new System.Data.DataColumn("CharIndex",typeof(int)),
                 new System.Data.DataColumn("CharSize",typeof(float)),
                 new System.Data.DataColumn("OffsetX",typeof(float)),
@@ -561,15 +557,15 @@ private static VectorStyle GetRasterPointSymbolizerStyle(FeatureDataRow row)
             {
                 rps = new RasterPointSymbolizer()
                 {
-                    Symbol = (Image) _boat.Clone(),
-                    Rotation = (float) row[2],
+                    Symbol = (Image)_boat.Clone(),
+                    Rotation = (float)row[2],
                     RemapColor = Color.White,
-                    Scale = (float) row[3],
-                    SymbolColor = Color.FromArgb((int) row[4])
+                    Scale = (float)row[3],
+                    SymbolColor = Color.FromArgb((int)row[4])
                 };
             }
 
-            return new VectorStyle() {PointSymbolizer = rps};
+            return new VectorStyle() { PointSymbolizer = rps };
         }
 
         private void PopulateGeomFeatureLayer(Map map, VectorLayer lyr, int direction)
@@ -584,7 +580,7 @@ private void PopulateGeomFeatureLayer(Map map, VectorLayer lyr, int direction)
             gp.Geometries.Clear();
             foreach (var geom in geoms)
                 gp.Geometries.Add(geom);
-            
+
         }
         private void PopulateCharacterPointSymbolizerLayer(Map map, GeometryFeatureProvider fp, int direction)
         {
@@ -597,7 +593,7 @@ private void PopulateCharacterPointSymbolizerLayer(Map map, GeometryFeatureProvi
             fdr["CharSize"] = 15f;
             fdr["OffsetX"] = -10f;
             fdr["OffsetY"] = 5f;
-            fdr.Geometry = GetRectangleCenter(map, direction == 0 ? MapDecorationAnchor.LeftBottom : direction == 1 ? MapDecorationAnchor.RightBottom  : MapDecorationAnchor.LeftBottom);
+            fdr.Geometry = GetRectangleCenter(map, direction == 0 ? MapDecorationAnchor.LeftBottom : direction == 1 ? MapDecorationAnchor.RightBottom : MapDecorationAnchor.LeftBottom);
             fp.Features.AddRow(fdr);
 
             fdr = fp.Features.NewRow();
@@ -605,7 +601,7 @@ private void PopulateCharacterPointSymbolizerLayer(Map map, GeometryFeatureProvi
             fdr["CharSize"] = 20f;
             fdr["OffsetX"] = -10f;
             fdr["OffsetY"] = 5f;
-            fdr.Geometry = GetRectangleCenter(map, direction == 0 ? MapDecorationAnchor.CenterBottom : direction == 1 ? MapDecorationAnchor.RightCenter  : MapDecorationAnchor.Center);
+            fdr.Geometry = GetRectangleCenter(map, direction == 0 ? MapDecorationAnchor.CenterBottom : direction == 1 ? MapDecorationAnchor.RightCenter : MapDecorationAnchor.Center);
             fp.Features.AddRow(fdr);
 
             fdr = fp.Features.NewRow();
@@ -626,14 +622,14 @@ private static VectorLayer CreateGeometryFeatureProviderLayer(string name, Syste
             con.Columns[0].AutoIncrement = true;
             con.Columns[0].AutoIncrementSeed = 1000;
             fdt.Constraints.Add(con);
-            fdt.PrimaryKey = new System.Data.DataColumn[]{fdt.Columns[0]};
+            fdt.PrimaryKey = new System.Data.DataColumn[] { fdt.Columns[0] };
 
             fdt.Columns.AddRange(columns);
 
             return new VectorLayer(name, new GeometryFeatureProvider(fdt));
         }
-               
-        private static VectorLayer CreateGeomLayer(string name, IGeometry[] geometries, System.Drawing.Color lineColor)
+
+        private static VectorLayer CreateGeomLayer(string name, Geometry[] geometries, System.Drawing.Color lineColor)
         {
             var lyr = new VectorLayer(name)
             {
@@ -645,7 +641,7 @@ private static VectorLayer CreateGeomLayer(string name, IGeometry[] geometries,
 
             return lyr;
         }
-        
+
         private static Coordinate[] GetRectanglePoints(Map map, MapDecorationAnchor anchor)
         {
             var env = map.Envelope;
@@ -702,13 +698,13 @@ private Point GetRectangleCenter(Map map, MapDecorationAnchor anchor)
         }
 
         public static VectorStyle GetCharacterPointStyle(FeatureDataRow row)
-         {
+        {
             var cps = new CharacterPointSymbolizer();
             cps.CharacterIndex = (int)row[1];
             cps.Font = new System.Drawing.Font("Wingdings", (float)row[2]);
             cps.Offset = new System.Drawing.PointF((float)row[3], (float)row[4]);
-            return new VectorStyle() {PointSymbolizer = cps};
-         }
+            return new VectorStyle() { PointSymbolizer = cps };
+        }
 
     }
 
@@ -717,7 +713,7 @@ public class MovingObjects : IDisposable
         private static readonly Random Rnd = new Random(17);
 
         private readonly List<MovingObject> _movingObjects = new List<MovingObject>();
-        
+
         private readonly VectorLayer _lyr;
         private readonly LabelLayer _llyr;
         private readonly Map _map;
@@ -726,7 +722,7 @@ public class MovingObjects : IDisposable
         private float _scale;
         private Color _color;
         private readonly Timer _timer;
-        
+
         public MovingObjects(Timer timer, double stepSize, VectorLayer lyr, LabelLayer llyr, Map map, float scale, Color color)
         {
             _timer = timer;
@@ -741,18 +737,18 @@ public MovingObjects(Timer timer, double stepSize, VectorLayer lyr, LabelLayer l
         }
 
         public void Start() => IsRunning = true;
-        
+
         public void Stop() => IsRunning = false;
-        
+
         public bool IsRunning { get; private set; }
 
         public void AddObject(string name, Point startAt)
         {
-            lock (((ICollection) _movingObjects).SyncRoot)
+            lock (((ICollection)_movingObjects).SyncRoot)
             {
-                var fp = (GeometryFeatureProvider) _lyr.DataSource;
+                var fp = (GeometryFeatureProvider)_lyr.DataSource;
                 var fdr = fp.Features.NewRow();
-                float heading = (float) Rnd.Next(0, 359);
+                float heading = (float)Rnd.Next(0, 359);
                 fdr[1] = name;
                 fdr[2] = MovingObject.NormalizePositive(90f - heading);
                 fdr[3] = _scale;
@@ -768,12 +764,12 @@ public void AddObject(string name, Point startAt)
 
         public bool DeleteObject(uint oid)
         {
-            lock (((ICollection) _movingObjects).SyncRoot)
+            lock (((ICollection)_movingObjects).SyncRoot)
             {
                 var obj = _movingObjects.Find(p => p.Oid == oid);
                 if (obj == null) return false;
-                
-                var fp = (GeometryFeatureProvider) _lyr.DataSource;
+
+                var fp = (GeometryFeatureProvider)_lyr.DataSource;
                 var fdr = fp.Features.Rows.Find(oid);
                 fp.Features.Rows.Remove(fdr);
                 fp.Features.AcceptChanges();
@@ -787,13 +783,13 @@ private void Timer_Tick(object sender, EventArgs e)
         {
             if (IsRunning)
             {
-                lock (((ICollection) _movingObjects).SyncRoot)
+                lock (((ICollection)_movingObjects).SyncRoot)
                 {
-                    var fp = (GeometryFeatureProvider) _lyr.DataSource;
+                    var fp = (GeometryFeatureProvider)_lyr.DataSource;
                     foreach (var obj in _movingObjects)
                     {
                         obj.Step(_map.Envelope, StepSize);
-                        var fdr = (FeatureDataRow) fp.Features.Rows.Find(obj.Oid);
+                        var fdr = (FeatureDataRow)fp.Features.Rows.Find(obj.Oid);
                         fdr[2] = 90f - obj.Heading;
                         fdr.AcceptChanges();
                     }
@@ -808,13 +804,13 @@ public void Dispose()
             _timer.Tick -= Timer_Tick;
         }
     }
-    
+
     public class MovingObject
     {
         public uint Oid { get; }
-        
+
         public Point Position { get; private set; }
-        
+
         public float Heading { get; set; }
 
         public MovingObject(uint oid, Point startAt, float initialHeading)
@@ -850,7 +846,7 @@ public void Step(Envelope currentExtent, double stepSize)
                 dy = -dy;
             }
 
-            Heading = NormalizePositive(90f - (float) Math.Atan2(dx, dy) * 180f / (float) Math.PI);
+            Heading = NormalizePositive(90f - (float)Math.Atan2(dx, dy) * 180f / (float)Math.PI);
             //Step(currentExtent, stepSize);
         }
 
diff --git a/Examples/WinFormSamples/FormMapBox.cs b/Examples/WinFormSamples/FormMapBox.cs
index 9e6bf70b..1fc1baec 100644
--- a/Examples/WinFormSamples/FormMapBox.cs
+++ b/Examples/WinFormSamples/FormMapBox.cs
@@ -1,19 +1,16 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Windows.Forms;
-using ProjNet.CoordinateSystems;
-using ProjNet.CoordinateSystems.Transformations;
-using SharpMap;
+using SharpMap;
 using SharpMap.CoordinateSystems;
 using SharpMap.CoordinateSystems.Transformations;
+using SharpMap.Data;
 using SharpMap.Forms;
 using SharpMap.Forms.Tools;
 using SharpMap.Layers;
-using System.Drawing.Drawing2D;
-using SharpMap.Data;
 using SharpMap.Rendering.Decoration;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Windows.Forms;
 using WinFormSamples.Samples;
 
 namespace WinFormSamples
@@ -33,14 +30,9 @@ public static bool UseDotSpatial
             {
                 if (value == UseDotSpatial) return;
 
-                var s = (Session) Session.Instance;
-                var css = !value 
-                    ? new CoordinateSystemServices(
-                        new CoordinateSystemFactory(),
-                        new CoordinateTransformationFactory(),
-                        SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems())
-                    : new CoordinateSystemServices(
-                        new DotSpatialCoordinateSystemFactory(), 
+                var s = (Session)Session.Instance;
+                var css = new CoordinateSystemServices(
+                        new DotSpatialCoordinateSystemFactory(),
                         new DotSpatialCoordinateTransformationFactory(),
                         SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
                 s.SetCoordinateSystemServices(css);
@@ -52,7 +44,7 @@ public FormMapBox()
             AddToListView = false;
 
             InitializeComponent();
-            
+
             mapBox1.ActiveTool = MapBox.Tools.Pan;
 
             var loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
@@ -63,9 +55,9 @@ public FormMapBox()
             {
                 lvwDecorations.Items.Add(name);
             }
-            
+
             AddToListView = true;
-            
+
             AppDomain.CurrentDomain.AssemblyLoad += HandleAssemblyLoad;
 
             pgMapDecoration.SelectedObject = null;
@@ -101,7 +93,7 @@ private void LoadMapDecorationTypes(System.Reflection.Assembly a)
 #pragma warning disable CA1031 // Do not catch general exception types
             catch (Exception)
             {
-                
+
             }
 #pragma warning restore CA1031 // Do not catch general exception types
         }
@@ -119,7 +111,7 @@ private static void AdjustRotation(LayerCollection lc, float angle)
             foreach (ILayer layer in lc)
             {
                 if (layer is VectorLayer)
-                    ((VectorLayer) layer).Style.SymbolRotation = -angle;
+                    ((VectorLayer)layer).Style.SymbolRotation = -angle;
                 else if (layer is LabelLayer)
                     ((LabelLayer)layer).Style.Rotation = -angle;
             }
@@ -142,7 +134,7 @@ private static string[] GetOpenFileName(string filter)
 
         private void btnTool_Click(object sender, EventArgs e)
         {
-            var btn = (Button) sender;
+            var btn = (Button)sender;
             IMapTool tool = null;
 
             switch (btn.Name)
@@ -159,7 +151,7 @@ private void btnTool_Click(object sender, EventArgs e)
             if (oldCustomTool is SampleTool) btnTool.Font = new Font(btn.Font, FontStyle.Regular);
             if (oldCustomTool is MagnifierTool) btnTool2.Font = new Font(btn.Font, FontStyle.Regular);
 
-            if (oldCustomTool is IDisposable) ((IDisposable) oldCustomTool).Dispose();
+            if (oldCustomTool is IDisposable) ((IDisposable)oldCustomTool).Dispose();
 
             mapBox1.CustomTool = tool;
             btn.Font = new Font(btn.Font, tool == null ? FontStyle.Regular : FontStyle.Bold);
@@ -174,7 +166,7 @@ private void btnTool_Click(object sender, EventArgs e)
             //    mapBox1.ActiveTool = MapBox.Tools.Pan;
             //}
         }
-        
+
         void mapBox1_MapQueryStarted(object sender, EventArgs e)
         {
             dataGridView1.DataSource = _queriedData = null;
@@ -193,7 +185,7 @@ private void mapBox1_OnMapQueried(FeatureDataTable data)
                 _queriedData = new FeatureDataSet();
             _queriedData.Tables.Add(data);
         }
-        
+
         private void btnCreateTiles_Click(object sender, EventArgs e)
         {
             if (mapBox1.Map == null)
@@ -208,8 +200,8 @@ private void btnCreateTiles_Click(object sender, EventArgs e)
                 f.ShowDialog();
             }
         }
-        
-                private void radioButton_Click(object sender, EventArgs e)
+
+        private void radioButton_Click(object sender, EventArgs e)
         {
             Cursor mic = mapBox1.Cursor;
             mapBox1.Cursor = Cursors.WaitCursor;
@@ -286,8 +278,8 @@ private void radioButton_Click(object sender, EventArgs e)
                         {
                             mapBox1.Refresh();
 
-                            MessageBox.Show("Requires SqlServer connection string to be defined (Project / Settings)", 
-                                "Sql Server", MessageBoxButtons.OK,MessageBoxIcon.Information);
+                            MessageBox.Show("Requires SqlServer connection string to be defined (Project / Settings)",
+                                "Sql Server", MessageBoxButtons.OK, MessageBoxIcon.Information);
                             return;
                         }
                         // now show SqlServer dialog
@@ -341,7 +333,7 @@ private void mapImage_ActiveToolChanged(MapBox.Tools tool)
             UpdatePropertyGrid();
         }
 
-        private void mapImage_MapCenterChanged(GeoAPI.Geometries.Coordinate center)
+        private void mapImage_MapCenterChanged(NetTopologySuite.Geometries.Coordinate center)
         {
             UpdatePropertyGrid();
         }
@@ -402,12 +394,12 @@ private void radioButton2_MouseUp(object sender, MouseEventArgs e)
                     {
                         string cn = InputBox(
                             "Please enter connection string.\n" +
-                            "For e.g. PostGis Rasters sth. like 'PG:host=... port=... dbname=... schema=... table=... column=...'", 
+                            "For e.g. PostGis Rasters sth. like 'PG:host=... port=... dbname=... schema=... table=... column=...'",
                             @"GDAL Raster Layer Connection", _gdalConnection);
                         if (string.IsNullOrEmpty(cn))
                             return;
-                        
-                        map = Samples.GdalSample.InitializeMap(tbAngle.Value, new []{ cn });
+
+                        map = Samples.GdalSample.InitializeMap(tbAngle.Value, new[] { cn });
                         _gdalConnection = cn;
                     }
                     else
@@ -519,42 +511,43 @@ private static string InputBox(string text, string caption, string defaultValue
                 Padding = new Padding(5),
                 Margin = new Padding(10)
             };
-            
+
             var textLabel = new TextBox
             {
-                Left = prompt.Margin.Left, 
-                Top = prompt.Margin.Top, 
+                Left = prompt.Margin.Left,
+                Top = prompt.Margin.Top,
                 Width = prompt.ClientSize.Width - prompt.Margin.Left - prompt.Margin.Right,
                 BackColor = SystemColors.Control,
                 BorderStyle = BorderStyle.None,
                 Multiline = true,
                 HideSelection = true,
-                ReadOnly = true, Enabled = false
+                ReadOnly = true,
+                Enabled = false
             };
 
             var size = SizeF.Empty;
             using (var g = Graphics.FromHwnd(IntPtr.Zero))
-                size =  g.MeasureString(text, DefaultFont, new SizeF(textLabel.Width, 20 * textLabel.Height));
+                size = g.MeasureString(text, DefaultFont, new SizeF(textLabel.Width, 20 * textLabel.Height));
             textLabel.Height = System.Drawing.Size.Ceiling(size).Height;
             textLabel.Lines = text.Split('\n');
             textLabel.SelectionStart = 0;
             textLabel.SelectionLength = 0;
 
-            var textBox = new TextBox 
-            { 
-                Left = prompt.Margin.Left, 
-                Top = textLabel.Bottom, 
+            var textBox = new TextBox
+            {
+                Left = prompt.Margin.Left,
+                Top = textLabel.Bottom,
                 Width = prompt.ClientSize.Width - prompt.Margin.Left - prompt.Margin.Right,
-                Multiline = true, 
+                Multiline = true,
                 Text = defaultValue ?? string.Empty
             };
 
             var confirmation = new Button
             {
-                Text = "&OK", 
-                Width = 100, 
+                Text = "&OK",
+                Width = 100,
                 Left = prompt.ClientSize.Width - prompt.Margin.Right - 100,
-                Top = textBox.Top + textBox.Height + prompt.Padding.Vertical, 
+                Top = textBox.Top + textBox.Height + prompt.Padding.Vertical,
                 DialogResult = DialogResult.OK
             };
 
diff --git a/Examples/WinFormSamples/FormMovingObjectOverTileLayer.cs b/Examples/WinFormSamples/FormMovingObjectOverTileLayer.cs
index eadfde48..b7a6ed18 100644
--- a/Examples/WinFormSamples/FormMovingObjectOverTileLayer.cs
+++ b/Examples/WinFormSamples/FormMovingObjectOverTileLayer.cs
@@ -1,25 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-using GeoAPI.Geometries;
+using BruTile.Predefined;
 using NetTopologySuite.Geometries;
 using SharpMap.Layers;
-using BruTile.Predefined;
-
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
 using WinFormSamples.Properties;
-
-using GeometryTransform = GeoAPI.CoordinateSystems.Transformations.GeometryTransform;
+using GeometryTransform = NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform;
 
 namespace WinFormSamples
 {
     public partial class FormMovingObjectOverTileLayer : Form
     {
 
-        private List<IGeometry> geos = new List<IGeometry>();
+        private List<Geometry> geos = new List<Geometry>();
 
         private bool movingUp = true;
         private bool movingLeft = true;
-        GeoAPI.Geometries.Coordinate position;
+        NetTopologySuite.Geometries.Coordinate position;
 
         public FormMovingObjectOverTileLayer()
         {
@@ -34,7 +31,7 @@ private void FormMovingObjectOverTileLayer_Load(object sender, EventArgs e)
 
             //Lisbon...
             var mathTransform = LayerTools.Wgs84toGoogleMercator.MathTransform;
-            GeoAPI.Geometries.Envelope geom = GeometryTransform.TransformBox(
+            NetTopologySuite.Geometries.Envelope geom = GeometryTransform.TransformBox(
                 new Envelope(-9.205626, -9.123736, 38.690993, 38.740837),
                 mathTransform);
 
@@ -48,7 +45,7 @@ private void FormMovingObjectOverTileLayer_Load(object sender, EventArgs e)
             //Adds a static layer
             var staticLayer = new VectorLayer("Fixed Marker");
             //position = geom.GetCentroid();
-            var aux = new List<IGeometry>();
+            var aux = new List<Geometry>();
             aux.Add(gf.CreatePoint(geom.Centre));
             staticLayer.Style.Symbol = Resources.PumpSmall;
             var geoProviderFixed = new SharpMap.Data.Providers.GeometryProvider(aux);
@@ -77,7 +74,7 @@ private void FormMovingObjectOverTileLayer_Load(object sender, EventArgs e)
         private void timer1_Tick(object sender, EventArgs e)
         {
             const double step = 25;
-            
+
             double dx, dy;
             if (movingLeft)
                 dx = -step;
diff --git a/Examples/WinFormSamples/LayerTools.cs b/Examples/WinFormSamples/LayerTools.cs
index 89b39428..7fea23fe 100644
--- a/Examples/WinFormSamples/LayerTools.cs
+++ b/Examples/WinFormSamples/LayerTools.cs
@@ -1,13 +1,11 @@
-using System;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.Layers;
+using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using SharpMap.Layers;
-using System.Drawing;
-using GeoAPI.CoordinateSystems.Transformations;
-using ProjNet.CoordinateSystems.Transformations;
-using GeoAPI.CoordinateSystems;
-using ProjNet.CoordinateSystems;
 
 namespace WinFormSamples
 {
@@ -31,7 +29,7 @@ public static ICoordinateTransformation Wgs84toGoogleMercator
                     CoordinateSystemFactory csFac = new ProjNet.CoordinateSystems.CoordinateSystemFactory();
                     CoordinateTransformationFactory ctFac = new CoordinateTransformationFactory();
 
-                    IGeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
+                    GeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
                       "WGS 84", AngularUnit.Degrees, HorizontalDatum.WGS84, PrimeMeridian.Greenwich,
                       new AxisInfo("north", AxisOrientationEnum.North), new AxisInfo("east", AxisOrientationEnum.East));
 
@@ -45,11 +43,11 @@ public static ICoordinateTransformation Wgs84toGoogleMercator
                     parameters.Add(new ProjectionParameter("false_northing", 0.0));
                     IProjection projection = csFac.CreateProjection("Google Mercator", "mercator_1sp", parameters);
 
-                    IProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
+                    ProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
                       "Google Mercator", wgs84, projection, LinearUnit.Metre, new AxisInfo("East", AxisOrientationEnum.East),
                       new AxisInfo("North", AxisOrientationEnum.North));
 
-                    ((CoordinateSystem)epsg900913).DefaultEnvelope = new [] { -20037508.342789, -20037508.342789, 20037508.342789, 20037508.342789 };
+                    ((CoordinateSystem)epsg900913).DefaultEnvelope = new[] { -20037508.342789, -20037508.342789, 20037508.342789, 20037508.342789 };
 
                     _wgs84ToGoogle = ctFac.CreateFromCoordinateSystems(wgs84, epsg900913);
                 }
@@ -73,7 +71,7 @@ public static ICoordinateTransformation Dhdn2ToWgs84
                     CoordinateSystemFactory csFac = new ProjNet.CoordinateSystems.CoordinateSystemFactory();
                     CoordinateTransformationFactory ctFac = new CoordinateTransformationFactory();
 
-                    IGeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
+                    GeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
                       "WGS 84", AngularUnit.Degrees, HorizontalDatum.WGS84, PrimeMeridian.Greenwich,
                       new AxisInfo("north", AxisOrientationEnum.North), new AxisInfo("east", AxisOrientationEnum.East));
 
@@ -87,7 +85,7 @@ public static ICoordinateTransformation Dhdn2ToWgs84
                     parameters.Add(new ProjectionParameter("false_northing", 0.0));
                     IProjection projection = csFac.CreateProjection("Google Mercator", "mercator_1sp", parameters);
 
-                    IProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
+                    ProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
                       "Google Mercator", wgs84, projection, LinearUnit.Metre, new AxisInfo("East", AxisOrientationEnum.East),
                       new AxisInfo("North", AxisOrientationEnum.North));
 
@@ -110,7 +108,7 @@ public static ICoordinateTransformation GoogleMercatorToWgs84
                     CoordinateSystemFactory csFac = new ProjNet.CoordinateSystems.CoordinateSystemFactory();
                     CoordinateTransformationFactory ctFac = new CoordinateTransformationFactory();
 
-                    IGeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
+                    GeographicCoordinateSystem wgs84 = csFac.CreateGeographicCoordinateSystem(
                       "WGS 84", AngularUnit.Degrees, HorizontalDatum.WGS84, PrimeMeridian.Greenwich,
                       new AxisInfo("north", AxisOrientationEnum.North), new AxisInfo("east", AxisOrientationEnum.East));
 
@@ -124,7 +122,7 @@ public static ICoordinateTransformation GoogleMercatorToWgs84
                     parameters.Add(new ProjectionParameter("false_northing", 0.0));
                     IProjection projection = csFac.CreateProjection("Google Mercator", "mercator_1sp", parameters);
 
-                    IProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
+                    ProjectedCoordinateSystem epsg900913 = csFac.CreateProjectedCoordinateSystem(
                       "Google Mercator", wgs84, projection, LinearUnit.Metre, new AxisInfo("East", AxisOrientationEnum.East),
                       new AxisInfo("North", AxisOrientationEnum.North));
 
@@ -158,7 +156,7 @@ public static LabelLayer CreateLabelLayer(VectorLayer originalLayer, string labe
         private static readonly Random Rnd = new Random();
         public static Color GetRandomColor()
         {
-            return  Color.FromArgb(Rnd.Next(0, 127), Rnd.Next(0, 255), Rnd.Next(0,255), Rnd.Next(0,255));
+            return Color.FromArgb(Rnd.Next(0, 127), Rnd.Next(0, 255), Rnd.Next(0, 255), Rnd.Next(0, 255));
         }
 
         public static Boolean GetRandomBoolean()
@@ -183,14 +181,14 @@ public static Pen GetRandomPen()
         public static Bitmap GetRandomSymbol()
         {
             var s = Rnd.Next(4, 12);
-            var f = new Font("WingDings", 2*s, GraphicsUnit.Pixel);
-            var bmp = new Bitmap(2*s + 2, 2*s + 2, PixelFormat.Format32bppArgb);
+            var f = new Font("WingDings", 2 * s, GraphicsUnit.Pixel);
+            var bmp = new Bitmap(2 * s + 2, 2 * s + 2, PixelFormat.Format32bppArgb);
             using (var g = Graphics.FromImage(bmp))
             {
                 g.Clear(Color.Transparent);
-                g.DrawString(new string(Convert.ToChar((byte) Rnd.Next(15, 127)), 1), f, GetRandomBrush(), new PointF(s, s) ,
+                g.DrawString(new string(Convert.ToChar((byte)Rnd.Next(15, 127)), 1), f, GetRandomBrush(), new PointF(s, s),
                              new StringFormat
-                                 {Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center});
+                             { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center });
             }
 
             return bmp;
@@ -199,14 +197,14 @@ public static Bitmap GetRandomSymbol()
         public static SharpMap.Styles.VectorStyle GetRandomVectorStyle()
         {
             return new SharpMap.Styles.VectorStyle
-                       {
-                           EnableOutline = GetRandomBoolean(),
-                           Outline = GetRandomPen(3, 7),
-                           Line = GetRandomPen(1, 4),
-                           Fill = GetRandomBrush(),
-                           Symbol = GetRandomSymbol(),
-                           //SymbolRotation = Rnd.Next(0, 359),
-                       };
+            {
+                EnableOutline = GetRandomBoolean(),
+                Outline = GetRandomPen(3, 7),
+                Line = GetRandomPen(1, 4),
+                Fill = GetRandomBrush(),
+                Symbol = GetRandomSymbol(),
+                //SymbolRotation = Rnd.Next(0, 359),
+            };
         }
 
         private static Pen GetRandomPen(int min, int max)
@@ -223,31 +221,31 @@ public static SharpMap.Map GetMapForProviders(IEnumerable<SharpMap.Data.Provider
             foreach (var provider in providers)
             {
                 var l = new VectorLayer(provider.ConnectionID, provider)
-                            {
-                                Style = GetRandomVectorStyle(),
-                                IsQueryEnabled = true
-                                
-                            };
+                {
+                    Style = GetRandomVectorStyle(),
+                    IsQueryEnabled = true
+
+                };
                 if (provider.GetFeatureCount() > 50000)
                     m.BackgroundLayer.Add(AsyncLayerProxyLayer.Create(l, new Size(256, 128)));
-                else    
-                m.Layers.Add(l);
+                else
+                    m.Layers.Add(l);
 
                 if (provider.GetFeatureCount() < 50000)
                 {
-                var ll = new LabelLayer("Label " + provider.ConnectionID);
-                ll.DataSource = provider;
-                
-                provider.Open();
-                var f = provider.GetFeature(1);
-                provider.Close();
+                    var ll = new LabelLayer("Label " + provider.ConnectionID);
+                    ll.DataSource = provider;
+
+                    provider.Open();
+                    var f = provider.GetFeature(1);
+                    provider.Close();
 
                     ll.LabelColumn = f.Table.Columns[0].ColumnName;
-                ll.Style.CollisionDetection = false;
-                ll.Style.IgnoreLength = true;
-                
-                m.Layers.Add(ll);
-            }
+                    ll.Style.CollisionDetection = false;
+                    ll.Style.IgnoreLength = true;
+
+                    m.Layers.Add(ll);
+                }
             }
             m.ZoomToExtents();
             return m;
diff --git a/Examples/WinFormSamples/MagnifierTool.cs b/Examples/WinFormSamples/MagnifierTool.cs
index 51f3adf8..71e13c98 100644
--- a/Examples/WinFormSamples/MagnifierTool.cs
+++ b/Examples/WinFormSamples/MagnifierTool.cs
@@ -1,18 +1,18 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Reflection;
-using System.Windows.Forms;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap;
 using SharpMap.Forms;
 using SharpMap.Forms.Tools;
+using System;
+using System.Drawing;
+using System.Reflection;
+using System.Windows.Forms;
+using Point = System.Drawing.Point;
 
 namespace WinFormSamples
 {
     public class MagnifierTool : MapTool
     {
-        
+
         private readonly MapBox _parentMapBox;
         private readonly PictureBox _magnified;
         private Map _map;
@@ -22,7 +22,7 @@ public class MagnifierTool : MapTool
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
-        public MagnifierTool(MapBox parentMapBox) 
+        public MagnifierTool(MapBox parentMapBox)
             : base("Magnifier", "A tool to magnify the portion of the map below the cursor")
         {
             _parentMapBox = parentMapBox;
@@ -31,7 +31,7 @@ public MagnifierTool(MapBox parentMapBox)
 
             MagnificationFactor = 1.10;
 
-            Offset = new Size(5,5);
+            Offset = new Size(5, 5);
 
             _magnified = new PictureBox();
             _magnified.Size = new Size(75, 75);
@@ -43,7 +43,7 @@ public MagnifierTool(MapBox parentMapBox)
             Map = _parentMapBox.Map;
             _map = Map.Clone();
             _map.Size = _magnified.Size;
-            _map.Zoom = _map.Size.Width*(Map.Envelope.Width/Map.Size.Width) / _magnification;
+            _map.Zoom = _map.Size.Width * (Map.Envelope.Width / Map.Size.Width) / _magnification;
             _map.Center = _map.Center;
             _magnified.Image = _map.GetMap();
 
@@ -105,14 +105,14 @@ public override bool DoMouseLeave()
         public override bool DoMouseWheel(Coordinate mapPosition, MouseEventArgs mouseEventArgs)
         {
             var factor = 1d;
-            if (Math.Sign(_parentMapBox.WheelZoomMagnitude)*mouseEventArgs.Delta > 0)
+            if (Math.Sign(_parentMapBox.WheelZoomMagnitude) * mouseEventArgs.Delta > 0)
                 factor = MagnificationFactor;
             else
-                factor = 1/MagnificationFactor;
+                factor = 1 / MagnificationFactor;
             Magnification *= factor;
             //_map.Zoom *= Math.Sign(mouseEventArgs.Delta)*MagnificationFactor * Math.Sign(_parentMapBox.WheelZoomMagnitude);
             //_magnified.Image = _map.GetMap();
-            
+
             return base.DoMouseWheel(mapPosition, mouseEventArgs);
         }
 
@@ -135,10 +135,10 @@ public double Magnification
 
                 var old = _magnification;
                 _magnification = value;
-                OnMagnificationChanged(_magnification/old);
+                OnMagnificationChanged(_magnification / old);
             }
         }
-        
+
         /// <summary>
         /// Event raised when the magnification factor has changed
         /// </summary>
@@ -151,17 +151,17 @@ public double Magnification
         private void OnMagnificationChanged(double change)
         {
             _map.Zoom /= change;
-            
+
             var h = MagnificationChanged;
             if (h != null) h(this, EventArgs.Empty);
         }
 
-        
+
         /// <summary>
         /// Gets or sets a value indicating by which factor the magnification has to change on scroll or key
         /// </summary>
         public double MagnificationFactor { get; set; }
-        
+
         public override bool DoMouseMove(Coordinate mapPosition, MouseEventArgs mouseEventArgs)
         {
             if (!Enabled) return false;
@@ -169,7 +169,7 @@ public override bool DoMouseMove(Coordinate mapPosition, MouseEventArgs mouseEve
             _map.Center = mapPosition;
             _magnified.Image = _map.GetMap();
             _magnified.Visible = true;
-            
+
             var newLocation = Point.Add(mouseEventArgs.Location, Offset);
             if (newLocation.X + _magnified.Size.Width > _parentMapBox.ClientSize.Width)
                 newLocation.X = mouseEventArgs.Location.X - Offset.Width - _magnified.Size.Width;
@@ -188,7 +188,7 @@ public Size Offset
             {
                 if (value.Width < 0 || value.Height < 0)
                     throw new ArgumentException("value");
-                
+
                 if (value == _offset)
                     return;
 
diff --git a/Examples/WinFormSamples/Program.cs b/Examples/WinFormSamples/Program.cs
index 33f9f86d..b8893544 100644
--- a/Examples/WinFormSamples/Program.cs
+++ b/Examples/WinFormSamples/Program.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Windows.Forms;
-using System.Text;
-using NetTopologySuite;
+using NetTopologySuite;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.CoordinateSystems;
+using System;
+using System.Windows.Forms;
 
 namespace WinFormSamples
 {
@@ -15,22 +15,21 @@ internal static class Program
         [STAThread]
         private static void Main()
         {
-            var gss = new NtsGeometryServices();
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
-                new CoordinateSystemFactory(), 
-                new CoordinateTransformationFactory(), 
+            var gss = NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
+                new CoordinateSystemFactory(),
+                new CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
 
             // plug-in WebMercator so that correct spherical definition is directly available to Layer Transformations using SRID
-            var pcs = (ProjectedCoordinateSystem)ProjectedCoordinateSystem.WebMercator;
-            css.AddCoordinateSystem((int)pcs.AuthorityCode, pcs);
+            var pcs = ProjectedCoordinateSystem.WebMercator;
+            ((ICoordinateSystemRepository)css).AddCoordinateSystem((int)pcs.AuthorityCode, pcs);
 
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
-           
+
             // for SqlServerSample referencing SharpMap.SqlServerSpatialObjects
             //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
 
diff --git a/Examples/WinFormSamples/SampleTool.cs b/Examples/WinFormSamples/SampleTool.cs
index 9d602356..4597b7f0 100644
--- a/Examples/WinFormSamples/SampleTool.cs
+++ b/Examples/WinFormSamples/SampleTool.cs
@@ -1,19 +1,18 @@
-using System;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap;
+using SharpMap.Data;
+using SharpMap.Forms;
+using SharpMap.Forms.Tools;
+using SharpMap.Layers;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
-using System.Security.Cryptography;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Common.Logging;
-using GeoAPI.Geometries;
-using SharpMap;
-using SharpMap.Data;
-using SharpMap.Forms;
-using SharpMap.Forms.Tools;
-using SharpMap.Layers;
 
 namespace WinFormSamples
 {
@@ -23,7 +22,7 @@ public class SampleTool : MapTool, IDisposable
 
         public SampleTool() : base("Sample", "A sample tool that does nothing really useful")
         {
-            Logger.Debug(fmh => fmh("Created \"{0}\"-Tool, {1}", Name,Description));
+            Logger.Debug(fmh => fmh("Created \"{0}\"-Tool, {1}", Name, Description));
             Enabled = true;
         }
 
@@ -92,7 +91,7 @@ public override bool DoMouseHover(Coordinate mapPosition)
 
             _cts = new CancellationTokenSource();
             _cts.Token.Register(HandleCancel);
-            
+
             var t = new Task<FeatureDataRow>(FindGeoNearPoint, mapPosition, _cts.Token);
             t.Start();
             t.ContinueWith(res => ShowToolTip(res.Result));
@@ -119,13 +118,13 @@ private void ShowToolTip(FeatureDataRow fdr)
         {
             if (fdr != null)
             {
-                
+
                 MapControl.BeginInvoke(new Action(() =>
                 {
                     var _t = new ToolTip();
                     _toolTip = _t;
                     _t/*oolTip*/.ToolTipTitle = fdr.Table.TableName;
-                    
+
                     _t/*oolTip*/.Show(ToText(fdr), MapControl);
                 }));
             }
@@ -140,7 +139,7 @@ private string ToText(FeatureDataRow fdr)
             var sb = new StringBuilder();
             if (fdr.Geometry != null)
             {
-                sb.AppendFormat("Geometry:\n  Type: {0}\n  SRID: {1}\n", 
+                sb.AppendFormat("Geometry:\n  Type: {0}\n  SRID: {1}\n",
                     fdr.Geometry.GeometryType, fdr.Geometry.SRID);
                 switch (fdr.Geometry.Dimension)
                 {
@@ -160,14 +159,14 @@ private string ToText(FeatureDataRow fdr)
             foreach (DataColumn col in fdr.Table.Columns)
                 sb.AppendFormat("  {0}: {1}\n", col.Caption, fdr[col] == DBNull.Value ? "NULL" : fdr[col]);
 
-            Logger.Debug(fmh => fmh("\n{0}\n{1}", fdr.Table.TableName,  sb.ToString(0, sb.Length-1)));
+            Logger.Debug(fmh => fmh("\n{0}\n{1}", fdr.Table.TableName, sb.ToString(0, sb.Length - 1)));
 
             return sb.ToString(0, sb.Length - 1);
         }
 
         private FeatureDataRow FindGeoNearPoint(object/*Coordinate*/ coord)
         {
-            var mapPosition = (Coordinate) coord;
+            var mapPosition = (Coordinate)coord;
             var env = new Envelope(mapPosition);
             env.ExpandBy(5 * Map.PixelWidth);
             var g = NetTopologySuite.Geometries.Prepared.PreparedGeometryFactory.Prepare(Map.Factory.ToGeometry(env));
@@ -197,12 +196,12 @@ private FeatureDataRow FindGeoNearPoint(object/*Coordinate*/ coord)
                         var fdt = fds.Tables[j];
                         for (var k = 0; k < fdt.Rows.Count; k++)
                         {
-                            var fdr = (FeatureDataRow) fdt.Rows[k];
+                            var fdr = (FeatureDataRow)fdt.Rows[k];
                             if (g.Intersects(fdr.Geometry))
                             {
                                 var distance = g.Geometry.InteriorPoint.Distance(fdr.Geometry);
                                 if (fdr.Geometry.Dimension == Dimension.Surface)
-                                    distance += 5* Map.PixelWidth;
+                                    distance += 5 * Map.PixelWidth;
                                 fdrs.Add(Tuple.Create(distance, fdr));
                             }
                         }
diff --git a/Examples/WinFormSamples/Samples/CreateTilesSample.cs b/Examples/WinFormSamples/Samples/CreateTilesSample.cs
index b41ae008..d08651d6 100644
--- a/Examples/WinFormSamples/Samples/CreateTilesSample.cs
+++ b/Examples/WinFormSamples/Samples/CreateTilesSample.cs
@@ -1,8 +1,8 @@
-using System;
+using ProjNet.CoordinateSystems.Transformations;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
-using GeoAPI.CoordinateSystems.Transformations;
 
 /*------------------------------------------------------------------------------ 
 Create Date : 2011-09-25
@@ -24,7 +24,7 @@ public class CreateTilesSample : IDisposable
             new Dictionary<SharpMap.Layers.ILayer, ICoordinateTransformation>();
 
         private float _opacity = 0.3f;
-        public  float Opacity
+        public float Opacity
         {
             get { return _opacity; }
             set
@@ -43,7 +43,7 @@ public CreateTilesSample(SharpMap.Map map, bool transformToMercator)
         public CreateTilesSample(SharpMap.Map map, bool transformToMercator, string rootTilesPath)
         {
             _map = map.Clone();
-            
+
             _map.MaximumZoom = double.MaxValue;
             _map.MinimumZoom = 0;
 
@@ -58,7 +58,7 @@ public CreateTilesSample(SharpMap.Map map, bool transformToMercator, string root
                 Directory.CreateDirectory(_rootTilesPath);
             }
         }
-        
+
         private void TransformLayers(ICoordinateTransformation coorTransform)
         {
             foreach (SharpMap.Layers.ILayer layer in _map.Layers)
@@ -85,7 +85,7 @@ private void TransformLayers(ICoordinateTransformation coorTransform)
 
         private void RestoreTransformations()
         {
-            foreach (var layer in  _map.Layers)
+            foreach (var layer in _map.Layers)
             {
                 ICoordinateTransformation ct;
                 _coordinateTransformations.TryGetValue(layer, out ct);
@@ -109,19 +109,19 @@ public void SaveImagesAtLevel(int level)
                 var path = string.Format(Path.Combine(_rootTilesPath, level.ToString()));
                 if (!Directory.Exists(path))
                 {
-                    Directory.CreateDirectory(path);                    
+                    Directory.CreateDirectory(path);
                 }
 
                 _map.Size = new Size(256, 256);
                 _map.ZoomToExtents();
-                
+
                 // number images of title on a line
                 var lineNumberImage = (int)(Math.Pow(2, level));
                 _map.Zoom = _map.Zoom / lineNumberImage;
-                
+
                 // 1/2 length image in world
                 var delta = _map.Center.X - _map.Envelope.MinX;
-                
+
                 // image size per tile ( in world )
                 var imageWidth = _map.Envelope.MaxX - _map.Envelope.MinX;
                 var imageHeight = imageWidth;
@@ -131,7 +131,7 @@ public void SaveImagesAtLevel(int level)
                 var centerY0 = _map.Center.Y + (lineNumberImage * imageHeight) / 2 - delta;
 
                 var ia = new System.Drawing.Imaging.ImageAttributes();
-                var cm = new System.Drawing.Imaging.ColorMatrix {Matrix33 = _opacity};
+                var cm = new System.Drawing.Imaging.ColorMatrix { Matrix33 = _opacity };
                 ia.SetColorMatrix(cm, System.Drawing.Imaging.ColorMatrixFlag.Default, System.Drawing.Imaging.ColorAdjustType.Bitmap);
 
                 // All tile columns
@@ -145,17 +145,17 @@ public void SaveImagesAtLevel(int level)
                     var centerY = centerY0;
                     for (var j = 0; j < lineNumberImage; j++, centerY = centerY - imageHeight)
                     {
-                        _map.Center = new GeoAPI.Geometries.Coordinate(centerX, centerY);
+                        _map.Center = new NetTopologySuite.Geometries.Coordinate(centerX, centerY);
                         using (var img = _map.GetMap())
                         {
                             using (var transImg = new System.Drawing.Bitmap(img.Width, img.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb))
                             {
                                 using (var g = System.Drawing.Graphics.FromImage(transImg))
                                 {
-                                    g.DrawImage(img, 
-                                        new[] { 
-                                            new Point(0, 0), 
-                                            new Point(transImg.Size.Width, 0), 
+                                    g.DrawImage(img,
+                                        new[] {
+                                            new Point(0, 0),
+                                            new Point(transImg.Size.Width, 0),
                                             new Point(0, transImg.Size.Height), 
                                             /*new Point(transImg.Size)*/ },
                                             new Rectangle(new Point(0, 0), img.Size), GraphicsUnit.Pixel, ia);
@@ -166,7 +166,8 @@ public void SaveImagesAtLevel(int level)
                     }
                 }
             }
-            catch(Exception ex) {
+            catch (Exception ex)
+            {
                 throw new Exception(ex.Message);
             }
         }
@@ -175,7 +176,7 @@ private static void SaveImage(Image img, string colPath, int imageId, int type)
             switch (type)
             {
                 default:
-                //case 0:
+                    //case 0:
                     img.Save(Path.Combine(colPath, string.Format("{0}.png", imageId)), System.Drawing.Imaging.ImageFormat.Png);
                     break;
                 case 1:
diff --git a/Examples/WinFormSamples/Samples/FormSqlServerOpts.cs b/Examples/WinFormSamples/Samples/FormSqlServerOpts.cs
index 574f4f8d..100286e9 100644
--- a/Examples/WinFormSamples/Samples/FormSqlServerOpts.cs
+++ b/Examples/WinFormSamples/Samples/FormSqlServerOpts.cs
@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
+using SharpMap.Data.Providers;
+using SharpMap.Layers;
+using System;
 using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using SharpMap;
-using SharpMap.Data.Providers;
-using SharpMap.Layers;
 
 namespace WinFormSamples.Samples
 {
diff --git a/Examples/WinFormSamples/Samples/GdalSample.cs b/Examples/WinFormSamples/Samples/GdalSample.cs
index 795f30b2..7ee491fc 100644
--- a/Examples/WinFormSamples/Samples/GdalSample.cs
+++ b/Examples/WinFormSamples/Samples/GdalSample.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Reflection;
 
 namespace WinFormSamples.Samples
@@ -88,7 +87,7 @@ private static SharpMap.Map InitializeGeoTiff(int index, float angle)
                         map.Layers.Add(shapeLayer);
                         break;
                 }
-                
+
                 //if (layer != null)
                 //    layer.UseRotation = true;
 
@@ -119,10 +118,10 @@ private static SharpMap.Map InitializeGeoTiff(int index, float angle)
 
         private static readonly string[] Vrts =
         {
-            @"..\DEM\Golden_CO.dem", 
-            "contours_sample_polyline_play_polyline.asc", 
-            "contours_sample_polyline_play1_polyline.vrt", 
-            "contours_sample_polyline_play2_polyline.vrt", 
+            @"..\DEM\Golden_CO.dem",
+            "contours_sample_polyline_play_polyline.asc",
+            "contours_sample_polyline_play1_polyline.vrt",
+            "contours_sample_polyline_play2_polyline.vrt",
             "contours_sample_polyline_play3_polyline.vrt"
         };
 
@@ -148,7 +147,7 @@ private static SharpMap.Map InitializeVRT(int index, float angle)
             System.Drawing.Drawing2D.Matrix mat = new System.Drawing.Drawing2D.Matrix();
             mat.RotateAt(angle, map.WorldToImage(map.Center));
             map.MapTransform = mat;
-            
+
             return map;
         }
 
diff --git a/Examples/WinFormSamples/Samples/GeometryFeatureProviderSample.cs b/Examples/WinFormSamples/Samples/GeometryFeatureProviderSample.cs
index d08efb97..b0b7c816 100644
--- a/Examples/WinFormSamples/Samples/GeometryFeatureProviderSample.cs
+++ b/Examples/WinFormSamples/Samples/GeometryFeatureProviderSample.cs
@@ -6,7 +6,7 @@ public static SharpMap.Map InitializeMap(float angle)
         {
             var dataSource = new SharpMap.Data.Providers.ShapeFile(
                 string.Format("{0}/roads.shp", ShapefileSample.PathOsm), true);
-            
+
             var fds = new SharpMap.Data.FeatureDataSet();
             dataSource.Open();
             dataSource.ExecuteIntersectionQuery(dataSource.GetExtents(), fds);
@@ -14,17 +14,17 @@ public static SharpMap.Map InitializeMap(float angle)
 
             var gfp = new SharpMap.Data.Providers.GeometryFeatureProvider(fds.Tables[0]);
             var vl = new SharpMap.Layers.VectorLayer("roads", gfp)
-                         {
-                             CoordinateTransformation = LayerTools.Dhdn2ToWgs84
-                         };
+            {
+                CoordinateTransformation = LayerTools.Dhdn2ToWgs84
+            };
             var ll = new SharpMap.Layers.LabelLayer("labels")
-                         {
-                             DataSource = gfp,
-                             CoordinateTransformation = LayerTools.Dhdn2ToWgs84,
-                             LabelColumn = "name",
-                             MultipartGeometryBehaviour =
+            {
+                DataSource = gfp,
+                CoordinateTransformation = LayerTools.Dhdn2ToWgs84,
+                LabelColumn = "name",
+                MultipartGeometryBehaviour =
                                  SharpMap.Layers.LabelLayer.MultipartGeometryBehaviourEnum.Largest,
-                         };
+            };
             ll.Style.Halo = new System.Drawing.Pen(System.Drawing.Color.Red);
             //ll.Style.IgnoreLength = true;
 
diff --git a/Examples/WinFormSamples/Samples/GradiantThemeSample.cs b/Examples/WinFormSamples/Samples/GradiantThemeSample.cs
index 8757612a..2d5d6836 100644
--- a/Examples/WinFormSamples/Samples/GradiantThemeSample.cs
+++ b/Examples/WinFormSamples/Samples/GradiantThemeSample.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
-using System.IO;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
-using ColorBlend=SharpMap.Rendering.Thematics.ColorBlend;
-using Point = GeoAPI.Geometries.Coordinate;
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using System.IO;
+using ColorBlend = SharpMap.Rendering.Thematics.ColorBlend;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace WinFormSamples.Samples
 {
diff --git a/Examples/WinFormSamples/Samples/HeatLayerSample.cs b/Examples/WinFormSamples/Samples/HeatLayerSample.cs
index 7f7b6152..6b9c3cc1 100644
--- a/Examples/WinFormSamples/Samples/HeatLayerSample.cs
+++ b/Examples/WinFormSamples/Samples/HeatLayerSample.cs
@@ -35,7 +35,7 @@ public static SharpMap.Map InitializeMap(float angle)
             l.HeatColorBlend = SharpMap.Layers.HeatLayer.Classic;
 
             var env = l.Envelope;
-            GeoAPI.Geometries.GeoAPIEx.Grow(env, env.Width * 0.05, env.Height * 0.05);
+            NetTopologySuite.Geometries.NtsExtensions.Grow(env, env.Width * 0.05, env.Height * 0.05);
             //m.EnforceMaximumExtents = true;
             //m.MaximumExtents = env;
             m.ZoomToBox(env);
@@ -55,13 +55,13 @@ private static SharpMap.Data.FeatureDataTable GetRealFeatureDataTable()
         private static void FillRealDataTable(SharpMap.Data.FeatureDataTable table)
         {
             table.BeginLoadData();
-            var factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4326);
+            var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4326);
 
             uint id = 0;
             foreach (var datas in PointData())
             {
                 var row = (SharpMap.Data.FeatureDataRow)table.LoadDataRow(new object[] { id++, datas[0] }, System.Data.LoadOption.OverwriteChanges);
-                row.Geometry = factory.CreatePoint(new GeoAPI.Geometries.Coordinate(datas[2], datas[1]));
+                row.Geometry = factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(datas[2], datas[1]));
             }
             table.EndLoadData();
         }
@@ -917,4 +917,4 @@ private static System.Collections.Generic.IEnumerable<double[]> PointData()
                 });
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Examples/WinFormSamples/Samples/OgrSample.cs b/Examples/WinFormSamples/Samples/OgrSample.cs
index 34eb3f15..d575c686 100644
--- a/Examples/WinFormSamples/Samples/OgrSample.cs
+++ b/Examples/WinFormSamples/Samples/OgrSample.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
-using SharpMap;
+using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering;
 using SharpMap.Styles;
-using Point=GeoAPI.Geometries.Coordinate;
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace WinFormSamples.Samples
 {
@@ -41,7 +41,7 @@ private static Map InitializeDXF(float angle)
             Ogr provider;
             try
             {
-                provider = new Ogr("GeoData/SampleDXF.dxf",0);
+                provider = new Ogr("GeoData/SampleDXF.dxf", 0);
             }
             catch (TypeInitializationException ex)
             {
@@ -121,9 +121,9 @@ private static Map InitializeS57(float angle)
                 {
                     lay.Style.Line =
                         new Pen(
-                            Color.FromArgb(150, Convert.ToInt32(rnd.NextDouble()*255),
-                                           Convert.ToInt32(rnd.NextDouble()*255), Convert.ToInt32(rnd.NextDouble()*255)),
-                            Convert.ToInt32(rnd.NextDouble()*3));
+                            Color.FromArgb(150, Convert.ToInt32(rnd.NextDouble() * 255),
+                                           Convert.ToInt32(rnd.NextDouble() * 255), Convert.ToInt32(rnd.NextDouble() * 255)),
+                            Convert.ToInt32(rnd.NextDouble() * 3));
                 }
                 map.Layers.Add(lay);
             }
diff --git a/Examples/WinFormSamples/Samples/OracleSample.cs b/Examples/WinFormSamples/Samples/OracleSample.cs
index 1e6a504e..3333941c 100644
--- a/Examples/WinFormSamples/Samples/OracleSample.cs
+++ b/Examples/WinFormSamples/Samples/OracleSample.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
 using SharpMap;
 using SharpMap.Layers;
-using SharpMap.Data.Providers;
 using SharpMap.Styles;
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 
 namespace WinFormSamples.Samples
 {
@@ -71,7 +70,7 @@ public static Map InitializeMap(float angle)
                 Enabled = true,
                 LabelColumn = "NAME",
                 PriorityColumn = "POPULATION",
-                PriorityDelegate = delegate(SharpMap.Data.FeatureDataRow fdr)
+                PriorityDelegate = delegate (SharpMap.Data.FeatureDataRow fdr)
                 {
                     Int32 retVal = 10000000 * ((String)fdr["capital"] == "Y" ? 1 : 0);
                     return retVal + Convert.ToInt32(fdr["population"]);
diff --git a/Examples/WinFormSamples/Samples/PostGisSample.cs b/Examples/WinFormSamples/Samples/PostGisSample.cs
index d82395bf..1b2dbfa9 100644
--- a/Examples/WinFormSamples/Samples/PostGisSample.cs
+++ b/Examples/WinFormSamples/Samples/PostGisSample.cs
@@ -37,7 +37,7 @@ public static SharpMap.Map InitializeMap(float angle)
             layCities.MaxVisible = 40;
 
             //Set up a country label layer
-            SharpMap.Layers.LabelLayer layLabel = new SharpMap.Layers.LabelLayer("Country labels") 
+            SharpMap.Layers.LabelLayer layLabel = new SharpMap.Layers.LabelLayer("Country labels")
             {
                 DataSource = layCountries.DataSource,
                 Enabled = true,
@@ -64,10 +64,10 @@ public static SharpMap.Map InitializeMap(float angle)
                 Enabled = true,
                 LabelColumn = "name",
                 PriorityColumn = "population",
-                PriorityDelegate = delegate(SharpMap.Data.FeatureDataRow fdr) 
-                { 
-                    Int32 retVal = 10000000 * (Int32)( (String)fdr["capital"] == "Y" ? 1 : 0 );
-                    return  retVal + Convert.ToInt32(fdr["population"]);
+                PriorityDelegate = delegate (SharpMap.Data.FeatureDataRow fdr)
+                {
+                    Int32 retVal = 10000000 * (Int32)((String)fdr["capital"] == "Y" ? 1 : 0);
+                    return retVal + Convert.ToInt32(fdr["population"]);
                 },
                 TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias,
                 SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias,
@@ -98,7 +98,7 @@ public static SharpMap.Map InitializeMap(float angle)
             map.BackColor = System.Drawing.Color.LightBlue;
 
             map.ZoomToExtents(); // = 360;
-            map.Center = new GeoAPI.Geometries.Coordinate(0, 0);
+            map.Center = new NetTopologySuite.Geometries.Coordinate(0, 0);
 
             Matrix mat = new Matrix();
             mat.RotateAt(angle, map.WorldToImage(map.Center));
diff --git a/Examples/WinFormSamples/Samples/ShapefileSample.cs b/Examples/WinFormSamples/Samples/ShapefileSample.cs
index e9cd3fbc..644ec548 100644
--- a/Examples/WinFormSamples/Samples/ShapefileSample.cs
+++ b/Examples/WinFormSamples/Samples/ShapefileSample.cs
@@ -1,16 +1,14 @@
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Drawing.Text;
-using SharpMap;
-using SharpMap.Data;
+using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering;
 using SharpMap.Rendering.Symbolizer;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
-using Point = GeoAPI.Geometries.Coordinate;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Drawing.Text;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace WinFormSamples.Samples
 {
@@ -30,7 +28,7 @@ public static Map InitializeMap(float angle)
                 case 2:
                     _mapId++;
                     return InitializeMapOsm(angle);
-                    //return InitializeMapSharpDX(angle);
+                //return InitializeMapSharpDX(angle);
                 case 3:
                     _mapId -= 3;
                     return InitializeMapWithSymbolizerLayers(angle);
@@ -49,103 +47,104 @@ private static Map InitializeMapWithSymbolizerLayers(float angle)
             var layCountries = new SharpMap.Layers.Symbolizer.PolygonalVectorLayer(
                 "Countries",
                 new ShapeFile("GeoData/World/countries.shp", true),
-                new BasicPolygonSymbolizer {Fill = new SolidBrush(Color.Green), Outline = Pens.Black,}
-                ) {SRID = 4326};
+                new BasicPolygonSymbolizer { Fill = new SolidBrush(Color.Green), Outline = Pens.Black, }
+                )
+            { SRID = 4326 };
 
             //Set up a river layer
             var symbolizer = new CachedLineSymbolizer();
-            symbolizer.LineSymbolizeHandlers.AddRange( new [] {
+            symbolizer.LineSymbolizeHandlers.AddRange(new[] {
                 new PlainLineSymbolizeHandler { Line = new Pen(Color.Blue, 3) { LineJoin = LineJoin.Round } },
                 new PlainLineSymbolizeHandler{ Line = new Pen(Color.Aqua, 1)}, });
 
             var layRivers = new SharpMap.Layers.Symbolizer.LinealVectorLayer("Rivers")
-                                {
-                                    //Set the datasource to a shapefile in the App_data folder
-                                    DataSource = new ShapeFile("GeoData/World/rivers.shp", true),
-                                    //Define a blue 2px wide pen
-                                    Symbolizer = symbolizer,
-                                    SRID = 4326
-                                };
+            {
+                //Set the datasource to a shapefile in the App_data folder
+                DataSource = new ShapeFile("GeoData/World/rivers.shp", true),
+                //Define a blue 2px wide pen
+                Symbolizer = symbolizer,
+                SRID = 4326
+            };
 
             //Set up a cities layer
             var layCities = new SharpMap.Layers.Symbolizer.PuntalVectorLayer("Cities")
-                                {
-                                    //Set the datasource to a shapefile in the App_data folder
-                                    DataSource = new ShapeFile("GeoData/World/cities.shp", true),
-                                    Symbolizer = new RasterPointSymbolizer() { Scale = 0.8f },
-                                    MaxVisible = 40
-                                } ;
+            {
+                //Set the datasource to a shapefile in the App_data folder
+                DataSource = new ShapeFile("GeoData/World/cities.shp", true),
+                Symbolizer = new RasterPointSymbolizer() { Scale = 0.8f },
+                MaxVisible = 40
+            };
 
             //Set up a country label layer
             var layLabel = new LabelLayer("Country labels")
-                               {
-                                   DataSource = layCountries.DataSource,
-                                   Enabled = true,
-                                   LabelColumn = "Name",
-                                   LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
-                                   Style =
+            {
+                DataSource = layCountries.DataSource,
+                Enabled = true,
+                LabelColumn = "Name",
+                LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
+                Style =
                                        new LabelStyle
-                                           {
-                                               ForeColor = Color.White,
-                                               Font = new Font(FontFamily.GenericSerif, 12),
-                                               BackColor = new SolidBrush(Color.FromArgb(128, 255, 0, 0)),
-                                               HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center
-                                           },
-                                   MaxVisible = 90,
-                                   MinVisible = 30,
-                                   SRID = 4326,
-                                   MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.Largest,
-                                   
-                               };
+                                       {
+                                           ForeColor = Color.White,
+                                           Font = new Font(FontFamily.GenericSerif, 12),
+                                           BackColor = new SolidBrush(Color.FromArgb(128, 255, 0, 0)),
+                                           HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center
+                                       },
+                MaxVisible = 90,
+                MinVisible = 30,
+                SRID = 4326,
+                MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.Largest,
+
+            };
 
             //Set up a city label layer
             var layCityLabel = new LabelLayer("City labels")
-                                   {
-                                       DataSource = layCities.DataSource,
-                                       Enabled = true,
-                                       LabelColumn = "Name",
-                                       TextRenderingHint = TextRenderingHint.AntiAlias,
-                                       SmoothingMode = SmoothingMode.AntiAlias,
-                                       SRID = 4326,
-                                       LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
-                                       Style =
+            {
+                DataSource = layCities.DataSource,
+                Enabled = true,
+                LabelColumn = "Name",
+                TextRenderingHint = TextRenderingHint.AntiAlias,
+                SmoothingMode = SmoothingMode.AntiAlias,
+                SRID = 4326,
+                LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
+                Style =
                                            new LabelStyle
-                                               {
-                                                   ForeColor = Color.Black,
-                                                   Font = new Font(FontFamily.GenericSerif, 11),
-                                                   HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Left,
-                                                   VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Bottom,
-                                                   Offset = new PointF(3, 3),
-                                                   CollisionDetection = true,
-                                                   Halo = new Pen(Color.Yellow, 2)
-                                               }, 
-                                       MaxVisible = layLabel.MinVisible,
-                                   };
+                                           {
+                                               ForeColor = Color.Black,
+                                               Font = new Font(FontFamily.GenericSerif, 11),
+                                               HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Left,
+                                               VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Bottom,
+                                               Offset = new PointF(3, 3),
+                                               CollisionDetection = true,
+                                               Halo = new Pen(Color.Yellow, 2)
+                                           },
+                MaxVisible = layLabel.MinVisible,
+            };
 
             //Setup River label
             var layRiverLabel = new LabelLayer("River labels")
-                                   {
-                                       DataSource = layRivers.DataSource,
-                                       Enabled = true,
-                                       LabelColumn = "Name",
-                                       TextRenderingHint = TextRenderingHint.AntiAlias,
-                                       SmoothingMode = SmoothingMode.AntiAlias,
-                                       SRID = 4326,
-                                       LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
-                                       MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.All,
-                                       Style =
+            {
+                DataSource = layRivers.DataSource,
+                Enabled = true,
+                LabelColumn = "Name",
+                TextRenderingHint = TextRenderingHint.AntiAlias,
+                SmoothingMode = SmoothingMode.AntiAlias,
+                SRID = 4326,
+                LabelFilter = LabelCollisionDetection.QuickAccurateCollisionDetectionMethod,
+                MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.All,
+                Style =
                                            new LabelStyle
-                                               {
-                                                   ForeColor = Color.DarkBlue,
-                                                   Font = new Font(FontFamily.GenericSansSerif, 11),
-                                                   HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center,
-                                                   VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Middle,
-                                                   CollisionDetection = true,
-                                                   Halo = new Pen(Color.Azure, 2), 
-                                                   IgnoreLength =  true
-                                                   
-                                               }, 
-                                   };
+                                           {
+                                               ForeColor = Color.DarkBlue,
+                                               Font = new Font(FontFamily.GenericSansSerif, 11),
+                                               HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center,
+                                               VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Middle,
+                                               CollisionDetection = true,
+                                               Halo = new Pen(Color.Azure, 2),
+                                               IgnoreLength = true
+
+                                           },
+            };
 
             //Add the layers to the map object.
             //The order we add them in are the order they are drawn, so we add the rivers last to put them on top
@@ -245,17 +244,23 @@ private static Map InitializeMapOrig(float angle)
                 new LabelStyle
                 {
                     MaxVisible = 10,
-                    CollisionBuffer = new Size(0, 0), CollisionDetection = true, Enabled = true,
-                    ForeColor = Color.LightSlateGray, Halo = new Pen(Color.Silver, 1), 
+                    CollisionBuffer = new Size(0, 0),
+                    CollisionDetection = true,
+                    Enabled = true,
+                    ForeColor = Color.LightSlateGray,
+                    Halo = new Pen(Color.Silver, 1),
                     HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center,
                     VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Middle,
                     Font = new Font(GenericFontFamilies.SansSerif.ToString(), 8f, FontStyle.Regular)
-                } ,
+                },
                 new LabelStyle
                 {
                     MaxVisible = layLabel.MinVisible,
-                    CollisionBuffer = new Size(3, 3), CollisionDetection = true, Enabled = true,
-                    ForeColor = Color.LightSlateGray, Halo = new Pen(Color.Silver, 5), 
+                    CollisionBuffer = new Size(3, 3),
+                    CollisionDetection = true,
+                    Enabled = true,
+                    ForeColor = Color.LightSlateGray,
+                    Halo = new Pen(Color.Silver, 5),
                     HorizontalAlignment = LabelStyle.HorizontalAlignmentEnum.Center,
                     VerticalAlignment = LabelStyle.VerticalAlignmentEnum.Middle,
                     Font = new Font(GenericFontFamilies.SansSerif.ToString(), 16f, FontStyle.Bold)
@@ -291,7 +296,7 @@ private static Map InitializeMapOrig(float angle)
             //Add the layers to the map object.
             //The order we add them in are the order they are drawn, so we add the rivers last to put them on top
             //map.BackgroundLayer.Add(AsyncLayerProxyLayer.Create(layCountries));
-            map.Layers.Add(layCountries); 
+            map.Layers.Add(layCountries);
             map.Layers.Add(layRivers);
             map.Layers.Add(layCities);
             map.Layers.Add(layLabel);
diff --git a/Examples/WinFormSamples/Samples/ShapefileSampleOsm.cs b/Examples/WinFormSamples/Samples/ShapefileSampleOsm.cs
index 5c1efa20..0b5d009c 100644
--- a/Examples/WinFormSamples/Samples/ShapefileSampleOsm.cs
+++ b/Examples/WinFormSamples/Samples/ShapefileSampleOsm.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Timers;
 using SharpMap;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
@@ -10,6 +5,11 @@
 using SharpMap.Rendering.Decoration;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Timers;
 
 namespace WinFormSamples.Samples
 {
@@ -21,7 +21,7 @@ public static partial class ShapefileSample
         public const string PathOsm = "GeoData/OSM";
 
 
-        private static GeoAPI.Geometries.Envelope _roadsExtents;
+        private static NetTopologySuite.Geometries.Envelope _roadsExtents;
 
         //Could have used SharpMap.Rendering.Thematics.CustomTheme,
         //but that one does not perserve styles for fast retrieval.
@@ -40,7 +40,7 @@ public ThemeViaDelegate(IStyle defaultStyle, String columnName)
                 _stylePreserver = new Dictionary<string, IStyle>();
                 _columnName = columnName;
             }
-            
+
 
             #region Implementation of ITheme
 
@@ -89,7 +89,7 @@ private static Map InitializeMapOsm(float angle)
             Map map = new Map();
             map.BackColor = Color.Cornsilk;
             map.SRID = 31466;
-            
+
             var encoding = System.Text.Encoding.UTF8;
 
             //Set up the countries layer
@@ -100,7 +100,7 @@ private static Map InitializeMapOsm(float angle)
             layNatural.Style = transparentStyle;
             //Set theme
             ThemeViaDelegate theme = new ThemeViaDelegate(layNatural.Style, "type");
-            theme.GetStyleFunction = delegate(FeatureDataRow row)
+            theme.GetStyleFunction = delegate (FeatureDataRow row)
                                          {
                                              string caseVal = (String)row["type"];
                                              caseVal = caseVal.ToLowerInvariant();
@@ -144,7 +144,7 @@ private static Map InitializeMapOsm(float angle)
             //layRoads.DataSource.Close();
             layRoads.Style = transparentStyle;
             ThemeViaDelegate themeRoads = new ThemeViaDelegate(transparentStyle, "type");
-            themeRoads.GetStyleFunction = delegate(FeatureDataRow row)
+            themeRoads.GetStyleFunction = delegate (FeatureDataRow row)
                                               {
                                                   VectorStyle returnStyle = new VectorStyle();
 
@@ -236,7 +236,7 @@ private static Map InitializeMapOsm(float angle)
             layWaterways.DataSource = new ShapeFile(string.Format("{0}/waterways.shp", PathOsm)) { Encoding = encoding };
             layRoads.Style = transparentStyle;
             ThemeViaDelegate themeWater = new ThemeViaDelegate(transparentStyle, "type");
-            themeWater.GetStyleFunction = delegate(FeatureDataRow row)
+            themeWater.GetStyleFunction = delegate (FeatureDataRow row)
             {
                 VectorStyle returnStyle = new VectorStyle();
                 returnStyle.Line.Brush = Brushes.Aqua;
@@ -270,7 +270,7 @@ private static Map InitializeMapOsm(float angle)
             layPoints.DataSource = new ShapeFile(string.Format("{0}/points.shp", PathOsm)) { Encoding = encoding };
             layPoints.Style = transparentStyle2;
             ThemeViaDelegate themePoints = new ThemeViaDelegate(transparentStyle2, "type");
-            themePoints.GetStyleFunction = delegate(FeatureDataRow row)
+            themePoints.GetStyleFunction = delegate (FeatureDataRow row)
             {
                 VectorStyle returnStyle = new VectorStyle();
                 switch ((String)row["type"])
@@ -344,11 +344,11 @@ private static Map InitializeMapOsm(float angle)
             map.Center = layRoads.Envelope.Centre;
 
             var disclaimer = new Disclaimer
-                {
-                    Font = new Font(FontFamily.GenericSansSerif, 7f, FontStyle.Italic),
-                    Text = "Geodata from OpenStreetMap (CC-by-SA)\nTransformed to Shapefile by geofabrik.de",
-                    Anchor = MapDecorationAnchor.CenterBottom
-                };
+            {
+                Font = new Font(FontFamily.GenericSansSerif, 7f, FontStyle.Italic),
+                Text = "Geodata from OpenStreetMap (CC-by-SA)\nTransformed to Shapefile by geofabrik.de",
+                Anchor = MapDecorationAnchor.CenterBottom
+            };
             map.Decorations.Add(disclaimer);
             transparentStyle2.MaxVisible = map.MaximumZoom * 0.3;
 
@@ -365,12 +365,12 @@ private class ShapeProvider : SharpMap.Data.Providers.ShapeFile
             private int _id;
             private int _modValue;
             public ShapeProvider(string file)
-                :this(file, true)
+                : this(file, true)
             {
             }
 
             public ShapeProvider(string file, bool fbi)
-                :base(file, fbi)
+                : base(file, fbi)
             {
                 FilterDelegate = Filter;
                 Open();
diff --git a/Examples/WinFormSamples/Samples/SpatiaLiteSample.cs b/Examples/WinFormSamples/Samples/SpatiaLiteSample.cs
index 35058b55..4a9364b9 100644
--- a/Examples/WinFormSamples/Samples/SpatiaLiteSample.cs
+++ b/Examples/WinFormSamples/Samples/SpatiaLiteSample.cs
@@ -12,8 +12,8 @@ private static string DataSource
         {
             get { return @"Data Source=GeoData\SpatiaLite\sample.sqlite"; }
         }
-        
-        
+
+
         public static SharpMap.Map InitializeMap(float angle)
         {
             //Initialize a new map of size 'imagesize'
@@ -52,7 +52,7 @@ public static SharpMap.Map InitializeMap(float angle)
             layCities.MaxVisible = 40;
 
             //Set up a country label layer
-            SharpMap.Layers.LabelLayer layLabel = new SharpMap.Layers.LabelLayer("Country labels") 
+            SharpMap.Layers.LabelLayer layLabel = new SharpMap.Layers.LabelLayer("Country labels")
             {
                 DataSource = layCountries.DataSource,
                 LabelColumn = "NAME",
@@ -77,10 +77,10 @@ public static SharpMap.Map InitializeMap(float angle)
                 DataSource = layCities.DataSource,
                 LabelColumn = "name",
                 PriorityColumn = "population",
-                PriorityDelegate = delegate(SharpMap.Data.FeatureDataRow fdr) 
-                { 
-                    System.Int32 retVal = 10000000 * ( (System.String)fdr["capital"] == "Y" ? 1 : 0 );
-                    return  retVal + System.Convert.ToInt32(fdr["population"]);
+                PriorityDelegate = delegate (SharpMap.Data.FeatureDataRow fdr)
+                {
+                    System.Int32 retVal = 10000000 * ((System.String)fdr["capital"] == "Y" ? 1 : 0);
+                    return retVal + System.Convert.ToInt32(fdr["population"]);
                 },
                 TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias,
                 SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias,
@@ -103,15 +103,15 @@ public static SharpMap.Map InitializeMap(float angle)
             layRiverLabels.LabelColumn = "Name";
             layRiverLabels.PriorityDelegate = GetRiverLength;
             layRiverLabels.Style = new SharpMap.Styles.LabelStyle
-                                       {
-                                           Font = new System.Drawing.Font("Arial", 10, System.Drawing.FontStyle.Bold),
-                                           Halo = new System.Drawing.Pen(System.Drawing.Color.Azure, 2),
-                                           ForeColor = System.Drawing.Color.DarkCyan,
-                                           IgnoreLength = false,
-                                           Enabled = true,
-                                           CollisionDetection = true,
-                                          
-                                       };
+            {
+                Font = new System.Drawing.Font("Arial", 10, System.Drawing.FontStyle.Bold),
+                Halo = new System.Drawing.Pen(System.Drawing.Color.Azure, 2),
+                ForeColor = System.Drawing.Color.DarkCyan,
+                IgnoreLength = false,
+                Enabled = true,
+                CollisionDetection = true,
+
+            };
             layRiverLabels.LabelFilter = SharpMap.Rendering.LabelCollisionDetection.ThoroughCollisionDetection;
 
             //Add the layers to the map object.
@@ -152,7 +152,8 @@ internal static SharpMap.Map InitializeMap(float angle, string[] filenames)
                     {
                         map.Layers.Add(
                             new SharpMap.Layers.VectorLayer(
-                                string.Format("{0} - {1}", provider.Table, provider.GeometryColumn), provider) { Style = LayerTools.GetRandomVectorStyle() });
+                                string.Format("{0} - {1}", provider.Table, provider.GeometryColumn), provider)
+                            { Style = LayerTools.GetRandomVectorStyle() });
                     }
                 }
                 if (map.Layers.Count > 0)
@@ -178,11 +179,11 @@ internal static int GetRiverLength(SharpMap.Data.FeatureDataRow row)
             if (row == null) return 0;
             if (row.Geometry == null)
                 return 0;
-            var ml = row.Geometry as GeoAPI.Geometries.IMultiLineString;
+            var ml = row.Geometry as NetTopologySuite.Geometries.MultiLineString;
             if (ml != null)
                 return System.Convert.ToInt32(ml.Length);
 
-            var l = row.Geometry as GeoAPI.Geometries.ILineString;
+            var l = row.Geometry as NetTopologySuite.Geometries.LineString;
             if (l != null)
                 return System.Convert.ToInt32(l.Length);
             return 0;
diff --git a/Examples/WinFormSamples/Samples/SqlServerSample.cs b/Examples/WinFormSamples/Samples/SqlServerSample.cs
index 577d0058..208e3a95 100644
--- a/Examples/WinFormSamples/Samples/SqlServerSample.cs
+++ b/Examples/WinFormSamples/Samples/SqlServerSample.cs
@@ -1,16 +1,9 @@
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
 using System;
-using System.Configuration;
-using System.Collections.Generic;
+using System.Data.SqlClient;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using GeoAPI.Geometries;
-using SharpMap.Data.Providers;
-using SharpMap.Layers;
-using System.Data.SqlClient;
 
 namespace WinFormSamples.Samples
 {
diff --git a/Examples/WinFormSamples/Samples/TextOnPathSample.cs b/Examples/WinFormSamples/Samples/TextOnPathSample.cs
index 15559b61..70cb0351 100644
--- a/Examples/WinFormSamples/Samples/TextOnPathSample.cs
+++ b/Examples/WinFormSamples/Samples/TextOnPathSample.cs
@@ -1,16 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using SharpMap;
+using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
-using SharpMap.Rendering;
-using SharpMap.Rendering.Symbolizer;
 using SharpMap.Styles;
-using Point = GeoAPI.Geometries.Coordinate;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Text;
 namespace WinFormSamples.Samples
 {
     class TextOnPathSample
@@ -52,16 +46,16 @@ public static Map InitializeMapOrig(float angle)
             layLabel.SRID = 4326;
             //layLabel.MultipartGeometryBehaviour = LabelLayer.MultipartGeometryBehaviourEnum.Largest;
 
-          
+
             //Add the layers to the map object.
             //The order we add them in are the order they are drawn, so we add the rivers last to put them on top
-            map.Layers.Add(layRoads);          
-            map.Layers.Add(layLabel);        
+            map.Layers.Add(layRoads);
+            map.Layers.Add(layLabel);
 
 
             //limit the zoom to 360 degrees width
             //map.MaximumZoom = 360;
-           // map.BackColor = Color.LightBlue;
+            // map.BackColor = Color.LightBlue;
 
             map.ZoomToExtents();
 
diff --git a/Examples/WinFormSamples/Samples/TileLayerSample.cs b/Examples/WinFormSamples/Samples/TileLayerSample.cs
index f89dcec6..57febf03 100644
--- a/Examples/WinFormSamples/Samples/TileLayerSample.cs
+++ b/Examples/WinFormSamples/Samples/TileLayerSample.cs
@@ -1,5 +1,6 @@
-using System;
-using BruTile.Predefined;
+using BruTile.Predefined;
+using NetTopologySuite;
+using System;
 
 namespace WinFormSamples.Samples
 {
@@ -30,19 +31,19 @@ public static SharpMap.Map InitializeMap(float angle)
                     return InitializeMapBing(KnownTileSource.BingAerialStaging);
                 case 6:
                     return InitializeMapBing(KnownTileSource.BingHybridStaging);
-                /*
-                case 7:
-                    return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleMap);
-                case 8:
-                    return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleSatellite);
-                case 9:
-                    return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleSatellite | BruTile.Web.GoogleMapType.GoogleLabels);
-                case 10:
-                    return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleTerrain);
-                case 11:
-                    _num = 0;
-                    return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleLabels);
-                 */
+                    /*
+                    case 7:
+                        return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleMap);
+                    case 8:
+                        return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleSatellite);
+                    case 9:
+                        return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleSatellite | BruTile.Web.GoogleMapType.GoogleLabels);
+                    case 10:
+                        return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleTerrain);
+                    case 11:
+                        _num = 0;
+                        return InitializeMapGoogle(BruTile.Web.GoogleMapType.GoogleLabels);
+                     */
             }
             return InitializeMapOsm();
         }
@@ -55,7 +56,7 @@ private static SharpMap.Map InitializeMapOsm()
                 KnownTileSources.Create(KnownTileSource.OpenStreetMap, userAgent: DefaultUserAgent), "TileLayer - OSM");
             map.BackgroundLayer.Add(tileLayer);
             map.ZoomToBox(tileLayer.Envelope);
-            
+
             return map;
         }
 
@@ -88,37 +89,37 @@ private static SharpMap.Map InitializeMapOsmWithXls(float angle)
             foreach (System.Data.DataRow row in ds.Tables[0].Rows)
             {
                 if (row["X"] == DBNull.Value || row["Y"] == DBNull.Value) continue;
-                var coords = new[] { Convert.ToDouble(row["X"]), Convert.ToDouble(row["Y"])};
+                var coords = new[] { Convert.ToDouble(row["X"]), Convert.ToDouble(row["Y"]) };
                 coords = ct.MathTransform.Transform(coords);
                 row["X"] = coords[0];
                 row["Y"] = coords[1];
             }
 
             //Add Rotation Column
-            ds.Tables[0].Columns.Add("Rotation", typeof (float));
+            ds.Tables[0].Columns.Add("Rotation", typeof(float));
             foreach (System.Data.DataRow row in ds.Tables[0].Rows)
                 row["Rotation"] = -angle;
 
             //Set up provider
             var xlsProvider = new SharpMap.Data.Providers.DataTablePoint(ds.Tables[0], "OID", "X", "Y");
             var xlsLayer = new SharpMap.Layers.VectorLayer("XLS", xlsProvider)
-                               {Style = {Symbol = SharpMap.Styles.VectorStyle.DefaultSymbol}};
+            { Style = { Symbol = SharpMap.Styles.VectorStyle.DefaultSymbol } };
 
             //Add layer to map
             map.Layers.Add(xlsLayer);
             var xlsLabelLayer = new SharpMap.Layers.LabelLayer("XLSLabel")
-                                    {
-                                        DataSource = xlsProvider,
-                                        LabelColumn = "Name",
-                                        PriorityColumn = "Population",
-                                        Style =
+            {
+                DataSource = xlsProvider,
+                LabelColumn = "Name",
+                PriorityColumn = "Population",
+                Style =
                                             {
                                                 CollisionBuffer = new System.Drawing.SizeF(2f, 2f),
                                                 CollisionDetection = true
                                             },
-                                        LabelFilter =
+                LabelFilter =
                                             SharpMap.Rendering.LabelCollisionDetection.ThoroughCollisionDetection
-                                    };
+            };
             xlsLabelLayer.Theme = new SharpMap.Rendering.Thematics.FontSizeTheme(xlsLabelLayer, map) { FontSizeScale = 1000f };
 
             map.Layers.Add(xlsLabelLayer);
@@ -138,13 +139,13 @@ private static SharpMap.Map InitializeMapOsmWithVariableLayerCollection(float an
             var tileLayer = new SharpMap.Layers.TileAsyncLayer(tileSource, "TileLayer - OSM with VLC");
             map.BackgroundLayer.Add(tileLayer);
 
-            var vl = new SharpMap.Layers.VectorLayer("Vilnius Transport Data - Bus", 
+            var vl = new SharpMap.Layers.VectorLayer("Vilnius Transport Data - Bus",
                 new VilniusTransportData(VilniusTransportData.TransportType.Bus));
             var pttBus = new PublicTransportTheme(System.Drawing.Brushes.DarkGreen);
             vl.Theme = new SharpMap.Rendering.Thematics.CustomTheme(pttBus.GetStyle);
             vl.CoordinateTransformation = GetCoordinateTransformation();
             map.VariableLayers.Add(vl);
-            vl = new SharpMap.Layers.VectorLayer("Vilnius Transport Data - Trolley", 
+            vl = new SharpMap.Layers.VectorLayer("Vilnius Transport Data - Trolley",
                 new VilniusTransportData(VilniusTransportData.TransportType.TrolleyBus));
             var pttTrolley = new PublicTransportTheme(System.Drawing.Brushes.Red);
             vl.Theme = new SharpMap.Rendering.Thematics.CustomTheme(pttTrolley.GetStyle);
@@ -157,7 +158,7 @@ private static SharpMap.Map InitializeMapOsmWithVariableLayerCollection(float an
             return map;
         }
 
-        private static GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation GetCoordinateTransformation()
+        private static ProjNet.CoordinateSystems.Transformations.ICoordinateTransformation GetCoordinateTransformation()
         {
 
             //The SRS for this datasource is EPSG:4326, therefore we need to transfrom it to OSM projection
@@ -180,37 +181,37 @@ private static SharpMap.Map InitializeMapBing(KnownTileSource mt)
         }
 
 
-/*
-        private static SharpMap.Map InitializeMapGoogle(BruTile.Web.GoogleMapType mt)
-        {
-            var map = new SharpMap.Map();
+        /*
+                private static SharpMap.Map InitializeMapGoogle(BruTile.Web.GoogleMapType mt)
+                {
+                    var map = new SharpMap.Map();
 
-            BruTile.Web.GoogleRequest req;
-            BruTile.ITileSource tileSource;
-            SharpMap.Layers.TileLayer tileLayer;
+                    BruTile.Web.GoogleRequest req;
+                    BruTile.ITileSource tileSource;
+                    SharpMap.Layers.TileLayer tileLayer;
 
-            if (mt == (BruTile.Web.GoogleMapType.GoogleSatellite | BruTile.Web.GoogleMapType.GoogleLabels))
-            {
-                req = new BruTile.Web.GoogleRequest(BruTile.Web.GoogleMapType.GoogleSatellite);
-                tileSource = new BruTile.Web.GoogleTileSource(req);
-                tileLayer = new SharpMap.Layers.TileLayer(tileSource, "TileLayer - " + BruTile.Web.GoogleMapType.GoogleSatellite);
-                map.Layers.Add(tileLayer);
-                req = new BruTile.Web.GoogleRequest(BruTile.Web.GoogleMapType.GoogleLabels);
-                tileSource = new BruTile.Web.GoogleTileSource(req);
-                mt = BruTile.Web.GoogleMapType.GoogleLabels;
-            }
-            else
-            {
-                req = new BruTile.Web.GoogleRequest(mt);
-                tileSource = new BruTile.Web.GoogleTileSource(req);
-            }
+                    if (mt == (BruTile.Web.GoogleMapType.GoogleSatellite | BruTile.Web.GoogleMapType.GoogleLabels))
+                    {
+                        req = new BruTile.Web.GoogleRequest(BruTile.Web.GoogleMapType.GoogleSatellite);
+                        tileSource = new BruTile.Web.GoogleTileSource(req);
+                        tileLayer = new SharpMap.Layers.TileLayer(tileSource, "TileLayer - " + BruTile.Web.GoogleMapType.GoogleSatellite);
+                        map.Layers.Add(tileLayer);
+                        req = new BruTile.Web.GoogleRequest(BruTile.Web.GoogleMapType.GoogleLabels);
+                        tileSource = new BruTile.Web.GoogleTileSource(req);
+                        mt = BruTile.Web.GoogleMapType.GoogleLabels;
+                    }
+                    else
+                    {
+                        req = new BruTile.Web.GoogleRequest(mt);
+                        tileSource = new BruTile.Web.GoogleTileSource(req);
+                    }
 
-            tileLayer = new SharpMap.Layers.TileLayer(tileSource, "TileLayer - " + mt);
-            map.Layers.Add(tileLayer);
-            map.ZoomToBox(tileLayer.Envelope);
-            return map;
-        }
-        */
+                    tileLayer = new SharpMap.Layers.TileLayer(tileSource, "TileLayer - " + mt);
+                    map.Layers.Add(tileLayer);
+                    map.ZoomToBox(tileLayer.Envelope);
+                    return map;
+                }
+                */
 
         private class PublicTransportTheme
         {
@@ -258,10 +259,10 @@ public SharpMap.Styles.IStyle GetStyle(SharpMap.Data.FeatureDataRow fdr)
                                      System.Drawing.Brushes.Yellow,
                                      new System.Drawing.RectangleF(2, 2, 34, 34),
                                      new System.Drawing.StringFormat
-                                         {
-                                             Alignment = System.Drawing.StringAlignment.Center,
-                                             LineAlignment = System.Drawing.StringAlignment.Center
-                                         });
+                                     {
+                                         Alignment = System.Drawing.StringAlignment.Center,
+                                         LineAlignment = System.Drawing.StringAlignment.Center
+                                     });
                     }
                     bmp.MakeTransparent(System.Drawing.Color.Wheat);
                     retval.Symbol = bmp;
@@ -269,7 +270,7 @@ public SharpMap.Styles.IStyle GetStyle(SharpMap.Data.FeatureDataRow fdr)
                 else
                 {
                     retval.Symbol = ColoredArrow(_brush);
-                    var rot =  (Single)(Double)fdr["Bearing"];
+                    var rot = (Single)(Double)fdr["Bearing"];
                     retval.SymbolRotation = rot % 360f;
                 }
                 return retval;
@@ -301,13 +302,13 @@ private static SharpMap.Data.FeatureDataTable VehicleDataTable()
                                       new System.Data.DataColumn("Id", typeof(int)), 
                                       //new System.Data.DataColumn("Lat", typeof(double)), 
                                       //new System.Data.DataColumn("Lng", typeof(double)), 
-                                      new System.Data.DataColumn("Line", typeof(string)), 
-                                      new System.Data.DataColumn("LastStop", typeof(string)), 
-                                      new System.Data.DataColumn("TrackType", typeof(string)), 
-                                      new System.Data.DataColumn("AreaName", typeof(string)), 
-                                      new System.Data.DataColumn("StreetName", typeof(string)), 
-                                      new System.Data.DataColumn("Time", typeof(string)), 
-                                      new System.Data.DataColumn("Bearing", typeof(double)) 
+                                      new System.Data.DataColumn("Line", typeof(string)),
+                                      new System.Data.DataColumn("LastStop", typeof(string)),
+                                      new System.Data.DataColumn("TrackType", typeof(string)),
+                                      new System.Data.DataColumn("AreaName", typeof(string)),
+                                      new System.Data.DataColumn("StreetName", typeof(string)),
+                                      new System.Data.DataColumn("Time", typeof(string)),
+                                      new System.Data.DataColumn("Bearing", typeof(double))
                                   });
                 return dt;
             }
@@ -315,7 +316,7 @@ private static SharpMap.Data.FeatureDataTable VehicleDataTable()
             private readonly TransportType _transportType;
 
             public VilniusTransportData(TransportType transportType)
-                :base(VehicleDataTable())
+                : base(VehicleDataTable())
             {
                 _transportType = transportType;
                 _reQuery.Elapsed += HandleTimerElapsed;
@@ -331,10 +332,10 @@ private void HandleTimerElapsed(object sender, System.Timers.ElapsedEventArgs e)
             /// <summary>
             /// timeout for map connections
             /// </summary>
-            private const int Timeout = 30*1000;
+            private const int Timeout = 30 * 1000;
 
-            private readonly GeoAPI.Geometries.IGeometryFactory _factory =
-                GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4326);
+            private readonly NetTopologySuite.Geometries.GeometryFactory _factory =
+                NtsGeometryServices.Instance.CreateGeometryFactory(4326);
 
             /// <summary>
             /// gets realtime data from public transport in city vilnius of lithuania
@@ -455,7 +456,7 @@ private void GetVilniusTransportData(string line)
 
                         if (lat.HasValue && lng.HasValue)
                         {
-                            dr.Geometry = _factory.CreatePoint(new GeoAPI.Geometries.Coordinate(lng.Value, lat.Value));
+                            dr.Geometry = _factory.CreatePoint(new NetTopologySuite.Geometries.Coordinate(lng.Value, lat.Value));
                             fdt.Rows.Add(dr);
                         }
                     }
diff --git a/Examples/WinFormSamples/Samples/TiledWmsSample.cs b/Examples/WinFormSamples/Samples/TiledWmsSample.cs
index 3c30e919..1bb51ad7 100644
--- a/Examples/WinFormSamples/Samples/TiledWmsSample.cs
+++ b/Examples/WinFormSamples/Samples/TiledWmsSample.cs
@@ -1,8 +1,7 @@
-using BruTile.Wmsc;
+using BruTile;
+using BruTile.Wmsc;
 using SharpMap;
 using SharpMap.Layers;
-using BruTile.Web;
-using BruTile;
 using System.Collections.Generic;
 
 namespace WinFormSamples.Samples
@@ -30,12 +29,12 @@ public static Map InitializeMap()
 
             var source = new List<ITileSource>(WmscTileSource.CreateFromWmscCapabilties(new System.Uri(url)));
 
-//            foreach (ITileSource src in source)
-//            {
-                tileLayer = new TileAsyncLayer(source[16], "tileLayer" + source[16]);
-                tileLayer.MapNewTileAvaliable += map.MapNewTileAvaliableHandler;
-                map.BackgroundLayer.Add(tileLayer);
-//            }
+            //            foreach (ITileSource src in source)
+            //            {
+            tileLayer = new TileAsyncLayer(source[16], "tileLayer" + source[16]);
+            tileLayer.MapNewTileAvaliable += map.MapNewTileAvaliableHandler;
+            map.BackgroundLayer.Add(tileLayer);
+            //            }
             map.ZoomToExtents();
 
 
diff --git a/Examples/WinFormSamples/Samples/WfsSample.cs b/Examples/WinFormSamples/Samples/WfsSample.cs
index d15d8649..8f5919d1 100644
--- a/Examples/WinFormSamples/Samples/WfsSample.cs
+++ b/Examples/WinFormSamples/Samples/WfsSample.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Net;
-using SharpMap;
+using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Styles;
 using SharpMap.Utilities.Wfs;
-using Point = GeoAPI.Geometries.Coordinate;
+using System;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Net;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace WinFormSamples.Samples
 {
diff --git a/Examples/WinFormSamples/Samples/WmsSample.cs b/Examples/WinFormSamples/Samples/WmsSample.cs
index 30cc07cb..72592181 100644
--- a/Examples/WinFormSamples/Samples/WmsSample.cs
+++ b/Examples/WinFormSamples/Samples/WmsSample.cs
@@ -1,8 +1,7 @@
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using SharpMap;
+using SharpMap;
 using SharpMap.Layers;
-using Point=GeoAPI.Geometries.Coordinate;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 
 namespace WinFormSamples.Samples
 {
@@ -13,7 +12,7 @@ public static Map InitializeMap(float angle)
             string wmsUrl = "http://resource.sgu.se/service/wms/130/brunnar";
 
             Map map = new Map();
-            
+
 
             WmsLayer layWms = new WmsLayer("Brunnar", wmsUrl);
 
@@ -23,14 +22,14 @@ public static Map InitializeMap(float angle)
 
             layWms.SetImageFormat(layWms.OutputFormats[0]);
             layWms.ContinueOnError = true;
-                //Skip rendering the WMS Map if the server couldn't be requested (if set to false such an event would crash the app)
+            //Skip rendering the WMS Map if the server couldn't be requested (if set to false such an event would crash the app)
             layWms.TimeOut = 20000; //Set timeout to 5 seconds
             layWms.SRID = 3006;
 
             //map.BackgroundLayer.Add(AsyncLayerProxyLayer.Create(layWms, new Size(256, 256)));
             map.BackgroundLayer.Add(layWms);
             map.MaximumExtents = layWms.Envelope;
-            
+
             //limit the zoom to 360 degrees width
             map.ZoomToExtents();
             map.BackColor = Color.LightBlue;
@@ -43,7 +42,7 @@ public static Map InitializeMap(float angle)
             map.MapTransform = mat;
 
             map.ZoomToExtents();
-            map.Zoom = map.Envelope.Width/3;
+            map.Zoom = map.Envelope.Width / 3;
             return map;
         }
     }
diff --git a/Examples/WinFormSamples/SharpMapTileSource.cs b/Examples/WinFormSamples/SharpMapTileSource.cs
index 34126afa..1d3d3827 100644
--- a/Examples/WinFormSamples/SharpMapTileSource.cs
+++ b/Examples/WinFormSamples/SharpMapTileSource.cs
@@ -1,16 +1,14 @@
 namespace WinFormSamples
 {
-    using System;
-    using System.Drawing;
-    using System.Drawing.Imaging;
-    using System.IO;
     using BruTile;
     using BruTile.Cache;
-
-    using GeoAPI.Geometries;
-
+    using NetTopologySuite.Geometries;
     using SharpMap;
     using SharpMap.Layers;
+    using System;
+    using System.Drawing;
+    using System.Drawing.Imaging;
+    using System.IO;
 
     internal class SharpMapTileSource : ITileSource
     {
@@ -76,12 +74,12 @@ public void Add(TileIndex index, byte[] image) { }
         private ImageFormat format;
 
         public SharpMapTileProvider(ITileSchema schema, ITileCache<byte[]> cache, params ILayer[] layers)
-        {            
+        {
             if (schema == null)
                 throw new ArgumentNullException("schema");
             if (layers == null)
                 throw new ArgumentNullException("layers");
-            
+
             this.Schema = schema;
             this.cache = cache ?? new NullCache();
 
@@ -102,11 +100,11 @@ public byte[] GetTile(TileInfo info)
             TileIndex index = info.Index;
             byte[] bytes = this.cache.Find(index);
             if (bytes != null)
-                return bytes;            
+                return bytes;
 
             using (Image tile = this.CreateTile(info))
             using (MemoryStream ms = new MemoryStream())
-            {                
+            {
                 tile.Save(ms, this.format);
                 bytes = ms.ToArray();
                 this.cache.Add(index, bytes);
@@ -134,7 +132,7 @@ private static ImageFormat GetFormat(ITileSchema schema)
 
         private readonly object synclock = new object();
 
-        private Image CreateTile(TileInfo info)        
+        private Image CreateTile(TileInfo info)
         {
             lock (synclock)
             {
@@ -151,5 +149,5 @@ private Image CreateTile(TileInfo info)
                 return map.GetMap();
             }
         }
-    }    
+    }
 }
diff --git a/Examples/WinFormSamples/WinFormSamples.csproj b/Examples/WinFormSamples/WinFormSamples.csproj
index f83dd300..89d99fc4 100644
--- a/Examples/WinFormSamples/WinFormSamples.csproj
+++ b/Examples/WinFormSamples/WinFormSamples.csproj
@@ -19,9 +19,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GDAL.Native" Version="2.4.2" />
-      <PackageReference Include="Npgsql" Version="4.0.10" />
-      <PackageReference Include="ProjNET4GeoAPI" Version="1.4.1" />
+      <PackageReference Include="GDAL.Native" Version="3.5.0" />
+      <PackageReference Include="Npgsql" Version="6.0.6" />
     </ItemGroup>
 
 
@@ -66,4 +65,8 @@
       </None>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/Examples/WinFormSamples/app.config b/Examples/WinFormSamples/app.config
index d3fb667e..e747552e 100644
--- a/Examples/WinFormSamples/app.config
+++ b/Examples/WinFormSamples/app.config
@@ -57,13 +57,4 @@
             </setting>
         </WinFormSamples.Properties.Settings>
     </applicationSettings>
-    <runtime>
-        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-            <dependentAssembly>
-                <assemblyIdentity name="System.Resources.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
-            </dependentAssembly>
-        </assemblyBinding>
-    </runtime>
-
 </configuration>
diff --git a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSON.cs b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSON.cs
index 8b4d9f35..14f68b04 100644
--- a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSON.cs
+++ b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSON.cs
@@ -1,13 +1,11 @@
-using GeoAPI;
-
-namespace SharpMap.Converters.GeoJSON
+namespace SharpMap.Converters.GeoJSON
 {
+    using NetTopologySuite.Geometries;
+    using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
-    using GeoAPI.Geometries;
-    using Newtonsoft.Json;
     //ReSharper disable InconsistentNaming
     /// <summary>
     /// GeoJSON converter class
@@ -22,8 +20,8 @@ public static GeoJSON Empty
         {
             get
             {
-                var factory = GeometryServiceProvider.Instance.CreateGeometryFactory();
-                var geometry =  factory.CreateGeometryCollection(new IGeometry[0]);
+                var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory();
+                var geometry = factory.CreateGeometryCollection(new Geometry[0]);
 
                 var dictionary = new Dictionary<string, object>();
                 return new GeoJSON(geometry, dictionary);
@@ -31,9 +29,9 @@ public static GeoJSON Empty
         }
 
         /// <summary>
-        /// Gets the <see cref="IGeometry"/> object
+        /// Gets the <see cref="Geometry"/> object
         /// </summary>
-        public IGeometry Geometry { get; private set; }
+        public Geometry Geometry { get; private set; }
 
         /// <summary>
         /// Gets the attributes
@@ -45,7 +43,7 @@ public static GeoJSON Empty
         /// </summary>
         /// <param name="geometry">The geometry</param>
         /// <param name="values">The attribute values</param>
-        public GeoJSON(IGeometry geometry, IDictionary<string, object> values)
+        public GeoJSON(Geometry geometry, IDictionary<string, object> values)
         {
             if (values == null)
                 throw new ArgumentNullException("values");
@@ -59,7 +57,7 @@ public GeoJSON(IGeometry geometry, IDictionary<string, object> values)
         /// </summary>
         /// <param name="converted">The converted geometry</param>
         /// <exception cref="ArgumentNullException">Thrown if <paramref name="converted"/> is <value>null</value></exception>
-        public void SetGeometry(IGeometry converted)
+        public void SetGeometry(Geometry converted)
         {
             if (converted == null)
                 throw new ArgumentNullException("converted");
diff --git a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONHelper.cs b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONHelper.cs
index 3b45cf69..ec876c6b 100644
--- a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONHelper.cs
+++ b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONHelper.cs
@@ -1,8 +1,8 @@
 namespace SharpMap.Converters.GeoJSON
 {
+    using SharpMap.Data;
     using System;
     using System.Collections.Generic;
-    using SharpMap.Data;
 
     /// <summary>
     /// GeoJSON helper class
@@ -40,6 +40,6 @@ public static IEnumerable<GeoJSON> GetData(FeatureDataSet data)
                     }
                 }
             }
-        }        
+        }
     }
 }
\ No newline at end of file
diff --git a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONWriter.cs b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONWriter.cs
index 70d2bfec..96c98f83 100644
--- a/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONWriter.cs
+++ b/SharpMap.Converters.GeoJSON/GeoJSON/GeoJSONWriter.cs
@@ -1,11 +1,11 @@
 namespace SharpMap.Converters.GeoJSON
 {
+    using NetTopologySuite.Geometries;
+    using Newtonsoft.Json;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
-    using GeoAPI.Geometries;
-    using Newtonsoft.Json;
 
     /// <summary>
     /// GeoJSON writer class
@@ -130,27 +130,27 @@ public static void WriteCoord(IEnumerable<Coordinate> coordinates, TextWriter wr
         /// </summary>
         /// <param name="geometry">The geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IGeometry geometry, JsonTextWriter writer)
+        public static void Write(Geometry geometry, JsonTextWriter writer)
         {
             if (geometry == null)
                 return;
             if (writer == null)
                 throw new ArgumentNullException("writer", "A valid JSON writer object is required");
 
-            if (geometry is IPoint)
-                Write(geometry as IPoint, writer);
-            else if (geometry is ILineString)
-                Write(geometry as ILineString, writer);
-            else if (geometry is IPolygon)
-                Write(geometry as IPolygon, writer);
-            else if (geometry is IMultiPoint)
-                Write(geometry as IMultiPoint, writer);
-            else if (geometry is IMultiLineString)
-                Write(geometry as IMultiLineString, writer);
-            else if (geometry is IMultiPolygon)
-                Write(geometry as IMultiPolygon, writer);
-            else if (geometry is IGeometryCollection)
-                Write(geometry as IGeometryCollection, writer);
+            if (geometry is Point)
+                Write(geometry as Point, writer);
+            else if (geometry is LineString)
+                Write(geometry as LineString, writer);
+            else if (geometry is Polygon)
+                Write(geometry as Polygon, writer);
+            else if (geometry is MultiPoint)
+                Write(geometry as MultiPoint, writer);
+            else if (geometry is MultiLineString)
+                Write(geometry as MultiLineString, writer);
+            else if (geometry is MultiPolygon)
+                Write(geometry as MultiPolygon, writer);
+            else if (geometry is GeometryCollection)
+                Write(geometry as GeometryCollection, writer);
         }
 
         /// <summary>
@@ -158,7 +158,7 @@ public static void Write(IGeometry geometry, JsonTextWriter writer)
         /// </summary>
         /// <param name="geometry">The geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IGeometry geometry, TextWriter writer)
+        public static void Write(Geometry geometry, TextWriter writer)
         {
             if (geometry == null)
                 return;
@@ -173,7 +173,7 @@ public static void Write(IGeometry geometry, TextWriter writer)
         /// </summary>
         /// <param name="point">The point geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IPoint point, JsonTextWriter writer)
+        public static void Write(Point point, JsonTextWriter writer)
         {
             if (point == null)
                 return;
@@ -199,7 +199,7 @@ public static void Write(IPoint point, JsonTextWriter writer)
         /// </summary>
         /// <param name="point">The point geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IPoint point, TextWriter writer)
+        public static void Write(Point point, TextWriter writer)
         {
             if (point == null)
                 return;
@@ -215,7 +215,7 @@ public static void Write(IPoint point, TextWriter writer)
         /// </summary>
         /// <param name="points">The multipoint geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiPoint points, JsonTextWriter writer)
+        public static void Write(MultiPoint points, JsonTextWriter writer)
         {
             if (points == null)
                 return;
@@ -241,7 +241,7 @@ public static void Write(IMultiPoint points, JsonTextWriter writer)
         /// </summary>
         /// <param name="points">The multipoint geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiPoint points, TextWriter writer)
+        public static void Write(MultiPoint points, TextWriter writer)
         {
             if (points == null)
                 return;
@@ -257,7 +257,7 @@ public static void Write(IMultiPoint points, TextWriter writer)
         /// </summary>
         /// <param name="line">The linestring geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(ILineString line, JsonTextWriter writer)
+        public static void Write(LineString line, JsonTextWriter writer)
         {
             if (line == null)
                 return;
@@ -282,7 +282,7 @@ public static void Write(ILineString line, JsonTextWriter writer)
         /// </summary>
         /// <param name="line">The linestring geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(ILineString line, TextWriter writer)
+        public static void Write(LineString line, TextWriter writer)
         {
             if (line == null)
                 return;
@@ -297,7 +297,7 @@ public static void Write(ILineString line, TextWriter writer)
         /// </summary>
         /// <param name="lines">The multi linestring geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiLineString lines, JsonTextWriter writer)
+        public static void Write(MultiLineString lines, JsonTextWriter writer)
         {
             if (lines == null)
                 return;
@@ -311,7 +311,7 @@ public static void Write(IMultiLineString lines, JsonTextWriter writer)
             writer.WriteStartArray();
             for (var i = 0; i < lines.Count; i++)
             {
-                var line = (ILineString)lines[i];
+                var line = (LineString)lines[i];
                 WriteCoord(line.Coordinates, writer);
             }
             writer.WriteEndArray();
@@ -323,7 +323,7 @@ public static void Write(IMultiLineString lines, JsonTextWriter writer)
         /// </summary>
         /// <param name="lines">The multi linestring geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiLineString lines, TextWriter writer)
+        public static void Write(MultiLineString lines, TextWriter writer)
         {
             if (lines == null)
                 return;
@@ -338,7 +338,7 @@ public static void Write(IMultiLineString lines, TextWriter writer)
         /// </summary>
         /// <param name="area">The polygon geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IPolygon area, JsonTextWriter writer)
+        public static void Write(Polygon area, JsonTextWriter writer)
         {
             if (area == null)
                 return;
@@ -351,7 +351,7 @@ public static void Write(IPolygon area, JsonTextWriter writer)
             writer.WritePropertyName("coordinates");
             writer.WriteStartArray();
             WriteCoord(area.ExteriorRing.Coordinates, writer);
-            foreach (ILinearRing hole in area.InteriorRings)
+            foreach (LinearRing hole in area.InteriorRings)
                 WriteCoord(hole.Coordinates, writer);
             writer.WriteEndArray();
             writer.WriteEndObject();
@@ -362,7 +362,7 @@ public static void Write(IPolygon area, JsonTextWriter writer)
         /// </summary>
         /// <param name="area">The polygon geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IPolygon area, TextWriter writer)
+        public static void Write(Polygon area, TextWriter writer)
         {
             if (area == null)
                 return;
@@ -377,7 +377,7 @@ public static void Write(IPolygon area, TextWriter writer)
         /// </summary>
         /// <param name="areas">The multi polygon geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiPolygon areas, JsonTextWriter writer)
+        public static void Write(MultiPolygon areas, JsonTextWriter writer)
         {
             if (areas == null)
                 return;
@@ -389,13 +389,13 @@ public static void Write(IMultiPolygon areas, JsonTextWriter writer)
             writer.WriteValue("MultiPolygon");
             writer.WritePropertyName("coordinates");
             writer.WriteStartArray();
-            for ( var i = 0; i < areas.NumGeometries; i++)
+            for (var i = 0; i < areas.NumGeometries; i++)
             {
-                var area = (IPolygon) areas[i];
+                var area = (Polygon)areas[i];
 
                 writer.WriteStartArray();
                 WriteCoord(area.ExteriorRing.Coordinates, writer);
-                foreach (ILinearRing hole in area.InteriorRings)
+                foreach (LinearRing hole in area.InteriorRings)
                     WriteCoord(hole.Coordinates, writer);
                 writer.WriteEndArray();
             }
@@ -408,7 +408,7 @@ public static void Write(IMultiPolygon areas, JsonTextWriter writer)
         /// </summary>
         /// <param name="areas">The multi polygon geometry</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IMultiPolygon areas, TextWriter writer)
+        public static void Write(MultiPolygon areas, TextWriter writer)
         {
             if (areas == null)
                 return;
@@ -423,7 +423,7 @@ public static void Write(IMultiPolygon areas, TextWriter writer)
         /// </summary>
         /// <param name="geometries">The collection of geometries</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IGeometryCollection geometries, JsonTextWriter writer)
+        public static void Write(GeometryCollection geometries, JsonTextWriter writer)
         {
             if (geometries == null)
                 return;
@@ -449,7 +449,7 @@ public static void Write(IGeometryCollection geometries, JsonTextWriter writer)
         /// </summary>
         /// <param name="geometries">The collection of geometries</param>
         /// <param name="writer">The JSON writer</param>
-        public static void Write(IGeometryCollection geometries, TextWriter writer)
+        public static void Write(GeometryCollection geometries, TextWriter writer)
         {
             if (geometries == null)
                 return;
@@ -470,7 +470,7 @@ public static void Write(GeoJSON feature, JsonTextWriter writer)
                 return;
             if (writer == null)
                 throw new ArgumentNullException("writer", "A valid JSON writer object is required");
-            
+
             writer.WriteStartObject();
             writer.WritePropertyName("type");
             writer.WriteValue("Feature");
@@ -480,7 +480,7 @@ public static void Write(GeoJSON feature, JsonTextWriter writer)
             writer.WritePropertyName("properties");
             Write(feature.Values, writer);
             writer.WritePropertyName("geometry_name");
-            writer.WriteValue("geometry");            
+            writer.WriteValue("geometry");
             writer.WritePropertyName("geometry");
             Write(feature.Geometry, writer);
             writer.WriteEndObject();
@@ -574,6 +574,6 @@ public static void Write(IDictionary<string, object> attributes, TextWriter writ
                 throw new ArgumentNullException("writer", "A valid text writer object is required");
 
             Write(attributes, CreateWriter(writer));
-        }     
+        }
     }
 }
diff --git a/SharpMap.Converters.GeoJSON/SharpMap.Converters.GeoJSON.csproj b/SharpMap.Converters.GeoJSON/SharpMap.Converters.GeoJSON.csproj
index d1d888c6..298a7324 100644
--- a/SharpMap.Converters.GeoJSON/SharpMap.Converters.GeoJSON.csproj
+++ b/SharpMap.Converters.GeoJSON/SharpMap.Converters.GeoJSON.csproj
@@ -12,12 +12,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
-        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Converters.Spatialite/SharpMap.Converters.Spatialite.csproj b/SharpMap.Converters.Spatialite/SharpMap.Converters.Spatialite.csproj
index 2df3b383..f88ba925 100644
--- a/SharpMap.Converters.Spatialite/SharpMap.Converters.Spatialite.csproj
+++ b/SharpMap.Converters.Spatialite/SharpMap.Converters.Spatialite.csproj
@@ -13,11 +13,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
+        <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/SharpMap.Converters.Spatialite/SpatiaLite/GeometryFromSpatiaLite.cs b/SharpMap.Converters.Spatialite/SpatiaLite/GeometryFromSpatiaLite.cs
index 70375b69..52604e65 100644
--- a/SharpMap.Converters.Spatialite/SpatiaLite/GeometryFromSpatiaLite.cs
+++ b/SharpMap.Converters.Spatialite/SpatiaLite/GeometryFromSpatiaLite.cs
@@ -15,6 +15,7 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 
@@ -34,7 +35,7 @@ public class GeometryFromSpatiaLite
         /// <param name="spatialliteGeom">The geometry blob</param>
         /// <param name="factory">The factory to create the result geometry</param>
         /// <returns>A geometry</returns>
-        public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.Geometries.IGeometryFactory factory)
+        public static Geometry Parse(byte[] spatialliteGeom, GeometryFactory factory)
         {
             var nBytes = spatialliteGeom.Length;
             if (spatialliteGeom.Length < 44
@@ -46,7 +47,7 @@ public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.G
             bool isLittleEndian = spatialliteGeom[1] == 0x01;
             if (spatialliteGeom[1] != 0x00 && spatialliteGeom[1] != 0x01)
                 throw new ApplicationException("Corrupt SpatialLite geom");
-            
+
 
 
             int idx = 39;
@@ -81,7 +82,7 @@ public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.G
             /* -------------------------------------------------------------------- */
             else if (nGType == 4)
             {
-                List<GeoAPI.Geometries.IPoint> pts = new List<GeoAPI.Geometries.IPoint>();
+                List<Point> pts = new List<Point>();
                 int numGeoms = ReadUInt32(spatialliteGeom, ref idx, isLittleEndian);
                 for (int i = 0; i < numGeoms; i++)
                 {
@@ -101,7 +102,7 @@ public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.G
             /* -------------------------------------------------------------------- */
             else if (nGType == 5)
             {
-                List<GeoAPI.Geometries.ILineString> lss = new List<GeoAPI.Geometries.ILineString>();
+                List<LineString> lss = new List<LineString>();
                 int numGeoms = ReadUInt32(spatialliteGeom, ref idx, isLittleEndian);
                 for (int i = 0; i < numGeoms; i++)
                 {
@@ -120,7 +121,7 @@ public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.G
             /* -------------------------------------------------------------------- */
             else if (nGType == 6)
             {
-                List<GeoAPI.Geometries.IPolygon> polys = new List<GeoAPI.Geometries.IPolygon>();
+                List<Polygon> polys = new List<Polygon>();
                 int numPolys = ReadUInt32(spatialliteGeom, ref idx, isLittleEndian);
                 for (int i = 0; i < numPolys; i++)
                 {
@@ -135,26 +136,26 @@ public static GeoAPI.Geometries.IGeometry Parse(byte[] spatialliteGeom, GeoAPI.G
                 }
                 return factory.CreateMultiPolygon(polys.ToArray());
             }
-            
+
             return null;
         }
 
-        private static GeoAPI.Geometries.IPolygon ReadPolygon(byte[] geom, ref int idx, bool isLittleEndian, GeoAPI.Geometries.IGeometryFactory factory)
+        private static Polygon ReadPolygon(byte[] geom, ref int idx, bool isLittleEndian, GeometryFactory factory)
         {
-            var nRings = ReadUInt32(geom,ref idx, isLittleEndian);
+            var nRings = ReadUInt32(geom, ref idx, isLittleEndian);
 
             if (nRings < 1 || nRings > Int32.MaxValue / (2 * 8))
                 throw new ApplicationException("Currupt SpatialLite geom");
 
-            List<GeoAPI.Geometries.ILineString> lineStrings = new List<GeoAPI.Geometries.ILineString>();
+            List<LineString> lineStrings = new List<LineString>();
             for (int i = 0; i < nRings; i++)
-                lineStrings.Add(ReadLineString(geom,ref idx, isLittleEndian, factory));
+                lineStrings.Add(ReadLineString(geom, ref idx, isLittleEndian, factory));
 
-            List<GeoAPI.Geometries.ILinearRing> holes = null;
+            List<LinearRing> holes = null;
             var shell = factory.CreateLinearRing(lineStrings[0].Coordinates);
             if (lineStrings.Count > 1)
             {
-                holes = new List<GeoAPI.Geometries.ILinearRing>();
+                holes = new List<LinearRing>();
                 for (int i = 1; i < lineStrings.Count; i++)
                 {
                     holes.Add(factory.CreateLinearRing(lineStrings[i].Coordinates));
@@ -163,7 +164,7 @@ private static GeoAPI.Geometries.IPolygon ReadPolygon(byte[] geom, ref int idx,
             return factory.CreatePolygon(shell, holes == null ? null : holes.ToArray());
         }
 
-        private static GeoAPI.Geometries.ILineString ReadLineString(byte[] geom, ref int idx, bool isLittleEndian, GeoAPI.Geometries.IGeometryFactory factory)
+        private static LineString ReadLineString(byte[] geom, ref int idx, bool isLittleEndian, GeometryFactory factory)
         {
             int iPoint;
             var nPointCount = ReadUInt32(geom, ref idx, isLittleEndian);
@@ -171,7 +172,7 @@ private static GeoAPI.Geometries.ILineString ReadLineString(byte[] geom, ref int
             if (nPointCount < 0 || nPointCount > Int32.MaxValue / (2 * 8))
                 throw new ApplicationException("Currupt SpatialLite geom");
 
-            List<GeoAPI.Geometries.Coordinate> pts = new List<GeoAPI.Geometries.Coordinate>();
+            List<Coordinate> pts = new List<Coordinate>();
 
             for (iPoint = 0; iPoint < nPointCount; iPoint++)
             {
@@ -181,13 +182,13 @@ private static GeoAPI.Geometries.ILineString ReadLineString(byte[] geom, ref int
             return factory.CreateLineString(pts.ToArray());
         }
 
-        private static GeoAPI.Geometries.Coordinate ReadPoint(byte[] geom, ref int idx, bool isLittleEndian)
+        private static Coordinate ReadPoint(byte[] geom, ref int idx, bool isLittleEndian)
         {
             double[] adfTuple = new double[2];
             adfTuple[0] = ReadDouble(geom, ref idx, isLittleEndian);
             adfTuple[1] = ReadDouble(geom, ref idx, isLittleEndian);
 
-            return new GeoAPI.Geometries.Coordinate(adfTuple[0], adfTuple[1], 0);
+            return new Coordinate(adfTuple[0], adfTuple[1]);
         }
 
         private static double ReadDouble(byte[] geom, ref int idx, bool isLittleEndian)
diff --git a/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystem.cs b/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystem.cs
index 721c8051..8a9fd1cf 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystem.cs
+++ b/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystem.cs
@@ -18,16 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  *
  */
-using System;
 using DotSpatial.Projections;
-using GeoAPI.CoordinateSystems;
+using ProjNet.CoordinateSystems;
+using System;
 
 namespace SharpMap.CoordinateSystems
 {
     /// <summary>
     /// A wrapper around a <see cref="DotSpatial.Projections.ProjectionInfo"/>
     /// </summary>
-    public class DotSpatialCoordinateSystem : ICoordinateSystem
+    public class DotSpatialCoordinateSystem
     {
         private static readonly string[] _latLonNames = { "Longitude", "Latitude" };
         private static readonly string[] _eastNorthNames = { "East", "North" };
@@ -44,13 +44,10 @@ public class DotSpatialCoordinateSystem : ICoordinateSystem
         /// <summary>
         /// Creates an instance of this class using the provided projection info
         /// </summary>
-        /// <param name="projecionInfo">The projection info</param>
-        public DotSpatialCoordinateSystem(ProjectionInfo projecionInfo)
+        /// <param name="projectionInfo">The projection info</param>
+        public DotSpatialCoordinateSystem(ProjectionInfo projectionInfo)
         {
-            if (projecionInfo == null)
-                throw new ArgumentNullException("projecionInfo");
-
-            _projectionInfo = projecionInfo;
+            _projectionInfo = projectionInfo ?? throw new ArgumentNullException("projectionInfo");
         }
 
         /// <summary>
@@ -61,7 +58,7 @@ public DotSpatialCoordinateSystem(ProjectionInfo projecionInfo)
         /// <param name="abbreviation">The abbreviation</param>
         /// <param name="remarks">The remarks</param>
         public DotSpatialCoordinateSystem(ProjectionInfo projecionInfo, string alias = null, string abbreviation = null, string remarks = null)
-            :this(projecionInfo)
+            : this(projecionInfo)
         {
             _alias = alias;
             _abbreviation = abbreviation;
@@ -89,10 +86,10 @@ public ProjectionInfo ProjectionInfo
         /// <returns></returns>
         public bool EqualParams(object obj)
         {
-            if (obj is DotSpatialCoordinateSystem)
-                return _projectionInfo.Matches(((DotSpatialCoordinateSystem) obj)._projectionInfo);
-            if (obj is ProjectionInfo)
-                return _projectionInfo.Matches((ProjectionInfo)obj);
+            if (obj is DotSpatialCoordinateSystem dcs)
+                return _projectionInfo.Matches(dcs._projectionInfo);
+            if (obj is ProjectionInfo pi)
+                return _projectionInfo.Matches(pi);
             return false;
         }
 
@@ -191,14 +188,14 @@ private static IUnit ToUnit(ProjectionInfo projDescriptor)
 
         private abstract class UnitWrapper : IUnit
         {
-            protected readonly IProjDescriptor Descriptor;
+            protected readonly ProjDescriptor Descriptor;
 
-            protected UnitWrapper(IProjDescriptor descriptor)
+            protected UnitWrapper(ProjDescriptor descriptor)
             {
                 Descriptor = descriptor;
             }
 
-            public abstract string Name { get; } 
+            public abstract string Name { get; }
 
             public string Authority { get { return "DS"; } }
             public long AuthorityCode { get { return 20000000; } }
@@ -212,15 +209,15 @@ protected UnitWrapper(IProjDescriptor descriptor)
             public abstract bool EqualParams(object obj);
         }
 
-        private class AngularUnitWrapper : UnitWrapper, IAngularUnit
+        private class AngularUnitWrapper : UnitWrapper
         {
-            private AngularUnit Unit
+            private DotSpatial.Projections.AngularUnit Unit
             {
-                get { return (AngularUnit) Descriptor; }
+                get { return (DotSpatial.Projections.AngularUnit)Descriptor; }
             }
 
-            public AngularUnitWrapper(AngularUnit angularUnit)
-                :base(angularUnit)
+            public AngularUnitWrapper(DotSpatial.Projections.AngularUnit angularUnit)
+                : base(angularUnit)
             {
             }
 
@@ -231,8 +228,8 @@ public AngularUnitWrapper(AngularUnit angularUnit)
             public override bool EqualParams(object obj)
             {
                 if (obj == null) return false;
-                if (obj is AngularUnitWrapper)
-                    return ((AngularUnitWrapper) obj).RadiansPerUnit == RadiansPerUnit;
+                if (obj is AngularUnitWrapper auw)
+                    return auw.RadiansPerUnit == RadiansPerUnit;
                 return false;
             }
 
@@ -244,14 +241,14 @@ public double RadiansPerUnit
             }
         }
 
-        private class LinearUnitWrapper : UnitWrapper, ILinearUnit
+        private class LinearUnitWrapper : UnitWrapper
         {
-            private LinearUnit Unit
+            private DotSpatial.Projections.LinearUnit Unit
             {
-                get { return (LinearUnit)Descriptor; }
+                get { return (DotSpatial.Projections.LinearUnit)Descriptor; }
             }
 
-            public LinearUnitWrapper(LinearUnit linearUnit)
+            public LinearUnitWrapper(DotSpatial.Projections.LinearUnit linearUnit)
                 : base(linearUnit)
             {
             }
@@ -263,8 +260,8 @@ public LinearUnitWrapper(LinearUnit linearUnit)
             public override bool EqualParams(object obj)
             {
                 if (obj == null) return false;
-                if (obj is LinearUnitWrapper)
-                    return ((LinearUnitWrapper)obj).MetersPerUnit == MetersPerUnit;
+                if (obj is LinearUnitWrapper luw)
+                    return luw.MetersPerUnit == MetersPerUnit;
                 return false;
             }
 
diff --git a/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs b/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs
index 32b00faa..04d932e1 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs
+++ b/SharpMap.CoordinateSystems.DotSpatial/DotSpatialCoordinateSystemFactory.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
+using DotSpatial.Projections;
+using ProjNet.CoordinateSystems;
+using System;
 using System.Globalization;
-using DotSpatial.Projections;
-using GeoAPI.CoordinateSystems;
-using DatumType = GeoAPI.CoordinateSystems.DatumType;
 
 namespace SharpMap.CoordinateSystems
 {
@@ -11,10 +9,11 @@ namespace SharpMap.CoordinateSystems
     /// An implementation for a coordinate system factory that creates <see cref="DotSpatialCoordinateSystem"/>s.
     /// </summary>
     /// <remarks>The only supported method is <see cref="CreateFromWkt"/></remarks>
-    public class DotSpatialCoordinateSystemFactory : ICoordinateSystemFactory
+    public class DotSpatialCoordinateSystemFactory : CoordinateSystemFactory
     {
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.ICompoundCoordinateSystem" />.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.ICompoundCoordinateSystem" />.
         /// </summary>
         /// <param name="name">Name of compound coordinate system.</param>
         /// <param name="head">Head coordinate system</param>
@@ -25,24 +24,28 @@ public ICompoundCoordinateSystem CreateCompoundCoordinateSystem(string name, ICo
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates an <see cref="T:GeoAPI.CoordinateSystems.IEllipsoid" /> from radius values.
+        /// Creates an <see cref="T:NetTopologySuite.CoordinateSystems.IEllipsoid" /> from radius values.
         /// </summary>
-        /// <seealso cref="M:GeoAPI.CoordinateSystems.ICoordinateSystemFactory.CreateFlattenedSphere(System.String,System.Double,System.Double,GeoAPI.CoordinateSystems.ILinearUnit)" />
+        /// <seealso cref="M:NetTopologySuite.CoordinateSystems.ICoordinateSystemFactory.CreateFlattenedSphere(System.String,System.Double,System.Double,NetTopologySuite.CoordinateSystems.ILinearUnit)" />
         /// <param name="name">Name of ellipsoid</param>
         /// <param name="semiMajorAxis"></param>
         /// <param name="semiMinorAxis"></param>
         /// <param name="linearUnit"></param>
         /// <returns>Ellipsoid</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IEllipsoid CreateEllipsoid(string name, double semiMajorAxis, double semiMinorAxis, ILinearUnit linearUnit)
+        public Ellipsoid CreateEllipsoid(string name, double semiMajorAxis, double semiMinorAxis, LinearUnit linearUnit)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IFittedCoordinateSystem" />.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IFittedCoordinateSystem" />.
         /// </summary>
         /// <remarks>The units of the axes in the fitted coordinate system will be
         /// inferred from the units of the base coordinate system. If the affine map
@@ -56,46 +59,51 @@ public IEllipsoid CreateEllipsoid(string name, double semiMajorAxis, double semi
         /// <param name="arAxes"></param>
         /// <returns>Fitted coordinate system</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IFittedCoordinateSystem CreateFittedCoordinateSystem(string name, ICoordinateSystem baseCoordinateSystem,
+        public FittedCoordinateSystem CreateFittedCoordinateSystem(string name, CoordinateSystem baseCoordinateSystem,
             string toBaseWkt, List<AxisInfo> arAxes)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates an <see cref="T:GeoAPI.CoordinateSystems.IEllipsoid" /> from an major radius, and inverse flattening.
+        /// Creates an <see cref="T:NetTopologySuite.CoordinateSystems.IEllipsoid" /> from an major radius, and inverse flattening.
         /// </summary>
-        /// <seealso cref="M:GeoAPI.CoordinateSystems.ICoordinateSystemFactory.CreateEllipsoid(System.String,System.Double,System.Double,GeoAPI.CoordinateSystems.ILinearUnit)" />
+        /// <seealso cref="M:NetTopologySuite.CoordinateSystems.ICoordinateSystemFactory.CreateEllipsoid(System.String,System.Double,System.Double,NetTopologySuite.CoordinateSystems.ILinearUnit)" />
         /// <param name="name">Name of ellipsoid</param>
         /// <param name="semiMajorAxis">Semi major-axis</param>
         /// <param name="inverseFlattening">Inverse flattening</param>
         /// <param name="linearUnit">Linear unit</param>
         /// <returns>Ellipsoid</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IEllipsoid CreateFlattenedSphere(string name, double semiMajorAxis, double inverseFlattening, ILinearUnit linearUnit)
+        public Ellipsoid CreateFlattenedSphere(string name, double semiMajorAxis, double inverseFlattening, LinearUnit linearUnit)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
         /// Creates a coordinate system object from an XML string.
         /// </summary>
         /// <param name="xml">XML representation for the spatial reference</param>
         /// <returns>The resulting spatial reference object</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public ICoordinateSystem CreateFromXml(string xml)
+        public CoordinateSystem CreateFromXml(string xml)
         {
             throw new NotSupportedException();
         }
+        */
 
         /// <summary>
         /// Creates a spatial reference object given its Well-known text representation.
-        /// The output object may be either a <see cref="T:GeoAPI.CoordinateSystems.IGeographicCoordinateSystem" /> or
-        /// a <see cref="T:GeoAPI.CoordinateSystems.IProjectedCoordinateSystem" />.
+        /// The output object may be either a <see cref="T:NetTopologySuite.CoordinateSystems.IGeographicCoordinateSystem" /> or
+        /// a <see cref="T:NetTopologySuite.CoordinateSystems.IProjectedCoordinateSystem" />.
         /// </summary>
         /// <param name="wkt">The Well-known text representation for the spatial reference</param>
         /// <returns>The resulting spatial reference object</returns>
-        public ICoordinateSystem CreateFromWkt(string wkt)
+        public new DotSpatialCoordinateSystem CreateFromWkt(string wkt)
         {
             //Hack: DotSpatial.Projections does not handle Authority and AuthorityCode
             var pos1 = wkt.LastIndexOf("AUTHORITY[", StringComparison.InvariantCulture);
@@ -135,8 +143,9 @@ public ICoordinateSystem CreateFromWkt(string wkt)
             return new DotSpatialCoordinateSystem(pi);
         }
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IGeographicCoordinateSystem" />, which could be Lat/Lon or Lon/Lat.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IGeographicCoordinateSystem" />, which could be Lat/Lon or Lon/Lat.
         /// </summary>
         /// <param name="name">Name of geographical coordinate system</param>
         /// <param name="angularUnit">Angular units</param>
@@ -146,20 +155,22 @@ public ICoordinateSystem CreateFromWkt(string wkt)
         /// <param name="axis1">Second axis</param>
         /// <returns>Geographic coordinate system</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IGeographicCoordinateSystem CreateGeographicCoordinateSystem(string name, IAngularUnit angularUnit,
-            IHorizontalDatum datum, IPrimeMeridian primeMeridian, AxisInfo axis0, AxisInfo axis1)
+        public GeographicCoordinateSystem CreateGeographicCoordinateSystem(string name, AngularUnit angularUnit,
+            HorizontalDatum datum, PrimeMeridian primeMeridian, AxisInfo axis0, AxisInfo axis1)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates <see cref="T:GeoAPI.CoordinateSystems.IHorizontalDatum" /> from ellipsoid and Bursa-World parameters.
+        /// Creates <see cref="T:NetTopologySuite.CoordinateSystems.IHorizontalDatum" /> from ellipsoid and Bursa-World parameters.
         /// </summary>
         /// <remarks>
         /// Since this method contains a set of Bursa-Wolf parameters, the created
         /// datum will always have a relationship to WGS84. If you wish to create a
         /// horizontal datum that has no relationship with WGS84, then you can
-        /// either specify a <see cref="T:GeoAPI.CoordinateSystems.DatumType">horizontalDatumType</see> of <see cref="F:GeoAPI.CoordinateSystems.DatumType.HD_Other" />, or create it via WKT.
+        /// either specify a <see cref="T:NetTopologySuite.CoordinateSystems.DatumType">horizontalDatumType</see> of <see cref="F:NetTopologySuite.CoordinateSystems.DatumType.HD_Other" />, or create it via WKT.
         /// </remarks>
         /// <param name="name">Name of ellipsoid</param>
         /// <param name="datumType">Type of datum</param>
@@ -167,14 +178,16 @@ public IGeographicCoordinateSystem CreateGeographicCoordinateSystem(string name,
         /// <param name="toWgs84">Wgs84 conversion parameters</param>
         /// <returns>Horizontal datum</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IHorizontalDatum CreateHorizontalDatum(string name, DatumType datumType, IEllipsoid ellipsoid,
+        public HorizontalDatum CreateHorizontalDatum(string name, DatumType datumType, Ellipsoid ellipsoid,
             Wgs84ConversionInfo toWgs84)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.ILocalCoordinateSystem">local coordinate system</see>.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.ILocalCoordinateSystem">local coordinate system</see>.
         /// </summary>
         /// <remarks>
         ///  The dimension of the local coordinate system is determined by the size of
@@ -192,9 +205,11 @@ public ILocalCoordinateSystem CreateLocalCoordinateSystem(string name, ILocalDat
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.ILocalDatum" />.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.ILocalDatum" />.
         /// </summary>
         /// <param name="name">Name of datum</param>
         /// <param name="datumType">Datum type</param>
@@ -204,22 +219,26 @@ public ILocalDatum CreateLocalDatum(string name, DatumType datumType)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IPrimeMeridian" />, relative to Greenwich.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IPrimeMeridian" />, relative to Greenwich.
         /// </summary>
         /// <param name="name">Name of prime meridian</param>
         /// <param name="angularUnit">Angular unit</param>
         /// <param name="longitude">Longitude</param>
         /// <returns>Prime meridian</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IPrimeMeridian CreatePrimeMeridian(string name, IAngularUnit angularUnit, double longitude)
+        public PrimeMeridian CreatePrimeMeridian(string name, AngularUnit angularUnit, double longitude)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IProjectedCoordinateSystem" /> using a projection object.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IProjectedCoordinateSystem" /> using a projection object.
         /// </summary>
         /// <param name="name">Name of projected coordinate system</param>
         /// <param name="gcs">Geographic coordinate system</param>
@@ -229,14 +248,16 @@ public IPrimeMeridian CreatePrimeMeridian(string name, IAngularUnit angularUnit,
         /// <param name="axis1">Secondary axis</param>
         /// <returns>Projected coordinate system</returns>
         /// <exception cref="NotSupportedException"></exception>
-        public IProjectedCoordinateSystem CreateProjectedCoordinateSystem(string name, IGeographicCoordinateSystem gcs,
-            IProjection projection, ILinearUnit linearUnit, AxisInfo axis0, AxisInfo axis1)
+        public ProjectedCoordinateSystem CreateProjectedCoordinateSystem(string name, GeographicCoordinateSystem gcs,
+            IProjection projection, LinearUnit linearUnit, AxisInfo axis0, AxisInfo axis1)
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IProjection" />.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IProjection" />.
         /// </summary>
         /// <param name="name">Name of projection</param>
         /// <param name="wktProjectionClass">Projection class</param>
@@ -247,9 +268,11 @@ public IProjection CreateProjection(string name, string wktProjectionClass, List
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IVerticalCoordinateSystem" /> from a <see cref="T:GeoAPI.CoordinateSystems.IVerticalDatum">datum</see> and <see cref="T:GeoAPI.CoordinateSystems.ILinearUnit">linear units</see>.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IVerticalCoordinateSystem" /> from a <see cref="T:NetTopologySuite.CoordinateSystems.IVerticalDatum">datum</see> and <see cref="T:NetTopologySuite.CoordinateSystems.ILinearUnit">linear units</see>.
         /// </summary>
         /// <param name="name">Name of vertical coordinate system</param>
         /// <param name="datum">Vertical datum</param>
@@ -262,9 +285,11 @@ public IVerticalCoordinateSystem CreateVerticalCoordinateSystem(string name, IVe
         {
             throw new NotSupportedException();
         }
+        */
 
+        /*
         /// <summary>
-        /// Creates a <see cref="T:GeoAPI.CoordinateSystems.IVerticalDatum" /> from an enumerated type value.
+        /// Creates a <see cref="T:NetTopologySuite.CoordinateSystems.IVerticalDatum" /> from an enumerated type value.
         /// </summary>
         /// <param name="name">Name of datum</param>
         /// <param name="datumType">Type of datum</param>
@@ -274,5 +299,6 @@ public IVerticalDatum CreateVerticalDatum(string name, DatumType datumType)
         {
             throw new NotSupportedException();
         }
+        */
     }
 }
diff --git a/SharpMap.CoordinateSystems.DotSpatial/SharpMap.CoordinateSystems.DotSpatial.csproj b/SharpMap.CoordinateSystems.DotSpatial/SharpMap.CoordinateSystems.DotSpatial.csproj
index 23be6696..fe6fb312 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/SharpMap.CoordinateSystems.DotSpatial.csproj
+++ b/SharpMap.CoordinateSystems.DotSpatial/SharpMap.CoordinateSystems.DotSpatial.csproj
@@ -12,12 +12,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DotSpatial.Projections" Version="1.9.0.0" />
-        <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
+        <PackageReference Include="DotSpatial.Projections" Version="4.0.656" />
+        <PackageReference Include="ProjNet" Version="2.0.0" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformation.cs b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformation.cs
index f0f1d31f..23e83f5f 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformation.cs
+++ b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformation.cs
@@ -1,6 +1,6 @@
-using System;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
+using System;
 
 namespace SharpMap.CoordinateSystems.Transformations
 {
@@ -55,7 +55,7 @@ public long AuthorityCode
         }
 
         /// <summary>Gets math transform.</summary>
-        public IMathTransform MathTransform
+        public MathTransform MathTransform
         {
             get { return _transform; }
         }
@@ -73,15 +73,15 @@ public string Remarks
         }
 
         /// <summary>Source coordinate system.</summary>
-        public ICoordinateSystem SourceCS
+        public CoordinateSystem SourceCS
         {
-            get { return _source; }
+            get { return new CoordinateSystemFactory().CreateFromXml(_source.XML); }
         }
 
         /// <summary>Target coordinate system.</summary>
-        public ICoordinateSystem TargetCS
+        public CoordinateSystem TargetCS
         {
-            get { return _target; }
+            get { return new CoordinateSystemFactory().CreateFromXml(_target.XML); }
         }
 
         /// <summary>
@@ -92,4 +92,4 @@ public TransformType TransformType
             get { throw new NotSupportedException(); }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs
index d266e1cb..33b6a7dc 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs
+++ b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialCoordinateTransformationFactory.cs
@@ -1,6 +1,6 @@
 using DotSpatial.Projections;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
 
 namespace SharpMap.CoordinateSystems.Transformations
 {
@@ -8,7 +8,7 @@ namespace SharpMap.CoordinateSystems.Transformations
     /// An implementation for a coordinate transformation factory, that creates 
     /// coordinate transformations based on <see cref="DotSpatialCoordinateSystem"/>s.
     /// </summary>
-    public class DotSpatialCoordinateTransformationFactory : ICoordinateTransformationFactory
+    public class DotSpatialCoordinateTransformationFactory : CoordinateTransformationFactory
     {
         /// <summary>
         /// Creates a transformation between two coordinate systems.
@@ -25,16 +25,14 @@ public class DotSpatialCoordinateTransformationFactory : ICoordinateTransformati
         /// For this method to work properly, the input coordinate systems must either be 
         /// <see cref="DotSpatialCoordinateSystem"/>s or return valid <see cref="IInfo.WKT"/> values.
         /// </remarks>
-        public ICoordinateTransformation CreateFromCoordinateSystems(ICoordinateSystem sourceCS, ICoordinateSystem targetCS)
+        public new ICoordinateTransformation CreateFromCoordinateSystems(CoordinateSystem sourceCS, CoordinateSystem targetCS)
         {
             if (sourceCS == null || targetCS == null)
                 return null;
 
-            var source = sourceCS as DotSpatialCoordinateSystem ??
-                         new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(sourceCS.WKT));
+            var source = new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(sourceCS.WKT));
 
-            var target = targetCS as DotSpatialCoordinateSystem ??
-                         new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(targetCS.WKT));
+            var target = new DotSpatialCoordinateSystem(ProjectionInfo.FromEsriString(targetCS.WKT));
 
             return new DotSpatialCoordinateTransformation(source, target);
         }
diff --git a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialMathTransform.cs b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialMathTransform.cs
index c8b90795..cfab9267 100644
--- a/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialMathTransform.cs
+++ b/SharpMap.CoordinateSystems.DotSpatial/Transformations/DotSpatialMathTransform.cs
@@ -1,15 +1,15 @@
+using DotSpatial.Projections;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
 using System;
 using System.Collections.Generic;
-using DotSpatial.Projections;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
 
 namespace SharpMap.CoordinateSystems.Transformations
 {
     /// <summary>
     /// A math transform based on two <see cref="ProjectionInfo"/>s.
     /// </summary>
-    internal class DotSpatialMathTransform : IMathTransform
+    internal class DotSpatialMathTransform : MathTransform
     {
         private readonly ProjectionInfo _source;
         private readonly ProjectionInfo _target;
@@ -28,14 +28,14 @@ public DotSpatialMathTransform(ProjectionInfo source, ProjectionInfo target)
         {
             _source = source;
             _target = target;
-            _order = new[] {_source, _target};
+            _order = new[] { _source, _target };
         }
 
         /// <summary>
         /// Tests whether this transform does not move any points.
         /// </summary>
         /// <returns></returns>
-        public bool Identity()
+        public override bool Identity()
         {
             return _source.Matches(_target);
         }
@@ -54,7 +54,7 @@ public bool Identity()
         /// </summary>
         /// <param name="point"></param>
         /// <returns></returns>
-        public double[,] Derivative(double[] point)
+        public override double[,] Derivative(double[] point)
         {
             throw new NotSupportedException();
         }
@@ -78,7 +78,7 @@ public bool Identity()
         /// </remarks>
         /// <param name="points"></param>
         /// <returns></returns>
-        public List<double> GetCodomainConvexHull(List<double> points)
+        public override List<double> GetCodomainConvexHull(List<double> points)
         {
             throw new NotSupportedException();
         }
@@ -96,7 +96,7 @@ public List<double> GetCodomainConvexHull(List<double> points)
         /// </remarks>
         /// <param name="points"></param>
         /// <returns></returns>
-        public DomainFlags GetDomainFlags(List<double> points)
+        public override DomainFlags GetDomainFlags(List<double> points)
         {
             throw new NotSupportedException();
         }
@@ -104,7 +104,7 @@ public DomainFlags GetDomainFlags(List<double> points)
         /// <summary>Creates the inverse transform of this object.</summary>
         /// <remarks>This method may fail if the transform is not one to one. However, all cartographic projections should succeed.</remarks>
         /// <returns></returns>
-        public IMathTransform Inverse()
+        public override MathTransform Inverse()
         {
             return _inverse ?? (_inverse = new DotSpatialMathTransform(_target, _source));
         }
@@ -114,7 +114,7 @@ public IMathTransform Inverse()
         /// </summary>
         /// <param name="point"></param>
         /// <returns></returns>
-        public double[] Transform(double[] point)
+        public new double[] Transform(double[] point)
         {
             var xy = new double[2];
             var numOrdinates = point.Length;
@@ -137,31 +137,6 @@ public double[] Transform(double[] point)
             return new[] { xy[0], xy[1], z[0], m[0] };
         }
 
-        /// <summary>
-        /// Transforms a a coordinate. The input coordinate remains unchanged.
-        /// </summary>
-        /// <param name="coordinate">The coordinate to transform</param>
-        /// <returns>The transformed coordinate</returns>
-        [Obsolete]
-        public ICoordinate Transform(ICoordinate coordinate)
-        {
-            // Set up fields
-            var xy = new[] {coordinate.X, coordinate.Y};
-            var z = double.IsNaN(coordinate.Z) ? null : new[] {coordinate.Z};
-            var m = double.IsNaN(coordinate.M) ? null : new[] {coordinate.M};
-            
-            //Do the reprojection
-            Reproject.ReprojectPoints(xy, z, _order[0], _order[1], 0, 1);
-
-            // Put result in new object
-            var res = (ICoordinate) Activator.CreateInstance(coordinate.GetType());
-            res.X = xy[0];
-            res.Y = xy[1];
-            if (z != null) res.Z = z[0];
-            if (m != null) res.M = m[0];
-            return res;
-        }
-
         /// <summary>
         /// Transforms a a coordinate. The input coordinate remains unchanged.
         /// </summary>
@@ -198,9 +173,9 @@ public Coordinate Transform(Coordinate coordinate)
         /// </remarks>
         /// <param name="points"></param>
         /// <returns></returns>
-        public IList<double[]> TransformList(IList<double[]> points)
+        public new IList<double[]> TransformList(IList<double[]> points)
         {
-            var xy = new double[points.Count*2];
+            var xy = new double[points.Count * 2];
             var numOrdinates = points[0].Length;
             var z = numOrdinates > 2 ? new double[points.Count] : null;
             var m = numOrdinates > 3 ? new double[points.Count] : null;
@@ -226,7 +201,7 @@ public IList<double[]> TransformList(IList<double[]> points)
                 else if (numOrdinates > 2)
                     res.Add(new[] { xy[j++], xy[j++], z[j] });
                 else
-                    res.Add(new []{ xy[j++], xy[j++] });
+                    res.Add(new[] { xy[j++], xy[j++] });
             }
             return res;
         }
@@ -255,12 +230,12 @@ public IList<Coordinate> TransformList(IList<Coordinate> points)
         }
 
         /// <summary>Reverses the transformation</summary>
-        public void Invert()
+        public override void Invert()
         {
             if (_isInverted)
-                _order = new[] {_source, _target};
+                _order = new[] { _source, _target };
             else
-                _order = new[] { _target, _source};
+                _order = new[] { _target, _source };
             _isInverted = !_isInverted;
         }
 
@@ -269,10 +244,10 @@ public void Invert()
         /// </summary>
         /// <param name="coordinateSequence">The coordinate sequence to transform.</param>
         /// <returns>The transformed coordinate sequence.</returns>
-        public ICoordinateSequence Transform(ICoordinateSequence coordinateSequence)
+        public CoordinateSequence Transform(CoordinateSequence coordinateSequence)
         {
             //if (coordinateSequence)
-            
+
             var xy = new double[coordinateSequence.Count * 2];
             var numOrdinates = coordinateSequence.Dimension;
             var z = numOrdinates > 2 ? new double[coordinateSequence.Count] : null;
@@ -283,9 +258,9 @@ public ICoordinateSequence Transform(ICoordinateSequence coordinateSequence)
             {
                 xy[j++] = coordinateSequence.GetX(i);
                 xy[j++] = coordinateSequence.GetY(i);
-                if (numOrdinates > 2) 
+                if (numOrdinates > 2)
                     z[i] = coordinateSequence.GetOrdinate(i, Ordinate.Z);
-                if (numOrdinates > 3) 
+                if (numOrdinates > 3)
                     m[i] = coordinateSequence.GetOrdinate(i, Ordinate.M);
             }
 
@@ -294,7 +269,7 @@ public ICoordinateSequence Transform(ICoordinateSequence coordinateSequence)
 
             // Set up result
             j = 0;
-            var res = (ICoordinateSequence)coordinateSequence.Clone();
+            var res = coordinateSequence.Copy();
             for (var i = 0; i < coordinateSequence.Count; i++)
             {
                 res.SetOrdinate(i, Ordinate.X, xy[j++]);
@@ -309,28 +284,36 @@ public ICoordinateSequence Transform(ICoordinateSequence coordinateSequence)
             return res;
         }
 
+        public override void Transform(ref double x, ref double y, ref double z)
+        {
+            var ret = Transform(new[] { x, y, x });
+            x = ret[0];
+            y = ret[1];
+            z = ret[2];
+        }
+
         /// <summary>Gets the dimension of input points.</summary>
-        public int DimSource
+        public override int DimSource
         {
             get { throw new NotSupportedException(); }
         }
 
         /// <summary>Gets the dimension of output points.</summary>
-        public int DimTarget
+        public override int DimTarget
         {
             get { throw new NotSupportedException(); }
         }
 
         /// <summary>Gets a Well-Known text representation of this object.</summary>
-        public string WKT
+        public override string WKT
         {
             get { throw new NotSupportedException(); }
         }
 
         /// <summary>Gets an XML representation of this object.</summary>
-        public string XML
+        public override string XML
         {
             get { throw new NotSupportedException(); }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.FileGdb/Converter/FileGdbGeometryConverter.cs b/SharpMap.Data.Providers.FileGdb/Converter/FileGdbGeometryConverter.cs
index 4488829d..e3352e98 100644
--- a/SharpMap.Data.Providers.FileGdb/Converter/FileGdbGeometryConverter.cs
+++ b/SharpMap.Data.Providers.FileGdb/Converter/FileGdbGeometryConverter.cs
@@ -16,25 +16,19 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using GeoAPI;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
-
-
 using EsriExtent = Esri.FileGDB.Envelope;
-
-using EsriShapeBuffer = Esri.FileGDB.ShapeBuffer;
-using EsriPointShapeBuffer = Esri.FileGDB.PointShapeBuffer;
-using EsriMultiPointShapeBuffer = Esri.FileGDB.MultiPointShapeBuffer;
-using EsriMultiPartShapeBuffer = Esri.FileGDB.MultiPartShapeBuffer;
-
 using EsriGeometryType = Esri.FileGDB.GeometryType;
+using EsriMultiPartShapeBuffer = Esri.FileGDB.MultiPartShapeBuffer;
+using EsriMultiPointShapeBuffer = Esri.FileGDB.MultiPointShapeBuffer;
+using EsriPointShapeBuffer = Esri.FileGDB.PointShapeBuffer;
+using EsriShapeBuffer = Esri.FileGDB.ShapeBuffer;
 using EsriShapeType = Esri.FileGDB.ShapeType;
-using EsriShapeModifiers = Esri.FileGDB.ShapeModifiers;
 
 
 
@@ -44,7 +38,7 @@ namespace SharpMap.Data.Providers.Converter
     internal class FileGdbGeometryConverter
     {
 
-        private static readonly IGeometryFactory geometryFactory = GeometryServiceProvider.Instance.CreateGeometryFactory();
+        private static readonly GeometryFactory geometryFactory = NtsGeometryServices.Instance.CreateGeometryFactory();
 
 
         internal static EsriExtent ToEsriExtent(Envelope bbox)
@@ -62,7 +56,7 @@ private static EsriShapeType EsriShapeType(EsriShapeBuffer buffer)
             return (EsriShapeType)buffer.shapeType;
         }
 
-        internal static IGeometry ToSharpMapGeometry(EsriShapeBuffer buffer)
+        internal static Geometry ToSharpMapGeometry(EsriShapeBuffer buffer)
         {
             if (buffer == null || buffer.IsEmpty)
                 return null;
@@ -91,7 +85,7 @@ internal static IGeometry ToSharpMapGeometry(EsriShapeBuffer buffer)
             }
         }
 
-        private static IGeometry ToSharpMapMultiLineString(EsriShapeBuffer shapeBuffer)
+        private static Geometry ToSharpMapMultiLineString(EsriShapeBuffer shapeBuffer)
         {
             if (shapeBuffer == null)
                 return null;
@@ -104,7 +98,7 @@ private static IGeometry ToSharpMapMultiLineString(EsriShapeBuffer shapeBuffer)
             }
 
             var hasZ = EsriShapeBuffer.HasZs(shapeBuffer.shapeType);
-            var lines = new List<ILineString>();
+            var lines = new List<LineString>();
 
             var offset = 0;
             for (var i = 0; i < multiPartShapeBuffer.NumParts; i++)
@@ -115,7 +109,7 @@ private static IGeometry ToSharpMapMultiLineString(EsriShapeBuffer shapeBuffer)
                     var index = offset + j;
                     var point = multiPartShapeBuffer.Points[index];
                     vertices.Add(hasZ
-                            ? new Coordinate(point.x, point.y, multiPartShapeBuffer.Zs[index])
+                            ? new CoordinateZ(point.x, point.y, multiPartShapeBuffer.Zs[index])
                             : new Coordinate(point.x, point.y));
                 }
                 lines.Add(new LineString(vertices.ToArray()));
@@ -129,7 +123,7 @@ private static IGeometry ToSharpMapMultiLineString(EsriShapeBuffer shapeBuffer)
 
         }
 
-        private static IGeometry ToSharpMapMultiPolygon(EsriShapeBuffer shapeBuffer)
+        private static Geometry ToSharpMapMultiPolygon(EsriShapeBuffer shapeBuffer)
         {
             if (shapeBuffer == null)
                 return null;
@@ -142,10 +136,10 @@ private static IGeometry ToSharpMapMultiPolygon(EsriShapeBuffer shapeBuffer)
             }
 
             var hasZ = EsriShapeBuffer.HasZs(shapeBuffer.shapeType);
-            IList<IPolygon> polygons = new List<IPolygon>();
-            //IPolygon poly = null;
-            ILinearRing shell = null;
-            IList<ILinearRing> holes = new List<ILinearRing>();
+            IList<Polygon> polygons = new List<Polygon>();
+            //Polygon poly = null;
+            LinearRing shell = null;
+            IList<LinearRing> holes = new List<LinearRing>();
             var offset = 0;
             for (var i = 0; i < multiPartShapeBuffer.NumParts; i++)
             {
@@ -155,7 +149,7 @@ private static IGeometry ToSharpMapMultiPolygon(EsriShapeBuffer shapeBuffer)
                     var index = offset + j;
                     var point = multiPartShapeBuffer.Points[index];
                     vertices.Add(hasZ
-                        ? new Coordinate(point.x, point.y, multiPartShapeBuffer.Zs[index])
+                        ? new CoordinateZ(point.x, point.y, multiPartShapeBuffer.Zs[index])
                         : new Coordinate(point.x, point.y));
                 }
 
@@ -184,7 +178,7 @@ private static IGeometry ToSharpMapMultiPolygon(EsriShapeBuffer shapeBuffer)
             return new MultiPolygon(polygons.ToArray());
         }
 
-        private static IGeometry FromShapeFilePolygon(EsriShapeBuffer shapeBuffer, out Envelope box)
+        private static Geometry FromShapeFilePolygon(EsriShapeBuffer shapeBuffer, out Envelope box)
         {
             box = null;
             if (shapeBuffer == null)
@@ -209,9 +203,9 @@ private static IGeometry FromShapeFilePolygon(EsriShapeBuffer shapeBuffer, out E
                     parts[i] = reader.ReadInt32();
                 parts[numParts] = numPoints;
 
-                //IPolygon poly = null;
-                ILinearRing shell = null;
-                IList<ILinearRing> holes = new List<ILinearRing>();
+                //Polygon poly = null;
+                LinearRing shell = null;
+                IList<LinearRing> holes = new List<LinearRing>();
                 for (var i = 0; i < numParts; i++)
                 {
                     var count = parts[i + 1] - parts[i];
@@ -219,7 +213,7 @@ private static IGeometry FromShapeFilePolygon(EsriShapeBuffer shapeBuffer, out E
                     for (var j = 0; j < count; j++)
                     {
                         var vertex = hasZ
-                                         ? new Coordinate(reader.ReadDouble(), reader.ReadDouble(), double.NaN)
+                                         ? new CoordinateZ(reader.ReadDouble(), reader.ReadDouble(), double.NaN)
                                          : new Coordinate(reader.ReadDouble(), reader.ReadDouble());
                         vertices.Add(vertex);
                         allVertices.Add(vertex);
@@ -255,7 +249,7 @@ private static IGeometry FromShapeFilePolygon(EsriShapeBuffer shapeBuffer, out E
         }
 
 
-        private static IGeometry FromShapeFilePolyLine(EsriShapeBuffer shapeBuffer, out Envelope box)
+        private static Geometry FromShapeFilePolyLine(EsriShapeBuffer shapeBuffer, out Envelope box)
         {
             box = null;
             if (shapeBuffer == null)
@@ -280,7 +274,7 @@ private static IGeometry FromShapeFilePolyLine(EsriShapeBuffer shapeBuffer, out
                     parts[i] = reader.ReadInt32();
                 parts[numParts] = numPoints;
 
-                var lines = new List<ILineString>();
+                var lines = new List<LineString>();
 
                 for (var i = 0; i < numParts; i++)
                 {
@@ -289,7 +283,7 @@ private static IGeometry FromShapeFilePolyLine(EsriShapeBuffer shapeBuffer, out
                     for (var j = 0; j < count; j++)
                     {
                         var vertex = hasZ
-                                         ? new Coordinate(reader.ReadDouble(), reader.ReadDouble(), double.NaN)
+                                         ? new CoordinateZ(reader.ReadDouble(), reader.ReadDouble(), double.NaN)
                                          : new Coordinate(reader.ReadDouble(), reader.ReadDouble());
                         vertices.Add(vertex);
                         allVertices.Add(vertex);
@@ -314,7 +308,7 @@ private static IGeometry FromShapeFilePolyLine(EsriShapeBuffer shapeBuffer, out
             }
         }
 
-        private static IGeometry FromShapeFileMultiPoint(EsriShapeBuffer shapeBuffer, out Envelope box)
+        private static Geometry FromShapeFileMultiPoint(EsriShapeBuffer shapeBuffer, out Envelope box)
         {
             box = null;
             if (shapeBuffer == null)
@@ -332,7 +326,7 @@ private static IGeometry FromShapeFileMultiPoint(EsriShapeBuffer shapeBuffer, ou
 
                 var numPoints = reader.ReadInt32();
 
-                IList<IPoint> points = new List<IPoint>();
+                IList<Point> points = new List<Point>();
 
                 for (var i = 0; i < numPoints; i++)
                 {
@@ -358,7 +352,7 @@ private static IGeometry FromShapeFileMultiPoint(EsriShapeBuffer shapeBuffer, ou
             }
         }
 
-        private static IGeometry FromShapeFilePoint(EsriShapeBuffer shapeBuffer, out Envelope box)
+        private static Geometry FromShapeFilePoint(EsriShapeBuffer shapeBuffer, out Envelope box)
         {
             box = null;
             if (shapeBuffer == null)
@@ -378,7 +372,7 @@ private static IGeometry FromShapeFilePoint(EsriShapeBuffer shapeBuffer, out Env
             }
         }
 
-        private static IGeometry ToSharpMapMultiPoint(EsriShapeBuffer shapeBuffer)
+        private static Geometry ToSharpMapMultiPoint(EsriShapeBuffer shapeBuffer)
         {
             var multiPointShapeBuffer = shapeBuffer as EsriMultiPointShapeBuffer;
             if (multiPointShapeBuffer == null)
@@ -388,7 +382,7 @@ private static IGeometry ToSharpMapMultiPoint(EsriShapeBuffer shapeBuffer)
             }
 
             var hasZ = EsriShapeBuffer.HasZs(multiPointShapeBuffer.shapeType);
-            IList<IPoint> points = new List<IPoint>();
+            IList<Point> points = new List<Point>();
             var offset = 0;
             foreach (var point in multiPointShapeBuffer.Points)
                 points.Add(hasZ
@@ -398,7 +392,7 @@ private static IGeometry ToSharpMapMultiPoint(EsriShapeBuffer shapeBuffer)
             return geometryFactory.CreateMultiPoint(points.ToArray());
         }
 
-        private static IGeometry ToSharpMapPoint(EsriShapeBuffer shapeBuffer)
+        private static Geometry ToSharpMapPoint(EsriShapeBuffer shapeBuffer)
         {
             var pointShapeBuffer = shapeBuffer as EsriPointShapeBuffer;
             if (pointShapeBuffer == null)
@@ -427,4 +421,4 @@ private static Envelope createEnvelope(BinaryReader reader)
 
 
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.FileGdb/FileGdbProvider.cs b/SharpMap.Data.Providers.FileGdb/FileGdbProvider.cs
index 88e367a2..cf099925 100644
--- a/SharpMap.Data.Providers.FileGdb/FileGdbProvider.cs
+++ b/SharpMap.Data.Providers.FileGdb/FileGdbProvider.cs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers.Converter;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -21,9 +23,6 @@
 using System.Data;
 using System.Globalization;
 using System.IO;
-using GeoAPI.Geometries;
-using SharpMap.Data.Providers.Converter;
-
 using EsriGdb = Esri.FileGDB.Geodatabase;
 using EsriTable = Esri.FileGDB.Table;
 
@@ -196,9 +195,9 @@ public int SRID
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns>Features within the specified <see cref="Envelope"/></returns>
-        public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var res = new Collection<IGeometry>();
+            var res = new Collection<Geometry>();
             foreach (var row in _esriTable.Search("*", string.Empty, FileGdbGeometryConverter.ToEsriExtent(bbox), Esri.FileGDB.RowInstance.Recycle))
             {
                 using (var buffer = row.GetGeometry())
@@ -233,7 +232,7 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public IGeometry GetGeometryByID(uint oid)
+        public Geometry GetGeometryByID(uint oid)
         {
             var fdt = CreateTable(_esriTable);
             var where = string.Format(CultureInfo.InvariantCulture, "{0}={1}", fdt.PrimaryKey[0].ColumnName, oid);
@@ -249,7 +248,7 @@ public IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             ExecuteIntersectionQuery(geom.EnvelopeInternal, ds);
         }
diff --git a/SharpMap.Data.Providers.FileGdb/FileGdbProviderTest.cs b/SharpMap.Data.Providers.FileGdb/FileGdbProviderTest.cs
index 3f8b5748..95c918dc 100644
--- a/SharpMap.Data.Providers.FileGdb/FileGdbProviderTest.cs
+++ b/SharpMap.Data.Providers.FileGdb/FileGdbProviderTest.cs
@@ -16,6 +16,8 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 #if DEBUG
 
+using NUnit.Framework;
+using SharpMap.Layers;
 using System;
 //using System.Configuration;
 using System.Data;
@@ -23,8 +25,6 @@
 using System.Drawing.Drawing2D;
 using System.Globalization;
 using System.IO;
-using NUnit.Framework;
-using SharpMap.Layers;
 
 #pragma warning disable 1591
 
@@ -50,10 +50,11 @@ public void TestEnsureNativePathSet()
         */
 
         [Test]
+        [Ignore("Only run if you have the test geodatabase properly configured")]
         public void TestSampleSources()
         {
             var di = new DirectoryInfo(@"D:\GIS\FileGDB\samples\data");
-
+            Assert.IsTrue(di.Exists);
             foreach (var tmp in di.EnumerateDirectories())
             {
                 var p = new FileGdbProvider(tmp.FullName);
@@ -68,7 +69,7 @@ public void TestSampleSources()
         private static readonly Random Rnd = new Random();
         private static Color RandomColor()
         {
-            return Color.FromArgb(Rnd.Next(31,128), Rnd.Next(256), Rnd.Next(256), Rnd.Next(256));
+            return Color.FromArgb(Rnd.Next(31, 128), Rnd.Next(256), Rnd.Next(256), Rnd.Next(256));
         }
 
         private static Brush RandomBrush()
@@ -82,10 +83,12 @@ private static Pen RandomPen()
         }
 
         [Test]
+        [Ignore("Only run if you have the test geodatabase properly configured")]
         public void TestMap()
         {
-            var m = new Map(new Size(1024, 786)) {BackColor = Color.FloralWhite};
+            var m = new Map(new Size(1024, 786)) { BackColor = Color.FloralWhite };
             const string samplePath = @"D:\GIS\FileGDB\samples\data\Topo.gdb";
+            Assert.IsTrue(Directory.Exists(samplePath));
 
             var p = new FileGdbProvider(samplePath);
 
@@ -97,10 +100,10 @@ public void TestMap()
                 Console.WriteLine(fc);
                 var pUse = new FileGdbProvider(samplePath) { Table = fc };
                 var vl = new VectorLayer("Layer:" + fc, pUse)
-                             {
-                                 SmoothingMode = SmoothingMode.HighQuality,
-                                 Style = {Fill = RandomBrush(), Line = RandomPen()}
-                             };
+                {
+                    SmoothingMode = SmoothingMode.HighQuality,
+                    Style = { Fill = RandomBrush(), Line = RandomPen() }
+                };
                 m.Layers.Add(vl);
 
                 var fds = new FeatureDataSet();
@@ -127,12 +130,12 @@ public void TestMap()
             Console.WriteLine();
 
             p.Dispose();
-            
+
 
             m.ZoomToExtents();
             var b = m.GetMap();
             b.Save("fgdb-usa-states.png");
-            
+
             //var fds = new FeatureDataSet();
             //lc.ExecuteIntersectionQuery(m.GetExtents().GetCentroid(), fds);
             //fds.Tables[0].TableName = lc.LayerName;
diff --git a/SharpMap.Data.Providers.FileGdb/SharpMap.Data.Providers.FileGdb.csproj b/SharpMap.Data.Providers.FileGdb/SharpMap.Data.Providers.FileGdb.csproj
index df22f910..34c3aa86 100644
--- a/SharpMap.Data.Providers.FileGdb/SharpMap.Data.Providers.FileGdb.csproj
+++ b/SharpMap.Data.Providers.FileGdb/SharpMap.Data.Providers.FileGdb.csproj
@@ -12,10 +12,6 @@
         <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
-    </ItemGroup>
-
     <ItemGroup Condition=" '$(PlatformTarget)' == 'x86' ">
         <Reference Include="Esri.FileGDBAPI">
             <HintPath>Libraries\bin\Esri.FileGDBAPI.dll</HintPath>
@@ -28,11 +24,15 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <PackageReference Include="NUnit" Version="3.12.0" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Data.Providers.GeoPackage/GeoPackage.cs b/SharpMap.Data.Providers.GeoPackage/GeoPackage.cs
index dd8bcf0d..d88a7166 100644
--- a/SharpMap.Data.Providers.GeoPackage/GeoPackage.cs
+++ b/SharpMap.Data.Providers.GeoPackage/GeoPackage.cs
@@ -1,10 +1,10 @@
+using SharpMap.Data.Providers.Tiles;
+using SharpMap.Layers;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.SQLite;
-using SharpMap.Data.Providers.Tiles;
-using SharpMap.Layers;
-using SharpMap.Styles;
 
 namespace SharpMap.Data.Providers
 {
diff --git a/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgBinaryHeader.cs b/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgBinaryHeader.cs
index d32d76df..6ec7c4a6 100644
--- a/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgBinaryHeader.cs
+++ b/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgBinaryHeader.cs
@@ -1,7 +1,7 @@
+using NetTopologySuite.DataStructures;
+using NetTopologySuite.Geometries;
 using System;
 using System.IO;
-using GeoAPI.DataStructures;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers.Geometry
 {
@@ -15,8 +15,8 @@ internal enum GeoPackageBinaryType : byte
         {
             Standard, Extended
         }
-        
-        private byte[] _magic = new byte[]{ 0x47, 0x50 };
+
+        private byte[] _magic = new byte[] { 0x47, 0x50 };
         private byte _version;
         private byte _flags;
         private int _srs_id;
@@ -151,7 +151,7 @@ internal int NumOrdinates
         /// <summary>
         /// Gets a value indicating that this geometry is empty
         /// </summary>
-        public bool IsEmpty { get { return (_flags & IsEmptyFlag) == IsEmptyFlag; }}
+        public bool IsEmpty { get { return (_flags & IsEmptyFlag) == IsEmptyFlag; } }
 
         /// <summary>
         /// Gets a value indicating that this geometry is empty
@@ -161,12 +161,12 @@ internal int NumOrdinates
         /// <summary>
         /// Gets the magic number
         /// </summary>
-        public byte[] Magic { get { return _magic; }}
+        public byte[] Magic { get { return _magic; } }
 
         /// <summary>
         /// Gets a value indicating the version of the geometry data
         /// </summary>
-        public byte Version { get { return _version; }}
+        public byte Version { get { return _version; } }
 
         /// <summary>
         /// Gets a value indicating the spatial reference id
@@ -179,7 +179,7 @@ public Envelope Extent
             internal set { _extent = value; }
         }
 
-        public Interval ZRange { get { return _zrange; }}
+        public Interval ZRange { get { return _zrange; } }
         public Interval MRange { get { return _mrange; } }
     }
 }
diff --git a/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgStandardBinary.cs b/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgStandardBinary.cs
index e925b3e4..967c035a 100644
--- a/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgStandardBinary.cs
+++ b/SharpMap.Data.Providers.GeoPackage/Geometry/GpkgStandardBinary.cs
@@ -1,7 +1,7 @@
-using System.IO;
-using GeoAPI.DataStructures;
-using GeoAPI.Geometries;
+using NetTopologySuite.DataStructures;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
+using System.IO;
 
 namespace SharpMap.Data.Providers.Geometry
 {
@@ -10,8 +10,8 @@ namespace SharpMap.Data.Providers.Geometry
     /// </summary>
     internal class GpkgStandardBinary
     {
-        private static readonly  Interval _full = Interval.Create(double.MinValue, double.MaxValue);
-        
+        private static readonly Interval _full = Interval.Create(double.MinValue, double.MaxValue);
+
         private WKBReader _wkbReader;
         public GpkgBinaryHeader Header;
         public byte[] WellKnownBytes;
@@ -27,7 +27,7 @@ public static GpkgStandardBinary Read(BinaryReader reader, WKBReader wkbReader)
             var res = new GpkgStandardBinary
             {
                 Header = GpkgBinaryHeader.Read(reader),
-                WellKnownBytes = reader.ReadBytes((int) (reader.BaseStream.Length - reader.BaseStream.Position)),
+                WellKnownBytes = reader.ReadBytes((int)(reader.BaseStream.Length - reader.BaseStream.Position)),
                 _wkbReader = wkbReader
             };
 
@@ -40,13 +40,13 @@ public static GpkgStandardBinary Read(BinaryReader reader, WKBReader wkbReader)
         /// <returns>
         /// The geometry
         /// </returns>
-        internal IGeometry GetGeometry()
+        internal NetTopologySuite.Geometries.Geometry GetGeometry()
         {
             var geom = _wkbReader.Read(WellKnownBytes);
             geom.SRID = Header.SrsId;
             if (Header.MRange != _full)
-                GeoAPIEx.SetExtent(geom as NetTopologySuite.Geometries.Geometry, Header.Extent);
+                NtsExtensions.SetExtent(geom as NetTopologySuite.Geometries.Geometry, Header.Extent);
             return geom;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.GeoPackage/GpkgContent.cs b/SharpMap.Data.Providers.GeoPackage/GpkgContent.cs
index 4b7a3347..2774f74d 100644
--- a/SharpMap.Data.Providers.GeoPackage/GpkgContent.cs
+++ b/SharpMap.Data.Providers.GeoPackage/GpkgContent.cs
@@ -1,9 +1,9 @@
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems;
 using System;
 using System.Data;
 using System.Data.SQLite;
 using System.Diagnostics;
-using ICoordinateSystem = GeoAPI.CoordinateSystems.ICoordinateSystem;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -29,7 +29,7 @@ public enum GpkgOrdinateOption : byte
         /// </summary>
         Optional,
     }
-    
+
     /// <summary>
     /// Class representing the content of a GeoPackage
     /// </summary>
@@ -53,13 +53,13 @@ public class GpkgContent
         public GpkgContent(IDataRecord rdr, string connectionString)
         {
             int index;
-            _tableName = rdr.IsDBNull(index=rdr.GetOrdinal("table_name")) ? string.Empty : rdr.GetString(index);
-            _dataType = rdr.IsDBNull(index=rdr.GetOrdinal("data_type")) ? string.Empty : rdr.GetString(index);
+            _tableName = rdr.IsDBNull(index = rdr.GetOrdinal("table_name")) ? string.Empty : rdr.GetString(index);
+            _dataType = rdr.IsDBNull(index = rdr.GetOrdinal("data_type")) ? string.Empty : rdr.GetString(index);
             _identifier = rdr.IsDBNull(index = rdr.GetOrdinal("identifier")) ? string.Empty : rdr.GetString(index);
             _description = rdr.IsDBNull(index = rdr.GetOrdinal("description")) ? string.Empty : rdr.GetString(index);
             _lastChange = rdr.IsDBNull(index = rdr.GetOrdinal("last_change")) ? DateTime.MinValue : rdr.GetDateTime(index);
             _extent = new Envelope(
-                rdr.GetDouble(rdr.GetOrdinal("min_x")), rdr.GetDouble(rdr.GetOrdinal("max_x")), 
+                rdr.GetDouble(rdr.GetOrdinal("min_x")), rdr.GetDouble(rdr.GetOrdinal("max_x")),
                 rdr.GetDouble(rdr.GetOrdinal("min_y")), rdr.GetDouble(rdr.GetOrdinal("max_y")));
             _srid = rdr.GetInt32(rdr.GetOrdinal("srs_id"));
             _connectionString = connectionString;
@@ -129,14 +129,14 @@ public int SRID
 
         internal int GeometryType { get; private set; }
 
-        private ICoordinateSystem _spatialReference;
+        private CoordinateSystem _spatialReference;
 
-        internal ICoordinateSystem SpatialReference
+        internal CoordinateSystem SpatialReference
         {
             get { return _spatialReference ?? (_spatialReference = GetSpatialRefernce()); }
         }
 
-        private ICoordinateSystem GetSpatialRefernce()
+        private CoordinateSystem GetSpatialRefernce()
         {
             return null;
         }
@@ -195,7 +195,7 @@ private static int GetGeometryType(string geometryTypeName)
 
         internal FeatureDataTable GetBaseTable()
         {
-            const string sqlPragmaTableInfo ="PRAGMA table_info('{0}');";
+            const string sqlPragmaTableInfo = "PRAGMA table_info('{0}');";
 
             const string sqlSelectHasColumnData =
                 "SELECT COUNT(*) FROM \"sqlite_master\" WHERE \"type\"='table' AND \"name\"='gpkg_column_data';";
@@ -206,7 +206,7 @@ internal FeatureDataTable GetBaseTable()
                 "SELECT * FROM \"gpkg_column_constraint\" WHERE \"constraint_name\"=?;";
 
             var fdt = new FeatureDataTable();
-            
+
             // Get the geometry column definition if not previously done
             if (string.IsNullOrEmpty(GeometryColumn))
                 GetGeometryColumnDefinition();
@@ -237,10 +237,10 @@ internal FeatureDataTable GetBaseTable()
                 {
                     // Get the column name
                     var columnName = rdrCI.GetString(1);
-                    
+
                     // We don't want the geometry to appear as an attribute in the feature data table;
                     if (columnName == GeometryColumn) continue;
-                    
+
                     // Set up the column
                     // column name and type
                     var dc = new DataColumn(rdrCI.GetString(1), GpkgUtility.GetTypeForDataTypeString(rdrCI.GetString(2)));
@@ -284,7 +284,7 @@ internal FeatureDataTable GetBaseTable()
 
                     if (rdrCI.GetInt32(5) == 1)
                     {
-                        fdt.PrimaryKey = new[] {dc};
+                        fdt.PrimaryKey = new[] { dc };
                         OidColumn = dc.ColumnName;
                     }
                 }
diff --git a/SharpMap.Data.Providers.GeoPackage/GpkgProvider.cs b/SharpMap.Data.Providers.GeoPackage/GpkgProvider.cs
index 2520bc30..01a235b9 100644
--- a/SharpMap.Data.Providers.GeoPackage/GpkgProvider.cs
+++ b/SharpMap.Data.Providers.GeoPackage/GpkgProvider.cs
@@ -1,17 +1,18 @@
-using System;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers.IO;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.SQLite;
 using System.Text;
-using GeoAPI.Geometries;
-using SharpMap.Data.Providers.IO;
 
 namespace SharpMap.Data.Providers
 {
     [Serializable]
     internal class GpkgProvider : BaseProvider
     {
-        private const string SqlBuildRtreeConstraint = 
+        private const string SqlBuildRtreeConstraint =
             "SELECT 'rtree_' || \"table_name\" || '_' || \"column_name\" FROM \"gpkg_extensions\" WHERE \"table_name\"=? AND \"extension_name\"='gpkg_rtree_index';";
 
         private readonly GpkgContent _content;
@@ -25,11 +26,11 @@ internal class GpkgProvider : BaseProvider
         /// </summary>
         /// <param name="content">The geopackage content</param>
         public GpkgProvider(GpkgContent content)
-            :base(content.SRID)
+            : base(content.SRID)
         {
             _content = content;
             ConnectionID = content.ConnectionString;
-            _reader = new GpkgStandardBinaryReader(GeoAPI.GeometryServiceProvider.Instance);
+            _reader = new GpkgStandardBinaryReader(NtsGeometryServices.Instance);
             _extent = content.Extent;
             _baseTable = content.GetBaseTable();
             _rtreeConstraint = BuildRtreeConstraint(content);
@@ -43,15 +44,15 @@ private string BuildRtreeConstraint(GpkgContent content)
                 var cmd = new SQLiteCommand(SqlBuildRtreeConstraint, cn);
                 cmd.Parameters.AddWithValue(null, content.TableName);
                 var tmp = cmd.ExecuteScalar();
-                if (tmp == null) 
+                if (tmp == null)
                     return string.Empty;
-                rtreeName = (string) tmp;
+                rtreeName = (string)tmp;
             }
 
             var sb = new StringBuilder();
             sb.AppendFormat(" \"{0}\" IN (", _content.OidColumn);
             sb.AppendFormat("SELECT \"id\" FROM \"{0}\" WHERE minX>=? AND maxX<=? AND minY>=? AND maxY<=?)", rtreeName);
-            
+
             return sb.ToString();
         }
 
@@ -100,22 +101,22 @@ private SQLiteDataReader CreateReader(int i, Envelope extent = null, string defi
             {
                 if (!string.IsNullOrEmpty(_rtreeConstraint))
                 {
-                    var addX = extent.Width*0.000012 + Double.Epsilon;
-                    var addY = extent.Height*0.000012 + Double.Epsilon;
+                    var addX = extent.Width * 0.000012 + Double.Epsilon;
+                    var addY = extent.Height * 0.000012 + Double.Epsilon;
                     sql.AppendFormat(" {0} {1}", whereAdded ? "AND" : "WHERE", _rtreeConstraint);
-                    cmd.Parameters.AddWithValue(null, extent.MinX-addX); 
-                    cmd.Parameters.AddWithValue(null, extent.MaxX+addX);
-                    cmd.Parameters.AddWithValue(null, extent.MinY-addY);
-                    cmd.Parameters.AddWithValue(null, extent.MaxY+addY);
+                    cmd.Parameters.AddWithValue(null, extent.MinX - addX);
+                    cmd.Parameters.AddWithValue(null, extent.MaxX + addX);
+                    cmd.Parameters.AddWithValue(null, extent.MinY - addY);
+                    cmd.Parameters.AddWithValue(null, extent.MaxY + addY);
                 }
             }
 
             // Terminate statment
             sql.Append(";");
             cmd.CommandText = sql.ToString();
-            
+
             System.Diagnostics.Debug.WriteLine(
-                string.Format("SQL: '{0}'",cmd.CommandText));
+                string.Format("SQL: '{0}'", cmd.CommandText));
 
             return cmd.ExecuteReader();
         }
@@ -126,20 +127,20 @@ private SQLiteDataReader CreateReader(int i, Envelope extent = null, string defi
         public string DefinitionQuery { get; set; }
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public override Collection<NetTopologySuite.Geometries.Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var res = new Collection<IGeometry>();
+            var res = new Collection<NetTopologySuite.Geometries.Geometry>();
             using (var reader = CreateReader(2, bbox))
             {
                 while (reader.Read())
                 {
                     if (reader.IsDBNull(0)) continue;
 
-                    var gpkg = _reader.Read((byte[]) reader.GetValue(0));
+                    var gpkg = _reader.Read((byte[])reader.GetValue(0));
                     if (gpkg.Header.IsEmpty) continue;
 
                     if (bbox.Intersects(gpkg.Header.Extent))
@@ -154,11 +155,11 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         }
 
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -170,7 +171,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
                 if (rdr.HasRows)
                 {
                     while (rdr.Read())
-                        res.Add((uint) rdr.GetInt64(0));
+                        res.Add((uint)rdr.GetInt64(0));
                 }
             }
             return res;
@@ -181,7 +182,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override NetTopologySuite.Geometries.Geometry GetGeometryByID(uint oid)
         {
             using (var rdr = CreateReader(2, null, string.Format("\"{0}\"={1}", _content.OidColumn, oid)))
             {
@@ -191,8 +192,8 @@ public override IGeometry GetGeometryByID(uint oid)
                     if (rdr.IsDBNull(0))
                         return null;
 
-                    var geom = _reader.Read((byte[]) rdr.GetValue(0));
-                    if (!geom.Header.IsEmpty) 
+                    var geom = _reader.Read((byte[])rdr.GetValue(0));
+                    if (!geom.Header.IsEmpty)
                         return geom.GetGeometry();
                 }
             }
@@ -218,14 +219,14 @@ public override void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                     while (rdr.Read())
                     {
                         if (rdr.IsDBNull(geometryIndex)) continue;
-                        
+
                         var geom = _reader.Read((byte[])rdr.GetValue(geometryIndex));
                         if (geom.Header.IsEmpty) continue;
                         if (!box.Intersects(geom.Header.Extent)) continue;
 
                         var data = new object[geometryIndex];
                         rdr.GetValues(data);
-                        var fdr = (FeatureDataRow) table.LoadDataRow(data, true);
+                        var fdr = (FeatureDataRow)table.LoadDataRow(data, true);
                         fdr.Geometry = geom.GetGeometry();
                     }
                 }
@@ -266,9 +267,9 @@ public override FeatureDataRow GetFeature(uint oid)
                     rdr.GetValues(data);
                     var row = _baseTable.NewRow();
                     row.ItemArray = data;
-                    row.Geometry = rdr.IsDBNull(rdr.FieldCount-1)
-                        ? null 
-                        : _reader.Read((byte[]) rdr.GetValue(rdr.FieldCount - 1)).GetGeometry();
+                    row.Geometry = rdr.IsDBNull(rdr.FieldCount - 1)
+                        ? null
+                        : _reader.Read((byte[])rdr.GetValue(rdr.FieldCount - 1)).GetGeometry();
                     return row;
                 }
             }
@@ -289,7 +290,7 @@ public override Envelope GetExtents()
         /// </summary>
         /// <param name="geom">The geometry to use as filter</param>
         /// <param name="ds">The feature data set to store the results in</param>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(NetTopologySuite.Geometries.Geometry geom, FeatureDataSet ds)
         {
             var prepGeom = NetTopologySuite.Geometries.Prepared.PreparedGeometryFactory.Prepare(geom);
 
@@ -315,7 +316,7 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                         {
                             var data = new object[geometryIndex];
                             rdr.GetValues(data);
-                            var fdr = (FeatureDataRow) table.LoadDataRow(data, true);
+                            var fdr = (FeatureDataRow)table.LoadDataRow(data, true);
                             fdr.Geometry = tmpGeom;
                         }
                     }
@@ -327,4 +328,4 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                 ds.Tables.Add(table);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.GeoPackage/GpkgUtility.cs b/SharpMap.Data.Providers.GeoPackage/GpkgUtility.cs
index c82ba08d..97eeb91b 100644
--- a/SharpMap.Data.Providers.GeoPackage/GpkgUtility.cs
+++ b/SharpMap.Data.Providers.GeoPackage/GpkgUtility.cs
@@ -87,7 +87,7 @@ public static string CreateConnectionString(string filename, string password, bo
         {
             var sb = new StringBuilder(512);
             sb.AppendFormat("DataSource={0};version=3;", filename);
-            
+
             // the pool size
             var poolSize = MaxPoolSize;
             if (poolSize > 1)
@@ -145,9 +145,9 @@ public static void CreateGeoPackage(string filename, string password = null)
             }
         }
 
-        private const string CreateSpatialRefSys = 
+        private const string CreateSpatialRefSys =
             @"CREATE TABLE gpkg_spatial_ref_sys (srs_name TEXT NOT NULL, srs_id INTEGER NOT NULL PRIMARY KEY, organization TEXT NOT NULL, organization_coordsys_id INTEGER NOT NULL, definition  TEXT NOT NULL, description TEXT);";
-        private const string CreateContents = 
+        private const string CreateContents =
             @"CREATE TABLE gpkg_contents (table_name TEXT NOT NULL PRIMARY KEY, data_type TEXT NOT NULL, identifier TEXT UNIQUE, description TEXT DEFAULT '', last_change DATETIME NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ','now')), min_x DOUBLE, min_y DOUBLE, max_x DOUBLE, max_y DOUBLE, srs_id INTEGER, CONSTRAINT fk_gc_r_srs_id FOREIGN KEY (srs_id) REFERENCES gpkg_spatial_ref_sys(srs_id));";
         private const string CreateGeometryColumns =
             @"CREATE TABLE gpkg_geometry_columns (table_name TEXT NOT NULL, column_name TEXT NOT NULL, geometry_type_name TEXT NOT NULL, srs_id INTEGER NOT NULL, z TINYINT NOT NULL, m TINYINT NOT NULL, CONSTRAINT pk_geom_cols PRIMARY KEY (table_name, column_name), CONSTRAINT uk_gc_table_name UNIQUE (table_name), CONSTRAINT fk_gc_tn FOREIGN KEY (table_name) REFERENCES gpkg_contents(table_name), CONSTRAINT fk_gc_srs FOREIGN KEY (srs_id) REFERENCES gpkg_spatial_ref_sys (srs_id));";
@@ -418,11 +418,11 @@ public static Type GetTypeForDataTypeString(string dataTypeString)
             switch (dataTypeString)
             {
                 case "tinyint":
-                    return typeof (byte);
+                    return typeof(byte);
 
                 case "int4":
                 case "smallint":
-                    return typeof (short);
+                    return typeof(short);
 
                 case "integer":
                 case "int":
@@ -431,17 +431,17 @@ public static Type GetTypeForDataTypeString(string dataTypeString)
 
                 case "int8":
                 case "bigint":
-                    return typeof (long);
+                    return typeof(long);
 
                 case "unsigned big int":
-                    return typeof (ulong);
+                    return typeof(ulong);
 
                 case "text":
                 case "clob":
-                    return typeof (string);
+                    return typeof(string);
 
                 case "blob":
-                    return typeof (byte[]);
+                    return typeof(byte[]);
 
                 case "double":
                 case "double precision":
@@ -456,10 +456,10 @@ public static Type GetTypeForDataTypeString(string dataTypeString)
                     return typeof(DateTime);
 
                 case "numeric":
-                    return typeof (decimal);
+                    return typeof(decimal);
 
                 case "boolean":
-                    return typeof (bool);
+                    return typeof(bool);
 
                 default:
                     if (dataTypeString.StartsWith("character(") ||
@@ -469,9 +469,9 @@ public static Type GetTypeForDataTypeString(string dataTypeString)
                         dataTypeString.StartsWith("native character(") ||
                         dataTypeString.StartsWith("nvarchar(")
                         )
-                        return typeof (string);
+                        return typeof(string);
                     if (dataTypeString.StartsWith("decimal("))
-                        return typeof (decimal);
+                        return typeof(decimal);
                     break;
             }
 
diff --git a/SharpMap.Data.Providers.GeoPackage/IO/GpkgStandardBinaryReader.cs b/SharpMap.Data.Providers.GeoPackage/IO/GpkgStandardBinaryReader.cs
index 9ce26fdf..a74e1104 100644
--- a/SharpMap.Data.Providers.GeoPackage/IO/GpkgStandardBinaryReader.cs
+++ b/SharpMap.Data.Providers.GeoPackage/IO/GpkgStandardBinaryReader.cs
@@ -1,22 +1,22 @@
-using System.IO;
-using GeoAPI;
-using GeoAPI.Geometries;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 using SharpMap.Data.Providers.Geometry;
+using System.IO;
 
 namespace SharpMap.Data.Providers.IO
 {
     internal class GpkgStandardBinaryReader
     {
-        
+
         private readonly WKBReader _wkbReader;
 
         internal GpkgStandardBinaryReader()
-            :this(GeometryServiceProvider.Instance)
+            : this(NtsGeometryServices.Instance)
         {
         }
 
-        internal GpkgStandardBinaryReader(IGeometryServices services)
+        internal GpkgStandardBinaryReader(NtsGeometryServices services)
         {
             _wkbReader = new WKBReader(services);
         }
@@ -61,4 +61,4 @@ public bool RepairRings
             set { _wkbReader.RepairRings = value; }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.GeoPackage/SharpMap.Data.Providers.GeoPackage.csproj b/SharpMap.Data.Providers.GeoPackage/SharpMap.Data.Providers.GeoPackage.csproj
index 16a1772a..69440739 100644
--- a/SharpMap.Data.Providers.GeoPackage/SharpMap.Data.Providers.GeoPackage.csproj
+++ b/SharpMap.Data.Providers.GeoPackage/SharpMap.Data.Providers.GeoPackage.csproj
@@ -12,7 +12,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
+      <PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
     </ItemGroup>
 
     <ItemGroup>
@@ -20,4 +20,8 @@
         <ProjectReference Include="..\SharpMap.Layers.BruTile\SharpMap.Layers.BruTile.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSchema.cs b/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSchema.cs
index c5bcae9f..b340486c 100644
--- a/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSchema.cs
+++ b/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSchema.cs
@@ -1,9 +1,9 @@
-using System;
+using BruTile;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
 using System.Diagnostics;
-using BruTile;
 
 namespace SharpMap.Data.Providers.Tiles
 {
@@ -15,7 +15,7 @@ internal class GpkgTileSchema : ITileSchema
         private const string SelectTileMatrix =
             "SELECT * FROM \"gpkg_tile_matrix\" WHERE \"table_name\"=? ORDER by \"zoom_level\";";
 
-        private readonly Dictionary<string, Resolution> _resolutions;
+        private readonly Dictionary<int, Resolution> _resolutions;
 
         private readonly string _name;
 
@@ -26,52 +26,52 @@ public GpkgTileSchema(GpkgContent content)
 
             var tms = GpkgTileMatrixSet.Read(content);
             Format = "image/png";
-            Extent = new Extent(content.Extent.MinX, content.Extent.MinY, 
+            Extent = new Extent(content.Extent.MinX, content.Extent.MinY,
                                 content.Extent.MaxX, content.Extent.MaxY);
             Srs = "EPSG:" + content.SRID;
             _resolutions = tms.ToResolutions();
         }
 
-        public int GetTileWidth(string levelId)
+        public int GetTileWidth(int level)
         {
-            return _resolutions[levelId].TileWidth;
+            return _resolutions[level].TileWidth;
         }
 
-        public int GetTileHeight(string levelId)
+        public int GetTileHeight(int level)
         {
-            return _resolutions[levelId].TileHeight;
+            return _resolutions[level].TileHeight;
         }
 
-        public double GetOriginX(string levelId)
+        public double GetOriginX(int level)
         {
-            return _resolutions[levelId].Left;
+            return _resolutions[level].Left;
         }
 
-        public double GetOriginY(string levelId)
+        public double GetOriginY(int level)
         {
-            return _resolutions[levelId].Top; 
+            return _resolutions[level].Top;
         }
 
-        public long GetMatrixWidth(string levelId)
+        public long GetMatrixWidth(int level)
         {
-            return _resolutions[levelId].MatrixWidth;
+            return _resolutions[level].MatrixWidth;
         }
 
-        public long GetMatrixHeight(string levelId)
+        public long GetMatrixHeight(int level)
         {
-            return _resolutions[levelId].MatrixHeight;
+            return _resolutions[level].MatrixHeight;
         }
 
-        public IEnumerable<TileInfo> GetTileInfos(Extent extent, string levelId)
+        public IEnumerable<TileInfo> GetTileInfos(Extent extent, int level)
         {
             // todo: move this method elsewhere.
-            var range = TileTransform.WorldToTile(extent, levelId, this);
+            var range = TileTransform.WorldToTile(extent, level, this);
 
             // todo: use a method to get tilerange for full schema and intersect with requested tilerange.
-            var startX = Math.Max(range.FirstCol, GetMatrixFirstCol(levelId));
-            var stopX = Math.Min(range.FirstCol + range.ColCount, GetMatrixFirstCol(levelId) + GetMatrixWidth(levelId));
-            var startY = Math.Max(range.FirstRow, GetMatrixFirstRow(levelId));
-            var stopY = Math.Min(range.FirstRow + range.RowCount, GetMatrixFirstRow(levelId) + GetMatrixHeight(levelId));
+            var startX = Math.Max(range.FirstCol, GetMatrixFirstCol(level));
+            var stopX = Math.Min(range.FirstCol + range.ColCount, GetMatrixFirstCol(level) + GetMatrixWidth(level));
+            var startY = Math.Max(range.FirstRow, GetMatrixFirstRow(level));
+            var stopY = Math.Min(range.FirstRow + range.RowCount, GetMatrixFirstRow(level) + GetMatrixHeight(level));
 
             for (var x = startX; x < stopX; x++)
             {
@@ -79,8 +79,8 @@ public IEnumerable<TileInfo> GetTileInfos(Extent extent, string levelId)
                 {
                     yield return new TileInfo
                     {
-                        Extent = TileTransform.TileToWorld(new TileRange(x, y), levelId, this),
-                        Index = new TileIndex(x, y, levelId)
+                        Extent = TileTransform.TileToWorld(new TileRange(x, y), level, this),
+                        Index = new TileIndex(x, y, level)
                     };
                 }
             }
@@ -92,17 +92,17 @@ public IEnumerable<TileInfo> GetTileInfos(Extent extent, double resolution)
             return GetTileInfos(extent, level);
         }
 
-        public Extent GetExtentOfTilesInView(Extent extent, string levelId)
+        public Extent GetExtentOfTilesInView(Extent extent, int level)
         {
-            return TileSchema.GetExtentOfTilesInView(this, extent, levelId);
+            return TileSchema.GetExtentOfTilesInView(this, extent, level);
         }
 
-        public int GetMatrixFirstCol(string levelId)
+        public int GetMatrixFirstCol(int level)
         {
             return 0;
         }
 
-        public int GetMatrixFirstRow(string levelId)
+        public int GetMatrixFirstRow(int level)
         {
             return 0;
         }
@@ -116,7 +116,7 @@ public string Name
 
         public Extent Extent { get; private set; }
 
-        public IDictionary<string, Resolution> Resolutions
+        public IDictionary<int, Resolution> Resolutions
         {
             get { return _resolutions; }
         }
@@ -181,17 +181,17 @@ public GpkgTileMatrixSet(IDataRecord tmsRecord)
 
             public List<GpkgTileMatrix> TileMatrices { get; private set; }
 
-            public Dictionary<string, Resolution> ToResolutions()
+            public Dictionary<int, Resolution> ToResolutions()
             {
-                var res = new Dictionary<string, Resolution>(TileMatrices.Count);
+                var res = new Dictionary<int, Resolution>(TileMatrices.Count);
                 foreach (var tileMatrix in TileMatrices)
                 {
                     var tmp = new Resolution(
-                        tileMatrix.ZoomLevel.ToString(), tileMatrix.PixelXSize,
+                        tileMatrix.ZoomLevel, tileMatrix.PixelXSize,
                         tileMatrix.TileWidth, tileMatrix.TileHeight,
                         MinX, MaxY,
                         tileMatrix.MatrixWidth, tileMatrix.MatrixHeight);
-                    res.Add(tmp.Id, tmp);
+                    res.Add(tmp.Level, tmp);
                 }
                 return res;
             }
diff --git a/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSource.cs b/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSource.cs
index 001a817b..b6ecce7b 100644
--- a/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSource.cs
+++ b/SharpMap.Data.Providers.GeoPackage/Tiles/GpkgTileSource.cs
@@ -1,5 +1,5 @@
-using System.Data.SQLite;
 using BruTile;
+using System.Data.SQLite;
 
 namespace SharpMap.Data.Providers.Tiles
 {
@@ -10,7 +10,7 @@ internal class GpkgTileSource : ITileSource
     {
         private const string SelectTemplate =
             "SELECT \"tile_data\" FROM \"{0}\" WHERE \"zoom_level\"=? AND \"tile_column\"=? AND \"tile_row\"=?;";
-        
+
         private readonly GpkgContent _content;
         private readonly GpkgTileSchema _schema;
         private readonly string _selectSql;
@@ -27,8 +27,8 @@ public byte[] GetTile(TileInfo tileInfo)
             using (var cn = new SQLiteConnection(_content.ConnectionString).OpenAndReturn())
             {
                 var cmd = new SQLiteCommand(_selectSql, cn);
-                cmd.Parameters.AddRange(new object[] { int.Parse(tileInfo.Index.Level), tileInfo.Index.Col, tileInfo.Index.Row });
-                return (byte[]) cmd.ExecuteScalar();
+                cmd.Parameters.AddRange(new object[] { tileInfo.Index.Level, tileInfo.Index.Col, tileInfo.Index.Row });
+                return (byte[])cmd.ExecuteScalar();
             }
         }
 
diff --git a/SharpMap.Data.Providers.Kml/KmlFileFeaturesExporter.cs b/SharpMap.Data.Providers.Kml/KmlFileFeaturesExporter.cs
index 6baf04ad..c52fd0d3 100644
--- a/SharpMap.Data.Providers.Kml/KmlFileFeaturesExporter.cs
+++ b/SharpMap.Data.Providers.Kml/KmlFileFeaturesExporter.cs
@@ -15,6 +15,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpKml.Base;
+using SharpKml.Engine;
+using SharpMap.Rendering.Thematics;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -25,14 +33,6 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
-using SharpKml.Base;
-using SharpKml.Dom;
-using SharpKml.Engine;
-using SharpMap.Rendering.Thematics;
-using SharpMap.Styles;
 using ColorMode = SharpKml.Dom.ColorMode;
 using Point = SharpKml.Dom.Point;
 
@@ -63,7 +63,7 @@ public void ForceDispose()
         #endregion
 
         #region ExportContext
-        
+
         /// <summary>
         /// An export context
         /// </summary>
@@ -118,9 +118,9 @@ public ExportContext(KmlFileFeaturesExporter exporter, IList<string> additionalF
         private int _sequence;
         //private ICoordinateTransformationFactory _coordinateTransformationFactory;
         //private ICoordinateSystemFactory _coordinateSystemFactory;
-        private IGeometryFactory _earthGeometryFactory;
+        private NetTopologySuite.Geometries.GeometryFactory _earthGeometryFactory;
         private int _earthSrid;
-        private ICoordinateSystem _earthCs;
+        private CoordinateSystem _earthCs;
         private readonly List<string> _additionalFiles;
         #endregion
 
@@ -177,9 +177,9 @@ public KmlFileFeaturesExporter(FeatureDataTable featureDataTable)
         public string Snippet { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating a delegate function to get <see cref="StyleSelector"/> for an <see cref="ExportContext"/>.
+        /// Gets or sets a value indicating a delegate function to get <see cref="SharpKml.Dom.StyleSelector"/> for an <see cref="ExportContext"/>.
         /// </summary>
-        public Func<ExportContext, StyleSelector> GetStyle { get; set; }
+        public Func<ExportContext, SharpKml.Dom.StyleSelector> GetStyle { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating a delegate function to get a snippet string for an <see cref="ExportContext"/>
@@ -203,7 +203,7 @@ public int EarthSrid
                 if (_earthSrid != value)
                 {
                     _earthSrid = value;
-                    _earthGeometryFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(value);
+                    _earthGeometryFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(value);
 
                     _earthCs = SharpMap.Session.Instance.CoordinateSystemServices.GetCoordinateSystem(value);
                 }
@@ -285,7 +285,7 @@ public KmlFile ExportToKml()
 
                 if (vectorStyle.Line != null)
                 {
-                    var lineStyle = new LineStyle();
+                    var lineStyle = new SharpKml.Dom.LineStyle();
                     style.Line = lineStyle;
 
                     var color = vectorStyle.Line.Color;
@@ -297,7 +297,7 @@ public KmlFile ExportToKml()
                 var solidColor = ConvertToColor32(vectorStyle.Fill);
                 if (solidColor != null)
                 {
-                    var polygonStyle = new PolygonStyle();
+                    var polygonStyle = new SharpKml.Dom.PolygonStyle();
                     style.Polygon = polygonStyle;
 
                     polygonStyle.Fill = true;
@@ -308,7 +308,7 @@ public KmlFile ExportToKml()
                 {
                     if (vectorStyle.PointSize > 0)
                     {
-                        var iconStyle = new IconStyle();
+                        var iconStyle = new SharpKml.Dom.IconStyle();
 
                         var pointColor = vectorStyle.PointColor != null
                             ? ConvertToColor32(vectorStyle.PointColor) ?? new Color32(255, 0, 0, 0)
@@ -316,7 +316,7 @@ public KmlFile ExportToKml()
 
                         iconStyle.Color = pointColor;
                         iconStyle.ColorMode = ColorMode.Normal;
-                        iconStyle.Icon = new IconStyle.IconLink(Pushpins.ShadedDot);
+                        iconStyle.Icon = new SharpKml.Dom.IconStyle.IconLink(Pushpins.ShadedDot);
                         iconStyle.Scale = vectorStyle.PointSize / 6;
 
                         style.Icon = iconStyle;
@@ -329,9 +329,9 @@ public KmlFile ExportToKml()
 
                     context.AdditionalFiles.Add(additionalFile);
 
-                    var iconStyle = new IconStyle
+                    var iconStyle = new SharpKml.Dom.IconStyle
                     {
-                        Icon = new IconStyle.IconLink(new Uri(context.IsKmz ? Path.GetFileName(additionalFile) : additionalFile, UriKind.Relative)),
+                        Icon = new SharpKml.Dom.IconStyle.IconLink(new Uri(context.IsKmz ? Path.GetFileName(additionalFile) : additionalFile, UriKind.Relative)),
                         Scale = vectorStyle.SymbolScale
                     };
 
@@ -412,7 +412,7 @@ protected int GetNextSequence()
         /// </summary>
         /// <param name="geometry">A geometry</param>
         /// <returns>A geometry in WGS84</returns>
-        protected virtual IGeometry ToTarget(IGeometry geometry)
+        protected virtual Geometry ToTarget(Geometry geometry)
         {
             if (geometry.SRID == EarthSrid || (geometry.SRID <= 0 && CoordinateTransformation == null))
                 return geometry;
@@ -444,7 +444,7 @@ protected void AddAdditionalFile(string file)
         /// <param name="feature">The feature</param>
         /// <param name="style">A style selector</param>
         /// <returns>A KML feature</returns>
-        protected virtual Feature CreateKmlFeature(FeatureDataRow feature, StyleSelector style)
+        protected virtual SharpKml.Dom.Feature CreateKmlFeature(FeatureDataRow feature, SharpKml.Dom.StyleSelector style)
         {
             var geometry = feature.Geometry;
 
@@ -461,7 +461,7 @@ protected virtual Feature CreateKmlFeature(FeatureDataRow feature, StyleSelector
                     }
                 case OgcGeometryType.MultiPoint:
                     {
-                        var multiGeometry = new MultipleGeometry();
+                        var multiGeometry = new SharpKml.Dom.MultipleGeometry();
 
                         foreach (var coordinate in geometry.Coordinates)
                         {
@@ -480,7 +480,7 @@ protected virtual Feature CreateKmlFeature(FeatureDataRow feature, StyleSelector
                     }
                 case OgcGeometryType.Polygon:
                     {
-                        var polygon = (IPolygon)geometry;
+                        var polygon = (Polygon)geometry;
 
                         var kmlPolygon = CreateKmlPolygon(polygon);
 
@@ -488,9 +488,9 @@ protected virtual Feature CreateKmlFeature(FeatureDataRow feature, StyleSelector
                     }
                 case OgcGeometryType.MultiLineString:
                     {
-                        var multiGeometry = new MultipleGeometry();
+                        var multiGeometry = new SharpKml.Dom.MultipleGeometry();
 
-                        var multiLineString = (IMultiLineString)geometry;
+                        var multiLineString = (MultiLineString)geometry;
                         foreach (var innerGeometry in multiLineString.Geometries)
                         {
                             var lineString = CreateLineString(innerGeometry);
@@ -502,10 +502,10 @@ protected virtual Feature CreateKmlFeature(FeatureDataRow feature, StyleSelector
                     }
                 case OgcGeometryType.MultiPolygon:
                     {
-                        var multiGeometry = new MultipleGeometry();
-                        var multiPoly = (IMultiPolygon)geometry;
+                        var multiGeometry = new SharpKml.Dom.MultipleGeometry();
+                        var multiPoly = (MultiPolygon)geometry;
 
-                        foreach (var innerGeometry in multiPoly.Geometries.Cast<IPolygon>())
+                        foreach (var innerGeometry in multiPoly.Geometries.Cast<Polygon>())
                         {
                             var polygon = CreateKmlPolygon(innerGeometry);
 
@@ -540,18 +540,18 @@ protected virtual string CreateDescription(FeatureDataRow feature)
         /// Creates a KML specific root document
         /// </summary>
         /// <returns>A KML root document</returns>
-        protected virtual Document CreateRootDocument()
+        protected virtual SharpKml.Dom.Document CreateRootDocument()
         {
-            var document = new Document { Name = _featureDataTable.TableName, Open = true, Visibility = true };
+            var document = new SharpKml.Dom.Document { Name = _featureDataTable.TableName, Open = true, Visibility = true };
 
             // document's name can't be empty
             if (string.IsNullOrEmpty(document.Name))
                 document.Name = "Document" + Guid.NewGuid();
 
             if (!string.IsNullOrEmpty(Snippet))
-                document.Snippet = new Snippet { MaximumLines = 2, Text = Snippet };
+                document.Snippet = new SharpKml.Dom.Snippet { MaximumLines = 2, Text = Snippet };
 
-            document.Time = new Timestamp { When = DateTime.Now };
+            document.Time = new SharpKml.Dom.Timestamp { When = DateTime.Now };
 
             return document;
         }
@@ -566,13 +566,13 @@ private KmlFile InternalExport()
 
             _additionalFiles.Clear();
 
-            var kml = new Kml();
+            var kml = new SharpKml.Dom.Kml();
 
             var document = CreateRootDocument();
 
             kml.Feature = document;
 
-            var embeddedStyles = new Dictionary<string, StyleSelector>();
+            var embeddedStyles = new Dictionary<string, SharpKml.Dom.StyleSelector>();
 
             foreach (FeatureDataRow featureRow in _featureDataTable.Rows)
             {
@@ -599,7 +599,7 @@ private KmlFile InternalExport()
             return kmlFile;
         }
 
-        private static string GetStyleXml(Element e)
+        private static string GetStyleXml(SharpKml.Dom.Element e)
         {
             var kml = KmlFile.Create(e, true);
             // we must to use NotCloseableMemoryStream because kml.Save pretend to close the stream we provide, but we do not want that.
@@ -620,9 +620,9 @@ private static string GetStyleXml(Element e)
             }
         }
 
-        private LineString CreateLineString(IGeometry geometry)
+        private SharpKml.Dom.LineString CreateLineString(Geometry geometry)
         {
-            var lineString = new LineString { Coordinates = new CoordinateCollection() };
+            var lineString = new SharpKml.Dom.LineString { Coordinates = new SharpKml.Dom.CoordinateCollection() };
 
             foreach (var coordinate in geometry.Coordinates)
             {
@@ -632,12 +632,12 @@ private LineString CreateLineString(IGeometry geometry)
 
             return lineString;
         }
-        private Polygon CreateKmlPolygon(IPolygon polygon)
+        private SharpKml.Dom.Polygon CreateKmlPolygon(Polygon polygon)
         {
-            var kmlPolygon = new Polygon();
-            var ring = new LinearRing { Coordinates = new CoordinateCollection() };
+            var kmlPolygon = new SharpKml.Dom.Polygon();
+            var ring = new SharpKml.Dom.LinearRing { Coordinates = new SharpKml.Dom.CoordinateCollection() };
 
-            kmlPolygon.OuterBoundary = new OuterBoundary { LinearRing = ring };
+            kmlPolygon.OuterBoundary = new SharpKml.Dom.OuterBoundary { LinearRing = ring };
 
             foreach (var coordinate in polygon.ExteriorRing.Coordinates)
             {
@@ -646,10 +646,10 @@ private Polygon CreateKmlPolygon(IPolygon polygon)
 
             foreach (var interiorRing in polygon.InteriorRings)
             {
-                var innerBoundary = new InnerBoundary();
+                var innerBoundary = new SharpKml.Dom.InnerBoundary();
                 kmlPolygon.AddInnerBoundary(innerBoundary);
 
-                ring = new LinearRing { Coordinates = new CoordinateCollection() };
+                ring = new SharpKml.Dom.LinearRing { Coordinates = new SharpKml.Dom.CoordinateCollection() };
 
                 innerBoundary.LinearRing = ring;
 
@@ -693,17 +693,17 @@ private static string SaveImagetoDisk(Image img)
             return null;
         }
 
-        private Placemark WrapPlacemark(Geometry kmlGeometry, StyleSelector style, FeatureDataRow feature)
+        private SharpKml.Dom.Placemark WrapPlacemark(SharpKml.Dom.Geometry kmlGeometry, SharpKml.Dom.StyleSelector style, FeatureDataRow feature)
         {
-            var placemark = new Placemark();
+            var placemark = new SharpKml.Dom.Placemark();
             if (!string.IsNullOrEmpty(NameColumn))
                 placemark.Name = Get(feature, NameColumn);
 
-            placemark.Description = new Description { Text = CreateDescription(feature) };
+            placemark.Description = new SharpKml.Dom.Description { Text = CreateDescription(feature) };
             placemark.Geometry = kmlGeometry;
             if (GetFeatureSnippet != null)
             {
-                placemark.Snippet = new Snippet { Text = GetFeatureSnippet(new ExportContext(this, _additionalFiles, feature)) };
+                placemark.Snippet = new SharpKml.Dom.Snippet { Text = GetFeatureSnippet(new ExportContext(this, _additionalFiles, feature)) };
             }
 
             if (style != null)
diff --git a/SharpMap.Data.Providers.Kml/KmlProvider.cs b/SharpMap.Data.Providers.Kml/KmlProvider.cs
index 3eeea47d..71d8aef5 100644
--- a/SharpMap.Data.Providers.Kml/KmlProvider.cs
+++ b/SharpMap.Data.Providers.Kml/KmlProvider.cs
@@ -15,6 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpKml.Engine;
+using SharpMap.Rendering.Symbolizer;
+using SharpMap.Rendering.Thematics;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -24,17 +29,6 @@
 using System.IO;
 using System.Linq;
 using System.Net;
-using GeoAPI.Geometries;
-using SharpKml.Dom;
-using SharpKml.Engine;
-using SharpMap.Rendering.Symbolizer;
-using SharpMap.Rendering.Thematics;
-using SharpMap.Styles;
-using LinearRing = SharpKml.Dom.LinearRing;
-using LineString = SharpKml.Dom.LineString;
-using Point = SharpKml.Dom.Point;
-using Polygon = SharpKml.Dom.Polygon;
-using Style = SharpKml.Dom.Style;
 
 namespace SharpMap.Data.Providers
 {
@@ -107,7 +101,7 @@ public static KmlProvider FromKmz(string filename, string internalFile = null)
         /// <param name="internalFile">The internal file to read, or null for default kml document</param>
         /// <param name="stylesOnly">True to skip geometries and read styles only</param>
         /// <exception cref="ArgumentNullException"></exception>
-        public static KmlProvider FromKmz(Stream stream,  string internalFile = null, bool stylesOnly = false)
+        public static KmlProvider FromKmz(Stream stream, string internalFile = null, bool stylesOnly = false)
         {
             var kmz = KmzFile.Open(stream);
 
@@ -135,8 +129,8 @@ static KmlProvider()
 
         #region private fields and constants
 
-        private IGeometryFactory _geometryFactory;
-        private Dictionary<Placemark, List<IGeometry>> _geometrys;
+        private GeometryFactory _geometryFactory;
+        private Dictionary<SharpKml.Dom.Placemark, List<Geometry>> _geometrys;
         private Dictionary<string, VectorStyle> _kmlStyles;
         private Dictionary<string, StyleMap> _styleMaps;
         private Dictionary<string, Image> _symbolDict;
@@ -193,7 +187,7 @@ public KmlProvider(KmlFile kmlFile, bool stylesOnly = false, string path = null)
         /// <param name="stylesOnly">True to skip geometries and read styles only</param>
         private void ParseKml(KmlFile kmlFile, bool stylesOnly)
         {
-            var kml = kmlFile.Root as Kml;
+            var kml = kmlFile.Root as SharpKml.Dom.Kml;
             if (kml == null)
             {
                 // for further info refer to https://github.com/samcragg/sharpkml/issues/24 
@@ -201,14 +195,14 @@ private void ParseKml(KmlFile kmlFile, bool stylesOnly)
                     "Kml file is null! Please check that the file conforms to http://www.opengis.net/kml/2.2 standards");
             }
 
-            var doc = kml.Feature as Document;
+            var doc = kml.Feature as SharpKml.Dom.Document;
             if (doc == null)
             {
                 throw new Exception(
                     "Kml file does not have a document node! please check that the file conforms to http://www.opengis.net/kml/2.2 standards");
             }
 
-            _geometryFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4326);
+            _geometryFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4326);
             ConnectionID = doc.Name;
             if (doc.Description != null && !string.IsNullOrEmpty(doc.Description.Text))
                 ConnectionID += " (" + doc.Description.Text + ")";
@@ -217,30 +211,30 @@ private void ParseKml(KmlFile kmlFile, bool stylesOnly)
             ExtractStyleMaps(kml);
 
             if (stylesOnly) return;
-            
+
             ExtractGeometries(kml);
             ValidatePlacemarkStyles(kml);
         }
 
         /// <summary>
-        /// Method called for rendering each feature (KML Placemark)      
+        /// Method called for rendering each feature (KML SharpKml.Dom.Placemark)      
         /// </summary>
         /// <param name="row"></param>
         /// <returns></returns>
         public VectorStyle GetKmlStyle(FeatureDataRow row)
         {
             // get styleID from row
-            var styleId = (string) row["StyleUrl"];
+            var styleId = (string)row["StyleUrl"];
 
-            // get any inline style (overrides) that apply to this Placemark
-            var pm = (Placemark) row["Object"];
-            var styleOverrides = pm.Styles.OfType<Style>().ToList().FirstOrDefault();
+            // get any inline style (overrides) that apply to this SharpKml.Dom.Placemark
+            var pm = (SharpKml.Dom.Placemark)row["Object"];
+            var styleOverrides = pm.Styles.OfType<SharpKml.Dom.Style>().ToList().FirstOrDefault();
 
             if (_kmlStyles.ContainsKey(styleId))
             {
                 return ApplyStyleOverrides(_kmlStyles[styleId], styleOverrides);
             }
-            
+
             if (_styleMaps.ContainsKey(styleId))
             {
                 var sm = _styleMaps[styleId];
@@ -261,7 +255,7 @@ public VectorStyle GetKmlStyle(FeatureDataRow row)
         /// Parse Styles defined at the head of the KML document 
         /// </summary>
         /// <param name="kml"></param>
-        private void ExtractStyles(Element kml)
+        private void ExtractStyles(SharpKml.Dom.Element kml)
         {
             _kmlStyles = new Dictionary<string, VectorStyle>();
 
@@ -270,18 +264,18 @@ private void ExtractStyles(Element kml)
             _symbolDict = new Dictionary<string, Image>();
             _externalFiles = new HashSet<string>();
 
-            foreach (var kmlStyle in kml.Flatten().OfType<Style>())
+            foreach (var kmlStyle in kml.Flatten().OfType<SharpKml.Dom.Style>())
             {
                 if (string.IsNullOrEmpty(kmlStyle.Id))
                     continue;
-                
+
                 if (_kmlStyles.ContainsKey(kmlStyle.Id))
                     continue;
 
-                SetKmlStyleDefaults(kmlStyle);                    
-                
-                var vectorStyle = ApplyStyleOverrides(new VectorStyle(){Enabled =  true}, kmlStyle);
-                
+                SetKmlStyleDefaults(kmlStyle);
+
+                var vectorStyle = ApplyStyleOverrides(new VectorStyle() { Enabled = true }, kmlStyle);
+
                 _kmlStyles.Add(kmlStyle.Id, vectorStyle);
             }
         }
@@ -291,22 +285,22 @@ private void ExtractStyles(Element kml)
         /// both the Normal and Highlight Styles which could include external references 
         /// </summary>
         /// <param name="kml"></param>
-        private void ExtractStyleMaps(Element kml)
+        private void ExtractStyleMaps(SharpKml.Dom.Element kml)
         {
             _styleMaps = new Dictionary<string, StyleMap>();
 
-            foreach (var style in kml.Flatten().OfType<StyleMapCollection>())
+            foreach (var style in kml.Flatten().OfType<SharpKml.Dom.StyleMapCollection>())
             {
-                var styleMap = new StyleMap {Id = style.Id};
+                var styleMap = new StyleMap { Id = style.Id };
                 if (_styleMaps.ContainsKey(styleMap.Id)) continue;
-                    
+
                 style.ToList().ForEach(x =>
                 {
                     if (x.State == null) return;
                     if (x.StyleUrl == null) return;
                     if (!x.StyleUrl.OriginalString.Contains("#")) return;
 
-                    var tokens = x.StyleUrl.OriginalString.Split(new char[]{'#'}, StringSplitOptions.RemoveEmptyEntries);
+                    var tokens = x.StyleUrl.OriginalString.Split(new char[] { '#' }, StringSplitOptions.RemoveEmptyEntries);
                     var styleName = tokens.Last();
 
                     if (tokens.Length == 2)
@@ -314,10 +308,10 @@ private void ExtractStyleMaps(Element kml)
 
                     switch (x.State.Value)
                     {
-                        case StyleState.Normal:
+                        case SharpKml.Dom.StyleState.Normal:
                             styleMap.NormalStyleUrl = styleName;
                             break;
-                        case StyleState.Highlight:
+                        case SharpKml.Dom.StyleState.Highlight:
                             styleMap.HighlightStyleUrl = styleName;
                             break;
                     }
@@ -335,8 +329,8 @@ private void LoadExternalStyle(string styleUrl)
             // style defined in external document at specified relative or absolute location
             if (string.IsNullOrWhiteSpace(styleUrl)) return;
             if (styleUrl.StartsWith("#")) return; // internal style
-            
-            var tokens = styleUrl.Split(new char[]{'#'}, StringSplitOptions.RemoveEmptyEntries);
+
+            var tokens = styleUrl.Split(new char[] { '#' }, StringSplitOptions.RemoveEmptyEntries);
             if (tokens.Length != 2) return;
 
             if (_kmlStyles.ContainsKey(tokens[1])) return;
@@ -380,7 +374,7 @@ private void LoadExternalStyles(Uri url)
                     foreach (var key in prov._kmlStyles.Keys)
                         if (!_kmlStyles.ContainsKey(key))
                             _kmlStyles.Add(key, prov._kmlStyles[key]);
-                    
+
                     foreach (var key in prov._styleMaps.Keys)
                         if (!_styleMaps.ContainsKey(key))
                             _styleMaps.Add(key, prov._styleMaps[key]);
@@ -401,9 +395,9 @@ private void LoadExternalStyles(Uri url)
         /// has already been loaded 
         /// </remarks>
         /// <param name="kml"></param>
-        private void ValidatePlacemarkStyles(Element kml)
+        private void ValidatePlacemarkStyles(SharpKml.Dom.Element kml)
         {
-            foreach (var f in kml.Flatten().OfType<Placemark>())
+            foreach (var f in kml.Flatten().OfType<SharpKml.Dom.Placemark>())
             {
                 if (f.StyleUrl != null && !string.IsNullOrWhiteSpace(f.StyleUrl.OriginalString))
                 {
@@ -414,7 +408,7 @@ private void ValidatePlacemarkStyles(Element kml)
                 else
                 {
                     // Possible inline style: ensure KML default styling values are set  
-                    var kmlStyle = f.Styles.OfType<Style>().ToList().FirstOrDefault();                    
+                    var kmlStyle = f.Styles.OfType<SharpKml.Dom.Style>().ToList().FirstOrDefault();
                     if (kmlStyle != null)
                         SetKmlStyleDefaults(kmlStyle);
                 }
@@ -431,31 +425,31 @@ private class StyleMap
             public string HighlightStyleUrl { get; set; }
         }
 
-        
+
         /// <summary>
         /// Apply PolyStyle, LineStyle, and/or IconStyle elements of a KML Style to the given VectorStyle.
         /// </summary>
         /// <remarks>
         /// As per KML documentation, in cases where a style element is defined both in a
-        /// shared style and in an inline style for a Feature (eg Placemark) the value of
+        /// shared style and in an inline style for a Feature (eg SharpKml.Dom.Placemark) the value of
         /// the Feature's inline style takes precedence over the value for the shared style
         /// </remarks>
         /// <param name="vectorStyle">cloned if kmlStyle is not null</param>
         /// <param name="kmlStyle">Style to apply to existing VectorStyle</param>
-        private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
+        private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, SharpKml.Dom.Style kmlStyle)
         {
             if (kmlStyle == null) return vectorStyle;
 
             if (kmlStyle.Polygon == null && kmlStyle.Line == null && kmlStyle.Icon == null) return vectorStyle;
 
             vectorStyle = vectorStyle.Clone();
-            
+
             if (kmlStyle.Polygon != null)
             {
                 // fill
-                var fill = kmlStyle.Polygon.Fill.GetValueOrDefault(((SolidBrush) vectorStyle.Fill).Color.A > 0);
+                var fill = kmlStyle.Polygon.Fill.GetValueOrDefault(((SolidBrush)vectorStyle.Fill).Color.A > 0);
                 var argb = kmlStyle.Polygon.Color?.Argb ?? ((SolidBrush)vectorStyle.Fill).Color.ToArgb();
-                
+
                 vectorStyle.Fill =
                     fill
                         ? new SolidBrush(Color.FromArgb(argb))
@@ -466,9 +460,9 @@ private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
 
                 var width = kmlStyle.Line?.Width ?? vectorStyle.Outline.Width;
                 argb = kmlStyle.Line?.Color?.Argb ?? vectorStyle.Outline.Color.ToArgb();
-                
+
                 vectorStyle.Outline = vectorStyle.EnableOutline
-                    ? new Pen(Color.FromArgb(argb), (float) width)
+                    ? new Pen(Color.FromArgb(argb), (float)width)
                     : new Pen(Color.Transparent);
             }
 
@@ -476,7 +470,7 @@ private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
             {
                 var width = kmlStyle.Line.Width.GetValueOrDefault(vectorStyle.Line.Width);
                 var argb = kmlStyle.Line.Color?.Argb ?? vectorStyle.Line.Color.ToArgb();
-                vectorStyle.Line = new Pen(Color.FromArgb(argb), (float) width);
+                vectorStyle.Line = new Pen(Color.FromArgb(argb), (float)width);
             }
 
             try
@@ -484,7 +478,7 @@ private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
                 if (kmlStyle.Icon != null)
                 {
                     RasterPointSymbolizer rps = null;
-                    
+
                     if (kmlStyle.Icon.Icon != null && kmlStyle.Icon.Icon.Href != null)
                     {
                         rps = new RasterPointSymbolizer();
@@ -504,8 +498,8 @@ private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
 
                     if (vectorStyle.PointSymbolizer is RasterPointSymbolizer)
                     {
-                        rps =(RasterPointSymbolizer) vectorStyle.PointSymbolizer;
-                        
+                        rps = (RasterPointSymbolizer)vectorStyle.PointSymbolizer;
+
                         var argb = kmlStyle.Icon.Color?.Argb ?? ((SolidBrush)vectorStyle.PointColor).Color.ToArgb();
                         rps.SymbolColor = Color.FromArgb(argb);
                         rps.RemapColor = Color.White;
@@ -525,70 +519,70 @@ private VectorStyle ApplyStyleOverrides(VectorStyle vectorStyle, Style kmlStyle)
         /// Convert KML geometry to NTS geometry     
         /// </summary>
         /// <param name="kml"></param>
-        public void ExtractGeometries(Element kml)
+        public void ExtractGeometries(SharpKml.Dom.Element kml)
         {
-            _geometrys = new Dictionary<Placemark, List<IGeometry>>();
+            _geometrys = new Dictionary<SharpKml.Dom.Placemark, List<Geometry>>();
 
             //todo handle other geom types such as gxTrack and gxMutliTrack
-            foreach (var f in kml.Flatten().OfType<Polygon>())
+            foreach (var f in kml.Flatten().OfType<SharpKml.Dom.Polygon>())
             {
                 ProcessPolygonGeometry(f);
             }
 
-            foreach (var f in kml.Flatten().OfType<LineString>())
+            foreach (var f in kml.Flatten().OfType<SharpKml.Dom.LineString>())
             {
                 ProcessLineStringGeometry(f);
             }
 
-            foreach (var f in kml.Flatten().OfType<Point>())
+            foreach (var f in kml.Flatten().OfType<SharpKml.Dom.Point>())
             {
                 ProcessPointGeometry(f);
             }
 
-//            foreach (var f in kml.Flatten().OfType<LinearRing>())
-//            {
-//                ProcessLinearRingGeometry(f);
-//            }
+            //            foreach (var f in kml.Flatten().OfType<LinearRing>())
+            //            {
+            //                ProcessLinearRingGeometry(f);
+            //            }
 
-            foreach (var f in kml.Flatten().OfType<MultipleGeometry>())
+            foreach (var f in kml.Flatten().OfType<SharpKml.Dom.MultipleGeometry>())
             {
                 ProcessMultipleGeometry(f);
             }
         }
 
-        private void ProcessMultipleGeometry(MultipleGeometry f)
+        private void ProcessMultipleGeometry(SharpKml.Dom.MultipleGeometry f)
         {
             f.Geometry.ToList().ForEach(g =>
             {
-                if (g is Polygon)
+                if (g is SharpKml.Dom.Polygon)
                 {
-                    ProcessPolygonGeometry((Polygon)g);
+                    ProcessPolygonGeometry((SharpKml.Dom.Polygon)g);
                 }
-                if (g is LineString)
+                if (g is SharpKml.Dom.LineString)
                 {
-                    ProcessLineStringGeometry((LineString)g);
+                    ProcessLineStringGeometry((SharpKml.Dom.LineString)g);
                 }
-                if (g is Point)
+                if (g is SharpKml.Dom.Point)
                 {
-                    ProcessPointGeometry((Point)g);
+                    ProcessPointGeometry((SharpKml.Dom.Point)g);
                 }
-//                if (g is LinearRing)
-//                {
-//                    ProcessLinearRingGeometry((LinearRing) g);
-//                }
-                if (g is MultipleGeometry)
+                //                if (g is LinearRing)
+                //                {
+                //                    ProcessLinearRingGeometry((LinearRing) g);
+                //                }
+                if (g is SharpKml.Dom.MultipleGeometry)
                 {
-                    ProcessMultipleGeometry((MultipleGeometry)g);
+                    ProcessMultipleGeometry((SharpKml.Dom.MultipleGeometry)g);
                 }
             });
         }
 
-        private void ProcessPolygonGeometry(Polygon f)
+        private void ProcessPolygonGeometry(SharpKml.Dom.Polygon f)
         {
             var outerRing = _geometryFactory.CreateLinearRing(
                 f.OuterBoundary.LinearRing.Coordinates.Select(crd => new Coordinate(crd.Longitude, crd.Latitude)).ToArray());
 
-            var innerHoles = new List<ILinearRing>();
+            var innerHoles = new List<LinearRing>();
 
             foreach (var hole in f.InnerBoundary)
             {
@@ -597,12 +591,12 @@ private void ProcessPolygonGeometry(Polygon f)
             }
 
             var pGeom = _geometryFactory.CreatePolygon(outerRing, innerHoles.ToArray());
-            AddGeometryToCollection(f.GetParent<Placemark>(), pGeom);
+            AddGeometryToCollection(f.GetParent<SharpKml.Dom.Placemark>(), pGeom);
         }
 
-        private void ProcessLineStringGeometry(LineString f)
+        private void ProcessLineStringGeometry(SharpKml.Dom.LineString f)
         {
-            IGeometry pGeom;
+            Geometry pGeom;
             if (f.Coordinates.Count == 1)
             {
                 var coord = f.Coordinates.First();
@@ -615,33 +609,33 @@ private void ProcessLineStringGeometry(LineString f)
                 pGeom = _geometryFactory.CreateLineString(
                         f.Coordinates.Select(crd => new Coordinate(crd.Longitude, crd.Latitude)).ToArray());
             }
-            AddGeometryToCollection(f.GetParent<Placemark>(), pGeom);
+            AddGeometryToCollection(f.GetParent<SharpKml.Dom.Placemark>(), pGeom);
         }
 
-        private void ProcessPointGeometry(Point f)
+        private void ProcessPointGeometry(SharpKml.Dom.Point f)
         {
             var coords = new Coordinate(f.Coordinate.Longitude, f.Coordinate.Latitude);
 
             var pGeom = _geometryFactory.CreatePoint(coords);
-            AddGeometryToCollection(f.GetParent<Placemark>(), pGeom);
+            AddGeometryToCollection(f.GetParent<SharpKml.Dom.Placemark>(), pGeom);
         }
 
         [Obsolete("ProcessPolygonGeometry correctly handles exterior and interior LinearRings")]
-        private void ProcessLinearRingGeometry(LinearRing f)
+        private void ProcessLinearRingGeometry(SharpKml.Dom.LinearRing f)
         {
             var ring = _geometryFactory.CreateLinearRing(
                     f.Coordinates.Select(crd => new Coordinate(crd.Longitude, crd.Latitude)).ToArray());
 
-            var geom = RingsArePolygons ? (IGeometry)_geometryFactory.CreatePolygon(ring) : ring;
-            AddGeometryToCollection(f.GetParent<Placemark>(), geom);
+            var geom = RingsArePolygons ? (Geometry)_geometryFactory.CreatePolygon(ring) : ring;
+            AddGeometryToCollection(f.GetParent<SharpKml.Dom.Placemark>(), geom);
         }
 
-        private void AddGeometryToCollection(Placemark parent, IGeometry geom)
+        private void AddGeometryToCollection(SharpKml.Dom.Placemark parent, Geometry geom)
         {
-            List<IGeometry> placeMarkGeoms;
+            List<Geometry> placeMarkGeoms;
             if (_geometrys.TryGetValue(parent, out placeMarkGeoms) == false)
             {
-                placeMarkGeoms = new List<IGeometry>();
+                placeMarkGeoms = new List<Geometry>();
                 _geometrys.Add(parent, placeMarkGeoms);
             }
 
@@ -654,14 +648,14 @@ void IDisposable.Dispose()
         }
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
             var box = _geometryFactory.ToGeometry(bbox);
-            var retCollection = new Collection<IGeometry>();
+            var retCollection = new Collection<Geometry>();
 
             foreach (var geometryList in _geometrys.Values)
             {
@@ -673,11 +667,11 @@ public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         }
 
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -687,7 +681,7 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
             var res = new Collection<uint>();
 
             uint id = 0;
-            
+
             _geometrys.Where(x => box.Intersects(_geometryFactory.BuildGeometry(x.Value))).ToList().ForEach(x =>
             {
                 res.Add(id);
@@ -701,11 +695,11 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public IGeometry GetGeometryByID(uint oid)
+        public Geometry GetGeometryByID(uint oid)
         {
             var sid = oid.ToString(NumberFormatInfo.InvariantInfo);
             var tmp = _geometrys.FirstOrDefault(x => x.Key.Id == sid);
-            
+
             return tmp.Value != null ?
                 _geometryFactory.BuildGeometry(tmp.Value) : null;
         }
@@ -715,7 +709,7 @@ public IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             var fdt = (FeatureDataTable)_schemaTable.Copy();
 
@@ -737,7 +731,7 @@ public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
                 feature.Value.Where(pGeom.Intersects).ToList()
                     .ForEach(v =>
                     {
-                        var newRow = (FeatureDataRow) fdt.LoadDataRow(GetAssetProperties(feature.Key), true);
+                        var newRow = (FeatureDataRow)fdt.LoadDataRow(GetAssetProperties(feature.Key), true);
                         newRow.Geometry = v;
                     }
                     );
@@ -778,7 +772,7 @@ public FeatureDataRow GetFeature(uint oid)
 
             if (tmp.Value != null)
             {
-                var res = (FeatureDataRow) _schemaTable.NewRow();
+                var res = (FeatureDataRow)_schemaTable.NewRow();
                 res.ItemArray = GetAssetProperties(tmp.Key);
                 res.Geometry = _geometryFactory.BuildGeometry(tmp.Value);
                 res.AcceptChanges();
@@ -833,7 +827,7 @@ public void Close()
         /// <summary>
         /// The spatial reference ID (CRS)
         /// </summary>
-        public int SRID { get { return 4326; } set { }}
+        public int SRID { get { return 4326; } set { } }
 
         #region private helper methods
 
@@ -848,18 +842,18 @@ private static void AddColumnsToFeatureDataTable(FeatureDataTable fdt)
                 fdt.Columns.Add("StyleUrl", typeof(string));
 
             if (!fdt.Columns.Contains("Object"))
-                fdt.Columns.Add("Object", typeof(Placemark));
+                fdt.Columns.Add("Object", typeof(SharpKml.Dom.Placemark));
         }
 
-        private static object[] GetAssetProperties(Feature f)
+        private static object[] GetAssetProperties(SharpKml.Dom.Feature f)
         {
-            var styleUrl = ""; 
+            var styleUrl = "";
             if (f.StyleUrl != null)
             {
-                var tokens = f.StyleUrl.ToString().Split(new char[]{'#'}, StringSplitOptions.RemoveEmptyEntries);
+                var tokens = f.StyleUrl.ToString().Split(new char[] { '#' }, StringSplitOptions.RemoveEmptyEntries);
                 if (tokens.Length > 0) styleUrl = tokens.Last();
             }
-           
+
             return new object[]
             {
                 f.Id,
@@ -877,26 +871,26 @@ private static object[] GetAssetProperties(Feature f)
         /// in internal dictionary, thus simplifying subsequent VectorStyle generation. 
         /// </remarks>
         /// <param name="style">The Style to check defaults</param>
-        private static void SetKmlStyleDefaults(Style style)
+        private static void SetKmlStyleDefaults(SharpKml.Dom.Style style)
         {
             if (style.Polygon != null)
             {
-                style.Polygon.Fill = style.Polygon.Fill.GetValueOrDefault(PolygonStyle.DefaultFill);
-                style.Polygon.Outline = style.Polygon.Outline.GetValueOrDefault(PolygonStyle.DefaultOutline);
-                style.Polygon.Color = style.Polygon.Color.GetValueOrDefault(ColorStyle.DefaultColor);
+                style.Polygon.Fill = style.Polygon.Fill.GetValueOrDefault(SharpKml.Dom.PolygonStyle.DefaultFill);
+                style.Polygon.Outline = style.Polygon.Outline.GetValueOrDefault(SharpKml.Dom.PolygonStyle.DefaultOutline);
+                style.Polygon.Color = style.Polygon.Color.GetValueOrDefault(SharpKml.Dom.ColorStyle.DefaultColor);
             }
-            
+
             if (style.Line != null)
             {
-                style.Line.Width = style.Line.Width.GetValueOrDefault(LineStyle.DefaultWidth);
-                style.Line.Color = style.Line.Color.GetValueOrDefault(ColorStyle.DefaultColor);
+                style.Line.Width = style.Line.Width.GetValueOrDefault(SharpKml.Dom.LineStyle.DefaultWidth);
+                style.Line.Color = style.Line.Color.GetValueOrDefault(SharpKml.Dom.ColorStyle.DefaultColor);
             }
 
             if (style.Icon != null)
             {
-                if (style.Icon.Icon == null) style.Icon.Icon = new IconStyle.IconLink(Pushpins.YellowPushpin); 
-                style.Icon.Scale = style.Icon.Scale.GetValueOrDefault(IconStyle.DefaultScale);
-                style.Icon.Color = style.Icon.Color.GetValueOrDefault(ColorStyle.DefaultColor);
+                if (style.Icon.Icon == null) style.Icon.Icon = new SharpKml.Dom.IconStyle.IconLink(Pushpins.YellowPushpin);
+                style.Icon.Scale = style.Icon.Scale.GetValueOrDefault(SharpKml.Dom.IconStyle.DefaultScale);
+                style.Icon.Color = style.Icon.Color.GetValueOrDefault(SharpKml.Dom.ColorStyle.DefaultColor);
                 style.Icon.Heading = style.Icon.Heading.GetValueOrDefault(0);
             }
         }
@@ -907,8 +901,8 @@ private static VectorStyle DefaultPointStyle()
             vectorStyle.Enabled = true;
             try
             {
-                var defaultIcon = GetImageFromUrl(Pushpins.RedPushpin); 
-                vectorStyle.PointSymbolizer = new RasterPointSymbolizer {Symbol = defaultIcon, Scale = 1f};
+                var defaultIcon = GetImageFromUrl(Pushpins.RedPushpin);
+                vectorStyle.PointSymbolizer = new RasterPointSymbolizer { Symbol = defaultIcon, Scale = 1f };
             }
             catch (Exception ex)
             {
diff --git a/SharpMap.Data.Providers.Kml/SharpMap.Data.Providers.Kml.csproj b/SharpMap.Data.Providers.Kml/SharpMap.Data.Providers.Kml.csproj
index e3548999..b8c87ce7 100644
--- a/SharpMap.Data.Providers.Kml/SharpMap.Data.Providers.Kml.csproj
+++ b/SharpMap.Data.Providers.Kml/SharpMap.Data.Providers.Kml.csproj
@@ -12,11 +12,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SharpKml.Core" Version="5.1.0" />
+      <PackageReference Include="SharpKml.Core" Version="5.2.0" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/OracleCustomTypeBase.cs b/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/OracleCustomTypeBase.cs
index d6901d4b..b44fb86f 100644
--- a/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/OracleCustomTypeBase.cs
+++ b/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/OracleCustomTypeBase.cs
@@ -1,11 +1,11 @@
-using System;
-using Oracle.DataAccess.Types;
 using Oracle.DataAccess.Client;
+using Oracle.DataAccess.Types;
+using System;
 
 #pragma warning disable 1591
 
 namespace SharpMap.Data.Providers.OracleUDT
-{   
+{
     [Serializable]
     public abstract class OracleCustomTypeBase<T> : INullable, IOracleCustomType, IOracleCustomTypeFactory
     where T : OracleCustomTypeBase<T>, new()
diff --git a/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/sdogeometry.cs b/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/sdogeometry.cs
index 70cc46fd..e37e760c 100644
--- a/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/sdogeometry.cs
+++ b/SharpMap.Data.Providers.OracleSpatial/Oracle.UDT/sdogeometry.cs
@@ -1,7 +1,5 @@
-using System.ComponentModel.Design;
-using System.Linq;
-using GeoAPI;
-using GeoAPI.Geometries;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using Oracle.DataAccess.Types;
 using System;
 using System.Collections.Generic;
@@ -20,14 +18,14 @@ public static class SdoGeometryTypes
         /// Point//Line//Polygon//exterior counterclockwise - polygon ring = 1003//interior clockwise  polygon ring = 2003
         /// </summary>
         public enum EtypeSimple { Point = 1, Line = 2, Polygon = 3, PolygonExterior = 1003, PolygonInterior = 2003 }
-       
+
         /// <summary>
         ///  Oracle Documentation for SDO_ETYPE - COMPOUND
         /// 1005: exterior polygon ring (must be specified in counterclockwise order)
         /// 2005: interior polygon ring (must be specified in clockwise order)
         /// </summary>
         public enum EtypeCompound { FourDigit = 4, PolygonExterior = 1005, PolygonInterior = 2005 }
-        
+
         /// <summary>
         /// Oracle Documentation for SDO_GTYPE.
         /// This represents the last two digits in a GTYPE, where the first item is dimension(ality) and the second is LRS
@@ -46,7 +44,7 @@ private enum OracleObjectColumns { SDO_GTYPE, SDO_SRID, SDO_POINT, SDO_ELEM_INFO
         public decimal? SdoGtype
         {
             get { return _sdoGtype; }
-            set { _sdoGtype = value;}
+            set { _sdoGtype = value; }
         }
         public int SdoGtypeAsInt
         {
@@ -223,29 +221,29 @@ public int PropertiesToGtype()
         }
 
         /// <summary>
-        /// Get geometry as GeoAPI IGeometry
+        /// Get geometry as NetTopologySuite Geometry
         /// </summary>
         /// <returns></returns>
-        public IGeometry AsGeometry()
+        public Geometry AsGeometry()
         {
             if (!SdoGtype.HasValue)
                 return null;
 
             int dimension = SdoGtypeAsInt / 1000;
-            int gType = SdoGtypeAsInt%100;
+            int gType = SdoGtypeAsInt % 100;
 
-            if (gType == (int) SdoGeometryTypes.EtypeSimple.Point && SdoPoint != null)
+            if (gType == (int)SdoGeometryTypes.EtypeSimple.Point && SdoPoint != null)
             {
                 return
-                    GeometryServiceProvider.Instance.CreateGeometryFactory()
+                    NtsGeometryServices.Instance.CreateGeometryFactory()
                         .CreatePoint(new Coordinate(Convert.ToDouble(SdoPoint.X), Convert.ToDouble(SdoPoint.Y)));
             }
-            
+
             if (_ordinatesArray != null)
             {
                 var coords = new List<Coordinate>();
 
-                
+
 
                 for (int i = 0; i < _ordinatesArray.Length; i += dimension)
                 {
@@ -255,7 +253,7 @@ public IGeometry AsGeometry()
 
                 if (_elemArray[1] == 2) //Line
                 {
-                    return GeometryServiceProvider.Instance.CreateGeometryFactory().CreateLineString(coords.ToArray());
+                    return NtsGeometryServices.Instance.CreateGeometryFactory().CreateLineString(coords.ToArray());
                 }
 
                 if (_elemArray[1] == 1003)
@@ -263,10 +261,10 @@ public IGeometry AsGeometry()
                     if (_elemArray[2] == 1)
                     {
                         //Check that the polygon is self-enclosing, else fix
-                        var seq = GeometryServiceProvider.Instance.DefaultCoordinateSequenceFactory.Create(coords.ToArray());
-                        
+                        var seq = NtsGeometryServices.Instance.DefaultCoordinateSequenceFactory.Create(coords.ToArray());
+
                         coords.EnsureValidRing();
-                        return GeometryServiceProvider.Instance.CreateGeometryFactory().CreatePolygon(seq);
+                        return NtsGeometryServices.Instance.CreateGeometryFactory().CreatePolygon(seq);
                     }
 
                     if (_elemArray[2] == 3)
@@ -276,7 +274,7 @@ public IGeometry AsGeometry()
                         coords.Add(coords[0]);
                         coords.Insert(1, new Coordinate(coords[0].X, coords[1].Y));
 
-                        return GeometryServiceProvider.Instance.CreateGeometryFactory().CreatePolygon(coords.ToArray());
+                        return NtsGeometryServices.Instance.CreateGeometryFactory().CreatePolygon(coords.ToArray());
                     }
                 }
             }
@@ -306,7 +304,7 @@ public string AsText
                                                     SdoPoint.Y,
                                                     (SdoPoint.Z == null) ? null : ",",
                                                     SdoPoint.Z);
-                    
+
                     sb.Append(tmp.Trim());
                     sb.Append(")");
                 }
@@ -359,4 +357,4 @@ public override string ToString()
             return AsText;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.OracleSpatial/OracleSpatial.cs b/SharpMap.Data.Providers.OracleSpatial/OracleSpatial.cs
index 0f1c3cb9..c5a879f2 100644
--- a/SharpMap.Data.Providers.OracleSpatial/OracleSpatial.cs
+++ b/SharpMap.Data.Providers.OracleSpatial/OracleSpatial.cs
@@ -18,14 +18,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using Oracle.DataAccess.Client;
 using SharpMap.Data.Providers.OracleUDT;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Globalization;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -370,7 +370,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                     {
                         var fdt = new FeatureDataTable(sourceDataset.Tables[0]);
                         foreach (DataColumn col in sourceDataset.Tables[0].Columns)
-                            if (string.Compare(col.ColumnName, GeometryColumn,CultureInfo.InvariantCulture, CompareOptions.OrdinalIgnoreCase) != 0)
+                            if (string.Compare(col.ColumnName, GeometryColumn, CultureInfo.InvariantCulture, CompareOptions.OrdinalIgnoreCase) != 0)
                                 fdt.Columns.Add(col.ColumnName, col.DataType, col.Expression);
 
                         if (sourceDataset.Tables[0].Rows.Count > 0)
@@ -549,7 +549,7 @@ public void GetFeaturesInView(Envelope bbox, FeatureDataSet ds)
     /// </example>
     /// </remarks>
     [Serializable]
-    public class OracleSpatial<TOid>  : BaseProvider<TOid> where TOid:IComparable<TOid>
+    public class OracleSpatial<TOid> : BaseProvider<TOid> where TOid : IComparable<TOid>
     {
         private string _definitionQuery;
         private string _geometryColumn;
@@ -1019,4 +1019,4 @@ public void GetFeaturesInView(Envelope bbox, FeatureDataSet ds)
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Data.Providers.OracleSpatial/SharpMap.Data.Providers.OracleSpatial.csproj b/SharpMap.Data.Providers.OracleSpatial/SharpMap.Data.Providers.OracleSpatial.csproj
index f80c4f96..b0b198ab 100644
--- a/SharpMap.Data.Providers.OracleSpatial/SharpMap.Data.Providers.OracleSpatial.csproj
+++ b/SharpMap.Data.Providers.OracleSpatial/SharpMap.Data.Providers.OracleSpatial.csproj
@@ -21,12 +21,18 @@
         <PackageReference Include="odp.net.x64" Version="112.3.20" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Compile Remove="Properties\**" />
+      <EmbeddedResource Remove="Properties\**" />
+      <None Remove="Properties\**" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-      <Folder Include="Properties\" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/SharpMap.Extensions/Data/FwToolsHelper.cs b/SharpMap.Extensions/Data/FwToolsHelper.cs
index 57648cdc..caa48500 100644
--- a/SharpMap.Extensions/Data/FwToolsHelper.cs
+++ b/SharpMap.Extensions/Data/FwToolsHelper.cs
@@ -18,8 +18,6 @@
 #pragma warning disable 1591
 
 using System;
-using System.Configuration;
-using System.IO;
 
 namespace SharpMap.Extensions.Data
 {
diff --git a/SharpMap.Extensions/Data/Providers/DataTablePoint.cs b/SharpMap.Extensions/Data/Providers/DataTablePoint.cs
index 9ed63570..9095d43a 100644
--- a/SharpMap.Extensions/Data/Providers/DataTablePoint.cs
+++ b/SharpMap.Extensions/Data/Providers/DataTablePoint.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
-using GeoAPI.Geometries;
-using Geometry = GeoAPI.Geometries.IGeometry;
-using BoundingBox = GeoAPI.Geometries.Envelope;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -94,13 +94,13 @@ private static FeatureDataTable CreateFeatureDataTable(DataTable table)
                 resc.Caption = c.Caption;
                 resc.ColumnMapping = c.ColumnMapping;
                 resc.Expression = c.Expression;
-                
+
                 res.Columns.Add(resc);
             }
             return res;
         }
 
-        
+
 
         /// <summary>
         /// Name of column that contains X coordinate
@@ -162,10 +162,10 @@ protected FeatureDataTable FeatureDataTable
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
             DataRow[] drow;
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
 
             if (Table.Rows.Count == 0)
             {
@@ -181,7 +181,7 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
 
             foreach (DataRow dr in drow)
             {
-                features.Add(Factory.CreatePoint(new Coordinate((double) dr[XColumn], (double) dr[YColumn])));
+                features.Add(Factory.CreatePoint(new Coordinate((double)dr[XColumn], (double)dr[YColumn])));
             }
 
             return features;
@@ -238,7 +238,7 @@ public override Geometry GetGeometryByID(uint oid)
 
             foreach (DataRow dr in rows)
             {
-                geom = Factory.CreatePoint(new Coordinate((double) dr[XColumn], (double) dr[YColumn]));
+                geom = Factory.CreatePoint(new Coordinate((double)dr[XColumn], (double)dr[YColumn]));
             }
 
             return geom;
@@ -276,7 +276,7 @@ public override void ExecuteIntersectionQuery(BoundingBox bbox, FeatureDataSet d
             {
                 fdt.ImportRow(dr);
                 FeatureDataRow fdr = fdt.Rows[fdt.Rows.Count - 1] as FeatureDataRow;
-                fdr.Geometry = Factory.CreatePoint(new Coordinate((double) dr[XColumn], (double) dr[YColumn]));
+                fdr.Geometry = Factory.CreatePoint(new Coordinate((double)dr[XColumn], (double)dr[YColumn]));
             }
 
             ds.Tables.Add(fdt);
@@ -306,7 +306,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                 throw new InvalidOperationException("Primary key not set to object id column");
 
             var row = _table.Rows.Find(rowId);
-        
+
             if (row == null) return null;
 
             var fdr = FeatureDataTable.NewRow();
@@ -321,11 +321,11 @@ public override FeatureDataRow GetFeature(uint rowId)
         /// </summary>
         /// <param name="row">The data row</param>
         /// <returns>A geometry</returns>
-        protected virtual IGeometry CreateGeometry(DataRow row)
+        protected virtual Geometry CreateGeometry(DataRow row)
         {
             return Factory.CreatePoint(
                 new Coordinate(
-                    Convert.ToDouble(row[XColumn]), 
+                    Convert.ToDouble(row[XColumn]),
                     Convert.ToDouble(row[YColumn])));
         }
 
@@ -353,10 +353,10 @@ public override BoundingBox GetExtents()
 
             foreach (DataRowView dr in Table.DefaultView)
             {
-                if (minX > (double) dr[XColumn]) minX = (double) dr[XColumn];
-                if (maxX < (double) dr[XColumn]) maxX = (double) dr[XColumn];
-                if (minY > (double) dr[YColumn]) minY = (double) dr[YColumn];
-                if (maxY < (double) dr[YColumn]) maxY = (double) dr[YColumn];
+                if (minX > (double)dr[XColumn]) minX = (double)dr[XColumn];
+                if (maxX < (double)dr[XColumn]) maxX = (double)dr[XColumn];
+                if (minY > (double)dr[YColumn]) minY = (double)dr[YColumn];
+                if (maxY < (double)dr[YColumn]) maxY = (double)dr[YColumn];
             }
 
             box = new BoundingBox(minX, maxX, minY, maxY);
diff --git a/SharpMap.Extensions/Data/Providers/ManagedSpatiaLite.cs b/SharpMap.Extensions/Data/Providers/ManagedSpatiaLite.cs
index a81233f2..3dcb4fc7 100644
--- a/SharpMap.Extensions/Data/Providers/ManagedSpatiaLite.cs
+++ b/SharpMap.Extensions/Data/Providers/ManagedSpatiaLite.cs
@@ -15,15 +15,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.Common;
-using System.Globalization;
-using GeoAPI.Geometries;
-using NetTopologySuite.IO;
-using Common.Logging;
 using System.Data.SQLite;
+using System.Globalization;
 
 namespace SharpMap.Data.Providers
 {
@@ -90,7 +90,7 @@ public ManagedSpatiaLite(string connectionStr, string tablename, string geometry
                                 dr.Read();
                                 SRID = dr.GetInt32(0);
 
-                                var coordDim = dr.GetFieldType(1) == typeof (long)
+                                var coordDim = dr.GetFieldType(1) == typeof(long)
                                     ? dr.GetInt64(1).ToString(NumberFormatInfo.InvariantInfo)
                                     : dr.GetString(1);
 
@@ -187,7 +187,7 @@ private void GetNonSpatialColumns()
         /// <summary>
         /// Gets or sets the extent for this data source
         /// </summary>
-        public Envelope CachedExtent 
+        public Envelope CachedExtent
         {
             get
             {
@@ -267,7 +267,7 @@ public string ObjectIdColumn
         public bool UseSpatiaLiteIndex
         {
             get { return _useSpatialIndex && _spatiaLiteIndex != SpatiaLiteIndex.None; }
-            set 
+            set
             {
                 if (_spatiaLiteIndex != SpatiaLiteIndex.None)
                     _useSpatialIndex = value;
@@ -285,7 +285,7 @@ public string SpatialIndex
             {
                 return _spatiaLiteIndex.ToString();
             }
-            set 
+            set
             {
                 Logger.Debug("SpatialIndex is obsolete, use UseSpatiaLiteIndex property");
             }
@@ -305,9 +305,9 @@ public string DefinitionQuery
         }
 
         /// <inheritdoc cref="IBaseProvider.GetGeometriesInView"/>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = GetConnection(ConnectionString))
             {
                 var strSql = "SELECT \"" + GeometryColumn + "\" AS \"_smtmp_\" ";
@@ -408,9 +408,9 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         }
 
         /// <inheritdoc cref="IProvider{T}.GetGeometryByID"/>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             var reader = new GaiaGeoReader(Factory.CoordinateSequenceFactory, Factory.PrecisionModel, _ordinates);
             using (var conn = GetConnection(ConnectionString))
             {
@@ -424,7 +424,7 @@ public override IGeometry GetGeometryByID(uint oid)
                         {
                             if (!dr.IsDBNull(0))
                             {
-                                geom = reader.Read((byte[]) dr[0]);
+                                geom = reader.Read((byte[])dr[0]);
                             }
                         }
                         dr.Close();
@@ -436,7 +436,7 @@ public override IGeometry GetGeometryByID(uint oid)
         }
 
         /// <inheritdoc cref="BaseProvider.OnExecuteIntersectionQuery"/>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             var prepGeom = NetTopologySuite.Geometries.Prepared.PreparedGeometryFactory.Prepare(geom);
             GetNonSpatialColumns();
@@ -466,9 +466,9 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                         fdt.BeginLoadData();
                         while (reader.Read())
                         {
-                            IGeometry g = null;
+                            Geometry g = null;
                             if (!reader.IsDBNull(geomIndex))
-                                g = geoReader.Read((byte[]) reader.GetValue(geomIndex));
+                                g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
                             //No geometry, no feature!
                             if (g == null)
@@ -481,8 +481,8 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                             //Get all the attribute data
                             var count = reader.GetValues(dataTransfer);
                             System.Diagnostics.Debug.Assert(count == dataTransfer.Length);
-                            
-                            var fdr = (FeatureDataRow) fdt.LoadDataRow(dataTransfer, true);
+
+                            var fdr = (FeatureDataRow)fdt.LoadDataRow(dataTransfer, true);
                             fdr.Geometry = g;
                         }
                         reader.Close();
@@ -495,7 +495,7 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
 
         private FeatureDataTable CreateTableFromReader(DbDataReader reader, int geomIndex)
         {
-            var res = new FeatureDataTable {TableName = Table};
+            var res = new FeatureDataTable { TableName = Table };
             for (var c = 0; c < geomIndex; c++)
             {
                 var fieldType = reader.GetFieldType(c);
@@ -530,7 +530,7 @@ public override void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                 // Attribute constraint
                 if (!String.IsNullOrEmpty(_definitionQuery))
                     strSql += DefinitionQuery + " AND ";
-                
+
                 // Spatial constraint
                 strSql += GetBoxClause(box);
 
@@ -547,7 +547,7 @@ public override void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                         fdt.BeginLoadData();
                         while (reader.Read())
                         {
-                            IGeometry g = null;
+                            Geometry g = null;
                             if (!reader.IsDBNull(geomIndex))
                                 g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
@@ -616,7 +616,7 @@ public override FeatureDataRow GetFeature(uint rowId)
             using (var conn = GetConnection(ConnectionString))
             {
                 var strSql = "SELECT " + _columns + ", \"" + GeometryColumn + "\" AS \"_smtmp_\" ";
-                strSql += "FROM " + Table + " WHERE \"" + ObjectIdColumn +"\" = " + rowId;
+                strSql += "FROM " + Table + " WHERE \"" + ObjectIdColumn + "\" = " + rowId;
 
                 using (var cmd = new SQLiteCommand(strSql, conn))
                 {
@@ -631,7 +631,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                         fdt.BeginLoadData();
                         while (reader.Read())
                         {
-                            IGeometry g = null;
+                            Geometry g = null;
                             if (!reader.IsDBNull(geomIndex))
                                 g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
@@ -656,9 +656,9 @@ public override FeatureDataRow GetFeature(uint rowId)
 
         private struct RTreeNodeEntry
         {
-// ReSharper disable NotAccessedField.Local
+            // ReSharper disable NotAccessedField.Local
             public readonly long NodeId;
-// ReSharper restore NotAccessedField.Local
+            // ReSharper restore NotAccessedField.Local
             public readonly Single XMin;
             public readonly Single XMax;
             public readonly Single YMin;
@@ -713,7 +713,7 @@ public RTreeNode(byte[] buffer)
                 XMax = Entries[0].XMax;
                 YMin = Entries[0].YMin;
                 YMax = Entries[0].YMax;
-                
+
                 var offset = 28;
                 for (var i = 1; i < NodesCount; i++)
                 {
@@ -724,7 +724,7 @@ public RTreeNode(byte[] buffer)
                     if (Entries[i].XMax > XMax) XMax = Entries[i].XMax;
                     if (Entries[i].YMin < YMin) YMin = Entries[i].YMin;
                     if (Entries[i].YMax > YMax) YMax = Entries[i].YMax;
-                    
+
                     offset += 24;
                 }
             }
@@ -753,8 +753,8 @@ public override Envelope GetExtents()
                         {
                             var buffer = (byte[])result;
                             var node = new RTreeNode(buffer);
-                            _cachedExtents = float.IsNaN(node.XMin) 
-                                ? new Envelope() 
+                            _cachedExtents = float.IsNaN(node.XMin)
+                                ? new Envelope()
                                 : new Envelope(node.XMin, node.XMax, node.YMin, node.YMax);
                             return new Envelope(_cachedExtents);
                         }
@@ -782,7 +782,7 @@ public override Envelope GetExtents()
 
                             while (dr.Read())
                             {
-                                var geom = geoReader.Read((byte[]) dr.GetValue(0));
+                                var geom = geoReader.Read((byte[])dr.GetValue(0));
 
                                 var env = geom.EnvelopeInternal;
                                 if (minx > env.MinX)
@@ -814,10 +814,10 @@ private string GetBoxClause(Envelope bbox)
         {
             if (UseSpatiaLiteIndex)
             {
-                return string.Format(Map.NumberFormatEnUs, 
+                return string.Format(Map.NumberFormatEnUs,
                     _spatiaLiteIndexClause, bbox.MaxX, bbox.MinX, bbox.MaxY, bbox.MinY);
             }
-            
+
             /*Without index, no  db filtering... :-( */
             return "1=1";
         }
@@ -843,8 +843,8 @@ public static IEnumerable<ManagedSpatiaLite> GetSpatialTables(string connectionS
                         {
                             while (dr.Read())
                             {
-                                res.Add(new ManagedSpatiaLite(connectionString, (string) dr["f_table_name"],
-                                    (string) dr["f_geometry_column"], "ROWID"));
+                                res.Add(new ManagedSpatiaLite(connectionString, (string)dr["f_table_name"],
+                                    (string)dr["f_geometry_column"], "ROWID"));
                             }
                             dr.Close();
                         }
diff --git a/SharpMap.Extensions/Data/Providers/NtsProvider.cs b/SharpMap.Extensions/Data/Providers/NtsProvider.cs
index 126223f5..2f0edcba 100644
--- a/SharpMap.Extensions/Data/Providers/NtsProvider.cs
+++ b/SharpMap.Extensions/Data/Providers/NtsProvider.cs
@@ -15,17 +15,14 @@
 // along with NtsProvider; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Features;
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
-using GeoAPI.Geometries;
-using NetTopologySuite.Features;
-using NetTopologySuite.Geometries;
-using NtsGeometry = NetTopologySuite.Geometries.Geometry;
-
-using Geometry = GeoAPI.Geometries.IGeometry;
-using BoundingBox = GeoAPI.Geometries.Envelope;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 
 namespace SharpMap.Data.Providers
@@ -97,7 +94,7 @@ protected internal NtsProvider() : this(new PrecisionModel())
         /// </param>
         /// <seealso cref="NetTopologySuite.Geometries.PrecisionModel"/>
         /// <seealso cref="NetTopologySuite.Geometries.GeometryFactory"/>
-        protected internal NtsProvider(IPrecisionModel precisionModel)
+        protected internal NtsProvider(PrecisionModel precisionModel)
         {
             Factory = new GeometryFactory(precisionModel);
         }
@@ -114,7 +111,7 @@ public NtsProvider(IProvider provider) : this()
         {
             BuildFromProvider(provider);
         }
-        
+
         /// <summary>
         /// Initializes a new instance of the <see cref="NtsProvider"/> class 
         /// from another <see cref="SharpMap.Data.Providers.IProvider" />.
@@ -148,7 +145,7 @@ public NtsProvider(IList<Feature> features) : this()
         /// <seealso cref="NetTopologySuite.Geometries.PrecisionModel"/>     
         /// <seealso cref="NetTopologySuite.Geometries.GeometryFactory"/>
         public NtsProvider(IProvider provider,
-            IPrecisionModel precisionModel) : this(precisionModel)
+            PrecisionModel precisionModel) : this(precisionModel)
         {
             BuildFromProvider(provider);
         }
@@ -268,7 +265,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                 dataTable.Columns.Add(new DataColumn(columnName, feature.Attributes.GetType(columnName)));
 
             var dataRow = dataTable.NewRow();
-            dataRow.Geometry = (Geometry) feature.Geometry.Clone();
+            dataRow.Geometry = feature.Geometry.Copy();
             foreach (var columnName in feature.Attributes.GetNames())
                 dataRow[columnName] = feature.Attributes[columnName];
             return dataRow;
@@ -390,7 +387,7 @@ protected override void ReleaseManagedResources()
         /// <param name="feature">Data to insert in the <see cref="SharpMap.Data.FeatureDataTable"/>.</param>
         private static void CreateNewRow(FeatureDataTable dataTable, Feature feature)
         {
-            var row = (FeatureDataRow) dataTable.LoadDataRow(feature.Attributes.GetValues(), true);
+            var row = (FeatureDataRow)dataTable.LoadDataRow(feature.Attributes.GetValues(), true);
             row.Geometry = feature.Geometry;
         }
 
diff --git a/SharpMap.Extensions/Data/Providers/OgrProvider.cs b/SharpMap.Extensions/Data/Providers/OgrProvider.cs
index 65bb55f0..82dc54d4 100644
--- a/SharpMap.Extensions/Data/Providers/OgrProvider.cs
+++ b/SharpMap.Extensions/Data/Providers/OgrProvider.cs
@@ -15,27 +15,27 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Collections.ObjectModel;
 using Common.Logging;
-using GeoAPI.Geometries;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 using SharpMap.Converters.WellKnownBinary;
 using SharpMap.Extensions.Data;
+using System;
+using System.Collections.ObjectModel;
 //using SharpMap.Geometries;
-using BoundingBox = GeoAPI.Geometries.Envelope;
-using Geometry=GeoAPI.Geometries.IGeometry;
-using OgrOgr = OSGeo.OGR.Ogr;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 using OgrDataSource = OSGeo.OGR.DataSource;
-using OgrLayer = OSGeo.OGR.Layer;
-using OgrGeometry = OSGeo.OGR.Geometry;
 using OgrEnvelope = OSGeo.OGR.Envelope;
 using OgrFeature = OSGeo.OGR.Feature;
-using OgrFeatureDefn = OSGeo.OGR.FeatureDefn;
 using OgrFieldDefn = OSGeo.OGR.FieldDefn;
 using OgrFieldType = OSGeo.OGR.FieldType;
-using OsrSpatialReference = OSGeo.OSR.SpatialReference;
+using OgrGeometry = OSGeo.OGR.Geometry;
 using OgrGeometryType = OSGeo.OGR.wkbGeometryType;
+using OgrLayer = OSGeo.OGR.Layer;
+using OgrOgr = OSGeo.OGR.Ogr;
+using OsrSpatialReference = OSGeo.OSR.SpatialReference;
 
 namespace SharpMap.Data.Providers
 {
@@ -205,8 +205,8 @@ public string LayerName
         {
             get
             {
-                using(var ogrLayer = GetLayer(LayerIndex))
-                using(var ogrLayerDefn = ogrLayer.GetLayerDefn())
+                using (var ogrLayer = GetLayer(LayerIndex))
+                using (var ogrLayerDefn = ogrLayer.GetLayerDefn())
                     return ogrLayerDefn.GetName();
             }
             set
@@ -382,7 +382,7 @@ public override BoundingBox GetExtents()
         /// <returns>number of features</returns>
         public override int GetFeatureCount()
         {
-            using(var ogrLayer = GetLayer(_layerIndex))
+            using (var ogrLayer = GetLayer(_layerIndex))
                 return (int)ogrLayer.GetFeatureCount(1);
         }
 
@@ -399,7 +399,7 @@ public override FeatureDataRow GetFeature(uint rowId)
             {
                 var fdt = ReadColumnDefinition(ogrLayer);
                 fdt.BeginLoadData();
-                using (var feature = ogrLayer.GetFeature((int) rowId))
+                using (var feature = ogrLayer.GetFeature((int)rowId))
                 {
                     //res = LoadOgrFeatureToFeatureDataRow(fdt, feature, Factory);
                     res = LoadOgrFeatureToFeatureDataRow(fdt, feature, reader);
@@ -425,7 +425,7 @@ public override Collection<uint> GetObjectIDsInView(BoundingBox bbox)
                 OgrFeature ogrFeature;
                 while ((ogrFeature = ogrLayer.GetNextFeature()) != null)
                 {
-                    objectIDs.Add((uint) ogrFeature.GetFID());
+                    objectIDs.Add((uint)ogrFeature.GetFID());
                     ogrFeature.Dispose();
                 }
                 ogrDataSource.Dispose();
@@ -445,7 +445,7 @@ public override Geometry GetGeometryByID(uint oid)
             {
                 using (var gr = ogrFeature.GetGeometryRef())
                 {
-                    var g = new OgrGeometryReader(Factory).Read(gr) ;
+                    var g = new OgrGeometryReader(Factory).Read(gr);
                     return g;
                 }
             }
@@ -557,7 +557,7 @@ protected override void ReleaseManagedResources()
         {
             if (_ogrDataSource != null)
                 _ogrDataSource.Dispose();
-            
+
             base.ReleaseManagedResources();
         }
 
@@ -585,7 +585,7 @@ private static FeatureDataTable ReadColumnDefinition(OgrLayer oLayer)
                 {
                     using (var ogrFldDef = ogrFeatureDefn.GetFieldDefn(iField))
                     {
-                        var type= ogrFldDef.GetFieldType();
+                        var type = ogrFldDef.GetFieldType();
                         switch (type)
                         {
                             case OgrFieldType.OFTInteger:
@@ -634,11 +634,11 @@ private static FeatureDataTable ReadColumnDefinition(OgrLayer oLayer)
         }
 
         //private static Geometry ParseOgrGeometry(OgrGeometry ogrGeometry, WKBReader reader)
-        ////private static Geometry ParseOgrGeometry(OgrGeometry ogrGeometry, IGeometryFactory factory)
+        ////private static Geometry ParseOgrGeometry(OgrGeometry ogrGeometry, GeometryFactory factory)
         //{
         //    if (ogrGeometry != null)
         //    {
-                
+
         //        //Just in case it isn't 2D
         //        ogrGeometry.FlattenTo2D();
         //        var wkbBuffer = new byte[ogrGeometry.WkbSize()];
@@ -654,11 +654,11 @@ private static FeatureDataTable ReadColumnDefinition(OgrLayer oLayer)
         //    return null;
         //}
 
-        //private static FeatureDataRow LoadOgrFeatureToFeatureDataRow(FeatureDataTable table, OSGeo.OGR.Feature ogrFeature, GeoAPI.Geometries.IGeometryFactory factory)
+        //private static FeatureDataRow LoadOgrFeatureToFeatureDataRow(FeatureDataTable table, OSGeo.OGR.Feature ogrFeature, NetTopologySuite.Geometries.GeometryFactory factory)
         private static FeatureDataRow LoadOgrFeatureToFeatureDataRow(FeatureDataTable table, OSGeo.OGR.Feature ogrFeature, OgrGeometryReader reader)
         {
             var values = new object[ogrFeature.GetFieldCount()];
-            
+
             for (var iField = 0; iField < ogrFeature.GetFieldCount(); iField++)
             {
                 // No need to get field value if there's no value available...
@@ -709,10 +709,10 @@ private static FeatureDataRow LoadOgrFeatureToFeatureDataRow(FeatureDataTable ta
                             else
                                 values[iField] = new DateTime(y, m, d, h, mi, (int)s);
                         }
-// ReSharper disable once EmptyGeneralCatchClause
+                        // ReSharper disable once EmptyGeneralCatchClause
                         catch { }
                         break;
-                    
+
                     default:
                         var iTmpField = iField;
                         _log.Debug(t => t("Cannot handle Ogr DataType '{0}'", ogrFeature.GetFieldType(iTmpField)));
@@ -829,7 +829,7 @@ public void GetFeaturesInView(BoundingBox bbox, FeatureDataSet ds)
         /// <param name="connection">The connection string</param>
         /// <param name="driverOptions">The options for the driver</param>
         /// <param name="layerOptions">The options for the layer</param>
-        public static void CreateFromFeatureDataTable(FeatureDataTable table, 
+        public static void CreateFromFeatureDataTable(FeatureDataTable table,
             OgcGeometryType geometryType, int srid, string driver, string connection, string[] driverOptions = null, string[] layerOptions = null)
         {
             if (table == null)
@@ -1001,8 +1001,8 @@ private static OgrFieldType GetFieldType(Type dataType)
 
                 case "System.DateTime":
                     return OgrFieldType.OFTDateTime;
-                    //return OgrFieldType.OFTDate;
-                    //return OgrFieldType.OFTTime;
+                //return OgrFieldType.OFTDate;
+                //return OgrFieldType.OFTTime;
 
                 case "System.Byte[]":
                     return OgrFieldType.OFTBinary;
@@ -1040,14 +1040,14 @@ private static OgrFieldType GetFieldType(Type dataType)
 
         private class OgrGeometryReader
         {
-            private readonly IGeometryFactory _factory;
+            private readonly GeometryFactory _factory;
             private WKBReader _reader;
 
             /// <summary>
             /// Creates a n instance of this class
             /// </summary>
             /// <param name="factory">The factory to use</param>
-            public OgrGeometryReader(IGeometryFactory factory)
+            public OgrGeometryReader(GeometryFactory factory)
             {
                 _factory = factory;
             }
@@ -1055,7 +1055,7 @@ public OgrGeometryReader(IGeometryFactory factory)
             /// <summary>
             /// A WKB reader
             /// </summary>
-            private WKBReader Reader { get { return _reader ?? (_reader = new WKBReader(_factory)); } }
+            private WKBReader Reader { get { return _reader ?? (_reader = new WKBReader(NtsGeometryServices.Instance)); } }
 #pragma warning restore 612
 
             /// <summary>
@@ -1063,7 +1063,7 @@ public OgrGeometryReader(IGeometryFactory factory)
             /// </summary>
             /// <param name="geom"></param>
             /// <returns></returns>
-            public IGeometry Read(OgrGeometry geom)
+            public Geometry Read(OgrGeometry geom)
             {
                 if (geom == null)
                     return null;
@@ -1084,14 +1084,14 @@ public IGeometry Read(OgrGeometry geom)
                 }
             }
 
-            private IGeometry ReadWkb(OgrGeometryType type, OgrGeometry geom)
+            private Geometry ReadWkb(OgrGeometryType type, OgrGeometry geom)
             {
                 var b = new byte[geom.WkbSize()];
                 geom.ExportToWkb(b);
                 return Reader.Read(b);
             }
 
-            private IGeometry ReadLineString(OgrGeometryType type, OgrGeometry geom)
+            private Geometry ReadLineString(OgrGeometryType type, OgrGeometry geom)
             {
                 var count = geom.GetPointCount();
                 var dimension = geom.GetCoordinateDimension();
@@ -1114,7 +1114,7 @@ private IGeometry ReadLineString(OgrGeometryType type, OgrGeometry geom)
                 return _factory.CreateLineString(cs);
             }
 
-            private IGeometry ReadPoint(OgrGeometryType type, OgrGeometry geom)
+            private Geometry ReadPoint(OgrGeometryType type, OgrGeometry geom)
             {
                 var c = new Coordinate(geom.GetX(0), geom.GetY(0));
                 if ((int)type > 0x1000000) c.Z = geom.GetZ(0);
diff --git a/SharpMap.Extensions/Data/Providers/Oracle.cs b/SharpMap.Extensions/Data/Providers/Oracle.cs
index fdc9f90a..c0987f08 100644
--- a/SharpMap.Extensions/Data/Providers/Oracle.cs
+++ b/SharpMap.Extensions/Data/Providers/Oracle.cs
@@ -18,15 +18,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using Oracle.ManagedDataAccess.Client;
+using SharpMap.Converters.WellKnownBinary;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Globalization;
-using GeoAPI.Geometries;
-using Oracle.ManagedDataAccess.Client;
-using SharpMap.Converters.WellKnownBinary;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -66,7 +66,7 @@ public class Oracle : BaseProvider
         /// <param name="geometryColumnName">Name of geometry column</param>
         /// /// <param name="oidColumnName">Name of column with unique identifier</param>
         public Oracle(string connectionStr, string tablename, string geometryColumnName, string oidColumnName)
-            :base(-2)
+            : base(-2)
         {
             ConnectionString = connectionStr;
             Table = tablename;
@@ -182,7 +182,7 @@ public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                Geometry geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                Geometry geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                                 if (geom != null)
                                     features.Add(geom);
                             }
@@ -199,7 +199,7 @@ public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public override  Geometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
             Geometry geom = null;
             using (var conn = new OracleConnection(ConnectionString))
@@ -214,7 +214,7 @@ public override  Geometry GetGeometryByID(uint oid)
                         while (dr.Read())
                         {
                             if (dr[0] != DBNull.Value)
-                                geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                         }
                     }
                 }
@@ -253,7 +253,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                var id = (uint) (decimal) dr[0];
+                                var id = (uint)(decimal)dr[0];
                                 objectlist.Add(id);
                             }
                         }
@@ -305,7 +305,7 @@ protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet
                             foreach (DataColumn col in ds.Tables[0].Columns)
                                 if (col.ColumnName != GeometryColumn && col.ColumnName != "sharpmap_tempgeometry")
                                     fdr[col.ColumnName] = dr[col];
-                            fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                            fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -328,7 +328,7 @@ public override int GetFeatureCount()
                 using (var command = new OracleCommand(strSql, conn))
                 {
                     conn.Open();
-                    return (int) command.ExecuteScalar();
+                    return (int)command.ExecuteScalar();
                 }
             }
         }
@@ -397,7 +397,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                             foreach (DataColumn col in ds.Tables[0].Columns)
                                 if (col.ColumnName != GeometryColumn && col.ColumnName != "sharpmap_tempgeometry")
                                     fdr[col.ColumnName] = dr[col];
-                            fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                            fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             return fdr;
                         }
                         else
@@ -427,7 +427,7 @@ public override Envelope GetExtents()
                     conn.Close();
                     if (result == DBNull.Value)
                         return null;
-                    var strBox = (string) result;
+                    var strBox = (string)result;
                     if (strBox.StartsWith("POLYGON", StringComparison.InvariantCultureIgnoreCase))
                     {
                         strBox = strBox.Replace("POLYGON", "");
@@ -522,7 +522,7 @@ public override void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
                             foreach (DataColumn col in ds2.Tables[0].Columns)
                                 if (col.ColumnName != GeometryColumn && col.ColumnName != "sharpmap_tempgeometry")
                                     fdr[col.ColumnName] = dr[col];
-                            fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                            fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -588,7 +588,7 @@ private string GetGeometryColumn()
                 conn.Close();
                 if (columnname == DBNull.Value)
                     throw new ApplicationException("Table '" + Table + "' does not contain a geometry column");
-                return (string) columnname;
+                return (string)columnname;
             }
         }
 
diff --git a/SharpMap.Extensions/Data/Providers/PostGIS.cs b/SharpMap.Extensions/Data/Providers/PostGIS.cs
index 1468d7df..eed4a75a 100644
--- a/SharpMap.Extensions/Data/Providers/PostGIS.cs
+++ b/SharpMap.Extensions/Data/Providers/PostGIS.cs
@@ -21,16 +21,16 @@
 // PostGIS v2.0 manual   : http://postgis.net/docs/manual-2.0/
 //              reference: http://postgis.net/docs/manual-2.0/reference.html
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
+using Npgsql;
+using NpgsqlTypes;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Data.Common;
-using Common.Logging;
-using GeoAPI.Geometries;
-using NetTopologySuite.IO;
-using Npgsql;
 using System.Globalization;
-using NpgsqlTypes;
 
 namespace SharpMap.Data.Providers
 {
@@ -44,7 +44,7 @@ public enum PostGisSpatialObjectType
         /// <para>This is the standard way</para>
         /// </summary>
         Geometry,
-        
+
         /// <summary>
         /// Spatial object stored in WGS84, calculations performed on the sphere.
         /// </summary>
@@ -75,7 +75,7 @@ public class PostGIS : BaseProvider
         private string _objectIdColumn;
         private string _schema = "public";
         private string _table;
-        
+
         private readonly double _postGisVersion;
         private readonly bool _supportSTIntersects;
         private readonly bool _supportSTMakeBox2d;
@@ -129,7 +129,7 @@ public PostGIS(string connectionString, string tablename, string objectIdColumnN
                 _postGisSpatialObject = GetSpatialObjectType();
                 SRID = GetGeometrySrid();
             }
-            
+
         }
 
         /// <summary>
@@ -147,13 +147,13 @@ private void GetNonSpatialColumns()
             {
                 conn.Open();
                 using (var dr = new NpgsqlCommand(string.Format(
-                    "SELECT \"column_name\" FROM \"information_schema\".\"columns\" "+
+                    "SELECT \"column_name\" FROM \"information_schema\".\"columns\" " +
                     "WHERE \"table_schema\"='{0}' AND \"table_name\"='{1}';", Schema, Table), conn).ExecuteReader())
                 {
                     if (!dr.HasRows)
                         throw new InvalidOperationException("Provider configuration incomplete or wrong!");
 
-                    var columns = new List<string>{ "\"" + ObjectIdColumn + "\"" };
+                    var columns = new List<string> { "\"" + ObjectIdColumn + "\"" };
                     while (dr.Read())
                     {
                         var column = dr.GetString(0);
@@ -291,9 +291,9 @@ private string GetBoxClause(Envelope bbox)
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = new NpgsqlConnection(ConnectionString))
             {
                 conn.Open();
@@ -322,9 +322,9 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
                         var reader = new PostGisReader(Factory);
                         while (dr.Read())
                         {
-                            if (dr.IsDBNull(0)) 
+                            if (dr.IsDBNull(0))
                                 continue;
-                            
+
                             var geom = reader.Read((byte[])dr.GetValue(0));
                             if (geom != null)
                                 features.Add(geom);
@@ -340,9 +340,9 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>The geometry</returns>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             using (var conn = new NpgsqlConnection(ConnectionString))
             {
                 conn.Open();
@@ -361,7 +361,7 @@ public override IGeometry GetGeometryByID(uint oid)
                         while (dr.Read())
                         {
                             if (!dr.IsDBNull(0))
-                                geom = reader.Read((byte[]) dr[0]);
+                                geom = reader.Read((byte[])dr[0]);
                         }
                     }
                 }
@@ -401,9 +401,9 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
                 {
                     while (dr.Read())
                     {
-                        if (dr[0] == DBNull.Value) 
+                        if (dr[0] == DBNull.Value)
                             continue;
-                        var id = (uint) (int) dr[0];
+                        var id = (uint)(int)dr[0];
                         objectlist.Add(id);
                     }
                 }
@@ -429,7 +429,7 @@ private FeatureDataTable CreateTableFromReader(DbDataReader reader, int geomInde
         /// </summary>
         /// <param name="geom"></param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             GetNonSpatialColumns();
 
@@ -451,10 +451,10 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                 }
                 else
                 {
-                    strSql += "\"" + GeometryColumn + "\" && @PGeo AND " + 
+                    strSql += "\"" + GeometryColumn + "\" && @PGeo AND " +
                               _prefixFunction + "distance(\"" + GeometryColumn + "\", @PGeo)<0";
                 }
-                
+
                 /*
                 string strGeom = _prefixFunction + "GeomFromText('" + geom.AsText() + "')";
                 if (SRID > 0)
@@ -487,11 +487,11 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
 
                         var dataTransfer = new object[geomIndex];
                         var geoReader = new PostGisReader(Factory.CoordinateSequenceFactory, Factory.PrecisionModel);
-                        
+
                         fdt.BeginLoadData();
                         while (reader.Read())
                         {
-                            IGeometry g = null;
+                            Geometry g = null;
                             if (!reader.IsDBNull(geomIndex))
                                 g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
@@ -544,7 +544,7 @@ public override FeatureDataRow GetFeature(uint rowId)
             {
                 conn.Open();
                 var strSql = "SELECT " + _columns + ", \"" + GeometryColumn + "\"" + _geometryCast + "::bytea AS \"_smtmp_\" ";
-                strSql += "FROM " + QualifiedTable + " WHERE \"" + ObjectIdColumn +"\" = " + rowId;
+                strSql += "FROM " + QualifiedTable + " WHERE \"" + ObjectIdColumn + "\" = " + rowId;
 
                 using (var cmd = new NpgsqlCommand(strSql, conn))
                 {
@@ -560,9 +560,9 @@ public override FeatureDataRow GetFeature(uint rowId)
                             fdt.BeginLoadData();
                             while (reader.Read())
                             {
-                                IGeometry g = null;
+                                Geometry g = null;
                                 if (!reader.IsDBNull(geomIndex))
-                                    g = geoReader.Read((byte[]) reader.GetValue(geomIndex));
+                                    g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
                                 //No geometry, no feature!
                                 if (g == null)
@@ -572,11 +572,11 @@ public override FeatureDataRow GetFeature(uint rowId)
                                 var count = reader.GetValues(dataTransfer);
                                 System.Diagnostics.Debug.Assert(count == dataTransfer.Length);
 
-                                var fdr = (FeatureDataRow) fdt.LoadDataRow(dataTransfer, true);
+                                var fdr = (FeatureDataRow)fdt.LoadDataRow(dataTransfer, true);
                                 fdr.Geometry = g;
                             }
                             fdt.EndLoadData();
-                            return (FeatureDataRow) fdt.Rows[0];
+                            return (FeatureDataRow)fdt.Rows[0];
                         }
                         return null;
                     }
@@ -592,7 +592,7 @@ public override Envelope GetExtents()
         {
             if (_cachedExtents != null)
                 return new Envelope(_cachedExtents);
-            
+
             // PostGIS geography are *always* stored in WGS84
             if (_postGisSpatialObject == PostGisSpatialObjectType.Geography)
             {
@@ -612,11 +612,11 @@ public override Envelope GetExtents()
                     var result = command.ExecuteScalar();
                     if (result == DBNull.Value)
                         return new Envelope();
-                    
-                    var strBox = (string) result;
+
+                    var strBox = (string)result;
                     if (strBox.StartsWith("BOX("))
                     {
-                        var vals = strBox.Substring(4, strBox.IndexOf(")", StringComparison.InvariantCultureIgnoreCase) - 4).Split(new [] {',', ' '});
+                        var vals = strBox.Substring(4, strBox.IndexOf(")", StringComparison.InvariantCultureIgnoreCase) - 4).Split(new[] { ',', ' ' });
                         return new Envelope(
                             double.Parse(vals[0], NumberFormatInfo.InvariantInfo),
                             double.Parse(vals[2], NumberFormatInfo.InvariantInfo),
@@ -669,11 +669,11 @@ public override void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
 
                         var dataTransfer = new object[geomIndex];
                         var geoReader = new PostGisReader(Factory.CoordinateSequenceFactory, Factory.PrecisionModel);
-                        
+
                         fdt.BeginLoadData();
                         while (reader.Read())
                         {
-                            IGeometry g = null;
+                            Geometry g = null;
                             if (!reader.IsDBNull(geomIndex))
                                 g = geoReader.Read((byte[])reader.GetValue(geomIndex));
 
@@ -726,7 +726,7 @@ private string GetGeometryColumn(out int srid)
         {
             string strSQL = "SELECT \"f_geometry_column\", \"srid\" from public.\"geometry_columns\" WHERE \"f_table_schema\"='" + _schema +
                             "' and \"f_table_name\"='" + _table + "'";
-            
+
             using (var conn = new NpgsqlConnection(ConnectionString))
             {
                 conn.Open();
@@ -820,7 +820,7 @@ private int GetGeometrySrid()
                 return 4326;
 
             var strSQL = "SELECT \"srid\" FROM public.\"geometry_columns\" WHERE \"f_table_schema\"='" + _schema +
-                            "' and \"f_table_name\"='" + _table + "' AND \"f_geometry_column\"='"+ GeometryColumn +"';";
+                            "' and \"f_table_name\"='" + _table + "' AND \"f_geometry_column\"='" + GeometryColumn + "';";
 
             using (var conn = new NpgsqlConnection(ConnectionString))
             {
@@ -834,7 +834,7 @@ private int GetGeometrySrid()
                     }
                 }
             }
-            throw new ApplicationException("Table '" + Table + "' does not contain a geometry column named '"+ GeometryColumn + "')");
+            throw new ApplicationException("Table '" + Table + "' does not contain a geometry column named '" + GeometryColumn + "')");
         }
 
         /// <summary>
diff --git a/SharpMap.Extensions/Data/Providers/SpatiaLite.cs b/SharpMap.Extensions/Data/Providers/SpatiaLite.cs
index d9ca0c88..e32080b7 100644
--- a/SharpMap.Extensions/Data/Providers/SpatiaLite.cs
+++ b/SharpMap.Extensions/Data/Providers/SpatiaLite.cs
@@ -15,18 +15,17 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Converters.WellKnownBinary;
+using SharpMap.Converters.WellKnownText;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Configuration;
 using System.Data;
 //using System.Diagnostics;
 using System.Data.SQLite;
 using System.Globalization;
-using Common.Logging;
-using GeoAPI.Geometries;
-using SharpMap.Converters.WellKnownBinary;
-using SharpMap.Converters.WellKnownText;
 
 namespace SharpMap.Data.Providers
 {
@@ -140,7 +139,7 @@ private static SQLiteConnection SpatiaLiteConnection(String connectionString)
         /// <param name="geometryColumnName">Name of the desired geometry column</param>
         /// <param name="oidColumnName">Name of the object Id column</param>
         public SpatiaLite(string connectionStr, string tablename, string geometryColumnName, string oidColumnName)
-            :base(-2)
+            : base(-2)
         {
             ConnectionString = connectionStr;
             Table = tablename;
@@ -163,10 +162,10 @@ public SpatiaLite(string connectionStr, string tablename, string geometryColumnN
                         dr.Read();
                         SRID = dr.GetInt32(0);
 
-                        var coordDim = dr.GetFieldType(1) == typeof(long) 
-                            ? dr.GetInt64(1).ToString(NumberFormatInfo.InvariantInfo) 
+                        var coordDim = dr.GetFieldType(1) == typeof(long)
+                            ? dr.GetInt64(1).ToString(NumberFormatInfo.InvariantInfo)
                             : dr.GetString(1);
-                        
+
                         switch (coordDim)
                         {
                             case "2":
@@ -221,7 +220,7 @@ public SpatiaLite(string connectionStr, string tablename, string geometryColumnN
         /// <summary>
         /// Gets or sets the extent for this data source
         /// </summary>
-        public Envelope CachedExtent 
+        public Envelope CachedExtent
         {
             get
             {
@@ -276,7 +275,7 @@ public string ObjectIdColumn
         public bool UseSpatiaLiteIndex
         {
             get { return _useSpatialIndex && _spatiaLiteIndex != SpatiaLiteIndex.None; }
-            set 
+            set
             {
                 if (_spatiaLiteIndex != SpatiaLiteIndex.None)
                     _useSpatialIndex = value;
@@ -292,8 +291,8 @@ public string SpatialIndex
             {
                 return _spatiaLiteIndex.ToString();
             }
-            set 
-            { 
+            set
+            {
                 System.Diagnostics.Debug.WriteLine("SpatialIndex is obsolete, use UseSpatiaLiteIndex property");
                 //_spatialIndex = value;
             }
@@ -312,9 +311,9 @@ public string DefinitionQuery
         }
 
         /// <inheritdoc cref="BaseProvider.GetGeometriesInView"/>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = SpatiaLiteConnection(ConnectionString))
             {
                 var boxIntersect = GetBoxClause(bbox);
@@ -333,7 +332,7 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                var geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                var geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                                 if (geom != null)
                                     features.Add(geom);
                             }
@@ -365,7 +364,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
                     {
                         while (dr.Read())
                         {
-                            if (dr[0] == DBNull.Value) 
+                            if (dr[0] == DBNull.Value)
                                 continue;
                             var id = Convert.ToUInt32(dr[0]);
                             objectlist.Add(id);
@@ -378,9 +377,9 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         }
 
         /// <inheritdoc cref="BaseProvider{T}.GetGeometryByID"/>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             using (var conn = SpatiaLiteConnection(ConnectionString))
             {
                 string strSql = "SELECT AsBinary(" + GeometryColumn + ") AS Geom FROM " + Table + " WHERE " +
@@ -393,7 +392,7 @@ public override IGeometry GetGeometryByID(uint oid)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                             }
                         }
                     }
@@ -404,7 +403,7 @@ public override IGeometry GetGeometryByID(uint oid)
         }
 
         /// <inheritdoc cref="BaseProvider.OnExecuteIntersectionQuery"/>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             using (var conn = SpatiaLiteConnection(ConnectionString))
             {
@@ -442,7 +441,7 @@ protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSe
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                                fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -488,7 +487,7 @@ public override void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                                fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -534,7 +533,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                 if (string.Compare(ObjectIdColumn, "rowid", true) == 0)
                     cols = "rowid,*";
 
-                string strSQL = "SELECT " +cols + ", AsBinary(" + GeometryColumn + ") AS sharpmap_tempgeometry FROM " + Table +
+                string strSQL = "SELECT " + cols + ", AsBinary(" + GeometryColumn + ") AS sharpmap_tempgeometry FROM " + Table +
                                 " WHERE " + ObjectIdColumn + "='" + rowId + "'";
                 using (SQLiteDataAdapter adapter = new SQLiteDataAdapter(strSQL, conn))
                 {
@@ -557,7 +556,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                                fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             return fdr;
                         }
                         return null;
@@ -628,7 +627,7 @@ public RTreeNode(byte[] buffer)
                 XMax = Entries[0].XMax;
                 YMin = Entries[0].YMin;
                 YMax = Entries[0].YMax;
-                
+
                 var offset = 28;
                 for (var i = 1; i < NodesCount; i++)
                 {
@@ -639,7 +638,7 @@ public RTreeNode(byte[] buffer)
                     if (Entries[i].XMax > XMax) XMax = Entries[i].XMax;
                     if (Entries[i].YMin < YMin) YMin = Entries[i].YMin;
                     if (Entries[i].YMax > YMax) YMax = Entries[i].YMax;
-                    
+
                     offset += 24;
                 }
             }
@@ -656,18 +655,18 @@ public override Envelope GetExtents()
             if (_spatiaLiteIndex == SpatiaLiteIndex.RTree)
             {
                 using (var conn = new SQLiteConnection(ConnectionString))
-                {   
+                {
                     conn.Open();
-                    var strSQL = string.Format("SELECT \"data\" FROM \"idx_{0}_{1}_node\" WHERE \"nodeno\"=1;", 
+                    var strSQL = string.Format("SELECT \"data\" FROM \"idx_{0}_{1}_node\" WHERE \"nodeno\"=1;",
                                                 _table, _geometryColumn);
-                    
+
                     using (var cmd = conn.CreateCommand())
                     {
                         cmd.CommandText = strSQL;
                         var result = cmd.ExecuteScalar();
                         if (result != null && result != DBNull.Value)
                         {
-                            var buffer = (byte[]) result;
+                            var buffer = (byte[])result;
                             var node = new RTreeNode(buffer);
 
                             _cachedExtents = float.IsNaN(node.XMin)
@@ -714,11 +713,11 @@ public override Envelope GetExtents()
                         if (dr.Read())
                         {
                             if (dr.IsDBNull(0))
-                                return new Envelope(0,0,0,0);
+                                return new Envelope(0, 0, 0, 0);
 
                             box = new Envelope(
-                                (double) dr["minx"], (double) dr["maxx"], 
-                                (double) dr["miny"], (double) dr["maxy"]);
+                                (double)dr["minx"], (double)dr["maxx"],
+                                (double)dr["miny"], (double)dr["maxy"]);
                         }
                     conn.Close();
                 }
@@ -758,15 +757,15 @@ private string GetBoxClause(Envelope bbox)
             return "MBRIntersects(GeomFromText('" + wkt + "')," + _geometryColumn + ")=1";
         }
 
-        private IGeometry LineFromBbox(Envelope bbox)
+        private Geometry LineFromBbox(Envelope bbox)
         {
-            var pointColl = new[] {bbox.Min(), bbox.Max()};
+            var pointColl = new[] { bbox.Min(), bbox.Max() };
             return Factory.CreateLineString(pointColl);
         }
 
 #pragma warning disable 1591
         [Obsolete("Will be made private!")]
-        public string GetOverlapsClause(IGeometry geom)
+        public string GetOverlapsClause(Geometry geom)
         {
             string wkt = GeometryToWKT.Write(geom);
             string retval = "Intersects(GeomFromText('" + wkt + "')," + _geometryColumn + ")=1";
diff --git a/SharpMap.Extensions/Data/Providers/SqlLite.cs b/SharpMap.Extensions/Data/Providers/SqlLite.cs
index d16c459e..56feeada 100644
--- a/SharpMap.Extensions/Data/Providers/SqlLite.cs
+++ b/SharpMap.Extensions/Data/Providers/SqlLite.cs
@@ -15,15 +15,15 @@
 // along with SqlLiteProvider; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+using Common.Logging;
+using SharpMap.Converters.WellKnownText;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.SQLite;
 using System.Globalization;
-using SharpMap.Converters.WellKnownText;
-using BoundingBox = GeoAPI.Geometries.Envelope;
-using Geometry = GeoAPI.Geometries.IGeometry;
-using Common.Logging;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -125,7 +125,7 @@ public override Collection<Geometry> GetGeometriesInView(BoundingBox bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                var geom = GeometryFromWKT.Parse((string) dr[0]);
+                                var geom = GeometryFromWKT.Parse((string)dr[0]);
                                 if (geom != null)
                                     features.Add(geom);
                             }
@@ -160,7 +160,7 @@ public override Collection<uint> GetObjectIDsInView(BoundingBox bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                var id = (uint) (int) dr[0];
+                                var id = (uint)(int)dr[0];
                                 objectlist.Add(id);
                             }
                         }
@@ -187,7 +187,7 @@ public override Geometry GetGeometryByID(uint oid)
                         while (dr.Read())
                         {
                             if (dr[0] != DBNull.Value)
-                                geom = GeometryFromWKT.Parse((string) dr[0]);
+                                geom = GeometryFromWKT.Parse((string)dr[0]);
                         }
                     }
                 }
@@ -200,14 +200,14 @@ public override Geometry GetGeometryByID(uint oid)
         protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             ExecuteIntersectionQuery(geom.EnvelopeInternal, ds);
-            
+
             //index of last added feature data table
             var index = ds.Tables.Count - 1;
             if (index <= 0) return;
 
             var res = CloneTableStructure(ds.Tables[index]);
             res.BeginLoadData();
-            
+
             var fdt = ds.Tables[index];
             foreach (FeatureDataRow row in fdt.Rows)
             {
@@ -257,7 +257,7 @@ public override void ExecuteIntersectionQuery(BoundingBox box, FeatureDataSet ds
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKT.Parse((string) dr["sharpmap_tempgeometry"]);
+                                fdr.Geometry = GeometryFromWKT.Parse((string)dr["sharpmap_tempgeometry"]);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -278,7 +278,7 @@ public override int GetFeatureCount()
                 using (var command = new SQLiteCommand(strSQL, conn))
                 {
                     conn.Open();
-                    count = (int) command.ExecuteScalar();
+                    count = (int)command.ExecuteScalar();
                     conn.Close();
                 }
             }
@@ -314,7 +314,7 @@ public override FeatureDataRow GetFeature(uint rowId)
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKT.Parse((string) dr["sharpmap_tempgeometry"]);
+                                fdr.Geometry = GeometryFromWKT.Parse((string)dr["sharpmap_tempgeometry"]);
                             return fdr;
                         }
                         return null;
@@ -341,7 +341,7 @@ public override BoundingBox GetExtents()
                     using (SQLiteDataReader dr = command.ExecuteReader())
                         if (dr.Read())
                         {
-                            box = new BoundingBox((double) dr[0], (double) dr[2], (double) dr[1], (double) dr[3]);
+                            box = new BoundingBox((double)dr[0], (double)dr[2], (double)dr[1], (double)dr[3]);
                         }
                     conn.Close();
                 }
@@ -417,7 +417,7 @@ public static int CreateDataTable(IProvider datasource, string tablename, string
                 string sql = "CREATE TABLE " + tablename + " (fid INTEGER PRIMARY KEY, geom TEXT, " +
                              "minx REAL, miny REAL, maxx REAL, maxy REAL, oid INTEGER";
                 foreach (DataColumn col in columns)
-                    if (col.DataType != typeof (String))
+                    if (col.DataType != typeof(String))
                         sql += ", " + col.ColumnName + " " + Type2SqlLiteTypeString(col.DataType);
                     else
                         sql += ", " + col.ColumnName + " TEXT";
@@ -582,8 +582,8 @@ private static DbType Type2SqlType(Type t)
         }
 
         [Obsolete]
-        private static readonly char[] _hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-        
+        private static readonly char[] _hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+
         /// <summary>
         /// 
         /// </summary>
@@ -592,12 +592,12 @@ private static DbType Type2SqlType(Type t)
         [Obsolete]
         public static string ToHexString(byte[] bytes)
         {
-            char[] chars = new char[bytes.Length*2];
+            char[] chars = new char[bytes.Length * 2];
             for (int i = 0; i < bytes.Length; i++)
             {
                 int b = bytes[i];
-                chars[i*2] = _hexDigits[b >> 4];
-                chars[i*2 + 1] = _hexDigits[b & 0xF];
+                chars[i * 2] = _hexDigits[b >> 4];
+                chars[i * 2 + 1] = _hexDigits[b & 0xF];
             }
             return new string(chars);
         }
diff --git a/SharpMap.Extensions/Layers/GdalRasterLayer.cs b/SharpMap.Extensions/Layers/GdalRasterLayer.cs
index 72fa869a..27fe675b 100644
--- a/SharpMap.Extensions/Layers/GdalRasterLayer.cs
+++ b/SharpMap.Extensions/Layers/GdalRasterLayer.cs
@@ -16,28 +16,28 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
 using Common.Logging;
-using GeoAPI;
-using GeoAPI.Geometries;
-using OSGeo.GDAL;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
+using NetTopologySuite;
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.Index.Strtree;
+using OSGeo.GDAL;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
 using SharpMap.Base;
 using SharpMap.CoordinateSystems;
 using SharpMap.Data;
 using SharpMap.Extensions.Data;
-using Geometry = GeoAPI.Geometries.IGeometry;
 using SharpMap.Rendering.Thematics;
+using System;
+using System.Buffers;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 using Point = System.Drawing.Point;
-
-using Polygon = GeoAPI.Geometries.IPolygon;
+using Polygon = NetTopologySuite.Geometries.Polygon;
 
 namespace SharpMap.Layers
 {
@@ -57,7 +57,7 @@ namespace SharpMap.Layers
     [Serializable]
     public class GdalRasterLayer : Layer, ICanQueryLayer
     {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (GdalRasterLayer));
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(GdalRasterLayer));
 
         static GdalRasterLayer()
         {
@@ -70,17 +70,17 @@ static GdalRasterLayer()
         /// </summary>
         private STRtree<string> _subDataSets;
 
-        private IGeometryFactory _factory;
-        
+        private GeometryFactory _factory;
+
         /// <summary>
         /// Gets or sets a value indicating the geometry factory to use when creating geometries.
         /// </summary>
         /// <returns>A geometry factory</returns>
-        protected IGeometryFactory Factory
+        protected GeometryFactory Factory
         {
             get
             {
-                return _factory ?? (_factory = GeometryServiceProvider.Instance.CreateGeometryFactory(SRID));
+                return _factory ?? (_factory = NtsGeometryServices.Instance.CreateGeometryFactory(SRID));
             }
             set { _factory = value; }
         }
@@ -89,7 +89,7 @@ protected IGeometryFactory Factory
         /// The extent of the layer
         /// </summary>
         protected Envelope _envelope;
-        
+
         /// <summary>
         /// The inner dataset object
         /// </summary>
@@ -105,7 +105,7 @@ protected IGeometryFactory Factory
         // outer radius is feather between inner radius and rest of image
 
         private Point _stretchPoint;
-        
+
         /// <summary>
         /// Flag indicating of geographic rotation is to be used.
         /// </summary>
@@ -133,7 +133,7 @@ public static string FWToolsVersion
         /// Gets or sets a rectangle that is used to tile the image when rendering
         /// </summary>
         public Size TilingSize { get; set; }
-        
+
         /// <summary>
         /// Gets or sets the bit depth of the raster file
         /// </summary>
@@ -486,7 +486,7 @@ protected void OpenDataset(string imageFilename)
 
                 if (_logger.IsDebugEnabled)
                     _logger.Debug("Reading projection for " + imageFilename);
-                
+
                 // have gdal read the projection
                 Projection = _gdalDataset.GetProjectionRef();
 
@@ -524,8 +524,8 @@ protected void OpenDataset(string imageFilename)
                 _imageSize = new Size(_gdalDataset.RasterXSize, _gdalDataset.RasterYSize);
                 _envelope = GetExtent();
 
-                HistoBounds = new Rectangle((int) _envelope.MinX, (int) _envelope.MinY, (int) _envelope.Width,
-                    (int) _envelope.Height);
+                HistoBounds = new Rectangle((int)_envelope.MinX, (int)_envelope.MinY, (int)_envelope.Width,
+                    (int)_envelope.Height);
                 //Bands = _gdalDataset.RasterCount;
 
                 if (_logger.IsDebugEnabled)
@@ -548,7 +548,7 @@ protected override void ReleaseManagedResources()
                 _gdalDataset.Dispose();
                 _gdalDataset = null;
             }
-            
+
             base.ReleaseManagedResources();
         }
 
@@ -627,13 +627,13 @@ private IEnumerable<Envelope> Tile(MapViewport map)
         {
             var lt = Point.Truncate(map.WorldToImage(map.Envelope.TopLeft()));
             var rb = Point.Ceiling(map.WorldToImage(map.Envelope.BottomRight()));
-            
+
             var size = new Size(rb.X - lt.X, rb.Y - lt.Y);
             var fullRect = new Rectangle(lt, size);
-            
+
             var overlapSize = new Size(2, 2);
 
-            for (int top = lt.Y; top < fullRect.Bottom; top+= TilingSize.Height )
+            for (int top = lt.Y; top < fullRect.Bottom; top += TilingSize.Height)
             {
                 for (int left = lt.X; left < fullRect.Right; left += TilingSize.Width)
                 {
@@ -650,7 +650,7 @@ private IEnumerable<Envelope> Tile(MapViewport map)
         /// Gets the spatial reference system of this layer
         /// </summary>
         /// <returns>A spatial reference system.</returns>
-        public ICoordinateSystem GetProjection()
+        public CoordinateSystem GetProjection()
         {
 
             try
@@ -786,7 +786,7 @@ public double GetZoomNearestRSet(Map map, bool bZoomIn)
         /// </summary>
         public void ResetHistoRectangle()
         {
-            HistoBounds = new Rectangle((int)_envelope.MinX, (int)_envelope.MinY, 
+            HistoBounds = new Rectangle((int)_envelope.MinX, (int)_envelope.MinY,
                                          (int)_envelope.Width, (int)_envelope.Height);
         }
 
@@ -795,7 +795,7 @@ public void ResetHistoRectangle()
         /// Gets transform between raster's native projection and the map projection and sets it to <see cref="Layer.CoordinateTransformation"/>
         /// </summary>
         /// <param name="mapProjection">A map projection</param>
-        private void GetTransform(ICoordinateSystem mapProjection)
+        private void GetTransform(CoordinateSystem mapProjection)
         {
             if (mapProjection == null || Projection == "")
             {
@@ -892,7 +892,7 @@ public Coordinate[] GetFourCorners()
                 _gdalDataset.GetGeoTransform(geoTrans);
 
                 // no rotation...use default transform
-                if (!_useRotation && !HaveSpot || (DoublesAreEqual(geoTrans[0],0) && DoublesAreEqual(geoTrans[3],0)))
+                if (!_useRotation && !HaveSpot || (DoublesAreEqual(geoTrans[0], 0) && DoublesAreEqual(geoTrans[3], 0)))
                     geoTrans = new[] { 999.5, 1, 0, 1000.5, 0, -1 };
 
                 points[0] = new Coordinate(geoTrans[0], geoTrans[3]);
@@ -932,8 +932,8 @@ private void ApplyTransformToEnvelope()
         {
             _envelope = ToTarget(GetExtent(_gdalDataset));
             HistoBounds = new Rectangle(
-                (int) Math.Floor(_envelope.MinX), (int) Math.Floor(_envelope.MinY),
-                (int) Math.Ceiling(_envelope.Width), (int) Math.Ceiling(_envelope.Width));
+                (int)Math.Floor(_envelope.MinX), (int)Math.Floor(_envelope.MinY),
+                (int)Math.Ceiling(_envelope.Width), (int)Math.Ceiling(_envelope.Width));
 
         }
 
@@ -941,7 +941,7 @@ private void ApplyTransformToEnvelope()
         /// Reprojects current raster to the given spatial reference system.
         /// </summary>
         /// <param name="cs">A spatial reference system.</param>
-        public void ReprojectToCoordinateSystem(ICoordinateSystem cs)
+        public void ReprojectToCoordinateSystem(CoordinateSystem cs)
         {
             GetTransform(cs);
             ApplyTransformToEnvelope();
@@ -954,14 +954,14 @@ public void ReprojectToCoordinateSystem(ICoordinateSystem cs)
         /// <param name="map">The map</param>
         public void ReprojectToMap(Map map)
         {
-            ICoordinateSystem cs = null;
+            CoordinateSystem cs = null;
             if (map.SRID > 0)
             {
                 using (var p = new OSGeo.OSR.SpatialReference(null))
                 {
                     string wkt;
                     p.ImportFromEPSG(map.SRID);
-                    p.ExportToWkt(out wkt);
+                    p.ExportToWkt(out wkt, null);
                     cs = map.GetCoordinateSystem();
                 }
             }
@@ -978,7 +978,7 @@ public void ReprojectToMap(Map map)
         /// <param name="mapProjection">The spatial reference system of the map</param>
         /// <param name="map">The map viewport</param>
         protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
-            Envelope displayBbox, ICoordinateSystem mapProjection, MapViewport map)
+            Envelope displayBbox, CoordinateSystem mapProjection, MapViewport map)
         {
             //check if image is in bounding box
             var dataSetBbox = ToTarget(GetExtent(dataset));
@@ -1033,8 +1033,8 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
             bitmapTl = rect.Location;
             bitmapSize = Size.Add(rect.Size, new Size(1, 1));
 
-            double disRatio = (double) displayImageSize.Width / displayImageSize.Height;
-            double bmsRatio = (double) bitmapSize.Width / bitmapSize.Height;
+            double disRatio = (double)displayImageSize.Width / displayImageSize.Height;
+            double bmsRatio = (double)bitmapSize.Width / bitmapSize.Height;
 
             // check to see if image is on its side
             if (bitmapSize.Width > bitmapSize.Height && displayImageSize.Width < displayImageSize.Height)
@@ -1169,7 +1169,7 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                     double geoLeft = geoTransform.Inverse[0];
                     double geoHorzPixRes = geoTransform.Inverse[1];
                     double geoXRot = geoTransform.Inverse[2];
-                    
+
                     double geoTop = geoTransform.Inverse[3];
                     double geoYRot = geoTransform.Inverse[4];
                     double geoVertPixRes = geoTransform.Inverse[5];
@@ -1180,7 +1180,7 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                     // get inverse transform  
                     // NOTE: calling transform.MathTransform.Inverse() once and storing it
                     // is much faster than having to call every time it is needed
-                    IMathTransform inverseTransform = null;
+                    MathTransform inverseTransform = null;
                     if (ReverseCoordinateTransformation != null)
                         inverseTransform = ReverseCoordinateTransformation.MathTransform;
 
@@ -1224,7 +1224,7 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                         {
                             //if (pixY > 10) break;
                             var rowPtr = bitmapData.Scan0 + pixY * bitmapData.Stride;
-                            var row = (byte*) rowPtr;
+                            var row = (byte*)rowPtr;
 
                             double gndY = Math.Min(Envelope.MaxY, displayBbox.MaxY) - pixY * mapPixelHeight;
                             //if (gndY > map.Envelope.MaxY) continue;
@@ -1236,7 +1236,7 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                                 // transform ground point if needed
                                 if (inverseTransform != null)
                                 {
-                                    double[] dblPoint = inverseTransform.Transform(new[] {gndX, gndY});
+                                    double[] dblPoint = inverseTransform.Transform(new[] { gndX, gndY });
                                     gndX = dblPoint[0];
                                     gndY = dblPoint[1];
                                 }
@@ -1249,8 +1249,8 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                                 if (!g2I.Contains(imageCoord))
                                     goto Incrementation;
 
-                                var imagePt = new Point((int) ((imageCoord.X - imageLeft) * dblXScale),
-                                    (int) ((imageCoord.Y - imageTop) * dblYScale));
+                                var imagePt = new Point((int)((imageCoord.X - imageLeft) * dblXScale),
+                                    (int)((imageCoord.Y - imageTop) * dblYScale));
 
                                 int bufferOffset = imagePt.Y * displayImageSize.Width + imagePt.X;
                                 // Apply color correction
@@ -1312,11 +1312,11 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
 
                                             // if pixel is within ground boundary, add its value to the histogram
                                             if (ch[i] != -1 && intermediateValue[i] > 0 &&
-                                                (HistoBounds.Bottom >= (int) gndY) &&
-                                                HistoBounds.Top <= (int) gndY &&
-                                                HistoBounds.Left <= (int) gndX && HistoBounds.Right >= (int) gndX)
+                                                (HistoBounds.Bottom >= (int)gndY) &&
+                                                HistoBounds.Top <= (int)gndY &&
+                                                HistoBounds.Left <= (int)gndX && HistoBounds.Right >= (int)gndX)
                                             {
-                                                histogram[ch[i]][(int) intermediateValue[i]]++;
+                                                histogram[ch[i]][(int)intermediateValue[i]]++;
                                             }
                                         }
 
@@ -1327,8 +1327,8 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
 
                                 // luminosity
                                 if (dataset.RasterCount >= 3)
-                                    histogram[dataset.RasterCount][(int) (intermediateValue[2] * 0.2126 
-                                                          + intermediateValue[1] * 0.7152 
+                                    histogram[dataset.RasterCount][(int)(intermediateValue[2] * 0.2126
+                                                          + intermediateValue[1] * 0.7152
                                                           + intermediateValue[0] * 0.0722)]++;
 
                                 DateTime writeStart = DateTime.MinValue;
@@ -1341,7 +1341,7 @@ protected virtual void GetPreview(Dataset dataset, Size size, Graphics g,
                                     totalTimeSetPixel += took.TotalMilliseconds;
                                 }
 
-                                Incrementation:
+                            Incrementation:
                                 gndX += mapPixelWidth;
                             }
                         }
@@ -1467,7 +1467,7 @@ private ColorBlend GetColorBlend(Band band)
                 };
 
             _colorBlend = new ColorBlend(new[] { Color.Blue, Color.Yellow, Color.Red }, minmax);
-            
+
             return _colorBlend;
 
         }
@@ -1480,7 +1480,7 @@ private Bitmap InitializeBitmap(Size bitmapSize, PixelFormat pixelFormat, out Bi
                 g.Clear(NoDataInitColor);
             }
 
-            bitmapData = res.LockBits(new Rectangle(new Point(0, 0), bitmapSize), 
+            bitmapData = res.LockBits(new Rectangle(new Point(0, 0), bitmapSize),
                                       ImageLockMode.WriteOnly, pixelFormat);
             return res;
         }
@@ -1488,7 +1488,7 @@ private Bitmap InitializeBitmap(Size bitmapSize, PixelFormat pixelFormat, out Bi
 
         // faster than rotated display
         private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
-            Envelope bbox, ICoordinateSystem mapProjection)
+            Envelope bbox, CoordinateSystem mapProjection)
         {
             var geoTransform = new GeoTransform(dataset);
 
@@ -1551,7 +1551,7 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
             BitmapData bitmapData = null;
             try
             {
-                var bitmapSize = new Size((int) Math.Round(dblImginMapW), (int) Math.Round(dblImginMapH)); 
+                var bitmapSize = new Size((int)Math.Round(dblImginMapW), (int)Math.Round(dblImginMapH));
                 bitmap = InitializeBitmap(bitmapSize, PixelFormat.Format24bppRgb, out bitmapData);
 
                 int noDataColorR = _noDataInitColor.R;
@@ -1567,7 +1567,7 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
 
                 ColorBlend colorBlend = null;
 
-                
+
                 unsafe
                 {
                     double[][] buffer = new double[dataset.RasterCount][];
@@ -1579,7 +1579,7 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
                     for (int i = 0; i < dataset.RasterCount; i++)
                     {
                         buffer[i] = ArrayPool<double>.Shared.Rent(
-                            (int) Math.Round(dblImginMapW) * (int) Math.Round(dblImginMapH));//new double[(int) Math.Round(dblImginMapW) * (int) Math.Round(dblImginMapH)];
+                            (int)Math.Round(dblImginMapW) * (int)Math.Round(dblImginMapH));//new double[(int) Math.Round(dblImginMapW) * (int) Math.Round(dblImginMapH)];
                         band[i] = dataset.GetRasterBand(i + 1);
 
                         //get nodata value if present
@@ -1590,9 +1590,9 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
 
                         bitScales[i] = GetBitScale(band[i].DataType);
 
-                        band[i].ReadRaster((int) Math.Round(x1), (int) Math.Round(y1), (int) Math.Round(imgPixWidth),
-                            (int) Math.Round(imgPixHeight),
-                            buffer[i], (int) Math.Round(dblImginMapW), (int) Math.Round(dblImginMapH),
+                        band[i].ReadRaster((int)Math.Round(x1), (int)Math.Round(y1), (int)Math.Round(imgPixWidth),
+                            (int)Math.Round(imgPixHeight),
+                            buffer[i], (int)Math.Round(dblImginMapW), (int)Math.Round(dblImginMapH),
                             0, 0);
 
                         switch (band[i].GetRasterColorInterpretation())
@@ -1648,12 +1648,12 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
                     }
 
                     if (BitDepth == 32)
-                        ch = new[] {0, 1, 2};
+                        ch = new[] { 0, 1, 2 };
 
                     int pIndx = 0;
                     for (int y = 0; y < Math.Round(dblImginMapH); y++)
                     {
-                        byte* row = (byte*) bitmapData.Scan0 + (y * bitmapData.Stride);
+                        byte* row = (byte*)bitmapData.Scan0 + (y * bitmapData.Stride);
                         for (int x = 0; x < Math.Round(dblImginMapW); x++, pIndx++)
                         {
                             for (int i = 0; i < dataset.RasterCount; i++)
@@ -1703,7 +1703,7 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
 
                                         if (dataset.RasterCount >= 3)
                                             Histogram[dataset.RasterCount][
-                                                (int) (intVal[2] * 0.2126 + intVal[1] * 0.7152 + intVal[0] * 0.0722)]++;
+                                                (int)(intVal[2] * 0.2126 + intVal[1] * 0.7152 + intVal[0] * 0.0722)]++;
                                     }
                                 }
 
@@ -1733,7 +1733,7 @@ private void GetNonRotatedPreview(Dataset dataset, Size size, Graphics g,
             if (TransparentColor != Color.Empty)
                 bitmap.MakeTransparent(TransparentColor);
 
-            g.DrawImage(bitmap, new Point((int) Math.Round(dblLocX), (int) Math.Round(dblLocY)));
+            g.DrawImage(bitmap, new Point((int)Math.Round(dblLocX), (int)Math.Round(dblLocY)));
         }
 
         /// <summary>
@@ -1762,10 +1762,10 @@ private static double GetBitScale(DataType dataType)
                 //    return 1d;
                 case DataType.GDT_UInt16:
                 case DataType.GDT_Int16:
-                    return 1d/256d;
+                    return 1d / 256d;
                 case DataType.GDT_Int32:
                 case DataType.GDT_UInt32:
-                    return 1d/16777216d;
+                    return 1d / 16777216d;
             }
             return 1d;
         }
@@ -1788,13 +1788,13 @@ protected unsafe void WritePixel(double x, double[] intVal, int iPixelSize, int[
                 {
                     if (ShowClip)
                     {
-                        if (DoublesAreEqual(intVal[0] ,0))
+                        if (DoublesAreEqual(intVal[0], 0))
                         {
                             row[offsetX++] = 255;
                             row[offsetX++] = 0;
                             row[offsetX] = 0;
                         }
-                        else if (DoublesAreEqual(intVal[0],255))
+                        else if (DoublesAreEqual(intVal[0], 255))
                         {
                             row[offsetX++] = 0;
                             row[offsetX++] = 0;
@@ -1830,13 +1830,13 @@ protected unsafe void WritePixel(double x, double[] intVal, int iPixelSize, int[
                     {
                         if (ShowClip)
                         {
-                            if (DoublesAreEqual(intVal[3],0))
+                            if (DoublesAreEqual(intVal[3], 0))
                             {
                                 row[(int)Math.Round(x) * iPixelSize] = 255;
                                 row[(int)Math.Round(x) * iPixelSize + 1] = 0;
                                 row[(int)Math.Round(x) * iPixelSize + 2] = 0;
                             }
-                            else if (DoublesAreEqual(intVal[3],255))
+                            else if (DoublesAreEqual(intVal[3], 255))
                             {
                                 row[(int)Math.Round(x) * iPixelSize] = 0;
                                 row[(int)Math.Round(x) * iPixelSize + 1] = 0;
@@ -1882,14 +1882,14 @@ protected unsafe void WritePixel(double x, double[] intVal, int iPixelSize, int[
             else
             {
                 {
-                if (ShowClip)
-                    if (DoublesAreEqual(intVal[0], 0) && DoublesAreEqual(intVal[1], 0) && DoublesAreEqual(intVal[2], 0))
-                    {
-                        intVal[0] = intVal[1] = 0;
-                        intVal[2] = 255;
-                    }
-                    else if (DoublesAreEqual(intVal[0], 255) && DoublesAreEqual(intVal[1], 255) && DoublesAreEqual(intVal[2], 255))
-                        intVal[1] = intVal[2] = 0;
+                    if (ShowClip)
+                        if (DoublesAreEqual(intVal[0], 0) && DoublesAreEqual(intVal[1], 0) && DoublesAreEqual(intVal[2], 0))
+                        {
+                            intVal[0] = intVal[1] = 0;
+                            intVal[2] = 255;
+                        }
+                        else if (DoublesAreEqual(intVal[0], 255) && DoublesAreEqual(intVal[1], 255) && DoublesAreEqual(intVal[2], 255))
+                            intVal[1] = intVal[2] = 0;
                 }
 
                 for (int i = 0; i < 3; i++)
@@ -1910,7 +1910,7 @@ private double ApplyColorCorrection(double imageVal, double spotVal, int channel
             if (HaveSpot)
             {
                 // gamma
-                if (!DoublesAreEqual(NonSpotGamma,1))
+                if (!DoublesAreEqual(NonSpotGamma, 1))
                     imageVal = 256 * Math.Pow((imageVal / 256), NonSpotGamma);
 
                 // gain
@@ -1947,7 +1947,7 @@ private double ApplyColorCorrection(double imageVal, double spotVal, int channel
                 if (distance <= InnerSpotRadius + OuterSpotRadius)
                 {
                     // gamma
-                    if (!DoublesAreEqual(SpotGamma,1))
+                    if (!DoublesAreEqual(SpotGamma, 1))
                         spotVal = 256 * Math.Pow((spotVal / 256), SpotGamma);
 
                     // gain
@@ -1991,7 +1991,7 @@ private double ApplyColorCorrection(double imageVal, double spotVal, int channel
 
             // gamma
             if (!DoublesAreEqual(Gamma, 1))
-                finalVal = (256*Math.Pow((finalVal/256), Gamma));
+                finalVal = (256 * Math.Pow((finalVal / 256), Gamma));
 
 
             switch (channel)
@@ -2166,8 +2166,8 @@ private void ComputeStretch()
             {
                 using (var rasterBand = _gdalDataset.GetRasterBand(band))
                 {
-                    var err = rasterBand.ReadRaster(0, 0, _gdalDataset.RasterXSize, _gdalDataset.RasterYSize, 
-                                                    buffer, 
+                    var err = rasterBand.ReadRaster(0, 0, _gdalDataset.RasterXSize, _gdalDataset.RasterYSize,
+                                                    buffer,
                                                     width, height, 0, 0);
                     if (err != CPLErr.CE_None)
                         Console.WriteLine("err {0}", err);
@@ -2206,7 +2206,7 @@ public void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
             ExecuteIntersectionQuery(pt, ds);
         }
 
-        
+
         private void ExecuteIntersectionQuery(Coordinate pt, FeatureDataSet ds)
         {
 
@@ -2237,7 +2237,7 @@ private void ExecuteIntersectionQuery(Coordinate pt, FeatureDataSet ds)
                 dataSet = _gdalDataset;
 
             //Setup resulting Table
-            var dt = new FeatureDataTable {TableName = LayerName};
+            var dt = new FeatureDataTable { TableName = LayerName };
             dt.Columns.Add("Ordinate X", typeof(Double));
             dt.Columns.Add("Ordinate Y", typeof(Double));
             for (int i = 1; i <= Bands; i++)
@@ -2332,7 +2332,7 @@ public Color NoDataInitColor
         }
 
         private ColorBlend _colorBlend;
-        
+
         /// <summary>
         /// Gets pr sets a value indicating a color blend
         /// </summary>
diff --git a/SharpMap.Extensions/Layers/GdalRasterLayerCachingProxy.cs b/SharpMap.Extensions/Layers/GdalRasterLayerCachingProxy.cs
index 68a7f002..d8284183 100644
--- a/SharpMap.Extensions/Layers/GdalRasterLayerCachingProxy.cs
+++ b/SharpMap.Extensions/Layers/GdalRasterLayerCachingProxy.cs
@@ -17,20 +17,20 @@
  * 
  */
 
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.Data;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Runtime.CompilerServices;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using GeoAPI.CoordinateSystems.Transformations;
-using BoundingBox = GeoAPI.Geometries.Envelope;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 using Point = System.Drawing.Point;
 
 namespace SharpMap.Layers
 {
-    
+
     /// <summary>
     /// A cache for <see cref="GdalRasterLayer"/>.
     /// </summary>
@@ -74,7 +74,7 @@ public GdalRasterLayerCachingProxy(string strLayerName, string imageFilename)
         {
             LayerName = strLayerName;
             _innerLayer = new GdalRasterLayer(strLayerName, imageFilename);
-        } 
+        }
         #endregion
 
         /// <summary>
diff --git a/SharpMap.Extensions/Layers/GdalTileIndexRasterLayer.cs b/SharpMap.Extensions/Layers/GdalTileIndexRasterLayer.cs
index 96622ca1..bb3894ef 100644
--- a/SharpMap.Extensions/Layers/GdalTileIndexRasterLayer.cs
+++ b/SharpMap.Extensions/Layers/GdalTileIndexRasterLayer.cs
@@ -15,16 +15,16 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
 using Common.Logging;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using OSGeo.GDAL;
 using SharpMap.Base;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
 
 namespace SharpMap.Layers
 {
@@ -53,7 +53,7 @@ class CacheHolder
 
         }
 
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (GdalTileIndexRasterLayer));
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(GdalTileIndexRasterLayer));
 
         private readonly ShapeFile _shapeFile;
         private readonly string _fieldName;
@@ -126,7 +126,8 @@ public override void Render(Graphics g, MapViewport map)
                         if (!_openDatasets.ContainsKey(file))
                         {
                             OpenDataset(file);
-                            _openDatasets.Add(file, new CacheHolder(){
+                            _openDatasets.Add(file, new CacheHolder()
+                            {
                                 Bands = Bands,
                                 Dataset = _gdalDataset,
                                 Envelope = _envelope,
@@ -155,7 +156,7 @@ public override void Render(Graphics g, MapViewport map)
             }
             catch (Exception)
             {
-                
+
                 _shapeFile.Close();
             }
         }
@@ -167,12 +168,12 @@ protected override void ReleaseManagedResources()
 
             foreach (var kvp in _openDatasets)
             {
-                if (kvp.Value  != null)
+                if (kvp.Value != null)
                 {
                     kvp.Value.Dataset.Dispose();
                 }
             }
-            
+
             base.ReleaseManagedResources();
         }
     }
diff --git a/SharpMap.Extensions/Layers/GeoTransform.cs b/SharpMap.Extensions/Layers/GeoTransform.cs
index 6deee819..cbe8d400 100644
--- a/SharpMap.Extensions/Layers/GeoTransform.cs
+++ b/SharpMap.Extensions/Layers/GeoTransform.cs
@@ -16,8 +16,8 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Layers
 {
@@ -32,7 +32,7 @@ namespace SharpMap.Layers
     internal class GeoTransform
     {
         private const double Epsilon = double.Epsilon;
-        
+
         private readonly double[] _inverseTransform = new double[6];
         private readonly double[] _transform = new double[6];
 
@@ -72,13 +72,13 @@ public bool IsTrivial
             {
                 return //East-West
                        Math.Abs(_transform[0]) < Epsilon &&
-                       Math.Abs(_transform[1] - 1) < Epsilon && 
+                       Math.Abs(_transform[1] - 1) < Epsilon &&
                        Math.Abs(_transform[2]) < Epsilon &&
                        //North-South
                        Math.Abs(_transform[3]) < Epsilon &&
                        Math.Abs(_transform[4]) < Epsilon &&
                        Math.Abs(_transform[5] - 1) < Epsilon;
-                       
+
             }
         }
 
@@ -173,7 +173,7 @@ public GeoTransform()
         /// <summary>
         /// Constructor
         /// </summary>
-        public GeoTransform(double offsetX, double offsetY, double pixelSizeX = 1, double pixelSizeY = - 1, double rotationX = 0, double rotationY = 0)
+        public GeoTransform(double offsetX, double offsetY, double pixelSizeX = 1, double pixelSizeY = -1, double rotationX = 0, double rotationY = 0)
         {
             _transform[0] = offsetX; /* x-offset */
             _transform[1] = pixelSizeX; /* west-east pixel resolution */
@@ -183,7 +183,7 @@ public GeoTransform(double offsetX, double offsetY, double pixelSizeX = 1, doubl
             _transform[5] = rotationY; /* north-south pixel resolution */
             ComputeInverse();
         }
-        
+
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
@@ -204,7 +204,7 @@ public GeoTransform(OSGeo.GDAL.Dataset gdalDataSet)
         {
             if (gdalDataSet == null)
                 throw new ArgumentException("GeoTransform constructor invoked with null dataset.", nameof(gdalDataSet));
-            
+
             gdalDataSet.GetGeoTransform(_transform);
             ComputeInverse();
         }
@@ -255,21 +255,21 @@ public double ProjectedY(double imgX, double imgY)
         public Coordinate ImageToGround(Coordinate imagePoint)
         {
             return new Coordinate
-                       {
-                           X = _transform[0] + _transform[1]*imagePoint.X + _transform[2]*imagePoint.Y,
-                           Y = _transform[3] + _transform[4]*imagePoint.X + _transform[5]*imagePoint.Y
-                       };
+            {
+                X = _transform[0] + _transform[1] * imagePoint.X + _transform[2] * imagePoint.Y,
+                Y = _transform[3] + _transform[4] * imagePoint.X + _transform[5] * imagePoint.Y
+            };
         }
 
         public Coordinate GroundToImage(Coordinate groundPoint)
         {
             return new Coordinate
-                       {
-                           X = _inverseTransform[0] + _inverseTransform[1]*groundPoint.X +
-                               _inverseTransform[2]*groundPoint.Y,
-                           Y = _inverseTransform[3] + _inverseTransform[4]*groundPoint.X +
-                               _inverseTransform[5]*groundPoint.Y
-                       };
+            {
+                X = _inverseTransform[0] + _inverseTransform[1] * groundPoint.X +
+                               _inverseTransform[2] * groundPoint.Y,
+                Y = _inverseTransform[3] + _inverseTransform[4] * groundPoint.X +
+                               _inverseTransform[5] * groundPoint.Y
+            };
         }
 
         public Envelope GroundToImage(Envelope e)
diff --git a/SharpMap.Extensions/SharpMap.Extensions.csproj b/SharpMap.Extensions/SharpMap.Extensions.csproj
index 583a003d..4fa643f1 100644
--- a/SharpMap.Extensions/SharpMap.Extensions.csproj
+++ b/SharpMap.Extensions/SharpMap.Extensions.csproj
@@ -14,14 +14,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="GDAL" Version="2.4.2" />
-      <PackageReference Include="NetTopologySuite.Core" Version="1.15.3" />
-      <PackageReference Include="NetTopologySuite.Features" Version="1.15.1" />
-      <PackageReference Include="NetTopologySuite.IO.PostGis" Version="1.15.1" />
-      <PackageReference Include="NetTopologySuite.IO.SpatiaLite" Version="1.15.1" />
-      <PackageReference Include="Npgsql" Version="4.0.10" />
-      <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.90" />
-      <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
+      <PackageReference Include="GDAL" Version="3.5.0" />
+      <PackageReference Include="NetTopologySuite.Features" Version="2.1.0" />
+      <PackageReference Include="NetTopologySuite.IO.PostGis" Version="2.1.0" />
+      <PackageReference Include="NetTopologySuite.IO.SpatiaLite" Version="2.0.0" />
+      <PackageReference Include="Npgsql" Version="6.0.6" />
+      <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.151" />
+      <PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
     </ItemGroup>
     
     
@@ -29,5 +28,10 @@
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
         
     </ItemGroup>
+    
+    
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
 
 </Project>
diff --git a/SharpMap.Layers.BruTile/Layers/TileAsyncLayer.cs b/SharpMap.Layers.BruTile/Layers/TileAsyncLayer.cs
index 609bb2cf..6dc4ba25 100644
--- a/SharpMap.Layers.BruTile/Layers/TileAsyncLayer.cs
+++ b/SharpMap.Layers.BruTile/Layers/TileAsyncLayer.cs
@@ -1,17 +1,17 @@
-using System;
+using BruTile;
+using BruTile.Cache;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using System.Threading;
-using BruTile;
-using BruTile.Cache;
 using System.IO;
 using System.Net;
-using GeoAPI.Geometries;
-using System.Diagnostics;
+using System.Threading;
 using System.Threading.Tasks;
-using Common.Logging;
 
 namespace SharpMap.Layers
 {
@@ -39,7 +39,7 @@ public bool OnlyRedrawWhenComplete
             get { return _onlyRedrawWhenComplete; }
             set { _onlyRedrawWhenComplete = value; }
         }
-        
+
         /// <summary>
         /// Returns the number of tiles that are in queue for download
         /// </summary>
@@ -49,7 +49,7 @@ public bool OnlyRedrawWhenComplete
         /// Event raised when tiles are downloaded
         /// </summary>
         public event DownloadProgressHandler DownloadProgressChanged;
-        
+
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
@@ -95,7 +95,7 @@ public TileAsyncLayer(ITileSource tileSource, string layerName, Color transparen
         /// <param name="fileCache">If the layer should use a file-cache so store tiles, set this to a fileCacheProvider. Set to null to avoid filecache</param>
         /// <param name="imgFormat">Set the format of the tiles to be used</param>
         public TileAsyncLayer(ITileSource tileSource, string layerName, Color transparentColor, bool showErrorInTile, FileCache fileCache, ImageFormat imgFormat)
-            : base(tileSource, layerName, transparentColor, showErrorInTile, fileCache,imgFormat)
+            : base(tileSource, layerName, transparentColor, showErrorInTile, fileCache, imgFormat)
         {
         }
 
@@ -107,16 +107,16 @@ public TileAsyncLayer(ITileSource tileSource, string layerName, Color transparen
         /// <summary>
         /// Method to cancel the async layer
         /// </summary>
-        
+
         public void Cancel()
         {
             //lock (_currentDownloads)
             //{
-                var cts = _cancellationTokenSource;
-                cts?.Cancel();
-                //_currentDownloads.Clear();
-                _numPendingDownloads = 0;
-                DownloadProgressChanged?.Invoke(_numPendingDownloads);
+            var cts = _cancellationTokenSource;
+            cts?.Cancel();
+            //_currentDownloads.Clear();
+            _numPendingDownloads = 0;
+            DownloadProgressChanged?.Invoke(_numPendingDownloads);
             //}
         }
 
@@ -129,7 +129,7 @@ public override void Render(Graphics graphics, MapViewport map)
         {
             var bbox = map.Envelope;
             var extent = new Extent(bbox.MinX, bbox.MinY, bbox.MaxX, bbox.MaxY);
-            string level = BruTile.Utilities.GetNearestLevel(_source.Schema.Resolutions, Math.Max(map.PixelWidth, map.PixelHeight));
+            var level = BruTile.Utilities.GetNearestLevel(_source.Schema.Resolutions, Math.Max(map.PixelWidth, map.PixelHeight));
             var tiles = new List<TileInfo>(_source.Schema.GetTileInfos(extent, level));
 
             tiles.Sort(new DistanceComparison(map.CenterOfInterest));
@@ -153,7 +153,7 @@ public override void Render(Graphics graphics, MapViewport map)
 
                 foreach (var info in tiles)
                 {
-                    var bitmap = _bitmaps.Find(info.Index); 
+                    var bitmap = _bitmaps.Find(info.Index);
                     if (bitmap != null)
                     {
                         //draws directly the bitmap
@@ -183,7 +183,7 @@ public override void Render(Graphics graphics, MapViewport map)
                         // Increase num pending downloads
                         Interlocked.Increment(ref _numPendingDownloads);
                         DownloadProgressChanged?.Invoke(_numPendingDownloads);
-                        
+
                         taskFactory.StartNew(() =>
                             {
                                 if (token.IsCancellationRequested)
@@ -265,10 +265,10 @@ static void HandleMapNewTileAvailable(MapViewport map, Graphics g, Envelope box,
                 min = new PointF((float)Math.Round(min.X), (float)Math.Round(min.Y));
                 max = new PointF((float)Math.Round(max.X), (float)Math.Round(max.Y));
 
-                using (var ia = (ImageAttributes) imageAttributes.Clone())
+                using (var ia = (ImageAttributes)imageAttributes.Clone())
                 {
                     g.DrawImage(bm,
-                        new Rectangle((int) min.X, (int) max.Y, (int) (max.X - min.X), (int) (min.Y - max.Y)),
+                        new Rectangle((int)min.X, (int)max.Y, (int)(max.X - min.X), (int)(min.Y - max.Y)),
                         0, 0,
                         sourceWidth, sourceHeight,
                         GraphicsUnit.Pixel,
@@ -327,7 +327,7 @@ private bool GetTileOnThread(CancellationToken cancelToken, ITileProvider tilePr
 
                     if (cancelToken.IsCancellationRequested)
                         cancelToken.ThrowIfCancellationRequested();
-                    
+
                     OnMapNewTileAvailable(tileInfo, bitmap);
                 }
                 return true;
@@ -336,7 +336,7 @@ private bool GetTileOnThread(CancellationToken cancelToken, ITileProvider tilePr
             {
                 if (Logger.IsDebugEnabled)
                     Logger.DebugFormat("Exception downloading tile {0},{1},{2} {3}", tileInfo.Index.Level, tileInfo.Index.Col, tileInfo.Index.Row, ex.Message);
-                
+
                 if (retry)
                 {
                     return GetTileOnThread(cancelToken, tileProvider, tileInfo, bitmaps, false);
diff --git a/SharpMap.Layers.BruTile/Layers/TileLayer.cs b/SharpMap.Layers.BruTile/Layers/TileLayer.cs
index c1695815..dabd15e8 100644
--- a/SharpMap.Layers.BruTile/Layers/TileLayer.cs
+++ b/SharpMap.Layers.BruTile/Layers/TileLayer.cs
@@ -1,4 +1,10 @@
-using System;
+using BruTile;
+using BruTile.Cache;
+using BruTile.Web;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Base;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Drawing;
@@ -8,12 +14,6 @@
 using System.Net;
 using System.Runtime.Serialization;
 using System.Threading;
-using BruTile;
-using BruTile.Cache;
-using BruTile.Web;
-using Common.Logging;
-using GeoAPI.Geometries;
-using SharpMap.Base;
 
 namespace SharpMap.Layers
 {
@@ -27,7 +27,7 @@ public class TileLayer : Layer, IDeserializationCallback
         private static readonly ILog Logger = LogManager.GetLogger<TileLayer>();
 
         #region Fields
-        
+
         //string layerName;
         ///// <summary>
         ///// The <see cref="ImageAttributes"/> used when rendering the tiles
@@ -49,19 +49,19 @@ public class TileLayer : Layer, IDeserializationCallback
         /// A file cache
         /// </summary>
         protected FileCache _fileCache;
-        
+
         /// <summary>
         /// The format of the images
         /// </summary>
         protected ImageFormat _ImageFormat;
-        
+
         /// <summary>
         /// Value indicating if "error" tiles should be generated or not.
         /// </summary>
         protected readonly bool _showErrorInTile;
 
         InterpolationMode _interpolationMode = InterpolationMode.HighQualityBicubic;
-        
+
         /// <summary>
         /// Color that is treated as a placeholder for transparency
         /// </summary>
@@ -82,7 +82,7 @@ public override Envelope Envelope
             {
                 var extent = _source.Schema.Extent;
                 return new Envelope(
-                    extent.MinX, extent.MaxX, 
+                    extent.MinX, extent.MaxX,
                     extent.MinY, extent.MaxY);
             }
         }
@@ -118,7 +118,7 @@ public TileLayer(ITileSource tileSource, string layerName)
         /// <param name="transparentColor">The color to be treated as transparent color</param>
         /// <param name="showErrorInTile">Flag indicating that an error tile should be generated for <see cref="WebException"/>s</param>
         public TileLayer(ITileSource tileSource, string layerName, Color transparentColor, bool showErrorInTile)
-            : this(tileSource,layerName, transparentColor, showErrorInTile,null)
+            : this(tileSource, layerName, transparentColor, showErrorInTile, null)
         {
         }
 
@@ -187,13 +187,13 @@ public override void Render(Graphics graphics, MapViewport map)
             if (!map.Size.IsEmpty && map.Size.Width > 0 && map.Size.Height > 0)
             {
                 var bmp = new Bitmap(map.Size.Width, map.Size.Height, PixelFormat.Format32bppArgb);
-                
+
                 using (var g = Graphics.FromImage(bmp))
                 {
                     g.InterpolationMode = InterpolationMode;
                     g.Transform = graphics.Transform.Clone();
 
-                    var extent = new Extent(map.Envelope.MinX, map.Envelope.MinY, 
+                    var extent = new Extent(map.Envelope.MinX, map.Envelope.MinY,
                                             map.Envelope.MaxX, map.Envelope.MaxY);
                     var level = BruTile.Utilities.GetNearestLevel(_source.Schema.Resolutions, Math.Max(map.PixelWidth, map.PixelHeight));
                     var tiles = new List<TileInfo>(_source.Schema.GetTileInfos(extent, level));
@@ -202,14 +202,14 @@ public override void Render(Graphics graphics, MapViewport map)
 
                     IList<WaitHandle> waitHandles = new List<WaitHandle>();
                     var toRender = new System.Collections.Concurrent.ConcurrentDictionary<TileIndex, Bitmap>();
-                    var takenFromCache = new System.Collections.Concurrent.ConcurrentDictionary<TileIndex,bool>();
+                    var takenFromCache = new System.Collections.Concurrent.ConcurrentDictionary<TileIndex, bool>();
                     foreach (TileInfo info in tiles)
                     {
                         var image = _bitmaps.Find(info.Index);
                         if (image != null)
                         {
                             toRender.TryAdd(info.Index, image);
-                            takenFromCache.TryAdd(info.Index,true);
+                            takenFromCache.TryAdd(info.Index, true);
                             continue;
                         }
                         if (_fileCache != null && _fileCache.Exists(info.Index))
@@ -249,14 +249,14 @@ public override void Render(Graphics graphics, MapViewport map)
                             var min = map.WorldToImage(new Coordinate(info.Extent.MinX, info.Extent.MinY));
                             var max = map.WorldToImage(new Coordinate(info.Extent.MaxX, info.Extent.MaxY));
 
-                            min = new PointF((float) Math.Round(min.X), (float) Math.Round(min.Y));
-                            max = new PointF((float) Math.Round(max.X), (float) Math.Round(max.Y));
+                            min = new PointF((float)Math.Round(min.X), (float)Math.Round(min.Y));
+                            max = new PointF((float)Math.Round(max.X), (float)Math.Round(max.Y));
 
                             try
                             {
                                 g.DrawImage(bitmap,
-                                            new Rectangle((int) min.X, (int) max.Y, (int) (max.X - min.X),
-                                                          (int) (min.Y - max.Y)),
+                                            new Rectangle((int)min.X, (int)max.Y, (int)(max.X - min.X),
+                                                          (int)(min.Y - max.Y)),
                                             0, 0, tileWidth, tileHeight,
                                             GraphicsUnit.Pixel,
                                             ia);
@@ -298,8 +298,8 @@ private void GetTileOnThread(object parameter)
             //MemoryCache<Bitmap> bitmaps = (MemoryCache<Bitmap>)parameters[2];
             var bitmaps = (ConcurrentDictionary<TileIndex, Bitmap>)parameters[2];
             AutoResetEvent autoResetEvent = (AutoResetEvent)parameters[3];
-            bool retry = (bool) parameters[4];
-            var takenFromCache = (IDictionary<TileIndex, bool>) parameters[5];
+            bool retry = (bool)parameters[4];
+            var takenFromCache = (IDictionary<TileIndex, bool>)parameters[5];
 
             var setEvent = true;
             try
@@ -316,7 +316,7 @@ private void GetTileOnThread(object parameter)
                 {
                     AddImageToFileCache(tileInfo, bitmap);
                 }
-                
+
             }
             catch (WebException ex)
             {
@@ -348,10 +348,10 @@ private void GetTileOnThread(object parameter)
                         // we don't want fatal exceptions here!
                         Logger.Error(e);
                     }
-                    
+
                 }
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 Logger.Error(ex.Message);
             }
diff --git a/SharpMap.Layers.BruTile/SharpMap.Layers.BruTile.csproj b/SharpMap.Layers.BruTile/SharpMap.Layers.BruTile.csproj
index ddd6b785..b29bab50 100644
--- a/SharpMap.Layers.BruTile/SharpMap.Layers.BruTile.csproj
+++ b/SharpMap.Layers.BruTile/SharpMap.Layers.BruTile.csproj
@@ -10,13 +10,17 @@
         <Description>The package contains a base map layer solution based on BruTile.</Description>
     </PropertyGroup>
 
+    <ItemGroup>
+      <PackageReference Include="BruTile" Version="3.1.3" />
+      <PackageReference Include="BruTile.Desktop" Version="3.1.3" />
+    </ItemGroup>
+
     <ItemGroup>
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BruTile" Version="2.1.2" />
-        <PackageReference Include="BruTile.Desktop" Version="2.1.2" />
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     </ItemGroup>
 
 </Project>
diff --git a/SharpMap.Layers.BruTile/Utilities/Cache/FileCacheSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Cache/FileCacheSurrogate.cs
index 14800e16..0c129550 100644
--- a/SharpMap.Layers.BruTile/Utilities/Cache/FileCacheSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Cache/FileCacheSurrogate.cs
@@ -1,7 +1,6 @@
-using System;
-using System.Reflection;
+using BruTile.Cache;
+using System;
 using System.Runtime.Serialization;
-using BruTile.Cache;
 
 namespace SharpMap.Utilities.Cache
 {
@@ -32,7 +31,7 @@ object IObjectReference.GetRealObject(StreamingContext context)
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var fileCache = (FileCache) obj;
+            var fileCache = (FileCache)obj;
             info.SetType(typeof(FileCacheRef));
             info.AddValue("dir", Utility.GetFieldValue<string>(fileCache, "_directory"));
             info.AddValue("fmt", Utility.GetFieldValue<string>(fileCache, "_format"));
diff --git a/SharpMap.Layers.BruTile/Utilities/Cache/MemoryCacheSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Cache/MemoryCacheSurrogate.cs
index 999033a9..9ed35428 100644
--- a/SharpMap.Layers.BruTile/Utilities/Cache/MemoryCacheSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Cache/MemoryCacheSurrogate.cs
@@ -1,11 +1,10 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
-using System;
+using BruTile;
+using BruTile.Cache;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile;
-using BruTile.Cache;
 
 namespace SharpMap.Utilities.Cache
 {
@@ -15,17 +14,17 @@ internal class MemoryCacheSurrogate<T> : ISerializationSurrogate
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var ms = (MemoryCache<T>) obj;
+            var ms = (MemoryCache<T>)obj;
             info.AddValue("min", ms.MinTiles);
             info.AddValue("max", ms.MaxTiles);
         }
 
         public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
         {
-            var ms = (MemoryCache<T>) obj;
+            var ms = (MemoryCache<T>)obj;
             ms.MinTiles = info.GetInt32("min");
             ms.MaxTiles = info.GetInt32("max");
-  
+
             Utility.SetFieldValue(ref obj, "_syncRoot", BindingFlags.NonPublic | BindingFlags.Instance, new object());
             Utility.SetFieldValue(ref obj, "_bitmaps", BindingFlags.NonPublic | BindingFlags.Instance, new Dictionary<TileIndex, T>());
             Utility.SetFieldValue(ref obj, "_touched", BindingFlags.NonPublic | BindingFlags.Instance, new Dictionary<TileIndex, long>());
diff --git a/SharpMap.Layers.BruTile/Utilities/ExtentSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/ExtentSurrogate.cs
index 7f9a0996..44cf161b 100644
--- a/SharpMap.Layers.BruTile/Utilities/ExtentSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/ExtentSurrogate.cs
@@ -1,8 +1,7 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
-using System.Reflection;
-using System.Runtime.Serialization;
 using BruTile;
+using System.Runtime.Serialization;
 
 namespace SharpMap.Utilities
 {
diff --git a/SharpMap.Layers.BruTile/Utilities/ResolutionSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/ResolutionSurrogate.cs
index 832c27ee..6031189a 100644
--- a/SharpMap.Layers.BruTile/Utilities/ResolutionSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/ResolutionSurrogate.cs
@@ -1,7 +1,7 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
-using System.Runtime.Serialization;
 using BruTile;
+using System.Runtime.Serialization;
 
 namespace SharpMap.Utilities
 {
@@ -19,7 +19,7 @@ internal class ResolutionRef : IObjectReference, ISerializable
             public ResolutionRef(SerializationInfo info, StreamingContext context)
             {
                 _resolution = new Resolution(
-                    info.GetString("id"), info.GetDouble("upp"),
+                    info.GetInt32("level"), info.GetDouble("upp"),
                     info.GetInt32("th"), info.GetInt32("tw"),
                     info.GetDouble("t"), info.GetDouble("l"),
                     info.GetInt32("mw"), info.GetInt32("mh"),
@@ -38,7 +38,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
             }
         }
 
-        
+
 
         #region Implementation of ISerializationSurrogate
 
@@ -46,7 +46,7 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
         {
             var res = (Resolution)obj;
             info.SetType(typeof(ResolutionRef));
-            info.AddValue("id", res.Id);
+            info.AddValue("level", res.Level);
             info.AddValue("upp", res.UnitsPerPixel);
             info.AddValue("th", res.TileHeight);
             info.AddValue("tw", res.TileWidth);
diff --git a/SharpMap.Layers.BruTile/Utilities/TileSchemaSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/TileSchemaSurrogate.cs
index a003f46a..972bd1ba 100644
--- a/SharpMap.Layers.BruTile/Utilities/TileSchemaSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/TileSchemaSurrogate.cs
@@ -1,11 +1,11 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile;
+using BruTile.Wmts;
 using System;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile;
-using BruTile.Wmts;
 
 namespace SharpMap.Utilities
 {
@@ -15,7 +15,7 @@ internal class TileSchemaSurrogate : ISerializationSurrogate
 
         public virtual void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var ts = (TileSchema) obj;
+            var ts = (TileSchema)obj;
             info.AddValue("name", ts.Name);
             info.AddValue("srs", ts.Srs);
             info.AddValue("extent", ts.Extent);
@@ -39,30 +39,30 @@ public virtual void GetObjectData(object obj, SerializationInfo info, StreamingC
 
         public virtual object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
         {
-            var ts = (TileSchema) obj;
+            var ts = (TileSchema)obj;
             ts.Name = info.GetString("name");
             ts.Srs = info.GetString("srs");
             var extentRef = (ExtentSurrogate.ExtentRef)info.GetValue("extent", typeof(ExtentSurrogate.ExtentRef));
-            ts.Extent = (Extent) ((IObjectReference) extentRef).GetRealObject(context);
+            ts.Extent = (Extent)((IObjectReference)extentRef).GetRealObject(context);
             ts.OriginX = info.GetDouble("originX");
             ts.OriginY = info.GetDouble("originY");
             //ts.Width = info.GetInt32("width");
             //ts.Height = info.GetInt32("height");
             ts.Format = info.GetString("format");
-            
-            var type = (Type) info.GetValue("resolutionsType", typeof (Type));
-            var list = (IDictionary<string, Resolution>) Activator.CreateInstance(type);
+
+            var type = (Type)info.GetValue("resolutionsType", typeof(Type));
+            var list = (IDictionary<int, Resolution>)Activator.CreateInstance(type);
             var count = info.GetInt32("resolutionsCount");
             for (var i = 0; i < count; i++)
             {
-                var key = info.GetString(string.Format("rk{0}", i));
+                var key = info.GetInt32(string.Format("rk{0}", i));
                 var valueRef = (IObjectReference)
                         info.GetValue(string.Format("rv{0}", i), typeof(ResolutionSurrogate.ResolutionRef));
-                var value = (Resolution) valueRef.GetRealObject(context);
+                var value = (Resolution)valueRef.GetRealObject(context);
                 list.Add(key, value);
             }
             Utility.SetFieldValue(ref obj, "_resolutions", BindingFlags.NonPublic | BindingFlags.Instance, list);
-            
+
             ts.YAxis = (YAxis)info.GetInt32("axis");
             return ts;
         }
@@ -76,7 +76,7 @@ internal class WmtsTileSchemaSurrogate : ISerializationSurrogate
         {
             public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
             {
-                var ts = (WmtsTileSchema) obj;
+                var ts = (WmtsTileSchema)obj;
                 info.AddValue("name", ts.Name);
                 info.AddValue("srs", ts.Srs);
                 info.AddValue("extent", ts.Extent);
@@ -118,8 +118,8 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
                     var key = info.GetString(string.Format("rk{0}", i));
                     var valueRef = (IObjectReference)
                         info.GetValue(string.Format("rv{0}", i), typeof(ResolutionSurrogate.ResolutionRef));
-                    var value = (Resolution) valueRef.GetRealObject(context);
-                    list.Add(key,value);
+                    var value = (Resolution)valueRef.GetRealObject(context);
+                    list.Add(key, value);
                 }
                 Utility.SetPropertyValue(ref obj, "Resolutions", BindingFlags.Public | BindingFlags.Instance, list);
 
@@ -132,14 +132,13 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
                 Utility.SetPropertyValue(ref obj, "Style", BindingFlags.Instance | BindingFlags.Public, info.GetString("style"));
                 Utility.SetPropertyValue(ref obj, "TileMatrixSet", BindingFlags.Instance | BindingFlags.Public, info.GetString("tileMatrixSet"));
 
-                CrsIdentifier tmp;
-                if (CrsIdentifier.TryParse(info.GetString("supportedSRS"), out tmp))
+                if (CrsIdentifier.TryParse(info.GetString("supportedSRS"), out CrsIdentifier tmp))
                     Utility.SetPropertyValue(ref obj, "SupportedSRS", BindingFlags.Instance | BindingFlags.Public, tmp);
-                
+
                 return ts;
             }
         }
-        
+
         internal class BingSchemaSurrogate : TileSchemaSurrogate
         {
         }
diff --git a/SharpMap.Layers.BruTile/Utilities/Utility.cs b/SharpMap.Layers.BruTile/Utilities/Utility.cs
index 77328a18..f9429c68 100644
--- a/SharpMap.Layers.BruTile/Utilities/Utility.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Utility.cs
@@ -1,10 +1,5 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Reflection;
-using System.Runtime.Serialization;
 using BruTile;
 using BruTile.Cache;
 using BruTile.Predefined;
@@ -17,6 +12,10 @@
 using SharpMap.Utilities.Web;
 using SharpMap.Utilities.Wmts;
 using SharpMap.Utilities.Wmts.Generated;
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
 
 namespace SharpMap.Utilities
 {
@@ -47,7 +46,7 @@ internal static T GetFieldValue<T>(object obj, string fieldName, BindingFlags bi
             var type = obj.GetType();
             var field = SearchField(type, fieldName, bindingFlags);
             if (field != null)
-                return (T) field.GetValue(obj);
+                return (T)field.GetValue(obj);
             System.Diagnostics.Trace.WriteLine(obj,
                                                string.Format("could not get '{0}' from '{1}'", fieldName, obj.GetType()));
             return defaultValue;
@@ -100,7 +99,7 @@ internal static void SetPropertyValue<T>(ref object obj, string propertyName,
         {
             var type = obj.GetType();
             var property = SearchProperty(type, propertyName, bindingFlags, true);
-            
+
             var setObj = (bindingFlags & BindingFlags.Static) == BindingFlags.Static ? null : obj;
             if (property != null)
                 property.SetValue(setObj, newValue, null);
@@ -115,9 +114,9 @@ internal static T GetPropertyValue<T>(object obj, string propertyName,
         {
             var type = obj.GetType();
             var property = SearchProperty(type, propertyName, bindingFlags);
-            
+
             if (property != null)
-                return (T) property.GetValue(obj, null);
+                return (T)property.GetValue(obj, null);
             System.Diagnostics.Trace.WriteLine(obj,
                                                string.Format("could not get '{0}' from '{1}'", propertyName,
                                                              obj.GetType()));
@@ -133,18 +132,18 @@ public static void AddBruTileSurrogates(this IFormatter formatter)
             var ss = new SurrogateSelector();
 
             // Base types
-            ss.AddSurrogate(typeof (Extent), new StreamingContext(StreamingContextStates.All), new ExtentSurrogate());
-            ss.AddSurrogate(typeof (Resolution), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(Extent), new StreamingContext(StreamingContextStates.All), new ExtentSurrogate());
+            ss.AddSurrogate(typeof(Resolution), new StreamingContext(StreamingContextStates.All),
                             new ResolutionSurrogate());
-            ss.AddSurrogate(typeof (TileSchema), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(TileSchema), new StreamingContext(StreamingContextStates.All),
                             new TileSchemaSurrogate());
 
             // Caches
-            ss.AddSurrogate(typeof (NullCache), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(NullCache), new StreamingContext(StreamingContextStates.All),
                             new NullCacheSurrogate());
-            ss.AddSurrogate(typeof (MemoryCache<byte[]>), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(MemoryCache<byte[]>), new StreamingContext(StreamingContextStates.All),
                             new MemoryCacheSurrogate<byte[]>());
-            ss.AddSurrogate(typeof (MemoryCache<System.Drawing.Bitmap>),
+            ss.AddSurrogate(typeof(MemoryCache<System.Drawing.Bitmap>),
                             new StreamingContext(StreamingContextStates.All),
                             new MemoryCacheSurrogate<System.Drawing.Bitmap>());
             ss.AddSurrogate(typeof(FileCache),
@@ -153,44 +152,44 @@ public static void AddBruTileSurrogates(this IFormatter formatter)
 
             // Predefined
             var tss1 = new TileSchemaSurrogate();
-            ss.AddSurrogate(typeof (GlobalMercator), new StreamingContext(StreamingContextStates.All), tss1);
+            ss.AddSurrogate(typeof(GlobalMercator), new StreamingContext(StreamingContextStates.All), tss1);
             ss.AddSurrogate(typeof(GlobalSphericalMercator), new StreamingContext(StreamingContextStates.All), tss1);
             //ss.AddSurrogate(typeof(SphericalMercatorWorldSchema), new StreamingContext(StreamingContextStates.All), tss1);
             //ss.AddSurrogate(typeof (SphericalMercatorInvertedWorldSchema), 
             //                new StreamingContext(StreamingContextStates.All),tss1);
             //ss.AddSurrogate(typeof (BingSchema), new StreamingContext(StreamingContextStates.All), tss1);
-            ss.AddSurrogate(typeof (WkstNederlandSchema), new StreamingContext(StreamingContextStates.All), tss1);
-            ss.AddSurrogate(typeof (WmtsTileSchema), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(WkstNederlandSchema), new StreamingContext(StreamingContextStates.All), tss1);
+            ss.AddSurrogate(typeof(WmtsTileSchema), new StreamingContext(StreamingContextStates.All),
                 new WmtsTileSchemaSurrogate());
 
             //Web
             var tss2 = new TileSourceSurrogate();
             ss.AddSurrogate(typeof(TileSource), new StreamingContext(StreamingContextStates.All), tss2);
-            ss.AddSurrogate(typeof (ArcGisTileRequest), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(ArcGisTileRequest), new StreamingContext(StreamingContextStates.All),
                             new ArcGisTileRequestSurrogate());
-            ss.AddSurrogate(typeof (ArcGisTileSource), new StreamingContext(StreamingContextStates.All), 
+            ss.AddSurrogate(typeof(ArcGisTileSource), new StreamingContext(StreamingContextStates.All),
                             new ArcGisTileSourceSurrogate());
-            ss.AddSurrogate(typeof (BasicRequest), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(BasicRequest), new StreamingContext(StreamingContextStates.All),
                             new BasicRequestSurrogate());
-            
+
             ss.AddSurrogate(typeof(TmsRequest), new StreamingContext(StreamingContextStates.All),
                             new TmsRequestSurrogate());
-            ss.AddSurrogate(typeof (TmsTileSource), new StreamingContext(StreamingContextStates.All), tss2);
+            ss.AddSurrogate(typeof(TmsTileSource), new StreamingContext(StreamingContextStates.All), tss2);
 
-            ss.AddSurrogate(typeof (HttpTileProvider), new StreamingContext(StreamingContextStates.All),
+            ss.AddSurrogate(typeof(HttpTileProvider), new StreamingContext(StreamingContextStates.All),
                             new HttpTileProviderSurrogate());
             ss.AddSurrogate(typeof(WmscTileSource), new StreamingContext(StreamingContextStates.All), tss2);
             ss.AddSurrogate(typeof(WmscRequest), new StreamingContext(StreamingContextStates.All),
                             new WmscRequestSurrogate());
 
-            ss.AddSurrogate(typeof(HttpTileSource), new StreamingContext(StreamingContextStates.All), 
+            ss.AddSurrogate(typeof(HttpTileSource), new StreamingContext(StreamingContextStates.All),
                             new HttpTileSourceSurrogate());
 
             //Wmts
             ss.AddSurrogate(typeof(ResourceUrl), new StreamingContext(StreamingContextStates.All), new ResourceUrlSurrogate());
             ss.AddSurrogate(typeof(WmtsRequest), new StreamingContext(StreamingContextStates.All), new WmtsRequestSurrogate());
-            
-            
+
+
             if (formatter.SurrogateSelector != null)
                 formatter.SurrogateSelector.ChainSelector(ss);
             else
@@ -208,7 +207,7 @@ public static void AddBruTileSurrogates(this IFormatter formatter)
         public static void GetList<T>(IList<T> obj, SerializationInfo info, StreamingContext context,
                                       string baseFieldName)
         {
-            info.AddValue(baseFieldName + "IsNull", obj==null);
+            info.AddValue(baseFieldName + "IsNull", obj == null);
             if (obj == null) return;
 
             info.AddValue(baseFieldName + "Type", obj.GetType());
@@ -284,7 +283,7 @@ public static IDictionary<TKey, TValue> SetDictionary<TKey, TValue>(Serializatio
             var count = info.GetInt32(baseFieldName + "Count");
             for (var i = 0; i < count; i++)
             {
-                var key = (TKey) info.GetValue(baseFieldName + "Key" + i, typeof (TKey));
+                var key = (TKey)info.GetValue(baseFieldName + "Key" + i, typeof(TKey));
                 var value = (TValue)info.GetValue(baseFieldName + "Value" + i, typeof(TValue));
                 instance.Add(key, value);
             }
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileRequestSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileRequestSurrogate.cs
index 3d093b27..aca37e72 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileRequestSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileRequestSurrogate.cs
@@ -1,9 +1,9 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile.Web;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
@@ -13,14 +13,14 @@ internal class ArcGisTileRequestSurrogate : ISerializationSurrogate
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var agtc = (ArcGisTileRequest) obj;
+            var agtc = (ArcGisTileRequest)obj;
             info.AddValue("baseUrl", Utility.GetFieldValue(agtc, "_baseUrl", BindingFlags.NonPublic | BindingFlags.Instance, string.Empty));
             var dict = Utility.GetFieldValue(agtc, "_customParameters", BindingFlags.NonPublic | BindingFlags.Instance,
                                              new Dictionary<string, string>());
             info.AddValue("customParametersCount", dict.Count);
             var i = 0;
             foreach (KeyValuePair<string, string> cp in dict)
-                info.AddValue(string.Format("customParameter{0}", i++), string.Format("{0}\t{1}}",cp.Key, cp.Value));
+                info.AddValue(string.Format("customParameter{0}", i++), string.Format("{0}\t{1}}", cp.Key, cp.Value));
             info.AddValue("format", Utility.GetFieldValue(agtc, "_format", BindingFlags.NonPublic | BindingFlags.Instance, string.Empty));
         }
 
@@ -33,7 +33,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
             var count = info.GetInt32("customParametersCount");
             for (var i = 0; i < count; i++)
             {
-                var kvp = info.GetString(string.Format("customParameter{0}", i)).Split(new[] {'\t'});
+                var kvp = info.GetString(string.Format("customParameter{0}", i)).Split(new[] { '\t' });
                 dict.Add(kvp[0], kvp[1]);
             }
             Utility.SetFieldValue(ref obj, "_customParameters", BindingFlags.NonPublic | BindingFlags.Instance, dict);
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileSourceSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileSourceSurrogate.cs
index 4edd8987..0a7e3366 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileSourceSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/ArcGisTileSourceSurrogate.cs
@@ -1,10 +1,10 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile;
+using BruTile.Web;
 using System;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
@@ -14,10 +14,10 @@ internal class ArcGisTileSourceSurrogate : ISerializationSurrogate
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var agts = (ArcGisTileSource) obj;
-            
+            var agts = (ArcGisTileSource)obj;
+
             // This is broken because of ITileSource.GetTile change
-            
+
             // Provider
             //var type = agts.GetType();
             //info.AddValue("providerType", type);
@@ -41,7 +41,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
             Utility.SetPropertyValue(ref obj, "Provider", BindingFlags.NonPublic | BindingFlags.Instance, (ITileProvider)info.GetValue("provider", type));
 
             //Schema
-            type = (Type) info.GetValue("schemaType", typeof (Type));
+            type = (Type)info.GetValue("schemaType", typeof(Type));
             Utility.SetPropertyValue(ref obj, "Schema", BindingFlags.NonPublic | BindingFlags.Instance, (ITileSchema)info.GetValue("schema", type));
 
             //BaseUrl
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/BasicRequestSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/BasicRequestSurrogate.cs
index 13848586..76f27ba4 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/BasicRequestSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/BasicRequestSurrogate.cs
@@ -1,9 +1,9 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile.Web;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
@@ -21,7 +21,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
         {
             var br = (BasicRequest)obj;
             Utility.SetFieldValue(ref obj, "_urlFormatter", BindingFlags.NonPublic | BindingFlags.Instance, info.GetString("urlFormatter"));
-            Utility.SetFieldValue(ref obj, "_serverNodes", newValue:(List<string>)info.GetValue("serverNodes", typeof(List<string>)));
+            Utility.SetFieldValue(ref obj, "_serverNodes", newValue: (List<string>)info.GetValue("serverNodes", typeof(List<string>)));
             Utility.SetFieldValue(ref obj, "_nodeCounterLock", newValue: new object());
             return br;
         }
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/BingRequestSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/BingRequestSurrogate.cs
index a8221a91..53a2d60e 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/BingRequestSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/BingRequestSurrogate.cs
@@ -1,8 +1,8 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile.Web;
 using System;
 using System.Runtime.Serialization;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/HttpTileProviderSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/HttpTileProviderSurrogate.cs
index 927202c2..ff9fe9df 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/HttpTileProviderSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/HttpTileProviderSurrogate.cs
@@ -1,11 +1,11 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile.Cache;
+using BruTile.Web;
 using System;
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile.Cache;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
@@ -25,11 +25,11 @@ public HttpTileProviderRef(SerializationInfo info, StreamingContext context)
                 var fetchTile = (Func<Uri, byte[]>)info.GetValue("_fetchTile", type);
 
                 type = (Type)info.GetValue("_persistentCacheType", typeof(Type));
-                var persistentCache = (IPersistentCache<byte[]>) info.GetValue("_persistentCache", type);
+                var persistentCache = (IPersistentCache<byte[]>)info.GetValue("_persistentCache", type);
 
                 _httpTileProvider = new HttpTileProvider(request, persistentCache, fetchTile);
             }
-            
+
             object IObjectReference.GetRealObject(StreamingContext context)
             {
                 return _httpTileProvider;
@@ -40,8 +40,8 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
                 throw new NotSupportedException();
             }
         }
-        
-        
+
+
         #region Implementation of ISerializationSurrogate
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/HttpTileSourceSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/HttpTileSourceSurrogate.cs
index 21fecba7..2bb52edb 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/HttpTileSourceSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/HttpTileSourceSurrogate.cs
@@ -1,10 +1,10 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile;
+using BruTile.Web;
 using System;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile;
-using BruTile.Web;
 
 namespace SharpMap.Utilities.Web
 {
@@ -26,12 +26,13 @@ public HttpTileSourceRef(SerializationInfo info, StreamingContext context)
                 // Attribution
                 var attribution = new Attribution(info.GetString("attText"), info.GetString("attUrl"));
 
-                // Provider
-                var tp = (HttpTileProvider)info.GetValue("provider", typeof(HttpTileProvider));
+                // Request
+                var tr = (BasicRequest)info.GetValue("request", typeof(BasicRequest));
+                var urlFormatter = Utility.GetFieldValue(tr, "_urlFormatter", BindingFlags.NonPublic | BindingFlags.Instance, "http://localhost");
 
-                _httpTileSource = new HttpTileSource(schema, "http://localhost", attribution: attribution) {Name = name};
+                _httpTileSource = new HttpTileSource(schema, urlFormatter, attribution: attribution) { Name = name };
                 object obj = _httpTileSource;
-                Utility.SetFieldValue(ref obj, "_provider", BindingFlags.NonPublic | BindingFlags.Instance, tp);
+                Utility.SetFieldValue(ref obj, "_request", BindingFlags.NonPublic | BindingFlags.Instance, tr);
             }
 
             void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
@@ -48,7 +49,7 @@ object IObjectReference.GetRealObject(StreamingContext context)
 
         public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
         {
-            var ts = (HttpTileSource) obj;
+            var ts = (HttpTileSource)obj;
             info.SetType(typeof(HttpTileSourceRef));
             info.AddValue("name", ts.Name, typeof(string));
 
@@ -56,14 +57,14 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
             var type = ts.Schema.GetType();
             info.AddValue("schemaType", type);
             info.AddValue("schema", ts.Schema, type);
-            
+
             // Attribution
             info.AddValue("attText", ts.Attribution?.Text ?? string.Empty);
-            info.AddValue("attUrl", ts.Attribution?.Url?? string.Empty);
+            info.AddValue("attUrl", ts.Attribution?.Url ?? string.Empty);
 
-            //Provider
-            var p = Utility.GetFieldValue<HttpTileProvider>(ts, "_provider");
-            info.AddValue("provider", p, typeof(HttpTileProvider));
+            //Request
+            var br = Utility.GetFieldValue<BasicRequest>(ts, "_request");
+            info.AddValue("request", br, typeof(BasicRequest));
         }
 
         public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/TileSourceSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/TileSourceSurrogate.cs
index 22f2eb84..216e426d 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/TileSourceSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/TileSourceSurrogate.cs
@@ -1,9 +1,10 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile;
+using BruTile.Web;
 using System;
 using System.Reflection;
 using System.Runtime.Serialization;
-using BruTile;
 
 namespace SharpMap.Utilities.Web
 {
@@ -18,10 +19,10 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
 
             info.AddValue("name", ts.Name);
 
-            // Provider
-            var tp = Utility.GetFieldValue<ITileProvider>(ts, "_provider");
-            info.AddValue("providerType", tp.GetType());
-            info.AddValue("provider", tp);
+            // Request
+            var tr = Utility.GetFieldValue<IRequest>(ts, "_request");
+            info.AddValue("requestType", tr.GetType());
+            info.AddValue("request", tr);
 
             // Schema
             info.AddValue("schemaType", ts.Schema.GetType());
@@ -30,16 +31,14 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
 
         public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
         {
-            var ts = (TileSource) obj;
+            var ts = (TileSource)obj;
             ts.Name = info.GetString("name");
 
-            var type = (Type) info.GetValue("providerType", typeof (Type));
-            Utility.SetFieldValue(ref obj, "_provider", BindingFlags.NonPublic | BindingFlags.Instance, (ITileProvider)info.GetValue("provider", type));
-            type = (Type)info.GetValue("schemaType", typeof(Type));
+            var type = (Type)info.GetValue("schemaType", typeof(Type));
             Utility.SetPropertyValue(ref obj, "Schema", BindingFlags.Public | BindingFlags.Instance, (ITileSchema)info.GetValue("schema", type));
             return obj;
         }
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap.Layers.BruTile/Utilities/Web/TmsRequestSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Web/TmsRequestSurrogate.cs
index 42437dc6..2150d62f 100644
--- a/SharpMap.Layers.BruTile/Utilities/Web/TmsRequestSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Web/TmsRequestSurrogate.cs
@@ -21,13 +21,13 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
         public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
         {
             Utility.SetFieldValue(ref obj, "_baseUrl", Utility.PrivateInstance, info.GetString("baseUrl"));
-            Utility.SetFieldValue(ref obj, "_baseUrls", Utility.PrivateInstance, 
+            Utility.SetFieldValue(ref obj, "_baseUrls", Utility.PrivateInstance,
                                   Utility.SetDictionary<string, System.Uri>(info, context, "baseUrls"));
             Utility.SetFieldValue(ref obj, "_imageFormat", Utility.PrivateInstance, info.GetString("imageFormat"));
             Utility.SetFieldValue(ref obj, "_customParameters", Utility.PrivateInstance,
                                   Utility.SetDictionary<string, string>(info, context, "customParameters"));
-            Utility.SetFieldValue(ref obj, "_serverNodes", Utility.PrivateInstance, 
-                                  Utility.SetList<string>(info, context,"serverNodes"));
+            Utility.SetFieldValue(ref obj, "_serverNodes", Utility.PrivateInstance,
+                                  Utility.SetList<string>(info, context, "serverNodes"));
             //Not serialized, but nonethelesss needed.
             Utility.SetFieldValue(ref obj, "_random", Utility.PrivateInstance, new System.Random());
             return null;
diff --git a/SharpMap.Layers.BruTile/Utilities/Wmts/ResourceUrlSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Wmts/ResourceUrlSurrogate.cs
index e18575d9..2743ff25 100644
--- a/SharpMap.Layers.BruTile/Utilities/Wmts/ResourceUrlSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Wmts/ResourceUrlSurrogate.cs
@@ -1,8 +1,8 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
-using System.Runtime.Serialization;
 using BruTile.Wmts;
 using BruTile.Wmts.Generated;
+using System.Runtime.Serialization;
 
 namespace SharpMap.Utilities.Wmts
 {
@@ -13,19 +13,19 @@ internal class ResourceUrlSurrogate : ISerializationSurrogate
         {
             public void GetObjectData(object obj, SerializationInfo info, StreamingContext context)
             {
-                var ru = (ResourceUrl) obj;
+                var ru = (ResourceUrl)obj;
                 info.AddValue("format", ru.Format);
                 info.AddValue("template", ru.Template);
-                info.AddValue("resourceType", (int) ru.ResourceType);
+                info.AddValue("resourceType", (int)ru.ResourceType);
             }
 
             public object SetObjectData(object obj, SerializationInfo info, StreamingContext context,
                 ISurrogateSelector selector)
             {
-                var ru = (ResourceUrl) obj;
+                var ru = (ResourceUrl)obj;
                 ru.Format = info.GetString("format");
                 ru.Template = info.GetString("template");
-                ru.ResourceType = (URLTemplateTypeResourceType) info.GetInt32("resourceType");
+                ru.ResourceType = (URLTemplateTypeResourceType)info.GetInt32("resourceType");
                 return ru;
             }
         }
diff --git a/SharpMap.Layers.BruTile/Utilities/Wmts/WmtsRequestSurrogate.cs b/SharpMap.Layers.BruTile/Utilities/Wmts/WmtsRequestSurrogate.cs
index 0e1e26f5..3f61e11b 100644
--- a/SharpMap.Layers.BruTile/Utilities/Wmts/WmtsRequestSurrogate.cs
+++ b/SharpMap.Layers.BruTile/Utilities/Wmts/WmtsRequestSurrogate.cs
@@ -1,8 +1,8 @@
 // Copyright (c) BruTile developers team. All rights reserved. See License.txt in the project root for license information.
 
+using BruTile.Wmts;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
-using BruTile.Wmts;
 
 namespace SharpMap.Utilities.Wmts
 {
@@ -19,8 +19,8 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
         public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
         {
             var urls = new List<ResourceUrl>(info.GetInt32("numResourceUrls"));
-            for(var i = 0; i < urls.Capacity;i++)
-                urls.Add((ResourceUrl)info.GetValue(string.Format("resourceUrl{0}",i), typeof(ResourceUrl)));
+            for (var i = 0; i < urls.Capacity; i++)
+                urls.Add((ResourceUrl)info.GetValue(string.Format("resourceUrl{0}", i), typeof(ResourceUrl)));
 
             Utility.SetFieldValue(ref obj, "_resourceUrls", newValue: urls);
             Utility.SetFieldValue(ref obj, "_syncLock", newValue: new object());
diff --git a/SharpMap.Layers.HeatLayer/HeatLayer.cs b/SharpMap.Layers.HeatLayer/HeatLayer.cs
index 1a647d2f..f6a707cb 100644
--- a/SharpMap.Layers.HeatLayer/HeatLayer.cs
+++ b/SharpMap.Layers.HeatLayer/HeatLayer.cs
@@ -22,16 +22,16 @@
 //
 // *******************************************************************************
 
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
+using SharpMap.Data;
+using SharpMap.Data.Providers;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using SharpMap.Data.Providers;
 using ColorBlend = SharpMap.Rendering.Thematics.ColorBlend;
 
 namespace SharpMap.Layers
@@ -55,12 +55,12 @@ public class HeatLayer : Layer, ICanQueryLayer
         /// <seealso cref="Color.A"/> value of 0.</para>
         /// </summary>
         public ColorBlend HeatColorBlend { get; set; }
-        
+
         /// <summary>
         /// A list of dots, that are used as heat value markers
         /// </summary>
         private readonly Bitmap[] _bitmaps = new Bitmap[32];
-        private readonly float [] _opacity = new float[32];
+        private readonly float[] _opacity = new float[32];
 
         private double _opacityMin;
         private double _opacityMax;
@@ -102,7 +102,7 @@ public HeatLayer(VectorLayer vectorLayer, string heatValueColumn, float heatValu
         /// <param name="heatValueColumn">The name of the column that contains the heat value</param>
         /// <param name="heatValueScale">A value that is responsible to scale the heat value to the range &#x211d;[0, 1f]</param>
         public HeatLayer(IProvider provider, string heatValueColumn, float heatValueScale = 1f)
-            :this()
+            : this()
         {
             DataSource = provider;
             LayerName = "heat_" + provider.ConnectionID + heatValueColumn;
@@ -152,7 +152,7 @@ public HeatLayer(IProvider provider, Func<FeatureDataRow, float> heatComputer)
         /// Gets the base layer
         /// </summary>
         public VectorLayer BaseLayer { get; private set; }
-        
+
         /// <summary>
         /// Gets the provider that serves the heat value features
         /// </summary>
@@ -169,11 +169,11 @@ public override void Render(Graphics g, MapViewport map)
             {
                 BaseLayer.Render(g, map);
             }
-            
+
             var fds = new FeatureDataSet();
             var box = map.Envelope;
             ExecuteIntersectionQuery(box, fds);
-            
+
             if (fds.Tables.Count == 0 || fds.Tables[0].Rows.Count == 0)
             {
                 //base.Render(g, map);
@@ -193,8 +193,8 @@ public override void Render(Graphics g, MapViewport map)
 
                 DrawPoints(map, fds.Tables[0].Select(), dot, image);
                 Colorize(image, HeatColorBlend, opacity);
-                
-                g.DrawImage(image, -dot.Width/2, -dot.Height/2);
+
+                g.DrawImage(image, -dot.Width / 2, -dot.Height / 2);
             }
             dot.Dispose();
 
@@ -225,8 +225,8 @@ public static ColorBlend Classic
             get
             {
                 return new ColorBlend(
-                    new[] { Color.FromArgb(0, Color.White), Color.Red, Color.Orange, Color.Yellow, Color.Green, Color.Cyan, Color.Blue, Color.Indigo},
-                    new[] { 0f,                             0.125f,    0.25f,        0.375f,       0.5f,        0.75f,      0.9f,       1 });
+                    new[] { Color.FromArgb(0, Color.White), Color.Red, Color.Orange, Color.Yellow, Color.Green, Color.Cyan, Color.Blue, Color.Indigo },
+                    new[] { 0f, 0.125f, 0.25f, 0.375f, 0.5f, 0.75f, 0.9f, 1 });
             }
         }
 
@@ -275,7 +275,7 @@ public void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
         /// </summary>
         /// <param name="geometry">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             if (CoordinateTransformation != null)
             {
@@ -357,7 +357,7 @@ public void CalculateZoomMinMax(double portion = 0.1d)
             }
 
             var ext = DataSource.GetExtents();
-            ZoomMin = ext.MaxExtent*portion;
+            ZoomMin = ext.MaxExtent * portion;
             ZoomMax = ext.MaxExtent - ZoomMin;
         }
 
@@ -379,13 +379,13 @@ private static Bitmap[] GenerateDots()
                     g.Clear(Color.White);
                     using (var path = new GraphicsPath())
                     {
-                        path.AddEllipse(0, 0, size-1, size-1);
+                        path.AddEllipse(0, 0, size - 1, size - 1);
                         var brush = new PathGradientBrush(path)
                         {
                             CenterColor = Color.Gray,
                             SurroundColors = new[] { Color.White },
                         };
-                        g.FillEllipse(brush, 0, 0, size-1, size-1);
+                        g.FillEllipse(brush, 0, 0, size - 1, size - 1);
                     }
                 }
                 res[i] = bmp;
@@ -484,9 +484,9 @@ private static void Colorize(Bitmap image, ColorBlend heatPalette, float f)
 
                 for (var x = 0; x < image.Width * 4; x += 4)
                 {
-                    var colorIndex = (255 - buffer[x+2]) / 255f;
+                    var colorIndex = (255 - buffer[x + 2]) / 255f;
                     var color = heatPalette.GetColor(colorIndex);
-                    var alpha = Convert.ToInt32(255f * (color.A / 255f) * (buffer[x+3] / 255f) * f);
+                    var alpha = Convert.ToInt32(255f * (color.A / 255f) * (buffer[x + 3] / 255f) * f);
                     color = Color.FromArgb(alpha, color);
                     buffer[x + 3] = color.A;
                     buffer[x + 2] = color.R;
@@ -517,7 +517,7 @@ private void DrawPoints(MapViewport map, IEnumerable<DataRow> features, Bitmap d
                     c = GeometryTransform.TransformCoordinate(c, CoordinateTransformation.MathTransform);
                 }
                 var posF = map.WorldToImage(c);
-                var pos = Point.Round(posF);
+                var pos = System.Drawing.Point.Round(posF);
                 //var pos = Point.Round(PointF.Subtract(posF, halfSize));
 
                 using (var tmpDot = ApplyHeatValueToImage(dot, heatValue))
@@ -531,7 +531,7 @@ private void DrawPoints(MapViewport map, IEnumerable<DataRow> features, Bitmap d
         private void InterpolateOpacityValues()
         {
             _opacity[0] = (float)_opacityMax;
-            var dOpacity = (float)(_opacityMin - _opacityMax)/31f;
+            var dOpacity = (float)(_opacityMin - _opacityMax) / 31f;
             for (var i = 1; i < 31; i++)
                 _opacity[i] = _opacity[i - 1] + dOpacity;
             _opacity[31] = (float)_opacityMin;
diff --git a/SharpMap.Layers.HeatLayer/ImageBlender.cs b/SharpMap.Layers.HeatLayer/ImageBlender.cs
index 55002847..b299a291 100644
--- a/SharpMap.Layers.HeatLayer/ImageBlender.cs
+++ b/SharpMap.Layers.HeatLayer/ImageBlender.cs
@@ -363,7 +363,7 @@ private static Bitmap PerChannelProcess(Bitmap destImg, int destX, int destY, in
                 System.Runtime.InteropServices.Marshal.Copy(srcScan0 + y * srcStride, srcBuffer, 0, srcStride);
                 System.Runtime.InteropServices.Marshal.Copy(dstScan0 + y * dstStride, dstBuffer, 0, dstStride);
 
-                for (var x = 0; x < 3* destWidth; x++)
+                for (var x = 0; x < 3 * destWidth; x++)
                 {
                     dstBuffer[x] = channelProcessFunction(ref srcBuffer[x], ref dstBuffer[x]);
                 }
diff --git a/SharpMap.Layers.HeatLayer/SharpMap.Layers.HeatLayer.csproj b/SharpMap.Layers.HeatLayer/SharpMap.Layers.HeatLayer.csproj
index 7a46ac55..5affc1d4 100644
--- a/SharpMap.Layers.HeatLayer/SharpMap.Layers.HeatLayer.csproj
+++ b/SharpMap.Layers.HeatLayer/SharpMap.Layers.HeatLayer.csproj
@@ -15,4 +15,8 @@
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Serialization/MapSerialization.cs b/SharpMap.Serialization/MapSerialization.cs
index 4aa6b480..85d27451 100644
--- a/SharpMap.Serialization/MapSerialization.cs
+++ b/SharpMap.Serialization/MapSerialization.cs
@@ -1,12 +1,11 @@
-using System;
+using SharpMap.Serialization.Model;
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
 using System.Drawing;
+using System.IO;
+using System.Linq;
 using System.Net;
 using System.Xml.Serialization;
-using SharpMap.Serialization.Model;
 
 namespace SharpMap.Serialization
 {
@@ -25,7 +24,7 @@ public static Map LoadMapFromStream(Stream s)
             Map m = new Map();
 
             if (md.Extent != null)
-                m.ZoomToBox(new GeoAPI.Geometries.Envelope(md.Extent.Xmin, md.Extent.Xmax, md.Extent.Ymin, md.Extent.Ymax));
+                m.ZoomToBox(new NetTopologySuite.Geometries.Envelope(md.Extent.Xmin, md.Extent.Xmax, md.Extent.Ymin, md.Extent.Ymax));
 
             if (!string.IsNullOrEmpty(md.BackGroundColor))
             {
@@ -55,14 +54,14 @@ public static Map LoadMapFromStream(Stream s)
                     }
                     else
                     {
-                        wmsl.AddChildLayers(wmsl.RootLayer,true);
+                        wmsl.AddChildLayers(wmsl.RootLayer, true);
                     }
                     lay = wmsl;
                 }
                 //And some simple tiled layers
                 else if (l is OsmLayer)
                 {
-                    var ol = (OsmLayer) l;
+                    var ol = (OsmLayer)l;
                     BruTile.Predefined.KnownTileSource kts;
                     if (!Enum.TryParse(ol.KnownTileSource, out kts))
                         kts = BruTile.Predefined.KnownTileSource.OpenStreetMap;
@@ -71,27 +70,27 @@ public static Map LoadMapFromStream(Stream s)
                     else
                         lay = new Layers.TileLayer(BruTile.Predefined.KnownTileSources.Create(kts, ol.ApiKey), l.Name);
                 }
-                    /*
-                else if (l is GoogleLayer)
-                {
-                    lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleMap), l.Name);
-                }
-                else if (l is GoogleSatLayer)
-                {
-                    lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleSatellite), l.Name);
-                }
-                else if (l is GoogleTerrainLayer)
-                {
-                    lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleTerrain), l.Name);
-                }
-                      */
+                /*
+            else if (l is GoogleLayer)
+            {
+                lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleMap), l.Name);
+            }
+            else if (l is GoogleSatLayer)
+            {
+                lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleSatellite), l.Name);
+            }
+            else if (l is GoogleTerrainLayer)
+            {
+                lay = new Layers.TileLayer(new BruTile.Web.GoogleTileSource(BruTile.Web.GoogleMapType.GoogleTerrain), l.Name);
+            }
+                  */
                 if (lay != null)
                 {
                     lay.MinVisible = l.MinVisible;
                     lay.MaxVisible = l.MaxVisible;
                     m.Layers.Add(lay);
                 }
-                
+
             }
 
 
diff --git a/SharpMap.Serialization/MapServerMapFileLoader.cs b/SharpMap.Serialization/MapServerMapFileLoader.cs
index 676cbbb2..bdde7cf9 100644
--- a/SharpMap.Serialization/MapServerMapFileLoader.cs
+++ b/SharpMap.Serialization/MapServerMapFileLoader.cs
@@ -1,12 +1,12 @@
-using System;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
+using SharpMap.Styles;
+using System;
 using System.Collections.Generic;
-using System.IO;
-using Common.Logging;
 using System.Drawing;
-using SharpMap.Layers;
 using System.Globalization;
-using SharpMap.Styles;
-using GeoAPI.Geometries;
+using System.IO;
 namespace SharpMap.Serialization
 {
     /// <summary>
@@ -191,7 +191,7 @@ private static void ParseLayer(TextReader sr, Map m, string shapePath)
                             lay.DataSource = sf;
                         }
 
-                        ApplyStyling(lay, classes,classItem, type);
+                        ApplyStyling(lay, classes, classItem, type);
 
                         m.Layers.Add(lay);
                         return;
@@ -269,7 +269,7 @@ private static VectorStyle CreateStyle(StyleElement[] styles, string type)
                     Brush b = new SolidBrush(styles[0].Color);
                     vs.PointColor = b;
                     vs.PointSize = (float)styles[0].Size;
-                    if (styles[0].Offset != Point.Empty)
+                    if (styles[0].Offset != System.Drawing.Point.Empty)
                     {
                         vs.SymbolOffset = new PointF(styles[0].Offset.X, styles[0].Offset.Y);
                     }
@@ -277,7 +277,7 @@ private static VectorStyle CreateStyle(StyleElement[] styles, string type)
                 else if (string.Compare(type, "line", StringComparison.InvariantCultureIgnoreCase) == 0)
                 {
                     vs.Line = new Pen(styles[0].Color, (float)styles[0].Width);
-                    if (styles[0].Offset != Point.Empty)
+                    if (styles[0].Offset != System.Drawing.Point.Empty)
                     {
                         vs.LineOffset = styles[0].Offset.Y;
                     }
@@ -287,7 +287,7 @@ private static VectorStyle CreateStyle(StyleElement[] styles, string type)
                     Brush b = new SolidBrush(styles[0].Color);
                     vs.Fill = b;
                 }
-                
+
                 if (styles[0].OutlineColor != Color.Empty)
                 {
                     vs.EnableOutline = true;
@@ -299,7 +299,7 @@ private static VectorStyle CreateStyle(StyleElement[] styles, string type)
             {
                 GroupStyle gs = new GroupStyle();
                 for (int i = 0; i < styles.Length; i++)
-                    gs.AddStyle(CreateStyle(new [] { styles[i] }, type));
+                    gs.AddStyle(CreateStyle(new[] { styles[i] }, type));
                 return gs;
             }
         }
@@ -321,7 +321,7 @@ private static ClassElement ParseClass(TextReader sr)
                 string[] parts = ParseLine(line);
                 if (parts != null && parts.Length > 0)
                 {
-                    if (string.Compare(parts[0],"END", StringComparison.InvariantCultureIgnoreCase) == 0)
+                    if (string.Compare(parts[0], "END", StringComparison.InvariantCultureIgnoreCase) == 0)
                     {
                         return classEl;
                     }
@@ -343,7 +343,7 @@ private static ClassElement ParseClass(TextReader sr)
                     }
                     else if (string.Compare(parts[0], "NAME", StringComparison.InvariantCultureIgnoreCase) == 0)
                     {
-                        classEl.Name= parts[1];
+                        classEl.Name = parts[1];
                     }
                 }
             }
@@ -361,7 +361,7 @@ private static StyleElement ParseStyle(TextReader sr)
                 BackGroundColor = Color.Empty,
                 OutlineColor = Color.Empty,
                 Size = 1,
-                Offset = Point.Empty
+                Offset = System.Drawing.Point.Empty
             };
 
             while ((line = sr.ReadLine()) != null)
@@ -385,7 +385,7 @@ private static StyleElement ParseStyle(TextReader sr)
                     }
                     else if (string.Compare(parts[0], "EXPRESSION", StringComparison.InvariantCultureIgnoreCase) == 0)
                     {
-                        styleEl.Offset = new Point(int.Parse(parts[1]), int.Parse(parts[2]));
+                        styleEl.Offset = new System.Drawing.Point(int.Parse(parts[1]), int.Parse(parts[2]));
                     }
                     else if (string.Compare(parts[0], "SIZE", StringComparison.InvariantCultureIgnoreCase) == 0)
                     {
@@ -405,15 +405,15 @@ private static StyleElement ParseStyle(TextReader sr)
                     }
                     else if (string.Compare(parts[0], "LINECAP", StringComparison.InvariantCultureIgnoreCase) == 0)
                     {
-                        switch(parts[1].ToLower())
+                        switch (parts[1].ToLower())
                         {
                             case "square":
                                 styleEl.LineCap = System.Drawing.Drawing2D.LineCap.Square;
                                 break;
-                                case "round":
+                            case "round":
                                 styleEl.LineCap = System.Drawing.Drawing2D.LineCap.Round;
                                 break;
-                                case "butt":
+                            case "butt":
                                 styleEl.LineCap = System.Drawing.Drawing2D.LineCap.Flat;
                                 break;
                         }
@@ -463,9 +463,9 @@ static string[] ParseLine(string line)
                 if (!inQuote && parmChars[index] == ' ')
                     parmChars[index] = '\n';
             }
-            string[] parts = new string(parmChars).Split(new [] {'\n'},  StringSplitOptions.RemoveEmptyEntries);
+            string[] parts = new string(parmChars).Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
             for (int i = 0; i < parts.Length; i++)
-                parts[i] = parts[i].Trim(' ', '\"','\'');
+                parts[i] = parts[i].Trim(' ', '\"', '\'');
 
             return parts;
         }
@@ -481,7 +481,7 @@ class StyleElement
             public Color BackGroundColor { get; set; }
             public System.Drawing.Drawing2D.LineCap LineCap { get; set; }
             public System.Drawing.Drawing2D.LineJoin LineJoin { get; set; }
-            public Point Offset { get; set; }
+            public System.Drawing.Point Offset { get; set; }
 
         }
         class ClassElement
diff --git a/SharpMap.Serialization/SharpMap.Serialization.csproj b/SharpMap.Serialization/SharpMap.Serialization.csproj
index 2d0440ff..1f568838 100644
--- a/SharpMap.Serialization/SharpMap.Serialization.csproj
+++ b/SharpMap.Serialization/SharpMap.Serialization.csproj
@@ -16,4 +16,8 @@
         <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Serialization/SharpMapSerializationClasses.cs b/SharpMap.Serialization/SharpMapSerializationClasses.cs
index b7b93640..dd8d5a84 100644
--- a/SharpMap.Serialization/SharpMapSerializationClasses.cs
+++ b/SharpMap.Serialization/SharpMapSerializationClasses.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace SharpMap.Serialization.Model
 {
@@ -23,7 +19,7 @@ public class Extent
         public double Xmax { get; set; }
         public double Ymax { get; set; }
     }
-    
+
     public partial class MapLayer
     {
         public string Name { get; set; }
@@ -86,7 +82,7 @@ public class WmsLayer : MapLayer
         public string WmsLayers { get; set; }
     }
 
-    public class SpatiaLiteLayer : StyledLayer 
+    public class SpatiaLiteLayer : StyledLayer
     {
         public string FileName { get; set; }
         public string TableName { get; set; }
diff --git a/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeographyConverter.cs b/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeographyConverter.cs
index 54efd362..ba9eb37f 100644
--- a/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeographyConverter.cs
+++ b/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeographyConverter.cs
@@ -1,21 +1,21 @@
-using System;
-using System.Linq;
+using Microsoft.SqlServer.Types;
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
-using GeoAPI.Geometries;
-using Microsoft.SqlServer.Types;
-using SharpMap.Data.Providers;
-using SMGeometry = GeoAPI.Geometries.IGeometry;
-using SMGeometryType = GeoAPI.Geometries.OgcGeometryType;
-using SMPoint = GeoAPI.Geometries.IPoint;
-using SMLineString = GeoAPI.Geometries.ILineString;
-using SMLinearRing = GeoAPI.Geometries.ILinearRing;
-using SMPolygon = GeoAPI.Geometries.IPolygon;
-using SMMultiPoint = GeoAPI.Geometries.IMultiPoint;
-using SMMultiLineString = GeoAPI.Geometries.IMultiLineString;
-using SMMultiPolygon = GeoAPI.Geometries.IMultiPolygon;
-using SMGeometryCollection = GeoAPI.Geometries.IGeometryCollection;
-using Factory = GeoAPI.Geometries.IGeometryFactory;
+using Factory = NetTopologySuite.Geometries.GeometryFactory;
+using SMGeometry = NetTopologySuite.Geometries.Geometry;
+using SMGeometryCollection = NetTopologySuite.Geometries.GeometryCollection;
+using SMGeometryType = NetTopologySuite.Geometries.OgcGeometryType;
+using SMLinearRing = NetTopologySuite.Geometries.LinearRing;
+using SMLineString = NetTopologySuite.Geometries.LineString;
+using SMMultiLineString = NetTopologySuite.Geometries.MultiLineString;
+using SMMultiPoint = NetTopologySuite.Geometries.MultiPoint;
+using SMMultiPolygon = NetTopologySuite.Geometries.MultiPolygon;
+using SMPoint = NetTopologySuite.Geometries.Point;
+using SMPolygon = NetTopologySuite.Geometries.Polygon;
 
 namespace SharpMap.Converters.SqlServer2008SpatialObjects
 {
@@ -99,7 +99,7 @@ protected SqlGeographyConverterException(SerializationInfo info, StreamingContex
     /// </summary>
     public static class SqlGeographyConverter
     {
-        private static readonly GeoAPI.IGeometryServices Services = GeoAPI.GeometryServiceProvider.Instance;
+        private static readonly NetTopologySuite.NtsGeometryServices Services = NetTopologySuite.NtsGeometryServices.Instance;
 
         /// <summary>
         /// A reduction tolerance<br/>
@@ -112,7 +112,7 @@ static SqlGeographyConverter()
         {
             SqlServer2008Ex.LoadSqlServerTypes();
         }
-        
+
         /// <summary>
         /// Converts a geometry to a SqlServer geography
         /// </summary>
@@ -434,7 +434,7 @@ private static SMGeometry SqlGeographyToSharpMapPolygon(SqlGeography geography,
             var fact = factory ?? Services.CreateGeometryFactory((int)geography.STSrid);
 
             // courtesy of NetTopologySuite.Io.SqlServerBytes
-            var rings = new List<ILinearRing>();
+            var rings = new List<LinearRing>();
             for (var i = 1; i <= geography.NumRings(); i++)
                 rings.Add(fact.CreateLinearRing(GetPoints(geography.RingN(i))));
 
diff --git a/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeometryConverter.cs b/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeometryConverter.cs
index a33b1824..a9d0ba92 100644
--- a/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeometryConverter.cs
+++ b/SharpMap.SqlServerSpatialObjects/Converters/SqlServer2008SpatialObjects/SqlGeometryConverter.cs
@@ -17,24 +17,24 @@
  */
 
 #endregion
+using Microsoft.SqlServer.Types;
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers;
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
-using GeoAPI.Geometries;
-using Microsoft.SqlServer.Types;
-using SharpMap.Data.Providers;
-using SMGeometry = GeoAPI.Geometries.IGeometry;
-using SMGeometryType = GeoAPI.Geometries.OgcGeometryType;
-using SMPoint = GeoAPI.Geometries.IPoint;
-using SMLineString = GeoAPI.Geometries.ILineString;
-using SMLinearRing = GeoAPI.Geometries.ILinearRing;
-using SMPolygon = GeoAPI.Geometries.IPolygon;
-using SMMultiPoint = GeoAPI.Geometries.IMultiPoint;
-using SMMultiLineString = GeoAPI.Geometries.IMultiLineString;
-using SMMultiPolygon = GeoAPI.Geometries.IMultiPolygon;
-using SMGeometryCollection = GeoAPI.Geometries.IGeometryCollection;
-using Factory = GeoAPI.Geometries.IGeometryFactory;
+using Factory = NetTopologySuite.Geometries.GeometryFactory;
+using SMGeometry = NetTopologySuite.Geometries.Geometry;
+using SMGeometryCollection = NetTopologySuite.Geometries.GeometryCollection;
+using SMGeometryType = NetTopologySuite.Geometries.OgcGeometryType;
+using SMLinearRing = NetTopologySuite.Geometries.LinearRing;
+using SMLineString = NetTopologySuite.Geometries.LineString;
+using SMMultiLineString = NetTopologySuite.Geometries.MultiLineString;
+using SMMultiPoint = NetTopologySuite.Geometries.MultiPoint;
+using SMMultiPolygon = NetTopologySuite.Geometries.MultiPolygon;
+using SMPoint = NetTopologySuite.Geometries.Point;
+using SMPolygon = NetTopologySuite.Geometries.Polygon;
 
 namespace SharpMap.Converters.SqlServer2008SpatialObjects
 {
@@ -53,14 +53,14 @@ public class SqlGeometryConverterException : Exception
         /// Creates an instance of this class
         /// </summary>
         public SqlGeometryConverterException()
-        {}
+        { }
 
         /// <summary>
         /// Creates an instance of this class providing the failing <paramref name="geometry"/>.
         /// </summary>
         /// <param name="geometry">A geometry</param>
         public SqlGeometryConverterException(SMGeometry geometry)
-            :this("Failed to convert SharpMapGeometry", geometry)
+            : this("Failed to convert SharpMapGeometry", geometry)
         {
             Geometry = geometry;
         }
@@ -106,7 +106,7 @@ public SqlGeometryConverterException(string message, Exception inner, SMGeometry
         /// </summary>
         /// <param name="info">A serialization info</param>
         /// <param name="context">A streaming context.</param>
-        protected SqlGeometryConverterException(SerializationInfo info, StreamingContext context) 
+        protected SqlGeometryConverterException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
             //Geometry = (SMGeometry) info.GetValue("geom", typeof (SMGeometry));
@@ -119,16 +119,16 @@ protected SqlGeometryConverterException(SerializationInfo info, StreamingContext
     /// </summary>
     public static class SqlGeometryConverter
     {
-        private static readonly GeoAPI.IGeometryServices Services = GeoAPI.GeometryServiceProvider.Instance;
+        private static readonly NetTopologySuite.NtsGeometryServices Services = NetTopologySuite.NtsGeometryServices.Instance;
 
         /// <summary>
         /// A reduction tolerance
         /// </summary>
         public static double ReduceTolerance = 1d;
-        
+
         static SqlGeometryConverter()
         {
-            SqlServer2008Ex.LoadSqlServerTypes();    
+            SqlServer2008Ex.LoadSqlServerTypes();
         }
 
         /// <summary>
@@ -176,7 +176,7 @@ public static IEnumerable<SqlGeometry> ToSqlGeometries(IEnumerable<SMGeometry> s
 
         private static void SharpMapGeometryToSqlGeometry(SqlGeometryBuilder geomBuilder, SMGeometry smGeometry)
         {
-            
+
             switch (smGeometry.OgcGeometryType)
             {
                 case SMGeometryType.Point:
@@ -209,7 +209,7 @@ private static void SharpMapGeometryToSqlGeometry(SqlGeometryBuilder geomBuilder
         private static void SharpMapGeometryCollectionToSqlGeometry(SqlGeometryBuilder geomBuilder, SMGeometryCollection geometryCollection)
         {
             geomBuilder.BeginGeometry(OpenGisGeometryType.GeometryCollection);
-            for (int i = 0; i < geometryCollection.NumGeometries; i++ )
+            for (int i = 0; i < geometryCollection.NumGeometries; i++)
                 SharpMapGeometryToSqlGeometry(geomBuilder, geometryCollection[i]);
             geomBuilder.EndGeometry();
         }
@@ -233,7 +233,7 @@ private static void SharpMapMultiLineStringToSqlGeometry(SqlGeometryBuilder geom
         private static void SharpMapMultiPointToSqlGeometry(SqlGeometryBuilder geomBuilder, SMMultiPoint multiPoint)
         {
             geomBuilder.BeginGeometry(OpenGisGeometryType.MultiPoint);
-            for(int i = 0; i < multiPoint.NumPoints; i++)
+            for (int i = 0; i < multiPoint.NumPoints; i++)
                 SharpMapPointToSqlGeometry(geomBuilder, multiPoint[i] as SMPoint);
             geomBuilder.EndGeometry();
         }
@@ -263,9 +263,9 @@ private static void SharpMapLineStringToSqlGeometry(SqlGeometryBuilder geomBuild
         private static void SharpMapPolygonToSqlGeometry(SqlGeometryBuilder geomBuilder, SMPolygon polygon)
         {
             geomBuilder.BeginGeometry(OpenGisGeometryType.Polygon);
-            AddRing(geomBuilder, (SMLinearRing )polygon.ExteriorRing);
+            AddRing(geomBuilder, (SMLinearRing)polygon.ExteriorRing);
             for (int i = 0; i < polygon.NumInteriorRings; i++)
-                AddRing(geomBuilder, (SMLinearRing )polygon.GetInteriorRingN(i));
+                AddRing(geomBuilder, (SMLinearRing)polygon.GetInteriorRingN(i));
             geomBuilder.EndGeometry();
         }
 
@@ -309,14 +309,14 @@ public static SMGeometry ToSharpMapGeometry(SqlGeometry geometry, Factory factor
             if (geometry == null) return null;
             if (geometry.IsNull) return null;
 
-            var fact = factory ?? Services.CreateGeometryFactory((int) geometry.STSrid);
-            
+            var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
+
             if (geometry.STIsEmpty())
                 return fact.CreateGeometryCollection(null);
-            
-            if (!geometry.STIsValid()) 
+
+            if (!geometry.STIsValid())
                 geometry = geometry.MakeValid();
-            
+
             OpenGisGeometryType geometryType = (OpenGisGeometryType)Enum.Parse(typeof(OpenGisGeometryType), (string)geometry.STGeometryType());
             switch (geometryType)
             {
@@ -345,7 +345,7 @@ public static SMGeometry ToSharpMapGeometry(SqlGeometry geometry, Factory factor
         /// <returns>A series of geometries</returns>
         public static IEnumerable<SMGeometry> ToSharpMapGeometries(IEnumerable<SqlGeometry> sqlGeometries)
         {
-            return ToSharpMapGeometries(sqlGeometries,null);
+            return ToSharpMapGeometries(sqlGeometries, null);
         }
 
         /// <summary>
@@ -358,7 +358,7 @@ public static IEnumerable<SMGeometry> ToSharpMapGeometries(IEnumerable<SqlGeomet
         public static IEnumerable<SMGeometry> ToSharpMapGeometries(IEnumerable<SqlGeometry> sqlGeometries, Factory factory)
         {
             var fact = factory ?? Services.CreateGeometryFactory((int)sqlGeometries.First().STSrid);
-            
+
             foreach (var sqlGeometry in sqlGeometries)
                 yield return ToSharpMapGeometry(sqlGeometry, fact);
         }
@@ -392,7 +392,7 @@ private static SMGeometryCollection SqlGeometryToSharpMapGeometryCollection(SqlG
             var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
             var geoms = new SMGeometry[(int)geometry.STNumGeometries()];
             for (var i = 1; i <= geometry.STNumGeometries(); i++)
-                geoms[i-1] = ToSharpMapGeometry(geometry.STGeometryN(i), fact);
+                geoms[i - 1] = ToSharpMapGeometry(geometry.STGeometryN(i), fact);
             return fact.CreateGeometryCollection(geoms);
         }
 
@@ -401,7 +401,7 @@ private static SMMultiPolygon SqlGeometryToSharpMapMultiPolygon(SqlGeometry geom
             var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
             var polygons = new SMPolygon[(int)geometry.STNumGeometries()];
             for (var i = 1; i <= geometry.STNumGeometries(); i++)
-                polygons[i-1] = (SMPolygon)SqlGeometryToSharpMapPolygon(geometry.STGeometryN(i), fact);
+                polygons[i - 1] = (SMPolygon)SqlGeometryToSharpMapPolygon(geometry.STGeometryN(i), fact);
             return fact.CreateMultiPolygon(polygons);
         }
 
@@ -410,7 +410,7 @@ private static SMMultiLineString SqlGeometryToSharpMapMultiLineString(SqlGeometr
             var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
             var lineStrings = new SMLineString[(int)geometry.STNumGeometries()];
             for (var i = 1; i <= geometry.STNumGeometries(); i++)
-                lineStrings[i-1] = (SMLineString)SqlGeometryToSharpMapLineString(geometry.STGeometryN(i), fact);
+                lineStrings[i - 1] = (SMLineString)SqlGeometryToSharpMapLineString(geometry.STGeometryN(i), fact);
             return fact.CreateMultiLineString(lineStrings);
         }
 
@@ -419,14 +419,14 @@ private static SMGeometry SqlGeometryToSharpMapMultiPoint(SqlGeometry geometry,
             var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
             var points = new SMPoint[(int)geometry.STNumGeometries()];
             for (var i = 1; i <= geometry.STNumGeometries(); i++)
-                points[i-1] = (SMPoint) SqlGeometryToSharpMapPoint(geometry.STGeometryN(i), fact);
+                points[i - 1] = (SMPoint)SqlGeometryToSharpMapPoint(geometry.STGeometryN(i), fact);
             return fact.CreateMultiPoint(points);
         }
 
         private static SMGeometry SqlGeometryToSharpMapPoint(SqlGeometry geometry, Factory factory)
         {
             var fact = factory ?? Services.CreateGeometryFactory((int)geometry.STSrid);
-            return fact.CreatePoint(new Coordinate( (double)geometry.STX, (double)geometry.STY));
+            return fact.CreatePoint(new Coordinate((double)geometry.STX, (double)geometry.STY));
         }
 
         private static Coordinate[] GetPoints(SqlGeometry geometry)
@@ -435,7 +435,7 @@ private static Coordinate[] GetPoints(SqlGeometry geometry)
             for (int i = 1; i <= (int)geometry.STNumPoints(); i++)
             {
                 var ptGeometry = geometry.STPointN(i);
-                pts[i-1] = new Coordinate((double)ptGeometry.STX, (double)ptGeometry.STY);
+                pts[i - 1] = new Coordinate((double)ptGeometry.STX, (double)ptGeometry.STY);
             }
             return pts;
         }
@@ -452,7 +452,7 @@ private static SMGeometry SqlGeometryToSharpMapPolygon(SqlGeometry geometry, Fac
             //exterior ring
             var exterior = fact.CreateLinearRing(GetPoints(geometry.STExteriorRing()));
             SMLinearRing[] interior = null;
-            if (geometry.STNumInteriorRing()>0)
+            if (geometry.STNumInteriorRing() > 0)
             {
                 interior = new SMLinearRing[(int)geometry.STNumInteriorRing()];
                 for (var i = 1; i <= geometry.STNumInteriorRing(); i++)
diff --git a/SharpMap.SqlServerSpatialObjects/Data/Providers/SqlServer2008Ex.cs b/SharpMap.SqlServerSpatialObjects/Data/Providers/SqlServer2008Ex.cs
index 792c071c..a410a787 100644
--- a/SharpMap.SqlServerSpatialObjects/Data/Providers/SqlServer2008Ex.cs
+++ b/SharpMap.SqlServerSpatialObjects/Data/Providers/SqlServer2008Ex.cs
@@ -16,14 +16,14 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    
 
 using Common.Logging;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Converters.SqlServer2008SpatialObjects;
 using System;
 using System.Collections.ObjectModel;
 using System.Data.SqlClient;
 using System.Text;
-using BoundingBox = GeoAPI.Geometries.Envelope;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -49,14 +49,14 @@ public class SqlServer2008Ex : SqlServer2008
 
         private static bool _isSqlTypesLoaded;
         private static readonly object _loadLock = new object();
-        
+
         /// <summary>
         /// Ensure SqlServerTypes (x32 or x64) are loaded at runtime
         /// </summary>
-        static  SqlServer2008Ex()
+        static SqlServer2008Ex()
         {
             if (!_isSqlTypesLoaded)
-                lock(_loadLock)
+                lock (_loadLock)
                     if (!_isSqlTypesLoaded)
                     {
                         try
@@ -75,8 +75,8 @@ static  SqlServer2008Ex()
         /// <summary>
         /// placeholder method to be called by related classes causing static ctor to load types
         /// </summary>
-        public static void LoadSqlServerTypes() {}
-        
+        public static void LoadSqlServerTypes() { }
+
         /// <summary>
         /// Always <code>true</code>. Both queries and client-side conversion will always attempt to repair invalid spatial objects 
         /// </summary>
diff --git a/SharpMap.SqlServerSpatialObjects/Geometries/SpatialOperationsEx.cs b/SharpMap.SqlServerSpatialObjects/Geometries/SpatialOperationsEx.cs
index 20770b53..466062fd 100644
--- a/SharpMap.SqlServerSpatialObjects/Geometries/SpatialOperationsEx.cs
+++ b/SharpMap.SqlServerSpatialObjects/Geometries/SpatialOperationsEx.cs
@@ -18,11 +18,11 @@
 
 #endregion
 
-using System;
 using Microsoft.SqlServer.Types;
 using SharpMap.Converters.SqlServer2008SpatialObjects;
 using SharpMap.Data.Providers;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using System;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Geometries
 {
@@ -283,7 +283,7 @@ public static Geometry Boundary(Geometry g, SqlServerSpatialObjectType spatialMo
                 return SqlGeometryConverter.ToSharpMapGeometry(sgBoundary);
             }
 
-            throw new ArgumentOutOfRangeException ("Geography does not support STBoundary");
+            throw new ArgumentOutOfRangeException("Geography does not support STBoundary");
         }
 
     }
diff --git a/SharpMap.SqlServerSpatialObjects/Geometries/SpatialRelationsEx.cs b/SharpMap.SqlServerSpatialObjects/Geometries/SpatialRelationsEx.cs
index ae61bb9c..44ad182a 100644
--- a/SharpMap.SqlServerSpatialObjects/Geometries/SpatialRelationsEx.cs
+++ b/SharpMap.SqlServerSpatialObjects/Geometries/SpatialRelationsEx.cs
@@ -16,11 +16,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
 using Microsoft.SqlServer.Types;
 using SharpMap.Converters.SqlServer2008SpatialObjects;
 using SharpMap.Data.Providers;
-using Geometry = GeoAPI.Geometries.IGeometry;
+using System;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Geometries
 {
@@ -33,7 +33,7 @@ static SpatialRelationsEx()
         {
             SqlServer2008Ex.LoadSqlServerTypes();
         }
-        
+
         /// <summary>
         /// Returns true if otherGeometry is wholly contained within the source geometry. This is the same as
         /// reversing the primary and comparison shapes of the Within operation.
@@ -104,7 +104,7 @@ public static bool Crosses(Geometry g1, Geometry g2, SqlServerSpatialObjectType
             }
             else
             {
-               throw new ArgumentOutOfRangeException ("Geography does not support STCrosses. You must first convert Geography to Geometry using WKB");
+                throw new ArgumentOutOfRangeException("Geography does not support STCrosses. You must first convert Geography to Geometry using WKB");
             }
         }
 
@@ -300,19 +300,19 @@ public static bool Within(Geometry g1, Geometry g2)
         /// <returns></returns>
         public static bool Within(Geometry g1, Geometry g2, SqlServerSpatialObjectType spatialMode)
         {
-        if (spatialMode == SqlServerSpatialObjectType.Geometry)
+            if (spatialMode == SqlServerSpatialObjectType.Geometry)
             {
                 SqlGeometry sg1 = SqlGeometryConverter.ToSqlGeometry(g1);
                 SqlGeometry sg2 = SqlGeometryConverter.ToSqlGeometry(g2);
                 return (bool)sg1.STWithin(sg2);
             }
-        else
+            else
             {
                 SqlGeography sg1 = SqlGeographyConverter.ToSqlGeography(g1);
                 SqlGeography sg2 = SqlGeographyConverter.ToSqlGeography(g2);
                 return (bool)sg1.STWithin(sg2);
             }
-            
+
         }
 
         /// <summary>
diff --git a/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj b/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj
index 36a0e6bd..14b375c4 100644
--- a/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj
+++ b/SharpMap.SqlServerSpatialObjects/SharpMap.SqlServerSpatialObjects.csproj
@@ -48,4 +48,8 @@
         </Content>
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.UI.WPF/PropertyExtensions.cs b/SharpMap.UI.WPF/PropertyExtensions.cs
index 790f8236..7d73f6cf 100644
--- a/SharpMap.UI.WPF/PropertyExtensions.cs
+++ b/SharpMap.UI.WPF/PropertyExtensions.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 
 namespace SharpMap.UI.WPF
 {
@@ -21,7 +17,7 @@ public static double Get_Z(this Coordinate coord)
             return coord.Z;
         }
 #pragma warning disable 618
-        public static double Get_M(this ICoordinate coord)
+        public static double Get_M(this Coordinate coord)
 #pragma warning restore 618
         {
             return coord.M;
diff --git a/SharpMap.UI.WPF/SharpMap.UI.WPF.csproj b/SharpMap.UI.WPF/SharpMap.UI.WPF.csproj
index c30e4ba7..ffb9012a 100644
--- a/SharpMap.UI.WPF/SharpMap.UI.WPF.csproj
+++ b/SharpMap.UI.WPF/SharpMap.UI.WPF.csproj
@@ -25,5 +25,9 @@
       <Reference Include="WindowsFormsIntegration" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 
 </Project>
diff --git a/SharpMap.UI.WPF/SharpMapHost.cs b/SharpMap.UI.WPF/SharpMapHost.cs
index cd7dc7c9..31c124ce 100644
--- a/SharpMap.UI.WPF/SharpMapHost.cs
+++ b/SharpMap.UI.WPF/SharpMapHost.cs
@@ -22,6 +22,12 @@
 
 namespace SharpMap.UI.WPF
 {
+    using Data.Providers;
+    using Forms;
+    using Layers;
+    using NetTopologySuite.Geometries;
+    using Rendering.Decoration;
+    using Rendering.Decoration.ScaleBar;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.Collections.Specialized;
@@ -30,15 +36,6 @@ namespace SharpMap.UI.WPF
     using System.Windows;
     using System.Windows.Forms.Integration;
     using System.Windows.Input;
-
-    using GeoAPI.Geometries;
-
-    using Data.Providers;
-    using Forms;
-    using Layers;
-    using Rendering.Decoration;
-    using Rendering.Decoration.ScaleBar;
-
     using KeyEventArgs = KeyEventArgs;
     using MouseEventArgs = MouseEventArgs;
 
@@ -49,23 +46,23 @@ public class SharpMapHost : WindowsFormsHost, INotifyPropertyChanged
     {
         // Dependency Property to store MapLayers.
         public static readonly DependencyProperty MapLayersProperty =
-            DependencyProperty.Register("MapLayers", typeof (ObservableCollection<ILayer>), typeof (SharpMapHost), new PropertyMetadata(SetMapLayersCallback));
+            DependencyProperty.Register("MapLayers", typeof(ObservableCollection<ILayer>), typeof(SharpMapHost), new PropertyMetadata(SetMapLayersCallback));
 
         // Dependency Property store store BackgroundLayer.
         public static readonly DependencyProperty BackgroundLayerProperty =
-            DependencyProperty.Register("BackgroundLayer", typeof (Layer), typeof (SharpMapHost), new PropertyMetadata(SetBackgroundLayerCallback));
+            DependencyProperty.Register("BackgroundLayer", typeof(Layer), typeof(SharpMapHost), new PropertyMetadata(SetBackgroundLayerCallback));
 
         // Dependency Property to store ActiveTool.
         public static readonly DependencyProperty ActiveToolProperty =
-            DependencyProperty.Register("ActiveTool", typeof (MapBox.Tools), typeof (SharpMapHost), new PropertyMetadata(SetActiveToolCallback));
+            DependencyProperty.Register("ActiveTool", typeof(MapBox.Tools), typeof(SharpMapHost), new PropertyMetadata(SetActiveToolCallback));
 
         // Dependency Property to store MaxExtent.
         public static readonly DependencyProperty MaxExtentProperty =
-            DependencyProperty.Register("MaxExtent", typeof (Envelope), typeof (SharpMapHost), new PropertyMetadata(SetMaxExtentCallback));
+            DependencyProperty.Register("MaxExtent", typeof(Envelope), typeof(SharpMapHost), new PropertyMetadata(SetMaxExtentCallback));
 
         // Dependency Property to store MapExtent.
         public static readonly DependencyProperty MapExtentProperty =
-            DependencyProperty.Register("MapExtent", typeof (Envelope), typeof (SharpMapHost), new PropertyMetadata(MapExtentCallback));
+            DependencyProperty.Register("MapExtent", typeof(Envelope), typeof(SharpMapHost), new PropertyMetadata(MapExtentCallback));
 
         // Dependency Property to store Rotation kept in MapTransform
         public static readonly DependencyProperty MapRotationProperty =
@@ -74,11 +71,11 @@ public class SharpMapHost : WindowsFormsHost, INotifyPropertyChanged
 
         // Dependency Property used when a new geometry is defined.
         public static readonly DependencyProperty DefinedGeometryProperty =
-            DependencyProperty.Register("DefinedGeometry", typeof (IGeometry), typeof (SharpMapHost), new PropertyMetadata(GeometryDefinedCallback));
+            DependencyProperty.Register("DefinedGeometry", typeof(Geometry), typeof(SharpMapHost), new PropertyMetadata(GeometryDefinedCallback));
 
         // Dependency Property used when right click in a MapFeature.
         public static readonly DependencyProperty FeatureRightClickedCommandProperty =
-            DependencyProperty.Register("FeatureRightClickedCommand", typeof (ICommand), typeof (SharpMapHost));
+            DependencyProperty.Register("FeatureRightClickedCommand", typeof(ICommand), typeof(SharpMapHost));
 
         private readonly MapBox _mapBox;
 
@@ -93,9 +90,11 @@ public class SharpMapHost : WindowsFormsHost, INotifyPropertyChanged
         /// </summary>
         public SharpMapHost()
         {
-            _mapBox = new MapBox{
+            _mapBox = new MapBox
+            {
                 BackColor = Color.White,
-                Map = new Map{
+                Map = new Map
+                {
                     SRID = 900913
                 }
             };
@@ -103,7 +102,8 @@ public SharpMapHost()
 
             MapLayers = new ObservableCollection<ILayer>();
 
-            var scaleBar = new ScaleBar{
+            var scaleBar = new ScaleBar
+            {
                 Anchor = MapDecorationAnchor.LeftBottom
             };
             _mapBox.Map.Decorations.Add(scaleBar);
@@ -118,7 +118,7 @@ public ObservableCollection<ILayer> MapLayers
         {
             get
             {
-                return (ObservableCollection<ILayer>) GetValue(MapLayersProperty);
+                return (ObservableCollection<ILayer>)GetValue(MapLayersProperty);
             }
             set
             {
@@ -130,7 +130,7 @@ public Layer BackgroundLayer
         {
             get
             {
-                return (Layer) GetValue(BackgroundLayerProperty);
+                return (Layer)GetValue(BackgroundLayerProperty);
             }
             set
             {
@@ -142,7 +142,7 @@ public MapBox.Tools ActiveTool
         {
             get
             {
-                return (MapBox.Tools) GetValue(ActiveToolProperty);
+                return (MapBox.Tools)GetValue(ActiveToolProperty);
             }
             set
             {
@@ -170,7 +170,7 @@ public Envelope MaxExtent
         {
             get
             {
-                return (Envelope) GetValue(MaxExtentProperty);
+                return (Envelope)GetValue(MaxExtentProperty);
             }
 
             set
@@ -204,11 +204,11 @@ public float MapRotation
                 SetValue(MapRotationProperty, value);
             }
         }
-        public IGeometry DefinedGeometry
+        public Geometry DefinedGeometry
         {
             get
             {
-                return (IGeometry) GetValue(DefinedGeometryProperty);
+                return (Geometry)GetValue(DefinedGeometryProperty);
             }
 
             set
@@ -296,7 +296,7 @@ private static void SetActiveToolCallback(object sender, DependencyPropertyChang
             }
 
             var mapBox = host._mapBox;
-            var newTool = (MapBox.Tools) args.NewValue;
+            var newTool = (MapBox.Tools)args.NewValue;
             mapBox.ActiveTool = newTool;
         }
 
@@ -314,7 +314,7 @@ private static void SetMaxExtentCallback(object sender, DependencyPropertyChange
             }
 
             var mapBox = host._mapBox;
-            var extent = (Envelope) args.NewValue;
+            var extent = (Envelope)args.NewValue;
             if (extent != null)
             {
                 mapBox.Map.EnforceMaximumExtents = true;
@@ -336,7 +336,7 @@ private static void MapExtentCallback(object sender, DependencyPropertyChangedEv
             }
 
             var mapBox = host._mapBox;
-            var extent = (Envelope) args.NewValue;
+            var extent = (Envelope)args.NewValue;
             mapBox.Map.ZoomToBox(extent);
             mapBox.Refresh();
         }
@@ -378,13 +378,13 @@ private static void GeometryDefinedCallback(object sender, DependencyPropertyCha
             if (host._editLayer == null)
             {
                 host._editLayer = new VectorLayer("EditLayer");
-                host._editLayerGeoProvider = new GeometryProvider(new List<IGeometry>());
+                host._editLayerGeoProvider = new GeometryProvider(new List<Geometry>());
                 host._editLayer.DataSource = host._editLayerGeoProvider;
                 host.MapLayers.Add(host._editLayer);
             }
 
             host._editLayerGeoProvider.Geometries.Clear();
-            var geom = (IGeometry) args.NewValue;
+            var geom = (Geometry)args.NewValue;
             if (geom != null)
             {
                 host._editLayerGeoProvider.Geometries.Add(geom);
@@ -401,8 +401,8 @@ private static void GeometryDefinedCallback(object sender, DependencyPropertyCha
         private void OnKeyDown(object sender, KeyEventArgs keyEventArgs)
         {
             var currentEnvelope = _mapBox.Map.Envelope;
-            var dX = currentEnvelope.Width/2;
-            var dY = currentEnvelope.Height/2;
+            var dX = currentEnvelope.Width / 2;
+            var dY = currentEnvelope.Height / 2;
 
             var x = _mapBox.Map.Center.X;
             var y = _mapBox.Map.Center.Y;
diff --git a/SharpMap.UI/Forms/ImageGenerator/IMapBoxImageRenderer.cs b/SharpMap.UI/Forms/ImageGenerator/IMapBoxImageRenderer.cs
index 1a642120..215fe006 100644
--- a/SharpMap.UI/Forms/ImageGenerator/IMapBoxImageRenderer.cs
+++ b/SharpMap.UI/Forms/ImageGenerator/IMapBoxImageRenderer.cs
@@ -18,9 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  *
  */
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Forms.ImageGenerator
 {
diff --git a/SharpMap.UI/Forms/ImageGenerator/LayerListImageGenerator.cs b/SharpMap.UI/Forms/ImageGenerator/LayerListImageGenerator.cs
index 717550a7..ed7d5097 100644
--- a/SharpMap.UI/Forms/ImageGenerator/LayerListImageGenerator.cs
+++ b/SharpMap.UI/Forms/ImageGenerator/LayerListImageGenerator.cs
@@ -1,4 +1,9 @@
-using System;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
+using SharpMap.Rendering;
+using SharpMap.Styles;
+using System;
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -10,11 +15,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using Common.Logging;
-using GeoAPI.Geometries;
-using SharpMap.Layers;
-using SharpMap.Rendering;
-using SharpMap.Styles;
+using Point = System.Drawing.Point;
 
 namespace SharpMap.Forms.ImageGenerator
 {
@@ -35,7 +36,7 @@ public LockedBitmap(object sync = null)
             }
 
             public object Sync { get; }
-            
+
             public Rectangle GraphicsArea { get; set; }
 
             public Bitmap Bitmap { get; set; }
@@ -91,7 +92,7 @@ public void Dispose()
         private class LayerInfo
         {
             public ILayer Layer { get; }
-            
+
             public bool Render { get; set; }
 
             public bool RenderRequired { get; set; }
@@ -124,9 +125,9 @@ public override string ToString()
 
         private bool _isDisposed;
         private PendingDownloadTracker _pendingDownloadTracker;
-        
+
         private MapBox MapBox { get; set; }
-        
+
         /// <summary>
         /// Creates an instance for this class
         /// </summary>
@@ -231,7 +232,7 @@ private void FillLayerInfos()
         private LayerInfo[] UpdateLayerInfos()
         {
             var liIt = _layerInfos.GetEnumerator();
-             
+
             foreach (var li in EnumerateLayers(Map, false))
             {
                 if (!liIt.MoveNext()) break;
@@ -281,7 +282,7 @@ private void ClearLayerInfos()
 
         private IEnumerable<LayerInfo> EnumerateLayers(LayerCollection collection, bool wire = false)
         {
-            var coll = (ICollection) collection;
+            var coll = (ICollection)collection;
             lock (coll.SyncRoot)
             {
                 foreach (var lyr in collection)
@@ -297,8 +298,8 @@ private IEnumerable<LayerInfo> EnumerateLayers(ILayer lyr, bool hierarchyEnabled
             if (lyr is LayerGroup lyrGroup)
             {
                 foreach (var tmpLyr in lyrGroup.Layers)
-                foreach (var tmpLyr2 in EnumerateLayers(tmpLyr, hierarchyEnabled & lyrGroup.Enabled && tmpLyr.Enabled))
-                    yield return tmpLyr2;
+                    foreach (var tmpLyr2 in EnumerateLayers(tmpLyr, hierarchyEnabled & lyrGroup.Enabled && tmpLyr.Enabled))
+                        yield return tmpLyr2;
             }
             else
             {
@@ -321,7 +322,7 @@ private void HandleVariableLayersRequery(object sender, EventArgs e)
 
             foreach (var lyrInfo in lyrInfos)
             {
-                Task.Run(delegate { RenderLayerImage(new object[] {lyrInfo, mvp, token, false}); }, token);
+                Task.Run(delegate { RenderLayerImage(new object[] { lyrInfo, mvp, token, false }); }, token);
             }
         }
 
@@ -336,7 +337,7 @@ private void HandleMapNewTileAvaliable(ITileAsyncLayer sender, Envelope box, Bit
             if (sender == null)
                 return;
 
-            if (IsDisposed) 
+            if (IsDisposed)
                 return;
 
             if (!_imageLayers.TryGetValue((ILayer)sender, out var lockImg))
@@ -433,7 +434,8 @@ public Image Image
         }
 
         /// <see cref="IMapBoxImageRenderer.ImageValue"/>
-        public Image ImageValue {
+        public Image ImageValue
+        {
             get
             {
                 Bitmap res;
@@ -444,7 +446,7 @@ public Image ImageValue {
                 }
 
                 res = new Bitmap(MapBox.Width, MapBox.Height);
-                
+
                 using (var gr = Graphics.FromImage(res))
                 {
                     gr.Clear(Map.BackColor);
@@ -455,7 +457,7 @@ public Image ImageValue {
                     // select layers to be rendered (ie Layers that are visible,
                     // excluding children of LayerGroup that is not visible)
                     var layers = EnumerateLayers(Map, false).Where(li => li.Render).ToList();
-                  
+
                     for (int i = 0; i < layers.Count; i++)
                     {
                         var lyr = layers[i].Layer;
@@ -519,7 +521,7 @@ public void Generate()
             }
 
             if (token.IsCancellationRequested) return;
-            
+
             var map = MapBox.Map;
             double mapZoom = map.Zoom;
             double mapScale = map.MapScale;
@@ -538,7 +540,7 @@ public void Generate()
                 {
                     mapBox.Invalidate();
                     if (!IsDisposed)
-                        mapBox.Invoke(new MethodInvoker(() => { if (!mapBox.IsDisposed) mapBox.Update();}));
+                        mapBox.Invoke(new MethodInvoker(() => { if (!mapBox.IsDisposed) mapBox.Update(); }));
                 }
             }
             else
@@ -562,7 +564,7 @@ public void Generate()
                     // Add task to list
                     bool invalidateAll = i == layers.Count - 1;
                     var li = layers[i];
-                    Task.Run(delegate {RenderLayerImage(new object[] { li, mvp, token, invalidateAll});}, token);
+                    Task.Run(delegate { RenderLayerImage(new object[] { li, mvp, token, invalidateAll }); }, token);
                 }
             }
 
@@ -580,127 +582,129 @@ public void Generate()
         /// <returns></returns>
         private void RenderLayerImage(object param)
         {
-                if (IsDisposed) return;
+            if (IsDisposed) return;
 
-                object[] parameters = (object[]) param;
-                var li = (LayerInfo)parameters[0];
-                if (!li.RenderRequired) return;
+            object[] parameters = (object[])param;
+            var li = (LayerInfo)parameters[0];
+            if (!li.RenderRequired) return;
 
-                var lyr = li.Layer;
-                var mvp = (MapViewport) parameters[1];
-                var token = (CancellationToken) parameters[2];
-                var invalidateAll = (bool) parameters[3];
-            
-                if (token.IsCancellationRequested)
-                    return;
+            var lyr = li.Layer;
+            var mvp = (MapViewport)parameters[1];
+            var token = (CancellationToken)parameters[2];
+            var invalidateAll = (bool)parameters[3];
 
-                var updateRect = Rectangle.Empty;
+            if (token.IsCancellationRequested)
+                return;
 
-                var sw = new Stopwatch();
-                _logger.Debug(t => t("\n{0}> Enter RenderLayerImage {1}\n{0}>\t{2} => {3}",
-                    Thread.CurrentThread.ManagedThreadId, lyr.LayerName, mvp.Envelope, mvp.Size));
-                sw.Start();
+            var updateRect = Rectangle.Empty;
 
-                _imageLayers.TryGetValue(lyr, out var img);
+            var sw = new Stopwatch();
+            _logger.Debug(t => t("\n{0}> Enter RenderLayerImage {1}\n{0}>\t{2} => {3}",
+                Thread.CurrentThread.ManagedThreadId, lyr.LayerName, mvp.Envelope, mvp.Size));
+            sw.Start();
 
-                // Update size if necessary
-                if (img != null)
+            _imageLayers.TryGetValue(lyr, out var img);
+
+            // Update size if necessary
+            if (img != null)
+            {
+                lock (img.Sync)
                 {
-                    lock (img.Sync)
+                    if (img.Bitmap != null && img.Bitmap.Size != mvp.Size)
                     {
-                        if (img.Bitmap != null && img.Bitmap.Size != mvp.Size)
+                        object lockObj = img.Sync;
+                        var newLockImg = new LockedBitmap(lockObj)
                         {
-                            object lockObj = img.Sync;
-                            var newLockImg = new LockedBitmap(lockObj) { 
-                                Bitmap = new Bitmap(mvp.Size.Width, mvp.Size.Height, PixelFormat.Format32bppArgb)
-                            };
-                            while (!_imageLayers.TryUpdate(lyr, newLockImg, img))
-                                Thread.Sleep(25);
-                            img = newLockImg;
-                        }
+                            Bitmap = new Bitmap(mvp.Size.Width, mvp.Size.Height, PixelFormat.Format32bppArgb)
+                        };
+                        while (!_imageLayers.TryUpdate(lyr, newLockImg, img))
+                            Thread.Sleep(25);
+                        img = newLockImg;
                     }
                 }
-                else 
+            }
+            else
+            {
+                img = new LockedBitmap
                 {
-                    img = new LockedBitmap {
-                        Bitmap = new Bitmap(mvp.Size.Width, mvp.Size.Height, PixelFormat.Format32bppArgb)
-                    };
-                    img = _imageLayers.AddOrUpdate(lyr, img, (u,v) => img);
-                }
+                    Bitmap = new Bitmap(mvp.Size.Width, mvp.Size.Height, PixelFormat.Format32bppArgb)
+                };
+                img = _imageLayers.AddOrUpdate(lyr, img, (u, v) => img);
+            }
 
-                Rectangle graphicsArea;
-                lock (img.Sync)
+            Rectangle graphicsArea;
+            lock (img.Sync)
+            {
+                try
                 {
-                    try
+                    using (var gr = Graphics.FromImage(img.Bitmap))
                     {
-                        using (var gr = Graphics.FromImage(img.Bitmap))
+                        if (!Map.MapTransform.IsIdentity)
                         {
-                            if (!Map.MapTransform.IsIdentity)
-                            {
-                                gr.Transform = Map.MapTransform;
-                                if (lyr is VectorLayer || lyr is LabelLayer)
-                                    RotateStyles(lyr, -Map.MapTransformRotation);  
-                            } 
-                            
-                            gr.Clear(Color.Transparent);
-                            if (lyr is ILayerEx lyrEx)
-                                graphicsArea = lyrEx.Render(gr, mvp);
-                            else
-                            {
-                                lyr.Render(gr, mvp);
-                                graphicsArea = new Rectangle(Point.Empty, mvp.Size);
-                            }
-                            
-                            if (!Map.MapTransform.IsIdentity && (lyr is VectorLayer || lyr is LabelLayer))
-                                RotateStyles(lyr, Map.MapTransformRotation);
-                            //gr.DrawRectangle(Pens.Red, graphicsArea);
+                            gr.Transform = Map.MapTransform;
+                            if (lyr is VectorLayer || lyr is LabelLayer)
+                                RotateStyles(lyr, -Map.MapTransformRotation);
                         }
-                    }
-                    catch (Exception)
-                    {
-                        goto Exit;
+
+                        gr.Clear(Color.Transparent);
+                        if (lyr is ILayerEx lyrEx)
+                            graphicsArea = lyrEx.Render(gr, mvp);
+                        else
+                        {
+                            lyr.Render(gr, mvp);
+                            graphicsArea = new Rectangle(Point.Empty, mvp.Size);
+                        }
+
+                        if (!Map.MapTransform.IsIdentity && (lyr is VectorLayer || lyr is LabelLayer))
+                            RotateStyles(lyr, Map.MapTransformRotation);
+                        //gr.DrawRectangle(Pens.Red, graphicsArea);
                     }
                 }
-
-                if (token.IsCancellationRequested)
+                catch (Exception)
+                {
                     goto Exit;
+                }
+            }
 
-                // The area of the canvas to update
-                updateRect = img.GraphicsArea.ExpandToInclude(graphicsArea);
+            if (token.IsCancellationRequested)
+                goto Exit;
 
-                if (token.IsCancellationRequested)
-                    goto Exit;
+            // The area of the canvas to update
+            updateRect = img.GraphicsArea.ExpandToInclude(graphicsArea);
 
-                var mapBox = MapBox;
-                if (mapBox.IsHandleCreated)
-                {
-                    _logger.Debug(t => t("\n{0}> Invalidating rectangle {1}",Thread.CurrentThread.ManagedThreadId, updateRect));
-                    InvalidateCacheImage();
-                    if (invalidateAll)
-                        mapBox.Invalidate();
-                    else
-                        mapBox.Invalidate(updateRect);
-
-                    //MapBox.Invoke(new MethodInvoker(() => MapBox.Invalidate(updateRect)));
-                    if (!IsDisposed)
-                        mapBox.Invoke(new MethodInvoker(() => { if (!mapBox.IsDisposed) mapBox.Update();}));
-                }
+            if (token.IsCancellationRequested)
+                goto Exit;
+
+            var mapBox = MapBox;
+            if (mapBox.IsHandleCreated)
+            {
+                _logger.Debug(t => t("\n{0}> Invalidating rectangle {1}", Thread.CurrentThread.ManagedThreadId, updateRect));
+                InvalidateCacheImage();
+                if (invalidateAll)
+                    mapBox.Invalidate();
+                else
+                    mapBox.Invalidate(updateRect);
+
+                //MapBox.Invoke(new MethodInvoker(() => MapBox.Invalidate(updateRect)));
+                if (!IsDisposed)
+                    mapBox.Invoke(new MethodInvoker(() => { if (!mapBox.IsDisposed) mapBox.Update(); }));
+            }
 
-                // Set the image envelope
-                img.GraphicsArea = graphicsArea; // mvp.Envelope.Intersection(lyr.Envelope);
+            // Set the image envelope
+            img.GraphicsArea = graphicsArea; // mvp.Envelope.Intersection(lyr.Envelope);
 
-                // Clear render required flag
-                li.RenderRequired = false;
+            // Clear render required flag
+            li.RenderRequired = false;
 
-                Exit:
-                sw.Stop();
-                _logger.Debug(t => t("\n{0}> Exit RenderLayerImage {1} after {4}ms \n{0}>\t{2} => {3}",
+        Exit:
+            sw.Stop();
+            _logger.Debug(t => t("\n{0}> Exit RenderLayerImage {1} after {4}ms \n{0}>\t{2} => {3}",
+                Thread.CurrentThread.ManagedThreadId, lyr.LayerName, mvp.Envelope, mvp.Size,
+                sw.ElapsedMilliseconds));
+            if (updateRect.IsEmpty)
+                _logger.Debug(t => t("\n{0}> Exit RenderLayerImage because of cancellation",
                     Thread.CurrentThread.ManagedThreadId, lyr.LayerName, mvp.Envelope, mvp.Size,
                     sw.ElapsedMilliseconds));
-                if (updateRect.IsEmpty)
-                    _logger.Debug(t => t("\n{0}> Exit RenderLayerImage because of cancellation",
-                        Thread.CurrentThread.ManagedThreadId, lyr.LayerName, mvp.Envelope, mvp.Size,
-                        sw.ElapsedMilliseconds));
         }
 
         private void InvalidateCacheImage()
@@ -723,13 +727,13 @@ private static void RotateStyles(ILayer lyr, float correction)
                 case VectorLayer vLyr when vLyr.Theme != null:
                     return;
                 case VectorLayer vLyr:
-                {
-                    if (vLyr.Style.PointSymbolizer != null)
-                        vLyr.Style.PointSymbolizer.Rotation += correction;
-                    else
-                        vLyr.Style.SymbolRotation += correction;
-                    return;
-                }
+                    {
+                        if (vLyr.Style.PointSymbolizer != null)
+                            vLyr.Style.PointSymbolizer.Rotation += correction;
+                        else
+                            vLyr.Style.SymbolRotation += correction;
+                        return;
+                    }
                 case LabelLayer lLyr when lLyr.Theme != null:
                     return;
                 case LabelLayer lLyr:
@@ -737,7 +741,7 @@ private static void RotateStyles(ILayer lyr, float correction)
                     break;
             }
         }
-        
+
         /// <summary>
         /// Gets or sets a value indicating the interval that the map is queried for layers that need to be rendered
         /// </summary>
@@ -751,7 +755,7 @@ public int RefreshInterval
                 if (value < 0)
                     return;
 
-                _logger.Debug(h=> string.Format("Setting Refresh interval to {0}ms.", value));
+                _logger.Debug(h => string.Format("Setting Refresh interval to {0}ms.", value));
 
                 _refreshTimer.Stop();
                 _refreshTimer.Interval = value;
diff --git a/SharpMap.UI/Forms/ImageGenerator/LegacyMapImageRenderer.cs b/SharpMap.UI/Forms/ImageGenerator/LegacyMapImageRenderer.cs
index f916c2ca..9a8820e5 100644
--- a/SharpMap.UI/Forms/ImageGenerator/LegacyMapImageRenderer.cs
+++ b/SharpMap.UI/Forms/ImageGenerator/LegacyMapImageRenderer.cs
@@ -1,14 +1,13 @@
-using System;
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
+using System;
 using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.Runtime.CompilerServices;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
-using Common.Logging;
-using GeoAPI.Geometries;
-using SharpMap.Layers;
+using Point = System.Drawing.Point;
 
 namespace SharpMap.Forms.ImageGenerator
 {
@@ -179,7 +178,7 @@ private void HandleVariableLayersRequery(object sender, EventArgs e)
             var mapBox = _mapBox;
             var map = _map;
 
-            if (mapBox.IsDisposed || _isDisposed )
+            if (mapBox.IsDisposed || _isDisposed)
                 return;
 
             Image oldRef;
@@ -330,7 +329,7 @@ private void GetImagesAsyncEnd(GetImageEndResult res)
                 _logger.DebugFormat("{0} - {1} / {2}", res.Generation, res.bbox, res.UpdateArea);
 
             var mapBox = _mapBox;
-            if ((mapBox.SetToolsNoneWhileRedrawing|| mapBox.ShowProgressUpdate) && mapBox.InvokeRequired)
+            if ((mapBox.SetToolsNoneWhileRedrawing || mapBox.ShowProgressUpdate) && mapBox.InvokeRequired)
             {
                 try
                 {
@@ -398,7 +397,7 @@ private void GetImagesAsyncEnd(GetImageEndResult res)
 
 #if DEBUG
                 if (res.Watch != null)
-                { 
+                {
                     res.Watch.Stop();
                     mapBox.LastRefreshTime = res.Watch.Elapsed;
                 }
@@ -419,7 +418,7 @@ private void GetImagesAsyncEnd(GetImageEndResult res)
         private Bitmap MergeImages(long generation, Rectangle rectangle)
         {
             var res = generation == _idImageGeneration
-                ? (Bitmap) _image
+                ? (Bitmap)_image
                 : new Bitmap(MapBox.Size.Width, MapBox.Size.Height);
 
             int counter = 0;
@@ -502,7 +501,7 @@ private void UpdateImage(bool forceRefresh, Rectangle updateArea)
             int width = _mapBox.Width;
             int height = _mapBox.Height;
             if (_imageStatic == null && _imageVariable == null && _imageBackground == null
-                && !forceRefresh 
+                && !forceRefresh
                 || width == 0 || height == 0) return;
 
             var bbox = _map.Envelope;
@@ -546,9 +545,13 @@ private void UpdateImage(bool forceRefresh, Rectangle updateArea)
                         GetImagesAsync(bbox, generation);
                         GetImagesAsyncEnd(new GetImageEndResult
                         {
-                            Tool = oldTool, bbox = bbox, Generation = generation, UpdateArea = updateArea
+                            Tool = oldTool,
+                            bbox = bbox,
+                            Generation = generation,
+                            UpdateArea = updateArea
 #if DEBUG
-                            , Watch = watch
+                            ,
+                            Watch = watch
 #endif
                         });
                     });
@@ -557,10 +560,13 @@ private void UpdateImage(bool forceRefresh, Rectangle updateArea)
             {
                 GetImagesAsyncEnd(new GetImageEndResult
                 {
-                    Tool = null, bbox = bbox, Generation = _imageGeneration,
+                    Tool = null,
+                    bbox = bbox,
+                    Generation = _imageGeneration,
                     UpdateArea = updateArea
 #if DEBUG
-                    , Watch = watch
+                    ,
+                    Watch = watch
 #endif
                 });
             }
diff --git a/SharpMap.UI/Forms/MapBox.cs b/SharpMap.UI/Forms/MapBox.cs
index 400050bc..fd1557f0 100644
--- a/SharpMap.UI/Forms/MapBox.cs
+++ b/SharpMap.UI/Forms/MapBox.cs
@@ -36,22 +36,23 @@
  * 
  * FObermaier
  */
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Forms.ImageGenerator;
+using SharpMap.Forms.Tools;
+using SharpMap.Layers;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using GeoAPI.Geometries;
-using SharpMap.Forms.Tools;
-using SharpMap.Layers;
+using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using IGeometry = GeoAPI.Geometries.IGeometry;
+using System.Runtime.InteropServices;
 using System.Threading;
-using Common.Logging;
-using System.Collections.Generic;
-using System.Drawing.Drawing2D;
-using SharpMap.Forms.ImageGenerator;
+using System.Windows.Forms;
+using Geometry = NetTopologySuite.Geometries.Geometry;
+using Point = System.Drawing.Point;
 
 namespace SharpMap.Forms
 {
@@ -62,7 +63,7 @@ namespace SharpMap.Forms
     /// The ExtendedMapImage control adds more than basic functionality to a Windows Form, such as dynamic pan, widow zoom and data query.
     /// </remarks>
     [DesignTimeVisible(true)]
-// ReSharper disable once PartialTypeWithSinglePart
+    // ReSharper disable once PartialTypeWithSinglePart
     public partial class MapBox : Control
     {
         /// <summary>
@@ -74,7 +75,7 @@ public partial class MapBox : Control
         /// The map image generation function to use when creating new <see cref="MapBox"/> instances
         /// </summary>
         private static Func<MapBox, ProgressBar, IMapBoxImageRenderer> _mapImageGeneratorFunction;
-        
+
         /// <summary>
         /// Gets or sets the map image generation function to assign when creating new MapBox instances.
         /// </summary>
@@ -107,8 +108,8 @@ public static IMapBoxImageRenderer LayerListImageGenerator(MapBox mapBox, Progre
             return new LayerListImageRenderer(mapBox, progressBar);
         }
 
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (MapBox));
-        
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(MapBox));
+
         static MapBox() { Map.Configure(); }
 
         #region PreviewModes enumerator
@@ -189,7 +190,7 @@ public enum Tools
             /// <summary>
             /// Query tool
             /// </summary>
-            [Obsolete ("Use QueryBox")]
+            [Obsolete("Use QueryBox")]
             Query = QueryBox,
 
             /// <summary>
@@ -200,7 +201,7 @@ public enum Tools
             /// <summary>
             /// Attempt true intersection query on geometry
             /// </summary>
-            [Obsolete ("Use QueryPoint")]
+            [Obsolete("Use QueryPoint")]
             QueryGeometry = QueryPoint,
 
             ///// <summary>
@@ -391,7 +392,7 @@ public enum MapQueryType
         /// Eventtype fired when a new geometry has been defined
         /// </summary>
         /// <param name="geometry">New Geometry</param>
-        public delegate void GeometryDefinedHandler(IGeometry geometry);
+        public delegate void GeometryDefinedHandler(Geometry geometry);
 
         /// <summary>
         /// Fired when a new polygon has been defined
@@ -475,12 +476,12 @@ public enum MapQueryType
         public static void RandomizeLayerColors(VectorLayer layer)
         {
             layer.Style.EnableOutline = true;
-            layer.Style.Fill = new SolidBrush(Color.FromArgb(80, _defaultColors[m_defaultColorIndex%_defaultColors.Length]));
+            layer.Style.Fill = new SolidBrush(Color.FromArgb(80, _defaultColors[m_defaultColorIndex % _defaultColors.Length]));
             layer.Style.Outline =
                 new Pen(
                     Color.FromArgb(100,
                                    _defaultColors[
-                                       (m_defaultColorIndex + ((int) (_defaultColors.Length*0.5)))%_defaultColors.Length]),
+                                       (m_defaultColorIndex + ((int)(_defaultColors.Length * 0.5))) % _defaultColors.Length]),
                     1f);
             m_defaultColorIndex++;
         }
@@ -716,7 +717,7 @@ public Map Map
                     if (cea.Cancel) return;
 
                     _map = value;
-                    using(var g = Graphics.FromImage(Image))
+                    using (var g = Graphics.FromImage(Image))
                         g.Clear(_map?.BackColor ?? SystemColors.Control);
 
                     OnMapChanged(EventArgs.Empty);
@@ -991,269 +992,269 @@ private void HandleMapBoxLostFocus(object sender, EventArgs e)
         //    Application.DoEvents();
         //}
 
-//        private void HandleMapNewTileAvaliable(ITileAsyncLayer sender, Envelope box, Bitmap bm, int sourceWidth,
-//                                               int sourceHeight, ImageAttributes imageAttributes)
-//        {
-//            lock (_backgroundImagesLocker)
-//            {
-//                try
-//                {
-//                    var min = Point.Round(_map.WorldToImage(box.Min()));
-//                    var max = Point.Round(_map.WorldToImage(box.Max()));
-
-//                    if (IsDisposed == false && _isDisposed == false)
-//                    {
-
-//                        using (var g = Graphics.FromImage(_imageBackground))
-//                        {
-
-//                            g.DrawImage(bm,
-//                                        new Rectangle(min.X, max.Y, (max.X - min.X), (min.Y - max.Y)),
-//                                        0, 0,
-//                                        sourceWidth, sourceHeight,
-//                                        GraphicsUnit.Pixel,
-//                                        imageAttributes);
-
-//                        }
-
-//                        UpdateImage(false);
-//                    }
-//                }
-//                catch (Exception ex)
-//                {
-//                    _logger.Warn(ex.Message, ex);
-//                    //this can be a GDI+ Hell Exception...
-//                }
-
-//            }
-
-//        }
-
-          #endregion
-
-//        private Image GetMap(Map map, LayerCollection layers, LayerCollectionType layerCollectionType,
-//                             Envelope extent)
-//        {
-//            try
-//            {
-//                var width = Width;
-//                var height = Height;
-
-//                if ((layers == null || layers.Count == 0 || width <= 0 || height <= 0))
-//                {
-//                    if (layerCollectionType == LayerCollectionType.Background)
-//                        return new Bitmap(1, 1);
-//                    return null;
-//                }
-
-//                var retval = new Bitmap(width, height);
-
-//                using (var g = Graphics.FromImage(retval))
-//                {
-//                    g.Clear(Color.Transparent);
-//                    map.RenderMap(g, layerCollectionType, false, true);
-//                }
-
-//                /*if (layerCollectionType == LayerCollectionType.Variable)
-//                    retval.MakeTransparent(_map.BackColor);
-//                else if (layerCollectionType == LayerCollectionType.Static && map.BackgroundLayer.Count > 0)
-//                    retval.MakeTransparent(_map.BackColor);*/
-//                return retval;
-//            }
-//            catch (Exception ee)
-//            {
-//                _logger.Error("Error while rendering map", ee);
-
-//                if (layerCollectionType == LayerCollectionType.Background)
-//                    return new Bitmap(1, 1);
-//                return null;
-//            }
-//        }
-
-
-//        private readonly object _staticImagesLocker = new object();
-//        private readonly object _backgroundImagesLocker = new object();
-//        private readonly object _paintImageLocker = new object();
-//        private readonly object _mapLocker = new object();
-
-//        private void GetImagesAsync(Envelope extent, int imageGeneration)
-//        {
-//            lock (_mapLocker)
-//            {
-//                if (_isDisposed)
-//                    return;
-
-//                if (imageGeneration < _imageGeneration)
-//                {
-//                    /*we're to old*/
-//                    return;
-//                }
-//                var safeMap = _map.Clone();
-//                _imageVariable = GetMap(safeMap, _map.VariableLayers, LayerCollectionType.Variable, extent);
-//                lock (_staticImagesLocker)
-//                {
-//                    _imageStatic = GetMap(safeMap, _map.Layers, LayerCollectionType.Static, extent);
-//                }
-//                lock (_backgroundImagesLocker)
-//                {
-//                    _imageBackground = GetMap(safeMap, _map.BackgroundLayer, LayerCollectionType.Background, extent);
-//                }
-//            }
-//        }
-
-//        private class GetImageEndResult
-//        {
-//            public Tools? Tool { get; set; }
-//            public Envelope bbox { get; set; }
-//            public int generation { get; set; }
-//        }
-
-//        private void GetImagesAsyncEnd(GetImageEndResult res)
-//        {
-//            // draw only if generation is larger than the current, else we have aldready drawn something newer
-//            // we must to check also IsHandleCreated because during disposal, the handle of the parent is detroyed sooner than progress bar's handle,
-//            // this leads to cross thread operation and exception because InvokeRequired returns false, but for the progress bar it is true.
-//            if (res == null || res.generation < _imageGeneration || _isDisposed || !IsHandleCreated)
-//                return;
-
-
-//            if (_logger.IsDebugEnabled)
-//                _logger.DebugFormat("{2}: {0} - {1}", res.generation, res.bbox, DateTime.Now);
-
-
-//            if ((_setActiveToolNoneDuringRedraw || ShowProgressUpdate) && InvokeRequired)
-//            {
-//                try
-//                {
-//                    BeginInvoke(new MethodInvoker(() => GetImagesAsyncEnd(res)));
-
-//                }
-//                catch (Exception ex)
-//                {
-//                    _logger.Warn(ex.Message, ex);
-//                }
-//            }
-//            else
-//            {
-//                try
-//                {
-//                    var oldRef = _image;
-//                    if (Width > 0 && Height > 0)
-//                    {
-
-//                        var bmp = new Bitmap(Width, Height);
-
-
-//                        using (var g = Graphics.FromImage(bmp))
-//                        {
-//                            g.Clear(_map.BackColor);
-//                            lock (_backgroundImagesLocker)
-//                            {
-//                                //Draws the background Image
-//                                if (_imageBackground != null)
-//                                {
-//                                    try
-//                                    {
-//                                        g.DrawImageUnscaled(_imageBackground, 0, 0);
-//                                    }
-//                                    catch (Exception ex)
-//                                    {
-//                                        _logger.Warn(ex.Message, ex);
-//                                    }
-//                                }
-//                            }
-
-//                            //Draws the static images
-//                            if (_staticImagesLocker != null)
-//                            {
-//                                try
-//                                {
-//                                    if (_imageStatic != null)
-//                                    {
-//                                        g.DrawImageUnscaled(_imageStatic, 0, 0);
-//                                    }
-//                                }
-//                                catch (Exception ex)
-//                                {
-//                                    _logger.Warn(ex.Message, ex);
-//                                }
-
-//                            }
-
-//                            //Draws the variable Images
-//                            if (_imageVariable != null)
-//                            {
-//                                try
-//                                {
-//                                    g.DrawImageUnscaled(_imageVariable, 0, 0);
-//                                }
-//                                catch (Exception ex)
-//                                {
-//                                    _logger.Warn(ex.Message, ex);
-//                                }
-//                            }
-
-//                            g.Dispose();
-//                        }
-
-
-//                        lock (_paintImageLocker)
-//                        {
-//                            _image = bmp;
-//                            _imageEnvelope = res.bbox;
-//                        }
-//                    }
-
-//                    if (res.Tool.HasValue)
-//                    {
-//                        if (_setActiveToolNoneDuringRedraw)
-//                            ActiveTool = res.Tool.Value;
-
-//                        _dragEndPoint = new Point(0, 0);
-//                        _isRefreshing = false;
-
-//                        if (_setActiveToolNoneDuringRedraw)
-//                            Enabled = true;
-
-//                        if (ShowProgressUpdate)
-//                        {
-//                            _progressBar.Enabled = false;
-//                            _progressBar.Visible = false;
-//                        }
-//                    }
-
-//                    lock (_paintImageLocker)
-//                    {
-//                        if (oldRef != null)
-//                            oldRef.Dispose();
-//                    }
-
-//                    Invalidate();
-//                }
-//                catch (Exception ex)
-//                {
-//                    _logger.Warn(ex.Message, ex);
-//                }
-
-//#if DEBUG
-//                _watch.Stop();
-//                LastRefreshTime = _watch.Elapsed;
-//#endif
-
-//                try
-//                {
-//                    if (MapRefreshed != null)
-//                    {
-//                        MapRefreshed(this, null);
-//                    }
-//                }
-//                catch (Exception ee)
-//                {
-//                    //Trap errors that occured when calling the eventhandlers
-//                    _logger.Warn("Exception while calling eventhandler", ee);
-//                }
-//            }
-//        }
+        //        private void HandleMapNewTileAvaliable(ITileAsyncLayer sender, Envelope box, Bitmap bm, int sourceWidth,
+        //                                               int sourceHeight, ImageAttributes imageAttributes)
+        //        {
+        //            lock (_backgroundImagesLocker)
+        //            {
+        //                try
+        //                {
+        //                    var min = Point.Round(_map.WorldToImage(box.Min()));
+        //                    var max = Point.Round(_map.WorldToImage(box.Max()));
+
+        //                    if (IsDisposed == false && _isDisposed == false)
+        //                    {
+
+        //                        using (var g = Graphics.FromImage(_imageBackground))
+        //                        {
+
+        //                            g.DrawImage(bm,
+        //                                        new Rectangle(min.X, max.Y, (max.X - min.X), (min.Y - max.Y)),
+        //                                        0, 0,
+        //                                        sourceWidth, sourceHeight,
+        //                                        GraphicsUnit.Pixel,
+        //                                        imageAttributes);
+
+        //                        }
+
+        //                        UpdateImage(false);
+        //                    }
+        //                }
+        //                catch (Exception ex)
+        //                {
+        //                    _logger.Warn(ex.Message, ex);
+        //                    //this can be a GDI+ Hell Exception...
+        //                }
+
+        //            }
+
+        //        }
+
+        #endregion
+
+        //        private Image GetMap(Map map, LayerCollection layers, LayerCollectionType layerCollectionType,
+        //                             Envelope extent)
+        //        {
+        //            try
+        //            {
+        //                var width = Width;
+        //                var height = Height;
+
+        //                if ((layers == null || layers.Count == 0 || width <= 0 || height <= 0))
+        //                {
+        //                    if (layerCollectionType == LayerCollectionType.Background)
+        //                        return new Bitmap(1, 1);
+        //                    return null;
+        //                }
+
+        //                var retval = new Bitmap(width, height);
+
+        //                using (var g = Graphics.FromImage(retval))
+        //                {
+        //                    g.Clear(Color.Transparent);
+        //                    map.RenderMap(g, layerCollectionType, false, true);
+        //                }
+
+        //                /*if (layerCollectionType == LayerCollectionType.Variable)
+        //                    retval.MakeTransparent(_map.BackColor);
+        //                else if (layerCollectionType == LayerCollectionType.Static && map.BackgroundLayer.Count > 0)
+        //                    retval.MakeTransparent(_map.BackColor);*/
+        //                return retval;
+        //            }
+        //            catch (Exception ee)
+        //            {
+        //                _logger.Error("Error while rendering map", ee);
+
+        //                if (layerCollectionType == LayerCollectionType.Background)
+        //                    return new Bitmap(1, 1);
+        //                return null;
+        //            }
+        //        }
+
+
+        //        private readonly object _staticImagesLocker = new object();
+        //        private readonly object _backgroundImagesLocker = new object();
+        //        private readonly object _paintImageLocker = new object();
+        //        private readonly object _mapLocker = new object();
+
+        //        private void GetImagesAsync(Envelope extent, int imageGeneration)
+        //        {
+        //            lock (_mapLocker)
+        //            {
+        //                if (_isDisposed)
+        //                    return;
+
+        //                if (imageGeneration < _imageGeneration)
+        //                {
+        //                    /*we're to old*/
+        //                    return;
+        //                }
+        //                var safeMap = _map.Clone();
+        //                _imageVariable = GetMap(safeMap, _map.VariableLayers, LayerCollectionType.Variable, extent);
+        //                lock (_staticImagesLocker)
+        //                {
+        //                    _imageStatic = GetMap(safeMap, _map.Layers, LayerCollectionType.Static, extent);
+        //                }
+        //                lock (_backgroundImagesLocker)
+        //                {
+        //                    _imageBackground = GetMap(safeMap, _map.BackgroundLayer, LayerCollectionType.Background, extent);
+        //                }
+        //            }
+        //        }
+
+        //        private class GetImageEndResult
+        //        {
+        //            public Tools? Tool { get; set; }
+        //            public Envelope bbox { get; set; }
+        //            public int generation { get; set; }
+        //        }
+
+        //        private void GetImagesAsyncEnd(GetImageEndResult res)
+        //        {
+        //            // draw only if generation is larger than the current, else we have aldready drawn something newer
+        //            // we must to check also IsHandleCreated because during disposal, the handle of the parent is detroyed sooner than progress bar's handle,
+        //            // this leads to cross thread operation and exception because InvokeRequired returns false, but for the progress bar it is true.
+        //            if (res == null || res.generation < _imageGeneration || _isDisposed || !IsHandleCreated)
+        //                return;
+
+
+        //            if (_logger.IsDebugEnabled)
+        //                _logger.DebugFormat("{2}: {0} - {1}", res.generation, res.bbox, DateTime.Now);
+
+
+        //            if ((_setActiveToolNoneDuringRedraw || ShowProgressUpdate) && InvokeRequired)
+        //            {
+        //                try
+        //                {
+        //                    BeginInvoke(new MethodInvoker(() => GetImagesAsyncEnd(res)));
+
+        //                }
+        //                catch (Exception ex)
+        //                {
+        //                    _logger.Warn(ex.Message, ex);
+        //                }
+        //            }
+        //            else
+        //            {
+        //                try
+        //                {
+        //                    var oldRef = _image;
+        //                    if (Width > 0 && Height > 0)
+        //                    {
+
+        //                        var bmp = new Bitmap(Width, Height);
+
+
+        //                        using (var g = Graphics.FromImage(bmp))
+        //                        {
+        //                            g.Clear(_map.BackColor);
+        //                            lock (_backgroundImagesLocker)
+        //                            {
+        //                                //Draws the background Image
+        //                                if (_imageBackground != null)
+        //                                {
+        //                                    try
+        //                                    {
+        //                                        g.DrawImageUnscaled(_imageBackground, 0, 0);
+        //                                    }
+        //                                    catch (Exception ex)
+        //                                    {
+        //                                        _logger.Warn(ex.Message, ex);
+        //                                    }
+        //                                }
+        //                            }
+
+        //                            //Draws the static images
+        //                            if (_staticImagesLocker != null)
+        //                            {
+        //                                try
+        //                                {
+        //                                    if (_imageStatic != null)
+        //                                    {
+        //                                        g.DrawImageUnscaled(_imageStatic, 0, 0);
+        //                                    }
+        //                                }
+        //                                catch (Exception ex)
+        //                                {
+        //                                    _logger.Warn(ex.Message, ex);
+        //                                }
+
+        //                            }
+
+        //                            //Draws the variable Images
+        //                            if (_imageVariable != null)
+        //                            {
+        //                                try
+        //                                {
+        //                                    g.DrawImageUnscaled(_imageVariable, 0, 0);
+        //                                }
+        //                                catch (Exception ex)
+        //                                {
+        //                                    _logger.Warn(ex.Message, ex);
+        //                                }
+        //                            }
+
+        //                            g.Dispose();
+        //                        }
+
+
+        //                        lock (_paintImageLocker)
+        //                        {
+        //                            _image = bmp;
+        //                            _imageEnvelope = res.bbox;
+        //                        }
+        //                    }
+
+        //                    if (res.Tool.HasValue)
+        //                    {
+        //                        if (_setActiveToolNoneDuringRedraw)
+        //                            ActiveTool = res.Tool.Value;
+
+        //                        _dragEndPoint = new Point(0, 0);
+        //                        _isRefreshing = false;
+
+        //                        if (_setActiveToolNoneDuringRedraw)
+        //                            Enabled = true;
+
+        //                        if (ShowProgressUpdate)
+        //                        {
+        //                            _progressBar.Enabled = false;
+        //                            _progressBar.Visible = false;
+        //                        }
+        //                    }
+
+        //                    lock (_paintImageLocker)
+        //                    {
+        //                        if (oldRef != null)
+        //                            oldRef.Dispose();
+        //                    }
+
+        //                    Invalidate();
+        //                }
+        //                catch (Exception ex)
+        //                {
+        //                    _logger.Warn(ex.Message, ex);
+        //                }
+
+        //#if DEBUG
+        //                _watch.Stop();
+        //                LastRefreshTime = _watch.Elapsed;
+        //#endif
+
+        //                try
+        //                {
+        //                    if (MapRefreshed != null)
+        //                    {
+        //                        MapRefreshed(this, null);
+        //                    }
+        //                }
+        //                catch (Exception ee)
+        //                {
+        //                    //Trap errors that occured when calling the eventhandlers
+        //                    _logger.Warn("Exception while calling eventhandler", ee);
+        //                }
+        //            }
+        //        }
 
         //private void UpdateImage(bool forceRefresh)
         //{
@@ -1455,7 +1456,7 @@ protected override void OnMouseEnter(EventArgs e)
         /// <param name="e">An <see cref="T:System.EventArgs"/> that contains the event data. </param>
         protected override void OnMouseLeave(EventArgs e)
         {
-            _logger.DebugFormat( "MouseLeave {0}", Name);
+            _logger.DebugFormat("MouseLeave {0}", Name);
 
             base.OnMouseLeave(e);
             if (UseCurrentTool)
@@ -1489,11 +1490,11 @@ protected override void OnMouseWheel(MouseEventArgs e)
                 // oldZoom and oldHeight are the APPARENT width amd height of the map in world coordinates,
                 // even when a MapTransform is applied (ie NOT the same as Envelope.Width amd Height)
                 var oldCenter = _map.Center;
-                var oldZoom = _map.Zoom; 
-                var oldHeight = _map.MapHeight; 
+                var oldZoom = _map.Zoom;
+                var oldHeight = _map.MapHeight;
 
                 var scale = (e.Delta / 120.0);
-                var scaleBase = 1 + (_wheelZoomMagnitude/(10*(IsControlPressed ? _fineZoomFactor : 1)));
+                var scaleBase = 1 + (_wheelZoomMagnitude / (10 * (IsControlPressed ? _fineZoomFactor : 1)));
                 var scaleFactor = Math.Pow(scaleBase, scale);
 
                 if (!ZoomToPointer)
@@ -1503,7 +1504,7 @@ protected override void OnMouseWheel(MouseEventArgs e)
                 {
                     // Limit scale factor to meaningful values
                     double newZoom = oldZoom * scaleFactor;
-                    if (newZoom > Map.MaximumZoom) 
+                    if (newZoom > Map.MaximumZoom)
                         scaleFactor = Map.MaximumZoom / oldZoom;
                     else if (newZoom < Map.MinimumZoom)
                         scaleFactor = Map.MinimumZoom / oldZoom;
@@ -1518,11 +1519,11 @@ protected override void OnMouseWheel(MouseEventArgs e)
 
                     double newWidth = oldZoom * scaleFactor;
                     double newHeight = oldHeight * scaleFactor;
-                    
+
                     var extent = new Envelope(
-                        newCenter.X - newWidth * 0.5, 
+                        newCenter.X - newWidth * 0.5,
                         newCenter.X + newWidth * 0.5,
-                        newCenter.Y - newHeight * 0.5, 
+                        newCenter.Y - newHeight * 0.5,
                         newCenter.Y + newHeight * 0.5);
 
                     if (_map.EnforceMaximumExtents && !_map.MaximumExtents.IsNull && !_map.MaximumExtents.Contains(extent))
@@ -1568,7 +1569,7 @@ protected override void OnMouseWheel(MouseEventArgs e)
         private void TimerUpdate(object state, System.Timers.ElapsedEventArgs args)
         {
             _logger.Debug("TimerRefresh");
-            if (Interlocked.CompareExchange(ref _needToRefreshAfterWheel, 0, 1)==1)
+            if (Interlocked.CompareExchange(ref _needToRefreshAfterWheel, 0, 1) == 1)
             {
                 OnMapZoomChanged(_map.Zoom);
 
@@ -1619,7 +1620,7 @@ protected override void OnMouseDown(MouseEventArgs e)
                 _dragStartPoint = e.Location;
                 _dragEndPoint = e.Location;
                 _dragStartCenter = _map.Center;
-                
+
                 _dragTransform = new Matrix();
                 _dragTransform.Translate(-e.X, -e.Y);
                 _dragTransform.Scale(1f, -1f, MatrixOrder.Append);  // reflect in X axis
@@ -1722,7 +1723,7 @@ protected override void OnMouseMove(MouseEventArgs e)
             }
 
             bool isStartDrag = //_image != null && e.Location != _dragStartPoint && !_dragging &&
-                               _miRenderer.ImageValue != null && e.Location != _dragStartPoint && !_dragging && 
+                               _miRenderer.ImageValue != null && e.Location != _dragStartPoint && !_dragging &&
                                (e.Button == MouseButtons.Left || e.Button == MouseButtons.Middle) &&
                                //Left of middle button can start drag
                                !(_setActiveToolNoneDuringRedraw &&
@@ -1733,7 +1734,7 @@ protected override void OnMouseMove(MouseEventArgs e)
             {
                 _dragging = true;
             }
- 
+
             if (_dragging)
             {
                 if (MouseDrag != null)
@@ -1768,9 +1769,9 @@ protected override void OnMouseMove(MouseEventArgs e)
                     _dragEndPoint = ClipPoint(e.Location);
                     if (_dragStartCenter != null)
                     {
-                        var pts = new[] { 
+                        var pts = new[] {
                             new PointF(_dragStartPoint.X, _dragStartPoint.Y),
-                            new PointF(_dragEndPoint.X, _dragEndPoint.Y) 
+                            new PointF(_dragEndPoint.X, _dragEndPoint.Y)
                          };
 
                         _dragTransform.TransformPoints(pts);
@@ -1792,11 +1793,11 @@ protected override void OnMouseMove(MouseEventArgs e)
                 {
                     _dragEndPoint = ClipPoint(e.Location);
                     if (_dragEndPoint.Y - _dragStartPoint.Y < 0) //Zoom out
-                        _scaling = (float) Math.Pow(1/(float) (_dragStartPoint.Y - _dragEndPoint.Y), 0.5);
+                        _scaling = (float)Math.Pow(1 / (float)(_dragStartPoint.Y - _dragEndPoint.Y), 0.5);
                     else //Zoom in
-                        _scaling = 1 + (_dragEndPoint.Y - _dragStartPoint.Y)*0.1f;
+                        _scaling = 1 + (_dragEndPoint.Y - _dragStartPoint.Y) * 0.1f;
 
-                    _map.Zoom = _orgScale/_scaling;
+                    _map.Zoom = _orgScale / _scaling;
                     if (MapZooming != null)
                         MapZooming(_map.Zoom);
 
@@ -1848,7 +1849,7 @@ protected override void OnKeyDown(KeyEventArgs e)
             base.OnKeyDown(e);
         }
 
-        private bool UseCurrentTool { get { return _currentTool != null && _currentTool.Enabled; }}
+        private bool UseCurrentTool { get { return _currentTool != null && _currentTool.Enabled; } }
 
         /// <summary>
         /// Gets a value indicating that the map is currently being dragged.
@@ -2063,7 +2064,7 @@ protected override void OnPaint(PaintEventArgs pe)
                     if (_activeTool == Tools.ZoomWindow || _activeTool == Tools.QueryBox ||
                         (_shiftButtonDragRectangleZoom && (ModifierKeys & Keys.Shift) != Keys.None))
                     {
-                        var image = (Bitmap) _miRenderer.ImageValue;
+                        var image = (Bitmap)_miRenderer.ImageValue;
 
                         //Reset image to normal view
                         using (var patch = image.Clone(pe.ClipRectangle, PixelFormat.DontCare))
@@ -2073,10 +2074,10 @@ protected override void OnPaint(PaintEventArgs pe)
                         if (_rectangle.Width > 0 && _rectangle.Height > 0)
                         {
                             pe.Graphics.FillRectangle(_rectangleBrush, _rectangle);
-                            var border = new Rectangle(_rectangle.X + (int) _rectanglePen.Width/2,
-                                                             _rectangle.Y + (int) _rectanglePen.Width/2,
-                                                             _rectangle.Width - (int) _rectanglePen.Width,
-                                                             _rectangle.Height - (int) _rectanglePen.Width);
+                            var border = new Rectangle(_rectangle.X + (int)_rectanglePen.Width / 2,
+                                                             _rectangle.Y + (int)_rectanglePen.Width / 2,
+                                                             _rectangle.Width - (int)_rectanglePen.Width,
+                                                             _rectangle.Height - (int)_rectanglePen.Width);
                             pe.Graphics.DrawRectangle(_rectanglePen, border);
                         }
                     }
@@ -2128,11 +2129,12 @@ protected override void OnPaint(PaintEventArgs pe)
                     var image = _miRenderer.ImageValue;
                     if (image != null && image.PixelFormat != PixelFormat.Undefined)
                     {
-                        
+
                         var imageEnvelope = _miRenderer.ImageEnvelope ?? new Envelope();
                         if (_map.Envelope.Equals(imageEnvelope))
                             pe.Graphics.DrawImageUnscaled(image, 0, 0);
-                        else {
+                        else
+                        {
                             var ul = _map.WorldToImage(imageEnvelope.TopLeft());
                             var lr = _map.WorldToImage(imageEnvelope.BottomRight());
                             pe.Graphics.DrawImage(image, RectangleF.FromLTRB(ul.X, ul.Y, lr.X, lr.Y));
@@ -2232,9 +2234,9 @@ protected override void OnMouseUp(MouseEventArgs e)
                     if (_dragging)
                     {
                         if (e.Y - _dragStartPoint.Y < 0) //Zoom out
-                            scale = (float) Math.Pow(1/(float) (_dragStartPoint.Y - e.Y), 0.5);
+                            scale = (float)Math.Pow(1 / (float)(_dragStartPoint.Y - e.Y), 0.5);
                         else //Zoom in
-                            scale = 1 + (e.Y - _dragStartPoint.Y)*0.1;
+                            scale = 1 + (e.Y - _dragStartPoint.Y) * 0.1;
                     }
                     else
                     {
@@ -2258,7 +2260,7 @@ protected override void OnMouseUp(MouseEventArgs e)
                         needToRefresh = true;
                         OnMapZoomChanged(_map.Zoom);
                     }
-                        
+
                 }
                 else if (_activeTool == Tools.ZoomIn)
                 {
@@ -2266,9 +2268,9 @@ protected override void OnMouseUp(MouseEventArgs e)
                     if (_dragging)
                     {
                         if (e.Y - _dragStartPoint.Y < 0) //Zoom out
-                            scale = (float) Math.Pow(1/(float) (_dragStartPoint.Y - e.Y), 0.5);
+                            scale = (float)Math.Pow(1 / (float)(_dragStartPoint.Y - e.Y), 0.5);
                         else //Zoom in
-                            scale = 1 + (e.Y - _dragStartPoint.Y)*0.1;
+                            scale = 1 + (e.Y - _dragStartPoint.Y) * 0.1;
                     }
                     else
                     {
@@ -2280,18 +2282,18 @@ protected override void OnMouseUp(MouseEventArgs e)
                             needToRefresh = true;
                             OnMapCenterChanged(_map.Center);
                         }
-                            
+
                     }
 
                     var oldZoom = _map.Zoom;
-                    _map.Zoom =oldZoom * 1/scale;
+                    _map.Zoom = oldZoom * 1 / scale;
 
                     if (Math.Abs(_map.Zoom - oldZoom) > PrecisionTolerance)
                     {
                         needToRefresh = true;
                         OnMapZoomChanged(_map.Zoom);
                     }
-                        
+
                 }
                 else if ((_activeTool == Tools.Pan &&
                           !(_shiftButtonDragRectangleZoom && (ModifierKeys & Keys.Shift) != Keys.None)) ||
@@ -2305,7 +2307,7 @@ protected override void OnMouseUp(MouseEventArgs e)
                             needToRefresh = true;
                             OnMapCenterChanged(_map.Center);
                         }
-                            
+
                     }
                     else
                     {
@@ -2350,7 +2352,7 @@ protected override void OnMouseUp(MouseEventArgs e)
                             else
                             {
                                 bounding = new Envelope(_map.ImageToWorld(new Point(e.X, e.Y)));
-                                bounding = bounding.Grow(_map.PixelSize*_queryGrowFactor);
+                                bounding = bounding.Grow(_map.PixelSize * _queryGrowFactor);
                                 isPoint = true;
                             }
 
@@ -2361,7 +2363,7 @@ protected override void OnMouseUp(MouseEventArgs e)
                             }
                             else
                             {
-                                IGeometry geom;
+                                Geometry geom;
                                 if (isPoint && QueryGrowFactor == 0)
                                     geom = _map.Factory.CreatePoint(_map.ImageToWorld(new Point(e.X, e.Y)));
                                 else
@@ -2411,16 +2413,16 @@ protected override void OnMouseUp(MouseEventArgs e)
                     if (_rectangle.Width > 0 && _rectangle.Height > 0)
                     {
                         var zoomWindowStartPoint = _dragStartPoint;
-                        var zoomWindowEndPoint = new PointF(e.X, e.Y); 
-                    
+                        var zoomWindowEndPoint = new PointF(e.X, e.Y);
+
                         Coordinate lowerLeft;
                         Coordinate upperRight;
                         GetBounds(
-                            _map.ImageToWorld(zoomWindowStartPoint), 
+                            _map.ImageToWorld(zoomWindowStartPoint),
                             _map.ImageToWorld(zoomWindowEndPoint),
-                            out lowerLeft, 
+                            out lowerLeft,
                             out upperRight);
-                            
+
                         _dragEndPoint.X = 0;
                         _dragEndPoint.Y = 0;
 
@@ -2508,7 +2510,7 @@ private List<ICanQueryLayer> GetLayersToQuery()
                     foreach (var layer in _map.Layers)
                     {
                         var cqLayer = layer as ICanQueryLayer;
-                        double visibleLevel = layer.VisibilityUnits == Styles.VisibilityUnits.ZoomLevel ? _map.Zoom  : _map.MapScale;
+                        double visibleLevel = layer.VisibilityUnits == Styles.VisibilityUnits.ZoomLevel ? _map.Zoom : _map.MapScale;
                         if (cqLayer != null && layer.Enabled && layer.MinVisible < visibleLevel &&
                             layer.MaxVisible >= visibleLevel && cqLayer.IsQueryEnabled)
                             layersToQuery.Add(cqLayer);
@@ -2634,7 +2636,7 @@ public bool PreFilterMessage(ref Message m)
             {
                 if (m.Msg == 0x020A)
                 {
-                    var delta = ((int) (m.WParam.ToInt64() & 0xFFFF0000) >> 16);
+                    var delta = ((int)(m.WParam.ToInt64() & 0xFFFF0000) >> 16);
                     var pt = _redirectHandle.PointToClient(new Point(m.LParam.ToInt32()));
                     if (_redirectHandle.ClientRectangle.Contains(pt))
                     {
diff --git a/SharpMap.UI/Forms/MiniMapControl.cs b/SharpMap.UI/Forms/MiniMapControl.cs
index 78e74915..e597fcce 100644
--- a/SharpMap.UI/Forms/MiniMapControl.cs
+++ b/SharpMap.UI/Forms/MiniMapControl.cs
@@ -15,6 +15,7 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.ComponentModel;
 using System.Drawing;
@@ -23,7 +24,6 @@
 using System.Security.Permissions;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Forms
 {
@@ -91,7 +91,7 @@ protected enum HitResult
         private int _framePenWidth = 2;
         private float _opacity;
         private Color _frameHaloColor;
-        private Point _translate;
+        private System.Drawing.Point _translate;
         private Cursor _oldCursor;
         private HitResult _hitResult;
         private Guid _mapId = Guid.NewGuid();
@@ -497,12 +497,12 @@ protected override void OnMouseDown(MouseEventArgs e)
 
             if (_hitResult == HitResult.None)
             {
-                _translate = Point.Empty;
+                _translate = System.Drawing.Point.Empty;
                 _frame = CalculateNewFrame(e.X, e.Y);
             }
             else
             {
-                _translate = new Point(Convert.ToInt32(e.X - (_frame.X + _frame.Width * 0.5)),
+                _translate = new System.Drawing.Point(Convert.ToInt32(e.X - (_frame.X + _frame.Width * 0.5)),
                     Convert.ToInt32(e.Y - (_frame.Y + _frame.Height * 0.5)));
             }
 
@@ -781,8 +781,8 @@ private Tuple<Image, int, Rectangle> GenerateMap(object state)
             try
             {
                 _isRenderingThread = true;
-                
-                var map = (Map) args[1];
+
+                var map = (Map)args[1];
 
                 Image img = null;
                 Rectangle frame;
@@ -793,11 +793,11 @@ private Tuple<Image, int, Rectangle> GenerateMap(object state)
                     var originalWidth = map.Zoom;
                     var originalHeight = map.MapHeight;
 
-                    var wx1 = originalCenter.X - originalWidth*0.5;
-                    var wy1 = originalCenter.Y - originalHeight*0.5;
+                    var wx1 = originalCenter.X - originalWidth * 0.5;
+                    var wy1 = originalCenter.Y - originalHeight * 0.5;
 
-                    var wx2 = originalCenter.X + originalWidth*0.5;
-                    var wy2 = originalCenter.Y + originalHeight*0.5;
+                    var wx2 = originalCenter.X + originalWidth * 0.5;
+                    var wy2 = originalCenter.Y + originalHeight * 0.5;
 
                     map.Size = Size;
                     map.ZoomToExtents();
diff --git a/SharpMap.UI/Forms/ToolBar/MapDigitizeGeometriesToolStrip.cs b/SharpMap.UI/Forms/ToolBar/MapDigitizeGeometriesToolStrip.cs
index d3fb1dc0..cba58ad5 100644
--- a/SharpMap.UI/Forms/ToolBar/MapDigitizeGeometriesToolStrip.cs
+++ b/SharpMap.UI/Forms/ToolBar/MapDigitizeGeometriesToolStrip.cs
@@ -60,7 +60,7 @@ public void InitializeComponent()
             _clear.ToolTipText += @"Removes all geometries from the geometry layer";
 
             _sep1 = new ToolStripSeparator();
-            _sep1.Size = new System.Drawing.Size(6,6);
+            _sep1.Size = new System.Drawing.Size(6, 6);
 
             _addPoint = new ToolStripButton();
             _addPoint.Name = "_addPoint";
@@ -107,7 +107,7 @@ protected virtual void OnMouseDown(object sender, MouseEventArgs e)
         {
             Debug.WriteLine(string.Format("\nButtonClicked '{0}'", ((ToolStripButton)sender).Name));
             if (_logger.IsDebugEnabled)
-                _logger.DebugFormat("\nButtonClicked '{0}'",((ToolStripButton)sender).Name);
+                _logger.DebugFormat("\nButtonClicked '{0}'", ((ToolStripButton)sender).Name);
         }
 
         /// <inheritdoc/>
@@ -134,14 +134,14 @@ protected override void OnMapControlChangedInternal(EventArgs e)
                 return;
             }
 
-            _geometryProvider = new Data.Providers.GeometryProvider((GeoAPI.Geometries.IGeometry)null);
+            _geometryProvider = new Data.Providers.GeometryProvider((NetTopologySuite.Geometries.Geometry)null);
             _layer = new Layers.VectorLayer("_tmp_Geometries", _geometryProvider);
 
             MapControl.ActiveToolChanged += OnMapControlActiveToolChanged;
             MapControl.GeometryDefined += OnGeometryDefined;
 
 
-            
+
         }
 
         private void OnRemoveFeatures(object sender, EventArgs e)
@@ -155,7 +155,7 @@ private void OnCheckedChanged(object sender, EventArgs e)
             if (MapControl == null) return;
 
             var checkedButton = (ToolStripButton)sender;
-            
+
             MapBox.Tools newTool;
             if (sender == _addPoint)
                 newTool = MapBox.Tools.DrawPoint;
@@ -201,7 +201,7 @@ private void OnMapControlActiveToolChanged(MapBox.Tools tool)
             }
         }
 
-        private void OnGeometryDefined(GeoAPI.Geometries.IGeometry geometry)
+        private void OnGeometryDefined(NetTopologySuite.Geometries.Geometry geometry)
         {
             if (geometry == null)
                 return;
@@ -214,9 +214,9 @@ private void OnGeometryDefined(GeoAPI.Geometries.IGeometry geometry)
         /// A handler that is invoked when a new geometry was defined.
         /// </summary>
         [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        public MapBox.GeometryDefinedHandler GeometryDefinedHandler{ get; set; }
+        public MapBox.GeometryDefinedHandler GeometryDefinedHandler { get; set; }
 
-        private void DefaultGeometryDefinedMethod(GeoAPI.Geometries.IGeometry geom)
+        private void DefaultGeometryDefinedMethod(NetTopologySuite.Geometries.Geometry geom)
         {
             using (var frm = new WktGeometryCreator())
             {
diff --git a/SharpMap.UI/Forms/ToolBar/MapQueryToolStrip.cs b/SharpMap.UI/Forms/ToolBar/MapQueryToolStrip.cs
index 730e2ecc..d2bb347f 100644
--- a/SharpMap.UI/Forms/ToolBar/MapQueryToolStrip.cs
+++ b/SharpMap.UI/Forms/ToolBar/MapQueryToolStrip.cs
@@ -25,7 +25,7 @@ public MapQueryToolStrip()
         /// </summary>
         /// <param name="container">A container to add components to</param>
         public MapQueryToolStrip(IContainer container)
-            :base(container)
+            : base(container)
         {
             InitializeComponent();
         }
@@ -43,7 +43,7 @@ public MapQueryToolStrip(IContainer container)
         private Layers.VectorLayer _layer;
 
         private readonly Dictionary<string, int> _dictLayerNameToIndex
-            = new Dictionary<string,int>();
+            = new Dictionary<string, int>();
 
         /// <summary>
         /// Method to initialize the tool strip
@@ -112,9 +112,9 @@ public void InitializeComponent()
         }
 
         /// <inheritdoc cref="MapToolStrip.OnMapControlChangingInternal"/>
-        protected override void  OnMapControlChangingInternal(CancelEventArgs e)
+        protected override void OnMapControlChangingInternal(CancelEventArgs e)
         {
- 	        base.OnMapControlChangingInternal(e);
+            base.OnMapControlChangingInternal(e);
             if (MapControl == null) return;
 
             OnClear();
@@ -127,13 +127,13 @@ protected override void  OnMapControlChangingInternal(CancelEventArgs e)
         }
 
         /// <inheritdoc cref="MapToolStrip.OnMapControlChangedInternal"/>
-        protected override void  OnMapControlChangedInternal(EventArgs e)
+        protected override void OnMapControlChangedInternal(EventArgs e)
         {
- 	        base.OnMapControlChangedInternal(e);
+            base.OnMapControlChangedInternal(e);
 
             if (MapControl == null)
             {
-                Enabled =false;
+                Enabled = false;
                 return;
             }
             MapControl.ActiveToolChanged += OnMapControlActiveToolChanged;
@@ -204,7 +204,7 @@ private void OnListChanged(object sender, ListChangedEventArgs e)
             int i = 0;
             int j = 0;
             int k = -1;
-            foreach(var lyr in MapControl.Map.Layers)
+            foreach (var lyr in MapControl.Map.Layers)
             {
                 if (lyr.LayerName == "QueriedFeatures") continue;
 
@@ -247,7 +247,7 @@ private void OnMapQueried(Data.FeatureDataTable features)
             _geometryProvider = new Data.Providers.GeometryFeatureProvider(features);
             _layer = new Layers.VectorLayer("QueriedFeatures", _geometryProvider);
             _layer.IsQueryEnabled = false;
-            
+
             var map = MapControl.Map;
             map.Layers.Add(_layer);
 
@@ -258,7 +258,7 @@ private void OnMapQueried(Data.FeatureDataTable features)
         private void OnCheckedChanged(object sender, EventArgs e)
         {
             if (MapControl == null) return;
-            
+
             if (_queryLayerPicker.SelectedItem == null)
             {
                 MessageBox.Show(@"No layer to query selected");
@@ -279,7 +279,7 @@ private void OnCheckedChanged(object sender, EventArgs e)
                 return;
             }
             TrySetActiveTool(checkedButton, newTool);
-            
+
         }
     }
 }
diff --git a/SharpMap.UI/Forms/ToolBar/MapToolstrip.cs b/SharpMap.UI/Forms/ToolBar/MapToolstrip.cs
index 016ec6d9..2a3163e2 100644
--- a/SharpMap.UI/Forms/ToolBar/MapToolstrip.cs
+++ b/SharpMap.UI/Forms/ToolBar/MapToolstrip.cs
@@ -1,11 +1,11 @@
-using System;
+using Common.Logging;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using Common.Logging;
 
 namespace SharpMap.Forms
 {
-    
+
     /// <summary>
     /// Map tool
     /// </summary>
@@ -69,7 +69,7 @@ public MapBox MapControl
                     var cea = new CancelEventArgs();
                     OnMapControlChanging(cea);
                     if (cea.Cancel) return;
-                    
+
                     _mapBox = value;
                     OnMapControlChanged(EventArgs.Empty);
                 }
@@ -91,7 +91,7 @@ protected void OnMapControlChanging(CancelEventArgs e)
 
             _logger.Info("MapControlChanging");
             MapControlChanging?.Invoke(this, e);
-            
+
             if (e.Cancel)
             {
                 _logger.Info("Canceled");
@@ -107,7 +107,7 @@ protected void OnMapControlChanging(CancelEventArgs e)
         /// <param name="e">The event arguments. If removing MapControl is not possible <see cref="CancelEventArgs.Cancel"/> must be set to <c>true</c>.</param>
         protected virtual void OnMapControlChangingInternal(CancelEventArgs e)
         {
-            
+
             //_mapBox.MapQueried -= OnMapQueried;
             //_mapBox.MapRefreshed -= OnMapRefreshed;
             //_mapBox.MapZoomChanged -= OnMapZoomChanged;
@@ -189,7 +189,7 @@ protected virtual void TrySetActiveTool(System.Windows.Forms.ToolStripButton btn
 
         }
 
-        
+
         #endregion
 
         /*
@@ -205,7 +205,7 @@ private void OnMapQueried(Data.FeatureDataTable queryResults)
             //What is to do here?
         }
 
-        private void OnMapCenterChanged(GeoAPI.Geometries.Coordinate geoPoint)
+        private void OnMapCenterChanged(NetTopologySuite.Geometries.Coordinate geoPoint)
         {
         }
         
diff --git a/SharpMap.UI/Forms/ToolBar/MapVariableLayerToolStrip.cs b/SharpMap.UI/Forms/ToolBar/MapVariableLayerToolStrip.cs
index aab770dd..edd712f2 100644
--- a/SharpMap.UI/Forms/ToolBar/MapVariableLayerToolStrip.cs
+++ b/SharpMap.UI/Forms/ToolBar/MapVariableLayerToolStrip.cs
@@ -1,7 +1,7 @@
-using System;
-using System.ComponentModel;
-using Common.Logging;
+using Common.Logging;
 using SharpMap.Forms.ImageGenerator;
+using System;
+using System.ComponentModel;
 
 namespace SharpMap.Forms.ToolBar
 {
diff --git a/SharpMap.UI/Forms/ToolBar/MapZoomToolStrip.cs b/SharpMap.UI/Forms/ToolBar/MapZoomToolStrip.cs
index 8b96e415..26175a3f 100644
--- a/SharpMap.UI/Forms/ToolBar/MapZoomToolStrip.cs
+++ b/SharpMap.UI/Forms/ToolBar/MapZoomToolStrip.cs
@@ -1,10 +1,10 @@
-using System;
+using NetTopologySuite.Geometries;
+using SharpMap.Properties;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
-using SharpMap.Properties;
 
 namespace SharpMap.Forms.ToolBar
 {
@@ -42,7 +42,7 @@ public MapZoomToolStrip()
         /// Creates an instance of this class
         /// </summary>
         public MapZoomToolStrip(IContainer container)
-            :base(container)
+            : base(container)
         {
             InitializeComponent();
             AddScales();
@@ -264,7 +264,7 @@ private void OnFixedZoom(object sender, EventArgs e)
         }
 
         #region ZoomExtentStack
-        
+
         /// <summary>
         /// An implementation of zoom previous/zoom next like *** MapControl
         /// </summary>
@@ -430,11 +430,11 @@ private void Add(Envelope newExtent)
                 // correct index
                 if (_skip == 0)
                     _index = _zoomExtentStack.Count - 1;
-                else 
+                else
                     _skip--;
             }
         }
-        
+
         #endregion
 
         private void OnCheckedChanged(object sender, EventArgs e)
@@ -445,16 +445,16 @@ private void OnCheckedChanged(object sender, EventArgs e)
 
             if (tsb == _pan)
                 TrySetActiveTool(tsb, MapBox.Tools.Pan);
-            
+
             if (tsb == _zoomToWindow)
                 TrySetActiveTool(tsb, MapBox.Tools.ZoomWindow);
-            
+
             if (tsb == _minZoom)
             {
                 MapControl.Map.MinimumZoom =
                     _minZoom.Checked ? MapControl.Map.Zoom : Double.Epsilon;
             }
-            
+
             if (tsb == _maxZoom)
             {
                 MapControl.Map.MaximumZoom =
@@ -482,7 +482,7 @@ private void OnCheckedChanged(object sender, EventArgs e)
         private void ResetControls()
         {
             Visible = true;
-            
+
             if (MapControl.Map != null)
             {
                 _minZoom.Checked = MapControl.Map.MinimumZoom > Double.Epsilon;
@@ -495,7 +495,7 @@ private void ResetControls()
 
             _mvpLock = new MapViewportLock(MapControl.Map);
         }
-        
+
         /// <inheritdoc cref="MapToolStrip.OnMapControlChangedInternal"/>
         protected override void OnMapControlChangedInternal(EventArgs e)
         {
@@ -534,8 +534,8 @@ private void HandleMapChanged(object sender, EventArgs e)
                 return;
 
             ResetControls();
-           
-            _predefinedScales.Text = string.Format(NumberFormatInfo.CurrentInfo, "1:{0}", 
+
+            _predefinedScales.Text = string.Format(NumberFormatInfo.CurrentInfo, "1:{0}",
                 Math.Round(MapControl.Map.GetMapScale(_dpiX), 0, MidpointRounding.AwayFromZero));
 
             MapControl.Map.MapViewOnChange += OnMapMapViewOnChange;
@@ -546,7 +546,7 @@ private void HandleMapChanging(object sender, CancelEventArgs e)
             if (sender != MapControl)
                 return;
             _zoomExtentStack.Clear();
-            
+
             MapControl.Map.MapViewOnChange -= OnMapMapViewOnChange;
             _mvpLock = null;
 
@@ -574,7 +574,7 @@ private void OnMapZoomChanged(double zoom)
                                 {
                                     _zoomPrev.Enabled = _zoomExtentStack.CanZoomPrevious;
                                     _zoomNext.Enabled = _zoomExtentStack.CanZoomNext;
-                                    _predefinedScales.Text = string.Format("1:{0}", 
+                                    _predefinedScales.Text = string.Format("1:{0}",
                                         Math.Round(scale, 0, MidpointRounding.AwayFromZero));
                                 });
             else
@@ -620,7 +620,7 @@ protected override void OnPreviewKeyDown(PreviewKeyDownEventArgs e)
 
         private void OnScaleSelected(object sender, EventArgs e)
         {
-            
+
             if (MapControl == null) return;
 
             if (string.IsNullOrEmpty(_predefinedScales.Text))
@@ -628,7 +628,7 @@ private void OnScaleSelected(object sender, EventArgs e)
 
             var text = _predefinedScales.Text;
             if (!text.StartsWith("1:"))
-                 text = "1:" + text;
+                text = "1:" + text;
 
             double val;
             if (!double.TryParse(text.Substring(2), NumberStyles.Float, NumberFormatInfo.CurrentInfo, out val))
diff --git a/SharpMap.UI/Forms/Tools/FeatureEditorTool.cs b/SharpMap.UI/Forms/Tools/FeatureEditorTool.cs
index 03246a4f..69f8dc60 100644
--- a/SharpMap.UI/Forms/Tools/FeatureEditorTool.cs
+++ b/SharpMap.UI/Forms/Tools/FeatureEditorTool.cs
@@ -10,7 +10,7 @@ public FeatureSelectTool()
 
     public class FeatureEditorTool : MapTool
     {
-        public FeatureEditorTool() 
+        public FeatureEditorTool()
             : base("FeatureEditorTool", "A tool to edit features")
         {
         }
diff --git a/SharpMap.UI/Forms/Tools/IMapTool.cs b/SharpMap.UI/Forms/Tools/IMapTool.cs
index bea969de..81afd153 100644
--- a/SharpMap.UI/Forms/Tools/IMapTool.cs
+++ b/SharpMap.UI/Forms/Tools/IMapTool.cs
@@ -15,9 +15,9 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Forms.Tools
 {
@@ -61,7 +61,7 @@ public interface IMapTool
         /// </summary>
         event EventHandler CursorChanged;
 
-        
+
         /// <summary>
         /// Function to perform some action on mouse hover
         /// </summary>
@@ -142,7 +142,7 @@ public interface IMapTool
         /// <param name="keyEventArgs">The key event arguments</param>
         /// <returns><value>true</value> if the action was handled and <b>false</b> other action should be taken</returns>
         bool DoKeyUp(Coordinate mapPosition, KeyEventArgs keyEventArgs);
-        
+
     }
 }
 
diff --git a/SharpMap.UI/Forms/Tools/MapTool.cs b/SharpMap.UI/Forms/Tools/MapTool.cs
index f95f911c..7c9ecea0 100644
--- a/SharpMap.UI/Forms/Tools/MapTool.cs
+++ b/SharpMap.UI/Forms/Tools/MapTool.cs
@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-    
+
+using NetTopologySuite.Geometries;
 using System;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Forms.Tools
 {
@@ -55,7 +55,7 @@ protected MapTool(string name, string description)
         /// </summary>
         public virtual void Cancel()
         {
-            
+
         }
 
         /// <summary>
diff --git a/SharpMap.UI/Forms/WktGeometryCreator.cs b/SharpMap.UI/Forms/WktGeometryCreator.cs
index c09cdfda..3fcc8cfe 100644
--- a/SharpMap.UI/Forms/WktGeometryCreator.cs
+++ b/SharpMap.UI/Forms/WktGeometryCreator.cs
@@ -1,8 +1,8 @@
-using System;
+using NetTopologySuite.IO;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Forms
 {
@@ -38,7 +38,7 @@ public WktGeometryCreator()
 
             cboWktKeywords.DisplayMember = "Key";
             cboWktKeywords.ValueMember = "Value";
-            
+
         }
 
         private void btnOk_Click(object sender, EventArgs e)
@@ -47,19 +47,19 @@ private void btnOk_Click(object sender, EventArgs e)
             Hide();
         }
 
-        private GeoAPI.Geometries.IGeometry _geometry;
-        
+        private NetTopologySuite.Geometries.Geometry _geometry;
+
         /// <summary>
         /// Gets or sets a value indicating the current geometry
         /// </summary>
-        public GeoAPI.Geometries.IGeometry Geometry
+        public NetTopologySuite.Geometries.Geometry Geometry
         {
             get
             {
                 return _geometry;
             }
 
-            set 
+            set
             {
                 if (ReferenceEquals(_geometry, value))
                     return;
@@ -70,7 +70,7 @@ public GeoAPI.Geometries.IGeometry Geometry
         }
 
         private readonly WKTWriter _wktWriter =
-            new WKTWriter(2) {Formatted = true, MaxCoordinatesPerLine = 3, Tab = 2};
+            new WKTWriter(2) { Formatted = true, MaxCoordinatesPerLine = 3, Tab = 2 };
         private WKTReader _wktReader = new WKTReader();
 
 
diff --git a/SharpMap.UI/SharpMap.UI.csproj b/SharpMap.UI/SharpMap.UI.csproj
index 6ea872e2..924d029c 100644
--- a/SharpMap.UI/SharpMap.UI.csproj
+++ b/SharpMap.UI/SharpMap.UI.csproj
@@ -30,7 +30,7 @@
 
     <ItemGroup>
         <PackageReference Include="GeoAPI.Core" Version="1.7.5" />
-        <PackageReference Include="System.Resources.Extensions" Version="4.7.0" />
+        <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -41,4 +41,8 @@
       <Reference Include="System.Windows.Forms" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Utilities.Indexing.SbnTree/SharpMap.Utilities.Indexing.SbnTree.csproj b/SharpMap.Utilities.Indexing.SbnTree/SharpMap.Utilities.Indexing.SbnTree.csproj
index b9599714..57858b12 100644
--- a/SharpMap.Utilities.Indexing.SbnTree/SharpMap.Utilities.Indexing.SbnTree.csproj
+++ b/SharpMap.Utilities.Indexing.SbnTree/SharpMap.Utilities.Indexing.SbnTree.csproj
@@ -11,11 +11,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SharpSbn.GeoAPI" Version="1.2.0" />
+      <PackageReference Include="SharpSbn" Version="1.2.0" />
     </ItemGroup>
 
     <ItemGroup>
       <ProjectReference Include="..\SharpMap\SharpMap.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 </Project>
diff --git a/SharpMap.Utilities.Indexing.SbnTree/SharpSbnIndexFactory.cs b/SharpMap.Utilities.Indexing.SbnTree/SharpSbnIndexFactory.cs
index 424ba2d9..24ec4e41 100644
--- a/SharpMap.Utilities.Indexing.SbnTree/SharpSbnIndexFactory.cs
+++ b/SharpMap.Utilities.Indexing.SbnTree/SharpSbnIndexFactory.cs
@@ -1,10 +1,10 @@
-using System;
+using NetTopologySuite.Geometries;
+using SharpSbn;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
-using GeoAPI.Geometries;
-using SharpSbn;
-using SbnEnvelope = GeoAPI.Geometries.Envelope;
+using SbnEnvelope = SharpSbn.DataStructures.Envelope;
 
 namespace SharpMap.Utilities.Indexing
 {
@@ -23,11 +23,14 @@ ISpatialIndex<uint> ISpatialIndexFactory<uint>.Create(Envelope extent, int expec
             return new SbnTreeWrapper(SbnTree.Create(ToCollection(entries)));
         }
 
-        private static ICollection<Tuple<uint, Envelope>> ToCollection(IEnumerable<ISpatialIndexItem<uint>> entries)
+        private static ICollection<Tuple<uint, SbnEnvelope>> ToCollection(IEnumerable<ISpatialIndexItem<uint>> entries)
         {
-            var res = new List<Tuple<uint, Envelope>>();
+            var res = new List<Tuple<uint, SbnEnvelope>>();
             foreach (var sii in entries)
-                res.Add(Tuple.Create(sii.ID, sii.Box));
+            {
+                var box = new SbnEnvelope(sii.Box.MinX, sii.Box.MaxX, sii.Box.MinY, sii.Box.MaxY);
+                res.Add(Tuple.Create(sii.ID, box));
+            }
             return res;
         }
 
@@ -63,7 +66,8 @@ public SbnTreeWrapper(SbnTree sbnTree)
             public Collection<uint> Search(Envelope e)
             {
                 var list = new List<uint>();
-                foreach (var queryFid in _sbnTree.QueryFids(e))
+                var box = new SbnEnvelope(e.MinX, e.MaxX, e.MinY, e.MaxY);
+                foreach (var queryFid in _sbnTree.QueryFids(box))
                 {
                     var oid = queryFid - 1;
                     if (oid < _sbnTree.FeatureCount) list.Add(oid);
@@ -73,7 +77,11 @@ public Collection<uint> Search(Envelope e)
 
             public Envelope Box
             {
-                get { return _sbnTree.Extent; }
+                get
+                {
+                    var box = new Envelope(_sbnTree.Extent.MinX, _sbnTree.Extent.MaxX, _sbnTree.Extent.MinY, _sbnTree.Extent.MaxY);
+                    return box;
+                }
             }
 
             void ISpatialIndex<uint>.SaveIndex(string filename)
@@ -106,6 +114,6 @@ Envelope ISpatialIndexItem<uint>.Box
                 get { return Item2; }
             }
         }
-#endregion
+        #endregion
     }
 }
diff --git a/SharpMap.Web/SharpMap.Web.csproj b/SharpMap.Web/SharpMap.Web.csproj
index f1e4a0e5..8268b4a5 100644
--- a/SharpMap.Web/SharpMap.Web.csproj
+++ b/SharpMap.Web/SharpMap.Web.csproj
@@ -13,7 +13,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+      <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     </ItemGroup>
 
     <ItemGroup>
@@ -26,5 +26,9 @@
         <Reference Include="System.Web" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 
 </Project>
diff --git a/SharpMap.Web/Web/Cache.cs b/SharpMap.Web/Web/Cache.cs
index 0a2e8618..5261a408 100644
--- a/SharpMap.Web/Web/Cache.cs
+++ b/SharpMap.Web/Web/Cache.cs
@@ -57,7 +57,7 @@ public static string InsertIntoCache(int minutes, Image map)
             using (var stream = new MemoryStream())
             {
                 map.Save(stream, ImageFormat.Png);
-                HttpContext.Current.Cache.Insert(guid, stream.ToArray(), null, 
+                HttpContext.Current.Cache.Insert(guid, stream.ToArray(), null,
                                                  Cache.NoAbsoluteExpiration,
                                                  TimeSpan.FromMinutes(minutes));
             }
diff --git a/SharpMap.Web/Web/HttpHandler.cs b/SharpMap.Web/Web/HttpHandler.cs
index 9508aa41..18949670 100644
--- a/SharpMap.Web/Web/HttpHandler.cs
+++ b/SharpMap.Web/Web/HttpHandler.cs
@@ -74,8 +74,8 @@ public void ProcessRequest(HttpContext context)
             if (cached is Image)
             {
                 //context.Response.ContentType = "image/png";
-                var b = (Image) cached;
-                
+                var b = (Image)cached;
+
                 // send the image to the viewer
                 using (var ms = new MemoryStream())
                 {
@@ -126,7 +126,7 @@ private static void WriteResponseInChunks(byte[] buffer, HttpResponse response)
                         {
                             {
                                 var tmpBuffer = new byte[ChunkSize];
-                                
+
                                 var length = ms.Read(tmpBuffer, 0, tmpBuffer.Length);
                                 response.OutputStream.Write(tmpBuffer, 0, length);
                                 response.Flush();
diff --git a/SharpMap.Web/Web/UI/Ajax/AjaxMapControl.cs b/SharpMap.Web/Web/UI/Ajax/AjaxMapControl.cs
index 31dfc4c3..20f770a3 100644
--- a/SharpMap.Web/Web/UI/Ajax/AjaxMapControl.cs
+++ b/SharpMap.Web/Web/UI/Ajax/AjaxMapControl.cs
@@ -23,8 +23,8 @@
 using System.Web.UI;
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
-using Image=System.Web.UI.WebControls.Image;
-using Point=GeoAPI.Geometries.Coordinate;
+using Image = System.Web.UI.WebControls.Image;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace SharpMap.Web.UI.Ajax
 {
@@ -53,7 +53,7 @@ namespace SharpMap.Web.UI.Ajax
     /// </remarks>
     [DefaultProperty("Map")]
     [ToolboxData("<{0}:AjaxMapControl runat=\"server\"></{0}:AjaxMapControl>")]
-    [Designer(typeof (AjaxMapControlDesigner))]
+    [Designer(typeof(AjaxMapControlDesigner))]
     public class AjaxMapControl : WebControl, INamingContainer, ICallbackEventHandler
     {
         internal static NumberFormatInfo numberFormat_EnUS = new CultureInfo("en-US", false).NumberFormat;
@@ -273,7 +273,7 @@ public string GetCallbackResult()
         {
             EnsureChildControls();
             if (callbackArg.Trim() == "") return String.Empty;
-            string[] vals = callbackArg.Split(new char[] {';'});
+            string[] vals = callbackArg.Split(new char[] { ';' });
             try
             {
                 map.Zoom = double.Parse(vals[2], numberFormat_EnUS);
diff --git a/SharpMap.Web/Web/UI/Ajax/AjaxMapControlDesigner.cs b/SharpMap.Web/Web/UI/Ajax/AjaxMapControlDesigner.cs
index 4ee336bb..08f767e0 100644
--- a/SharpMap.Web/Web/UI/Ajax/AjaxMapControlDesigner.cs
+++ b/SharpMap.Web/Web/UI/Ajax/AjaxMapControlDesigner.cs
@@ -42,7 +42,7 @@ public override bool AllowResize
         /// <returns></returns>
         public override string GetDesignTimeHtml()
         {
-            ControlCollection childControls = ((AjaxMapControl) Component).Controls;
+            ControlCollection childControls = ((AjaxMapControl)Component).Controls;
             return base.GetDesignTimeHtml();
         }
 
@@ -55,7 +55,7 @@ public override void Initialize(IComponent component)
             if (!(component is AjaxMapControl))
                 throw (new ArgumentException("Component must be an AjaxMapControl", "Component"));
             AjaxMapControl mapControl = component as AjaxMapControl;
-            mapControl.Map = new Map(new Size((int) mapControl.Width.Value, (int) mapControl.Height.Value));
+            mapControl.Map = new Map(new Size((int)mapControl.Width.Value, (int)mapControl.Height.Value));
             base.Initialize(component);
         }
     }
diff --git a/SharpMap.Web/Web/Wms/ServerCapabilities.cs b/SharpMap.Web/Web/Wms/ServerCapabilities.cs
index aef510dc..1f0f62e4 100644
--- a/SharpMap.Web/Web/Wms/ServerCapabilities.cs
+++ b/SharpMap.Web/Web/Wms/ServerCapabilities.cs
@@ -15,16 +15,16 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
 using System;
+using System.Collections.Generic;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Reflection;
 using System.Web;
 using System.Xml;
 using System.Xml.Schema;
-using GeoAPI.Geometries;
-using SharpMap.Layers;
-using System.Collections.Generic;
 
 namespace SharpMap.Web.Wms
 {
@@ -185,7 +185,7 @@ private static XmlNode GenerateCapabilityNode(Map map, XmlDocument capabilities,
             LayerRootNode.AppendChild(CreateElement("CRS", "EPSG:" + map.Layers[0].SRID, capabilities, false,
                                                     wmsNamespaceURI)); //TODO
             LayerRootNode.AppendChild(GenerateBoundingBoxElement(map.GetExtents(), map.Layers[0].SRID, capabilities));
-                        
+
             XmlElement geoBox = capabilities.CreateElement("EX_GeographicBoundingBox", wmsNamespaceURI);
 
             //Using default values here. This should be changed when projection library is complete
@@ -302,10 +302,10 @@ private static XmlNode GetWmsLayerNode(ILayer layer, XmlDocument doc)
             XmlNode LayerNode = doc.CreateNode(XmlNodeType.Element, "Layer", wmsNamespaceURI);
             LayerNode.AppendChild(CreateElement("Name", layer.LayerName, doc, false, wmsNamespaceURI));
             LayerNode.AppendChild(CreateElement("Title", layer.LayerTitle ?? layer.LayerName, doc, false, wmsNamespaceURI));
-			//if this is a vector layer with themes property set, add the Styles
+            //if this is a vector layer with themes property set, add the Styles
             if (layer.GetType() == typeof(VectorLayer))
                 if ((layer as VectorLayer).Themes != null)
-                    foreach (KeyValuePair<string,SharpMap.Rendering.Thematics.ITheme> kvp in (layer as VectorLayer).Themes)
+                    foreach (KeyValuePair<string, SharpMap.Rendering.Thematics.ITheme> kvp in (layer as VectorLayer).Themes)
                     {
                         XmlNode styleNode = doc.CreateNode(XmlNodeType.Element, "Style", wmsNamespaceURI);
                         styleNode.AppendChild(CreateElement("Name", kvp.Key, doc, false, wmsNamespaceURI));
@@ -313,10 +313,10 @@ private static XmlNode GetWmsLayerNode(ILayer layer, XmlDocument doc)
                         LayerNode.AppendChild(styleNode);
                     }
             //If this is a grouplayer, add childlayers recursively
-            if (layer.GetType() == typeof (LayerGroup))
-                foreach (Layer childlayer in ((LayerGroup) layer).Layers)
+            if (layer.GetType() == typeof(LayerGroup))
+                foreach (Layer childlayer in ((LayerGroup)layer).Layers)
                     LayerNode.AppendChild(GetWmsLayerNode(childlayer, doc));
-            
+
             LayerNode.Attributes.Append(CreateAttribute("queryable", GetQueriable(layer), doc));
 
             LayerNode.AppendChild(GenerateBoundingBoxElement(layer.Envelope, layer.SRID, doc));
diff --git a/SharpMap.Web/Web/Wms/WmsServer.cs b/SharpMap.Web/Web/Wms/WmsServer.cs
index d1c2af15..a17a75df 100644
--- a/SharpMap.Web/Web/Wms/WmsServer.cs
+++ b/SharpMap.Web/Web/Wms/WmsServer.cs
@@ -15,32 +15,33 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.Data;
+using SharpMap.Data.Providers;
+using SharpMap.Layers;
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text;
 using System.Web;
 using System.Xml;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using SharpMap.Data.Providers;
-using SharpMap.Layers;
-using System.Collections.Generic;
-using System.Text;
-using GeoAPI.CoordinateSystems.Transformations;
 
 namespace SharpMap.Web.Wms
-{    
+{
     /// <summary>
     /// This is a helper class designed to make it easy to create a WMS Service
     /// </summary>
     public static class WmsServer
     {
-        
-		#region Delegates
+
+        #region Delegates
 
         public delegate FeatureDataTable InterSectDelegate(FeatureDataTable featureDataTable, Envelope box);
 
@@ -297,7 +298,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
         /// <param name="context">The context the <see cref="WmsServer"/> is running in.</param>
         public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription description, HttpContext context)
         {
-            if (_pixelSensitivity ==-1)
+            if (_pixelSensitivity == -1)
                 _pixelSensitivity = 1;
             if (map == null)
                 throw (new ArgumentException("Map for WMS is null"));
@@ -428,7 +429,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                 //sets the map size to the size of the client in order to calculate the coordinates of the projection of the client
                 try
                 {
-                    map.Size = new Size(Convert.ToInt16(context.Request.Params["WIDTH"]), 
+                    map.Size = new Size(Convert.ToInt16(context.Request.Params["WIDTH"]),
                                         Convert.ToInt16(context.Request.Params["HEIGHT"]));
                 }
                 catch
@@ -437,7 +438,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                     return;
                 }
                 //sets the boundingbox to the boundingbox of the client in order to calculate the coordinates of the projection of the client
-                var bbox = ParseBBOX(context.Request.Params["bbox"], map.Layers[0].TargetSRID == 4326);                
+                var bbox = ParseBBOX(context.Request.Params["bbox"], map.Layers[0].TargetSRID == 4326);
                 if (bbox == null)
                 {
                     WmsException.ThrowWmsException("Invalid parameter BBOX", context);
@@ -447,7 +448,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
 
                 //sets the point clicked by the client
                 Single x = 0f, y = 0f;
-                
+
                 //tries to set the x to the Param I, if the client send an X, it will try the X, if both fail, exception is thrown
                 if (context.Request.Params["X"] != null)
                     try
@@ -556,7 +557,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                     WmsException.ThrowWmsException("Required parameter CRS not specified", context);
                     return;
                 }
-                if (!ConsideredEqual(context.Request.Params["CRS"],  $"EPSG:{map.Layers[0].TargetSRID}"))
+                if (!ConsideredEqual(context.Request.Params["CRS"], $"EPSG:{map.Layers[0].TargetSRID}"))
                 {
                     WmsException.ThrowWmsException(WmsException.WmsExceptionCode.InvalidCRS, "CRS not supported",
                                                    context);
@@ -647,7 +648,7 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                     return;
                 }
 
-                map.PixelAspectRatio = (width/(double) height)/(bbox.Width/bbox.Height);
+                map.PixelAspectRatio = (width / (double)height) / (bbox.Width / bbox.Height);
                 map.Center = bbox.Centre;
                 map.Zoom = bbox.Width;
 
@@ -675,8 +676,8 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                 {
                     if (!String.IsNullOrEmpty(context.Request.Params["LAYERS"]))
                     {
-                        var layerz = context.Request.Params["LAYERS"].Split(new[] {','});
-                        var styles = context.Request.Params["STYLES"].Split(new[] {','});
+                        var layerz = context.Request.Params["LAYERS"].Split(new[] { ',' });
+                        var styles = context.Request.Params["STYLES"].Split(new[] { ',' });
                         //test whether the lengt of the layers and the styles is the same. WMS spec is unclear on what to do if there is no one-to-one correspondence
                         if (layerz.Length == styles.Length)
                         {
@@ -750,9 +751,9 @@ public static void ParseQueryString(Map map, Capabilities.WmsServiceDescription
                 //Set layers on/off
                 var layersString = context.Request.Params["LAYERS"];
                 if (!string.IsNullOrEmpty(layersString))
-                    //If LAYERS is empty, use default layer on/off settings
+                //If LAYERS is empty, use default layer on/off settings
                 {
-                    var layers = layersString.Split(new[] {','});
+                    var layers = layersString.Split(new[] { ',' });
                     if (description.LayerLimit > 0)
                     {
                         if (layers.Length == 0 && map.Layers.Count > description.LayerLimit ||
@@ -867,7 +868,7 @@ public static ImageCodecInfo GetEncoderInfo(String mimeType)
         /// <returns>Boundingbox or null if invalid parameter</returns>
 // ReSharper disable InconsistentNaming
         public static Envelope ParseBBOX(string boundingBox, bool flipXY)
-// ReSharper restore InconsistentNaming
+        // ReSharper restore InconsistentNaming
         {
             var strVals = boundingBox.Split(new[] { ',' });
             if (strVals.Length != 4)
@@ -887,8 +888,8 @@ public static Envelope ParseBBOX(string boundingBox, bool flipXY)
             if (maxy < miny)
                 return null;
 
-            return flipXY 
-                ? new Envelope(miny, maxy, minx, maxx) 
+            return flipXY
+                ? new Envelope(miny, maxy, minx, maxx)
                 : new Envelope(minx, maxx, miny, maxy);
         }
 
@@ -929,69 +930,69 @@ public static string CreateFeatureInfoPlain(Map map, string[] requestedLayers, S
                         var queryBoxMinY = y - (_pixelSensitivity);
                         var queryBoxMaxX = x + (_pixelSensitivity);
                         var queryBoxMaxY = y + (_pixelSensitivity);
-                            
+
                         var minXY = map.ImageToWorld(new PointF(queryBoxMinX, queryBoxMinY));
-                            var maxXY = map.ImageToWorld(new PointF(queryBoxMaxX, queryBoxMaxY));
-                            var queryBox = new Envelope(minXY, maxXY);
-                            var fds = new FeatureDataSet();
-                            queryLayer.ExecuteIntersectionQuery(queryBox, fds);
-                            
-                            if (_intersectDelegate != null)
-                            {
-                                var tmp = _intersectDelegate(fds.Tables[0], queryBox);
-                                fds.Tables.RemoveAt(0);
-                                fds.Tables.Add(tmp);
-                            }
-                            if (fds.Tables.Count == 0)
+                        var maxXY = map.ImageToWorld(new PointF(queryBoxMaxX, queryBoxMaxY));
+                        var queryBox = new Envelope(minXY, maxXY);
+                        var fds = new FeatureDataSet();
+                        queryLayer.ExecuteIntersectionQuery(queryBox, fds);
+
+                        if (_intersectDelegate != null)
+                        {
+                            var tmp = _intersectDelegate(fds.Tables[0], queryBox);
+                            fds.Tables.RemoveAt(0);
+                            fds.Tables.Add(tmp);
+                        }
+                        if (fds.Tables.Count == 0)
+                        {
+                            vstr = vstr + "\nSearch returned no results on layer: " + requestLayer;
+                        }
+                        else
+                        {
+                            if (fds.Tables[0].Rows.Count == 0)
                             {
-                                vstr = vstr + "\nSearch returned no results on layer: " + requestLayer;
+                                vstr = vstr + "\nSearch returned no results on layer: " + requestLayer + " ";
                             }
                             else
                             {
-                                if (fds.Tables[0].Rows.Count == 0)
+                                //filter the rows with the CQLFilter if one is provided
+                                if (cqlFilter != null)
                                 {
-                                    vstr = vstr + "\nSearch returned no results on layer: " + requestLayer + " ";
-                                }
-                                else
-                                {
-                                    //filter the rows with the CQLFilter if one is provided
-                                    if (cqlFilter != null)
+                                    for (int i = fds.Tables[0].Rows.Count - 1; i >= 0; i--)
                                     {
-                                        for (int i = fds.Tables[0].Rows.Count - 1; i >= 0; i--)
+                                        if (!CqlFilter((FeatureDataRow)fds.Tables[0].Rows[i], cqlFilter))
                                         {
-                                            if (!CqlFilter((FeatureDataRow)fds.Tables[0].Rows[i], cqlFilter))
-                                            {
-                                                fds.Tables[0].Rows.RemoveAt(i);
-                                            }
+                                            fds.Tables[0].Rows.RemoveAt(i);
                                         }
                                     }
-                                    //if featurecount < fds...count, select smallest bbox, because most likely to be clicked
-                                    vstr = vstr + "\n Layer: '" + requestLayer + "'\n Featureinfo:\n";
-                                    int[] keys = new int[fds.Tables[0].Rows.Count];
-                                    double[] area = new double[fds.Tables[0].Rows.Count];
-                                    for (int l = 0; l < fds.Tables[0].Rows.Count; l++)
-                                    {
-                                        var fdr = (FeatureDataRow)fds.Tables[0].Rows[l];
-                                        area[l] = fdr.Geometry.EnvelopeInternal.Area;
-                                        keys[l] = l;
-                                    }
-                                    Array.Sort(area, keys);
-                                    if (fds.Tables[0].Rows.Count < featureCount)
-                                    {
-                                        featureCount = fds.Tables[0].Rows.Count;
-                                    }
-                                    for (int k = 0; k < featureCount; k++)
+                                }
+                                //if featurecount < fds...count, select smallest bbox, because most likely to be clicked
+                                vstr = vstr + "\n Layer: '" + requestLayer + "'\n Featureinfo:\n";
+                                int[] keys = new int[fds.Tables[0].Rows.Count];
+                                double[] area = new double[fds.Tables[0].Rows.Count];
+                                for (int l = 0; l < fds.Tables[0].Rows.Count; l++)
+                                {
+                                    var fdr = (FeatureDataRow)fds.Tables[0].Rows[l];
+                                    area[l] = fdr.Geometry.EnvelopeInternal.Area;
+                                    keys[l] = l;
+                                }
+                                Array.Sort(area, keys);
+                                if (fds.Tables[0].Rows.Count < featureCount)
+                                {
+                                    featureCount = fds.Tables[0].Rows.Count;
+                                }
+                                for (int k = 0; k < featureCount; k++)
+                                {
+                                    for (int j = 0; j < fds.Tables[0].Rows[keys[k]].ItemArray.Length; j++)
                                     {
-                                        for (int j = 0; j < fds.Tables[0].Rows[keys[k]].ItemArray.Length; j++)
-                                        {
-                                            vstr = vstr + " '" + fds.Tables[0].Rows[keys[k]].ItemArray[j] + "'";
-                                        }
-                                        if ((k + 1) < featureCount)
-                                            vstr = vstr + ",\n";
+                                        vstr = vstr + " '" + fds.Tables[0].Rows[keys[k]].ItemArray[j] + "'";
                                     }
+                                    if ((k + 1) < featureCount)
+                                        vstr = vstr + ",\n";
                                 }
                             }
-                        
+                        }
+
                     }
                 }
                 if (found == false)
@@ -1048,14 +1049,14 @@ public static string CreateFeatureInfoGeoJSON(Map map, string[] requestedLayers,
                         //
                         if (_intersectDelegate != null)
                         {
-                            var tmp =  _intersectDelegate(fds.Tables[0], queryBox);
+                            var tmp = _intersectDelegate(fds.Tables[0], queryBox);
                             fds.Tables.RemoveAt(0);
                             fds.Tables.Add(tmp);
                         }
                         //filter the rows with the CQLFilter if one is provided
                         if (cqlFilterString != null)
                         {
-                            for (var i = fds.Tables[0].Rows.Count-1; i >=0 ; i--)
+                            for (var i = fds.Tables[0].Rows.Count - 1; i >= 0; i--)
                             {
                                 if (!CqlFilter((FeatureDataRow)fds.Tables[0].Rows[i], cqlFilterString))
                                 {
@@ -1066,7 +1067,7 @@ public static string CreateFeatureInfoGeoJSON(Map map, string[] requestedLayers,
                         var data = Converters.GeoJSON.GeoJSONHelper.GetData(fds);
 
                         // Reproject geometries if needed
-                        IMathTransform transform = null;
+                        MathTransform transform = null;
                         if (queryLayer is VectorLayer)
                         {
                             ICoordinateTransformation transformation = (queryLayer as VectorLayer).CoordinateTransformation;
@@ -1083,7 +1084,7 @@ public static string CreateFeatureInfoGeoJSON(Map map, string[] requestedLayers,
                             });
                         }
                         items.AddRange(data);
-                        
+
                     }
                 }
                 if (found == false)
@@ -1095,7 +1096,7 @@ public static string CreateFeatureInfoGeoJSON(Map map, string[] requestedLayers,
             }
             var writer = new StringWriter();
             Converters.GeoJSON.GeoJSONWriter.Write(items, writer);
-            return writer.ToString();            
+            return writer.ToString();
         }
         /// <summary>
         /// Filters the features to be processed by a CQL filter
@@ -1107,28 +1108,28 @@ private static bool CqlFilter(FeatureDataRow row, string cqlString)
         {
             var toreturn = true;
             //check on filter type (AND, OR, NOT)
-            var splitstring =new[]{" "};
+            var splitstring = new[] { " " };
             var cqlStringItems = cqlString.Split(splitstring, StringSplitOptions.RemoveEmptyEntries);
             var comparers = new[] { "==", "!=", "<", ">", "<=", ">=", "BETWEEN", "LIKE", "IN" };
             for (int i = 0; i < cqlStringItems.Length; i++)
             {
                 var tmpResult = true;
                 //check first on AND OR NOT, only the case if multiple checks have to be done
-// ReSharper disable InconsistentNaming
+                // ReSharper disable InconsistentNaming
                 var AND = true;
                 var OR = false;
                 var NOT = false;
-// ReSharper restore InconsistentNaming
+                // ReSharper restore InconsistentNaming
                 if (cqlStringItems[i] == "AND") { i++; }
                 if (cqlStringItems[i] == "OR") { AND = false; OR = true; i++; }
-                if (cqlStringItems[i] == "NOT"){AND = false; NOT = true;i++;}
+                if (cqlStringItems[i] == "NOT") { AND = false; NOT = true; i++; }
                 if ((NOT && !toreturn) || (AND && !toreturn))
-                    break;                
+                    break;
                 //valid cql starts always with the column name
                 string column = cqlStringItems[i];
                 int columnIndex = row.Table.Columns.IndexOf(column);
                 Type t = row.Table.Columns[columnIndex].DataType;
-                if (columnIndex <0)
+                if (columnIndex < 0)
                     break;
                 i++;
                 string comparer = cqlStringItems[i];
@@ -1254,18 +1255,18 @@ private static bool CqlFilter(FeatureDataRow row, string cqlString)
                     toreturn = false;
 
             }
-                //OpenLayers.Filter.Comparison.EQUAL_TO = “==”;
-                //OpenLayers.Filter.Comparison.NOT_EQUAL_TO = “!=”;
-                //OpenLayers.Filter.Comparison.LESS_THAN = “<”;
-                //OpenLayers.Filter.Comparison.GREATER_THAN = “>”;
-                //OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO = “<=”;
-                //OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO = “>=”;
-                //OpenLayers.Filter.Comparison.BETWEEN = “..”;
-                //OpenLayers.Filter.Comparison.LIKE = “~”;
-                //IN (,,)
-            
+            //OpenLayers.Filter.Comparison.EQUAL_TO = “==”;
+            //OpenLayers.Filter.Comparison.NOT_EQUAL_TO = “!=”;
+            //OpenLayers.Filter.Comparison.LESS_THAN = “<”;
+            //OpenLayers.Filter.Comparison.GREATER_THAN = “>”;
+            //OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO = “<=”;
+            //OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO = “>=”;
+            //OpenLayers.Filter.Comparison.BETWEEN = “..”;
+            //OpenLayers.Filter.Comparison.LIKE = “~”;
+            //IN (,,)
+
             return toreturn;
         }
-        
+
     }
 }
diff --git a/SharpMap/Base/DisposableObject.cs b/SharpMap/Base/DisposableObject.cs
index 10f0fcc5..4532d47e 100644
--- a/SharpMap/Base/DisposableObject.cs
+++ b/SharpMap/Base/DisposableObject.cs
@@ -2,7 +2,7 @@
 
 namespace SharpMap.Base
 {
-    
+
     /// <summary>
     /// 
     /// </summary>
@@ -56,14 +56,14 @@ private void Dispose(bool disposing)
         /// Releases unmanaged resources
         /// </summary>
         protected virtual void ReleaseUnmanagedResources()
-        {}
+        { }
 
         /// <summary>
         /// Releases managed resources
         /// </summary>
         protected virtual void ReleaseManagedResources()
-        {}
-        
+        { }
+
         #endregion
 
         /// <summary>
diff --git a/SharpMap/Converters/WellKnownBinary/GeometryFromWKB.cs b/SharpMap/Converters/WellKnownBinary/GeometryFromWKB.cs
index e43a8972..676f2152 100644
--- a/SharpMap/Converters/WellKnownBinary/GeometryFromWKB.cs
+++ b/SharpMap/Converters/WellKnownBinary/GeometryFromWKB.cs
@@ -35,23 +35,23 @@
  *
  */
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using GeoAPI.Geometries;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Converters.WellKnownBinary
 {
     /// <summary>
-    ///  Converts Well-known Binary representations to a <see cref="GeoAPI.Geometries.IGeometry"/> instance.
+    ///  Converts Well-known Binary representations to a <see cref="NetTopologySuite.Geometries.Geometry"/> instance.
     /// </summary>
     /// <remarks>
-    /// <para>The Well-known Binary Representation for <see cref="GeoAPI.Geometries.IGeometry"/> (WKBGeometry) provides a portable 
-    /// representation of a <see cref="GeoAPI.Geometries.IGeometry"/> value as a contiguous stream of bytes. It permits <see cref="GeoAPI.Geometries.IGeometry"/> 
+    /// <para>The Well-known Binary Representation for <see cref="NetTopologySuite.Geometries.Geometry"/> (WKBGeometry) provides a portable 
+    /// representation of a <see cref="NetTopologySuite.Geometries.Geometry"/> value as a contiguous stream of bytes. It permits <see cref="NetTopologySuite.Geometries.Geometry"/> 
     /// values to be exchanged between an ODBC client and an SQL database in binary form.</para>
-    /// <para>The Well-known Binary Representation for <see cref="GeoAPI.Geometries.IGeometry"/> is obtained by serializing a <see cref="GeoAPI.Geometries.IGeometry"/>
+    /// <para>The Well-known Binary Representation for <see cref="NetTopologySuite.Geometries.Geometry"/> is obtained by serializing a <see cref="NetTopologySuite.Geometries.Geometry"/>
     /// instance as a sequence of numeric types drawn from the set {Unsigned Integer, Double} and
     /// then serializing each numeric type as a sequence of bytes using one of two well defined,
     /// standard, binary representations for numeric types (NDR, XDR). The specific binary encoding
@@ -62,13 +62,13 @@ namespace SharpMap.Converters.WellKnownBinary
     public class GeometryFromWKB
     {
         /// <summary>
-        /// Creates a <see cref="GeoAPI.Geometries.IGeometry"/> from the supplied byte[] containing the Well-known Binary representation.
+        /// Creates a <see cref="NetTopologySuite.Geometries.Geometry"/> from the supplied byte[] containing the Well-known Binary representation.
         /// </summary>
         /// <param name="bytes">byte[] containing the Well-known Binary representation.</param>
         /// <param name="factory">The factory to create the result geometry</param>
-        /// <returns>A <see cref="GeoAPI.Geometries.IGeometry"/> bases on the supplied Well-known Binary representation.</returns>
-        public static IGeometry Parse(byte[] bytes, IGeometryFactory factory)
-        {            
+        /// <returns>A <see cref="NetTopologySuite.Geometries.Geometry"/> bases on the supplied Well-known Binary representation.</returns>
+        public static Geometry Parse(byte[] bytes, GeometryFactory factory)
+        {
             // Create a memory stream using the suppiled byte array.
             using (var ms = new MemoryStream(bytes))
             {
@@ -77,17 +77,17 @@ public static IGeometry Parse(byte[] bytes, IGeometryFactory factory)
                 {
                     // Call the main create function.
                     return Parse(reader, factory);
-                }                
-            }            
+                }
+            }
         }
 
         /// <summary>
-        /// Creates a <see cref="GeoAPI.Geometries.IGeometry"/> based on the Well-known binary representation.
+        /// Creates a <see cref="NetTopologySuite.Geometries.Geometry"/> based on the Well-known binary representation.
         /// </summary>
         /// <param name="reader">A <see cref="System.IO.BinaryReader">BinaryReader</see> used to read the Well-known binary representation.</param>
         /// <param name="factory">The factory to create the result geometry</param>
-        /// <returns>A <see cref="GeoAPI.Geometries.IGeometry"/> based on the Well-known binary representation.</returns>
-        public static IGeometry Parse(BinaryReader reader, IGeometryFactory factory)
+        /// <returns>A <see cref="NetTopologySuite.Geometries.Geometry"/> based on the Well-known binary representation.</returns>
+        public static Geometry Parse(BinaryReader reader, GeometryFactory factory)
         {
             WKBReader wkb = new WKBReader();
             return wkb.Read(reader.BaseStream);
@@ -132,7 +132,7 @@ public static IGeometry Parse(BinaryReader reader, IGeometryFactory factory)
             */
         }
 
-        private static IPoint CreateWKBPoint(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static Point CreateWKBPoint(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // Create and return the point.
             return factory.CreatePoint(new Coordinate(ReadDouble(reader, byteOrder), ReadDouble(reader, byteOrder)));
@@ -141,7 +141,7 @@ private static IPoint CreateWKBPoint(BinaryReader reader, WkbByteOrder byteOrder
         private static Coordinate[] ReadCoordinates(BinaryReader reader, WkbByteOrder byteOrder)
         {
             // Get the number of points in this linestring.
-            var numPoints = (int) ReadUInt32(reader, byteOrder);
+            var numPoints = (int)ReadUInt32(reader, byteOrder);
 
             // Create a new array of coordinates.
             var coords = new Coordinate[numPoints];
@@ -155,43 +155,43 @@ private static Coordinate[] ReadCoordinates(BinaryReader reader, WkbByteOrder by
             return coords;
         }
 
-        private static ILineString CreateWKBLineString(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static LineString CreateWKBLineString(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             var arrPoint = ReadCoordinates(reader, byteOrder);
             return factory.CreateLineString(arrPoint);
         }
 
-        private static ILinearRing CreateWKBLinearRing(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static LinearRing CreateWKBLinearRing(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             var points = new List<Coordinate>(ReadCoordinates(reader, byteOrder));
-            if (!points[0].Equals2D(points[points.Count-1]))
+            if (!points[0].Equals2D(points[points.Count - 1]))
                 points.Add(new Coordinate(points[0]));
             return factory.CreateLinearRing(points.ToArray());
         }
 
-        private static IPolygon CreateWKBPolygon(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static Polygon CreateWKBPolygon(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // Get the Number of rings in this Polygon.
-            var numRings = (int) ReadUInt32(reader, byteOrder);
+            var numRings = (int)ReadUInt32(reader, byteOrder);
 
             Debug.Assert(numRings >= 1, "Number of rings in polygon must be 1 or more.");
 
             var shell = CreateWKBLinearRing(reader, byteOrder, factory);
-            
-            var holes = new ILinearRing[--numRings];
+
+            var holes = new LinearRing[--numRings];
             for (var i = 0; i < numRings; i++)
                 holes[i] = CreateWKBLinearRing(reader, byteOrder, factory);
 
             return factory.CreatePolygon(shell, holes);
         }
 
-        private static IMultiPoint CreateWKBMultiPoint(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static MultiPoint CreateWKBMultiPoint(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // Get the number of points in this multipoint.
-            var numPoints = (int) ReadUInt32(reader, byteOrder);
+            var numPoints = (int)ReadUInt32(reader, byteOrder);
 
             // Create a new array for the points.
-            var points = new IPoint[numPoints];
+            var points = new Point[numPoints];
 
             // Loop on the number of points.
             for (var i = 0; i < numPoints; i++)
@@ -208,13 +208,13 @@ private static IMultiPoint CreateWKBMultiPoint(BinaryReader reader, WkbByteOrder
             return factory.CreateMultiPoint(points);
         }
 
-        private static IMultiLineString CreateWKBMultiLineString(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static MultiLineString CreateWKBMultiLineString(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // Get the number of linestrings in this multilinestring.
-            var numLineStrings = (int) ReadUInt32(reader, byteOrder);
+            var numLineStrings = (int)ReadUInt32(reader, byteOrder);
 
             // Create a new array for the linestrings .
-            var lines = new ILineString[numLineStrings];
+            var lines = new LineString[numLineStrings];
 
             // Loop on the number of linestrings.
             for (var i = 0; i < numLineStrings; i++)
@@ -231,13 +231,13 @@ private static IMultiLineString CreateWKBMultiLineString(BinaryReader reader, Wk
             return factory.CreateMultiLineString(lines);
         }
 
-        private static IMultiPolygon CreateWKBMultiPolygon(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static MultiPolygon CreateWKBMultiPolygon(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // Get the number of Polygons.
-            var numPolygons = (int) ReadUInt32(reader, byteOrder);
+            var numPolygons = (int)ReadUInt32(reader, byteOrder);
 
             // Create a new array for the Polygons.
-            var polygons = new IPolygon[numPolygons];
+            var polygons = new Polygon[numPolygons];
 
             // Loop on the number of polygons.
             for (var i = 0; i < numPolygons; i++)
@@ -256,13 +256,13 @@ private static IMultiPolygon CreateWKBMultiPolygon(BinaryReader reader, WkbByteO
             return factory.CreateMultiPolygon(polygons);
         }
 
-        private static IGeometry CreateWKBGeometryCollection(BinaryReader reader, WkbByteOrder byteOrder, IGeometryFactory factory)
+        private static Geometry CreateWKBGeometryCollection(BinaryReader reader, WkbByteOrder byteOrder, GeometryFactory factory)
         {
             // The next byte in the array tells the number of geometries in this collection.
-            var numGeometries = (int) ReadUInt32(reader, byteOrder);
+            var numGeometries = (int)ReadUInt32(reader, byteOrder);
 
             // Create a new array for the geometries.
-            var geometries = new IGeometry[numGeometries];
+            var geometries = new Geometry[numGeometries];
 
             // Loop on the number of geometries.
             for (var i = 0; i < numGeometries; i++)
@@ -285,7 +285,7 @@ private static uint ReadUInt32(BinaryReader reader, WkbByteOrder byteOrder)
             }
             if (byteOrder == WkbByteOrder.Ndr)
                 return reader.ReadUInt32();
-            
+
             throw new ArgumentException("Byte order not recognized");
         }
 
@@ -299,8 +299,8 @@ private static double ReadDouble(BinaryReader reader, WkbByteOrder byteOrder)
             }
             if (byteOrder == WkbByteOrder.Ndr)
                 return reader.ReadDouble();
-            
+
             throw new ArgumentException("Byte order not recognized");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Converters/WellKnownBinary/GeometryToWKB.cs b/SharpMap/Converters/WellKnownBinary/GeometryToWKB.cs
index 74c92af1..1b2f7f77 100644
--- a/SharpMap/Converters/WellKnownBinary/GeometryToWKB.cs
+++ b/SharpMap/Converters/WellKnownBinary/GeometryToWKB.cs
@@ -35,22 +35,21 @@
  *
  */
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.IO;
-using GeoAPI.Geometries;
-using GeoAPI.IO;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Converters.WellKnownBinary
 {
     /// <summary>
-    /// Converts a <see cref="GeoAPI.Geometries.IGeometry"/> instance to a Well-known Binary string representation.
+    /// Converts a <see cref="NetTopologySuite.Geometries.Geometry"/> instance to a Well-known Binary string representation.
     /// </summary>
     /// <remarks>
-    /// <para>The Well-known Binary Representation for <see cref="GeoAPI.Geometries.IGeometry"/> (WKBGeometry) provides a portable 
-    /// representation of a <see cref="GeoAPI.Geometries.IGeometry"/> value as a contiguous stream of bytes. It permits <see cref="GeoAPI.Geometries.IGeometry"/> 
+    /// <para>The Well-known Binary Representation for <see cref="NetTopologySuite.Geometries.Geometry"/> (WKBGeometry) provides a portable 
+    /// representation of a <see cref="NetTopologySuite.Geometries.Geometry"/> value as a contiguous stream of bytes. It permits <see cref="NetTopologySuite.Geometries.Geometry"/> 
     /// values to be exchanged between an ODBC client and an SQL database in binary form.</para>
-    /// <para>The Well-known Binary Representation for <see cref="GeoAPI.Geometries.IGeometry"/> is obtained by serializing a <see cref="GeoAPI.Geometries.IGeometry"/>
+    /// <para>The Well-known Binary Representation for <see cref="NetTopologySuite.Geometries.Geometry"/> is obtained by serializing a <see cref="NetTopologySuite.Geometries.Geometry"/>
     /// instance as a sequence of numeric types drawn from the set {Unsigned Integer, Double} and
     /// then serializing each numeric type as a sequence of bytes using one of two well defined,
     /// standard, binary representations for numeric types (NDR, XDR). The specific binary encoding
@@ -67,8 +66,8 @@ public class GeometryToWKB
         /// </summary>
         /// <param name="g">The geometry to write</param>
         /// <returns>WKB representation of the geometry</returns>
-        public static byte[] Write(IGeometry g)
-        {            
+        public static byte[] Write(Geometry g)
+        {
             return Write(g, WkbByteOrder.Ndr);
         }
 
@@ -78,7 +77,7 @@ public static byte[] Write(IGeometry g)
         /// <param name="g">The geometry to write</param>
         /// <param name="wkbByteOrder">Byte order</param>
         /// <returns>WKB representation of the geometry</returns>
-        public static byte[] Write(IGeometry g, WkbByteOrder wkbByteOrder)
+        public static byte[] Write(Geometry g, WkbByteOrder wkbByteOrder)
         {
             ByteOrder order;
             switch (wkbByteOrder)
@@ -157,40 +156,40 @@ private static void WriteDouble(double value, BinaryWriter writer, WkbByteOrder
         /// <param name="geometry">The geometry to determine the type of.</param>
         /// <param name="bWriter">Binary Writer</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteType(IGeometry geometry, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteType(Geometry geometry, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Determine the type of the geometry.
             switch (geometry.OgcGeometryType)
             {
-                    //Points are type 1.
+                //Points are type 1.
                 case OgcGeometryType.Point:
-                    WriteUInt32((uint) WKBGeometryType.wkbPoint, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbPoint, bWriter, byteorder);
                     break;
-                    //Linestrings are type 2.
+                //Linestrings are type 2.
                 case OgcGeometryType.LineString:
-                    WriteUInt32((uint) WKBGeometryType.wkbLineString, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbLineString, bWriter, byteorder);
                     break;
-                    //Polygons are type 3.
+                //Polygons are type 3.
                 case OgcGeometryType.Polygon:
-                    WriteUInt32((uint) WKBGeometryType.wkbPolygon, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbPolygon, bWriter, byteorder);
                     break;
-                    //Mulitpoints are type 4.
+                //Mulitpoints are type 4.
                 case OgcGeometryType.MultiPoint:
-                    WriteUInt32((uint) WKBGeometryType.wkbMultiPoint, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbMultiPoint, bWriter, byteorder);
                     break;
-                    //Multilinestrings are type 5.
+                //Multilinestrings are type 5.
                 case OgcGeometryType.MultiLineString:
-                    WriteUInt32((uint) WKBGeometryType.wkbMultiLineString, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbMultiLineString, bWriter, byteorder);
                     break;
-                    //Multipolygons are type 6.
+                //Multipolygons are type 6.
                 case OgcGeometryType.MultiPolygon:
-                    WriteUInt32((uint) WKBGeometryType.wkbMultiPolygon, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbMultiPolygon, bWriter, byteorder);
                     break;
-                    //Geometrycollections are type 7.
+                //Geometrycollections are type 7.
                 case OgcGeometryType.GeometryCollection:
-                    WriteUInt32((uint) WKBGeometryType.wkbGeometryCollection, bWriter, byteorder);
+                    WriteUInt32((uint)WKBGeometryType.wkbGeometryCollection, bWriter, byteorder);
                     break;
-                    //If the type is not of the above 7 throw an exception.
+                //If the type is not of the above 7 throw an exception.
                 default:
                     throw new ArgumentException("Invalid Geometry Type");
             }
@@ -202,38 +201,38 @@ private static void WriteType(IGeometry geometry, BinaryWriter bWriter, WkbByteO
         /// <param name="geometry">The geometry to be written.</param>
         /// <param name="bWriter"></param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteGeometry(IGeometry geometry, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteGeometry(Geometry geometry, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             switch (geometry.OgcGeometryType)
             {
-                    //Write the point.
+                //Write the point.
                 case OgcGeometryType.Point:
-                    WritePoint((IPoint) geometry, bWriter, byteorder);
+                    WritePoint((Point)geometry, bWriter, byteorder);
                     break;
                 case OgcGeometryType.LineString:
-                    var ls = (ILineString) geometry;
+                    var ls = (LineString)geometry;
                     WriteLineString(ls, bWriter, byteorder);
                     break;
                 case OgcGeometryType.Polygon:
-                    WritePolygon((IPolygon) geometry, bWriter, byteorder);
+                    WritePolygon((Polygon)geometry, bWriter, byteorder);
                     break;
-                    //Write the Multipoint.
+                //Write the Multipoint.
                 case OgcGeometryType.MultiPoint:
-                    WriteMultiPoint((IMultiPoint) geometry, bWriter, byteorder);
+                    WriteMultiPoint((MultiPoint)geometry, bWriter, byteorder);
                     break;
-                    //Write the Multilinestring.
+                //Write the Multilinestring.
                 case OgcGeometryType.MultiLineString:
-                    WriteMultiLineString((IMultiLineString) geometry, bWriter, byteorder);
+                    WriteMultiLineString((MultiLineString)geometry, bWriter, byteorder);
                     break;
-                    //Write the Multipolygon.
+                //Write the Multipolygon.
                 case OgcGeometryType.MultiPolygon:
-                    WriteMultiPolygon((IMultiPolygon) geometry, bWriter, byteorder);
+                    WriteMultiPolygon((MultiPolygon)geometry, bWriter, byteorder);
                     break;
-                    //Write the Geometrycollection.
+                //Write the Geometrycollection.
                 case OgcGeometryType.GeometryCollection:
-                    WriteGeometryCollection((IGeometryCollection) geometry, bWriter, byteorder);
+                    WriteGeometryCollection((GeometryCollection)geometry, bWriter, byteorder);
                     break;
-                    //If the type is not of the above 7 throw an exception.
+                //If the type is not of the above 7 throw an exception.
                 default:
                     throw new ArgumentException("Invalid Geometry Type");
             }
@@ -259,7 +258,7 @@ private static void WritePoint(Coordinate point, BinaryWriter bWriter, WkbByteOr
         /// <param name="point">The point to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WritePoint(IPoint point, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WritePoint(Point point, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Write the coordinate.
             WritePoint(point.Coordinate, bWriter, byteorder);
@@ -272,12 +271,12 @@ private static void WritePoint(IPoint point, BinaryWriter bWriter, WkbByteOrder
         /// <param name="ls">The linestring to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteLineString(ILineString ls, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteLineString(LineString ls, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             var vertices = ls.Coordinates;
 
             //Write the number of points in this linestring.
-            WriteUInt32((uint) vertices.Length, bWriter, byteorder);
+            WriteUInt32((uint)vertices.Length, bWriter, byteorder);
 
             //Loop on each vertices.
             foreach (var p in vertices)
@@ -291,19 +290,19 @@ private static void WriteLineString(ILineString ls, BinaryWriter bWriter, WkbByt
         /// <param name="poly">The polygon to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WritePolygon(IPolygon poly, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WritePolygon(Polygon poly, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Get the number of rings in this polygon.
             var numRings = poly.NumInteriorRings + 1;
 
             //Write the number of rings to the stream (add one for the shell)
-            WriteUInt32((uint) numRings, bWriter, byteorder);
+            WriteUInt32((uint)numRings, bWriter, byteorder);
 
             //Write the exterior of this polygon.
             WriteLineString(poly.ExteriorRing, bWriter, byteorder);
 
             //Loop on the number of rings - 1 because we already wrote the shell.
-            foreach (ILinearRing lr in poly.InteriorRings)
+            foreach (LinearRing lr in poly.InteriorRings)
                 //Write the (lineString)LinearRing.
                 WriteLineString(lr, bWriter, byteorder);
         }
@@ -314,19 +313,19 @@ private static void WritePolygon(IPolygon poly, BinaryWriter bWriter, WkbByteOrd
         /// <param name="mp">The multipoint to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteMultiPoint(IMultiPoint mp, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteMultiPoint(MultiPoint mp, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             var vertices = mp.Coordinates;
 
             //Write the number of points.
-            WriteUInt32((uint) vertices.Length, bWriter, byteorder);
+            WriteUInt32((uint)vertices.Length, bWriter, byteorder);
 
             //Loop on the number of points.
             foreach (var p in vertices)
             {
                 //Write Points Header
-                bWriter.Write((byte) byteorder);
-                WriteUInt32((uint) WKBGeometryType.wkbPoint, bWriter, byteorder);
+                bWriter.Write((byte)byteorder);
+                WriteUInt32((uint)WKBGeometryType.wkbPoint, bWriter, byteorder);
                 //Write each point.
                 WritePoint(p, bWriter, byteorder);
             }
@@ -338,18 +337,18 @@ private static void WriteMultiPoint(IMultiPoint mp, BinaryWriter bWriter, WkbByt
         /// <param name="mls">The multilinestring to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteMultiLineString(IMultiLineString mls, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteMultiLineString(MultiLineString mls, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Write the number of linestrings.
             int num = mls.NumGeometries;
-            WriteUInt32((uint) num, bWriter, byteorder);
+            WriteUInt32((uint)num, bWriter, byteorder);
 
             //Loop on the number of linestrings. 
             //NOTE: by contract, the first item returned 
-            //      from GetEnumerator (i.e. using foreach) is the IMultiLineString itself!
+            //      from GetEnumerator (i.e. using foreach) is the MultiLineString itself!
             for (int i = 0; i < num; i++)
             {
-                ILineString ls = (ILineString) mls.GetGeometryN(i);
+                LineString ls = (LineString)mls.GetGeometryN(i);
                 //Write LineString Header
                 bWriter.Write((byte)byteorder);
                 WriteUInt32((uint)WKBGeometryType.wkbLineString, bWriter, byteorder);
@@ -364,21 +363,21 @@ private static void WriteMultiLineString(IMultiLineString mls, BinaryWriter bWri
         /// <param name="mp">The mulitpolygon to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteMultiPolygon(IMultiPolygon mp, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteMultiPolygon(MultiPolygon mp, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Write the number of polygons.
             int num = mp.NumGeometries;
-            WriteUInt32((uint) num, bWriter, byteorder);
+            WriteUInt32((uint)num, bWriter, byteorder);
 
             //Loop on the number of polygons.
             //NOTE: by contract, the first item returned 
-            //      from GetEnumerator (i.e. using foreach) is the IMultiPolygon itself!
+            //      from GetEnumerator (i.e. using foreach) is the MultiPolygon itself!
             for (int i = 0; i < num; i++)
             {
-                IPolygon poly = (IPolygon) mp.GetGeometryN(i);
+                Polygon poly = (Polygon)mp.GetGeometryN(i);
                 //Write polygon header
-                bWriter.Write((byte) byteorder);
-                WriteUInt32((uint) WKBGeometryType.wkbPolygon, bWriter, byteorder);
+                bWriter.Write((byte)byteorder);
+                WriteUInt32((uint)WKBGeometryType.wkbPolygon, bWriter, byteorder);
                 //Write each polygon.
                 WritePolygon(poly, bWriter, byteorder);
             }
@@ -391,22 +390,22 @@ private static void WriteMultiPolygon(IMultiPolygon mp, BinaryWriter bWriter, Wk
         /// <param name="gc">The geometrycollection to be written.</param>
         /// <param name="bWriter">Stream to write to.</param>
         /// <param name="byteorder">Byte order</param>
-        private static void WriteGeometryCollection(IGeometryCollection gc, BinaryWriter bWriter, WkbByteOrder byteorder)
+        private static void WriteGeometryCollection(GeometryCollection gc, BinaryWriter bWriter, WkbByteOrder byteorder)
         {
             //Get the number of geometries in this geometrycollection.
             var num = gc.NumGeometries;
 
             //Write the number of geometries.
-            WriteUInt32((uint) num, bWriter, byteorder);
+            WriteUInt32((uint)num, bWriter, byteorder);
 
             //Loop on the number of geometries.
             //NOTE: by contract, the first item returned 
-            //      from GetEnumerator (i.e. using foreach) is the IGeometryCollection itself!
+            //      from GetEnumerator (i.e. using foreach) is the GeometryCollection itself!
             for (var i = 0; i < num; i++)
             {
-                IGeometry geom = gc.GetGeometryN(i);
+                Geometry geom = gc.GetGeometryN(i);
                 //Write the byte-order format of the following geometry.
-                bWriter.Write((byte) byteorder);
+                bWriter.Write((byte)byteorder);
                 //Write the type of each geometry.                
                 WriteType(geom, bWriter, byteorder);
                 //Write each geometry.
@@ -416,4 +415,4 @@ private static void WriteGeometryCollection(IGeometryCollection gc, BinaryWriter
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Converters/WellKnownText/GeometryFromWKT.cs b/SharpMap/Converters/WellKnownText/GeometryFromWKT.cs
index 22f21b1b..20632ee0 100644
--- a/SharpMap/Converters/WellKnownText/GeometryFromWKT.cs
+++ b/SharpMap/Converters/WellKnownText/GeometryFromWKT.cs
@@ -35,17 +35,16 @@
  *
  */
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Converters.WellKnownText
 {
     /// <summary>
-    ///  Converts a Well-known Text representation to a <see cref="GeoAPI.Geometries.IGeometry"/> instance.
+    ///  Converts a Well-known Text representation to a <see cref="NetTopologySuite.Geometries.Geometry"/> instance.
     /// </summary>
     /// <remarks>
     /// <para>The Well-Known Text (WKT) representation of Geometry is designed to exchange geometry data in ASCII form.</para>
@@ -71,11 +70,11 @@ namespace SharpMap.Converters.WellKnownText
     public class GeometryFromWKT
     {
         /// <summary>
-        /// Converts a Well-known text representation to a <see cref="GeoAPI.Geometries.IGeometry"/>.
+        /// Converts a Well-known text representation to a <see cref="NetTopologySuite.Geometries.Geometry"/>.
         /// </summary>
-        /// <param name="wellKnownText">A <see cref="GeoAPI.Geometries.IGeometry"/> tagged text string ( see the OpenGIS Simple Features Specification.</param>
-        /// <returns>Returns a <see cref="GeoAPI.Geometries.IGeometry"/> specified by wellKnownText.  Throws an exception if there is a parsing problem.</returns>
-        public static IGeometry Parse(string wellKnownText)
+        /// <param name="wellKnownText">A <see cref="NetTopologySuite.Geometries.Geometry"/> tagged text string ( see the OpenGIS Simple Features Specification.</param>
+        /// <returns>Returns a <see cref="NetTopologySuite.Geometries.Geometry"/> specified by wellKnownText.  Throws an exception if there is a parsing problem.</returns>
+        public static Geometry Parse(string wellKnownText)
         {
             // throws a parsing exception is there is a problem.
             using (var reader = new StringReader(wellKnownText))
@@ -83,13 +82,13 @@ public static IGeometry Parse(string wellKnownText)
         }
 
         /// <summary>
-        /// Converts a Well-known Text representation to a <see cref="GeoAPI.Geometries.IGeometry"/>.
+        /// Converts a Well-known Text representation to a <see cref="NetTopologySuite.Geometries.Geometry"/>.
         /// </summary>
         /// <param name="reader">A Reader which will return a Geometry Tagged Text
         /// string (see the OpenGIS Simple Features Specification)</param>
-        /// <returns>Returns a <see cref="GeoAPI.Geometries.IGeometry"/> read from StreamReader. 
+        /// <returns>Returns a <see cref="NetTopologySuite.Geometries.Geometry"/> read from StreamReader. 
         /// An exception will be thrown if there is a parsing problem.</returns>
-        public static IGeometry Parse(TextReader reader)
+        public static Geometry Parse(TextReader reader)
         {
             WKTReader wkt = new WKTReader();
             return wkt.Read(reader);
@@ -240,12 +239,12 @@ private static string GetNextWord(WktStreamTokenizer tokenizer)
         /// shell and holes do not form closed linestrings, or if an unexpected
         /// token is encountered.
         /// </remarks>
-        private static IGeometry ReadGeometryTaggedText(WktStreamTokenizer tokenizer)
+        private static Geometry ReadGeometryTaggedText(WktStreamTokenizer tokenizer)
         {
             tokenizer.NextToken();
             var type = tokenizer.GetStringValue().ToUpper();
-            IGeometry geometry;
-            IGeometryFactory factory = new GeometryFactory();
+            Geometry geometry;
+            GeometryFactory factory = new GeometryFactory();
 
             switch (type)
             {
@@ -278,17 +277,17 @@ private static IGeometry ReadGeometryTaggedText(WktStreamTokenizer tokenizer)
         }
 
         /// <summary>
-        /// Creates a <see cref="IMultiPolygon"/> using the next token in the stream.
+        /// Creates a <see cref="MultiPolygon"/> using the next token in the stream.
         /// </summary>
         /// <param name="tokenizer">tokenizer over a stream of text in Well-known Text
         /// format. The next tokens must form a MultiPolygon.</param>
         /// <param name="factory">The factory to create the result geometry</param>
         /// <returns>a <code>MultiPolygon</code> specified by the next token in the 
-        /// stream, or if if the coordinates used to create the <see cref="IPolygon"/>
+        /// stream, or if if the coordinates used to create the <see cref="Polygon"/>
         /// shells and holes do not form closed linestrings.</returns>
-        private static IMultiPolygon ReadMultiPolygonText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static MultiPolygon ReadMultiPolygonText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
-            var polygons = new List<IPolygon>();
+            var polygons = new List<Polygon>();
             string nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken == "EMPTY")
                 return factory.CreateMultiPolygon(polygons.ToArray());
@@ -318,7 +317,7 @@ private static IMultiPolygon ReadMultiPolygonText(WktStreamTokenizer tokenizer,
         ///  shell and holes do not form closed linestrings, or if an unexpected
         ///  token is encountered.
         ///  </remarks>
-        private static IPolygon ReadPolygonText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static Polygon ReadPolygonText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             string nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken == "EMPTY")
@@ -326,7 +325,7 @@ private static IPolygon ReadPolygonText(WktStreamTokenizer tokenizer, IGeometryF
 
             var exteriorRing = factory.CreateLinearRing(GetCoordinates(tokenizer));
             nextToken = GetNextCloserOrComma(tokenizer);
-            var interiorRings = new List<ILinearRing>();
+            var interiorRings = new List<LinearRing>();
             while (nextToken == ",")
             {
                 //Add holes
@@ -348,7 +347,7 @@ private static IPolygon ReadPolygonText(WktStreamTokenizer tokenizer, IGeometryF
         /// <remarks>
         /// ParseException is thrown if an unexpected token is encountered.
         /// </remarks>
-        private static IPoint ReadPointText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static Point ReadPointText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             var nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken == "EMPTY")
@@ -356,7 +355,7 @@ private static IPoint ReadPointText(WktStreamTokenizer tokenizer, IGeometryFacto
 
             var c = new Coordinate(GetNextNumber(tokenizer), GetNextNumber(tokenizer));
             GetNextCloser(tokenizer);
-            
+
             return factory.CreatePoint(c);
         }
 
@@ -371,7 +370,7 @@ private static IPoint ReadPointText(WktStreamTokenizer tokenizer, IGeometryFacto
         /// <remarks>
         /// ParseException is thrown if an unexpected token is encountered.
         /// </remarks>
-        private static IMultiPoint ReadMultiPointText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static MultiPoint ReadMultiPointText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             string nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken == "EMPTY")
@@ -389,18 +388,18 @@ private static IMultiPoint ReadMultiPointText(WktStreamTokenizer tokenizer, IGeo
         }
 
         /// <summary>
-        /// Creates a <see cref="IMultiLineString"/> using the next token in the stream. 
+        /// Creates a <see cref="MultiLineString"/> using the next token in the stream. 
         /// </summary>
         /// <param name="tokenizer">tokenizer over a stream of text in Well-known Text format. The next tokens must form a MultiLineString Text</param>
         /// <param name="factory">The factory to create the result geometry</param>
         /// <returns>a <see cref="MultiLineString"/> specified by the next token in the stream</returns>
-        private static IMultiLineString ReadMultiLineStringText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static MultiLineString ReadMultiLineStringText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             string nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken == "EMPTY")
                 return factory.CreateMultiLineString(null);
 
-            var lineStrings = new List<ILineString>();
+            var lineStrings = new List<LineString>();
             lineStrings.Add(ReadLineStringText(tokenizer, factory));
             nextToken = GetNextCloserOrComma(tokenizer);
             while (nextToken == ",")
@@ -421,7 +420,7 @@ private static IMultiLineString ReadMultiLineStringText(WktStreamTokenizer token
         /// <remarks>
         /// ParseException is thrown if an unexpected token is encountered.
         /// </remarks>
-        private static ILineString ReadLineStringText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static LineString ReadLineStringText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             return factory.CreateLineString(GetCoordinates(tokenizer));
         }
@@ -434,12 +433,12 @@ private static ILineString ReadLineStringText(WktStreamTokenizer tokenizer, IGeo
         /// <param name="factory">The factory to create the result geometry</param>
         /// <returns>
         /// A <see cref="GeometryCollection"/> specified by the next token in the stream.</returns>
-        private static IGeometryCollection ReadGeometryCollectionText(WktStreamTokenizer tokenizer, IGeometryFactory factory)
+        private static GeometryCollection ReadGeometryCollectionText(WktStreamTokenizer tokenizer, GeometryFactory factory)
         {
             var nextToken = GetNextEmptyOrOpener(tokenizer);
             if (nextToken.Equals("EMPTY"))
                 return factory.CreateGeometryCollection(null);
-            var geometries = new List<IGeometry>();
+            var geometries = new List<Geometry>();
             geometries.Add(ReadGeometryTaggedText(tokenizer));
             nextToken = GetNextCloserOrComma(tokenizer);
             while (nextToken.Equals(","))
diff --git a/SharpMap/Converters/WellKnownText/GeometryToWKT.cs b/SharpMap/Converters/WellKnownText/GeometryToWKT.cs
index 0bf62f7c..4e9e0e8c 100644
--- a/SharpMap/Converters/WellKnownText/GeometryToWKT.cs
+++ b/SharpMap/Converters/WellKnownText/GeometryToWKT.cs
@@ -35,16 +35,16 @@
  *
  */
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.Globalization;
 using System.IO;
-using GeoAPI.Geometries;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Converters.WellKnownText
 {
     /// <summary>
-    /// Outputs the textual representation of a <see cref="GeoAPI.Geometries.IGeometry"/> instance.
+    /// Outputs the textual representation of a <see cref="NetTopologySuite.Geometries.Geometry"/> instance.
     /// </summary>
     /// <remarks>
     /// <para>The Well-Known Text (WKT) representation of Geometry is designed to exchange geometry data in ASCII form.</para>
@@ -75,7 +75,7 @@ public class GeometryToWKT
         /// <param name="geometry">A Geometry to write.</param>
         /// <returns>A &lt;Geometry Tagged Text&gt; string (see the OpenGIS Simple
         ///  Features Specification)</returns>
-        public static string Write(IGeometry geometry)
+        public static string Write(Geometry geometry)
         {
             StringWriter sw = new StringWriter();
             Write(geometry, sw);
@@ -91,7 +91,7 @@ public static string Write(IGeometry geometry)
         /// Geometry is written to the output stream as &lt;Geometry Tagged Text&gt; string (see the OpenGIS
         /// Simple Features Specification).
         /// </remarks>
-        public static void Write(IGeometry geometry, StringWriter writer)
+        public static void Write(Geometry geometry, StringWriter writer)
         {
             WKTWriter wkt = new WKTWriter();
             wkt.Write(geometry, writer);
@@ -103,28 +103,28 @@ public static void Write(IGeometry geometry, StringWriter writer)
         /// </summary>
         /// <param name="geometry">The Geometry to process.</param>
         /// <param name="writer">The output stream to Append to.</param>
-        private static void AppendGeometryTaggedText(IGeometry geometry, StringWriter writer)
+        private static void AppendGeometryTaggedText(Geometry geometry, StringWriter writer)
         {
             if (geometry == null)
                 throw new NullReferenceException("Cannot write Well-Known Text: geometry was null");
-            
-            if (geometry is IPoint)
+
+            if (geometry is Point)
             {
-                var point = geometry as IPoint;
+                var point = geometry as Point;
                 AppendPointTaggedText(point, writer);
             }
-            else if (geometry is ILineString)
-                AppendLineStringTaggedText(geometry as ILineString, writer);
-            else if (geometry is IPolygon)
-                AppendPolygonTaggedText(geometry as IPolygon, writer);
-            else if (geometry is IMultiPoint)
-                AppendMultiPointTaggedText(geometry as IMultiPoint, writer);
-            else if (geometry is IMultiLineString)
-                AppendMultiLineStringTaggedText(geometry as IMultiLineString, writer);
-            else if (geometry is IMultiPolygon)
-                AppendMultiPolygonTaggedText(geometry as IMultiPolygon, writer);
-            else if (geometry is IGeometryCollection)
-                AppendGeometryCollectionTaggedText(geometry as IGeometryCollection, writer);
+            else if (geometry is LineString)
+                AppendLineStringTaggedText(geometry as LineString, writer);
+            else if (geometry is Polygon)
+                AppendPolygonTaggedText(geometry as Polygon, writer);
+            else if (geometry is MultiPoint)
+                AppendMultiPointTaggedText(geometry as MultiPoint, writer);
+            else if (geometry is MultiLineString)
+                AppendMultiLineStringTaggedText(geometry as MultiLineString, writer);
+            else if (geometry is MultiPolygon)
+                AppendMultiPolygonTaggedText(geometry as MultiPolygon, writer);
+            else if (geometry is GeometryCollection)
+                AppendGeometryCollectionTaggedText(geometry as GeometryCollection, writer);
             else
                 throw new NotSupportedException("Unsupported Geometry implementation:" + geometry.GetType().Name);
         }
@@ -135,7 +135,7 @@ private static void AppendGeometryTaggedText(IGeometry geometry, StringWriter wr
         /// </summary>
         /// <param name="coordinate">the <code>Coordinate</code> to process</param>
         /// <param name="writer">the output writer to Append to</param>
-        private static void AppendPointTaggedText(IPoint coordinate, StringWriter writer)
+        private static void AppendPointTaggedText(Point coordinate, StringWriter writer)
         {
             writer.Write("POINT ");
             AppendPointText(coordinate, writer);
@@ -146,7 +146,7 @@ private static void AppendPointTaggedText(IPoint coordinate, StringWriter writer
         /// </summary>
         /// <param name="lineString">The LineString to process.</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendLineStringTaggedText(ILineString lineString, StringWriter writer)
+        private static void AppendLineStringTaggedText(LineString lineString, StringWriter writer)
         {
             writer.Write("LINESTRING ");
             AppendLineStringText(lineString, writer);
@@ -158,7 +158,7 @@ private static void AppendLineStringTaggedText(ILineString lineString, StringWri
         /// </summary>
         /// <param name="polygon">Th Polygon to process.</param>
         /// <param name="writer">The stream writer to Append to.</param>
-        private static void AppendPolygonTaggedText(IPolygon polygon, StringWriter writer)
+        private static void AppendPolygonTaggedText(Polygon polygon, StringWriter writer)
         {
             writer.Write("POLYGON ");
             AppendPolygonText(polygon, writer);
@@ -170,7 +170,7 @@ private static void AppendPolygonTaggedText(IPolygon polygon, StringWriter write
         /// </summary>
         /// <param name="multipoint">The MultiPoint to process.</param>
         /// <param name="writer">The output writer to Append to.</param>
-        private static void AppendMultiPointTaggedText(IMultiPoint multipoint, StringWriter writer)
+        private static void AppendMultiPointTaggedText(MultiPoint multipoint, StringWriter writer)
         {
             writer.Write("MULTIPOINT ");
             AppendMultiPointText(multipoint, writer);
@@ -182,7 +182,7 @@ private static void AppendMultiPointTaggedText(IMultiPoint multipoint, StringWri
         /// </summary>
         /// <param name="multiLineString">The MultiLineString to process</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendMultiLineStringTaggedText(IMultiLineString multiLineString, StringWriter writer)
+        private static void AppendMultiLineStringTaggedText(MultiLineString multiLineString, StringWriter writer)
         {
             writer.Write("MULTILINESTRING ");
             AppendMultiLineStringText(multiLineString, writer);
@@ -194,7 +194,7 @@ private static void AppendMultiLineStringTaggedText(IMultiLineString multiLineSt
         /// </summary>
         /// <param name="multiPolygon">The MultiPolygon to process</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendMultiPolygonTaggedText(IMultiPolygon multiPolygon, StringWriter writer)
+        private static void AppendMultiPolygonTaggedText(MultiPolygon multiPolygon, StringWriter writer)
         {
             writer.Write("MULTIPOLYGON ");
             AppendMultiPolygonText(multiPolygon, writer);
@@ -206,7 +206,7 @@ private static void AppendMultiPolygonTaggedText(IMultiPolygon multiPolygon, Str
         /// </summary>
         /// <param name="geometryCollection">The GeometryCollection to process</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendGeometryCollectionTaggedText(IGeometryCollection geometryCollection,
+        private static void AppendGeometryCollectionTaggedText(GeometryCollection geometryCollection,
                                                                StringWriter writer)
         {
             writer.Write("GEOMETRYCOLLECTION ");
@@ -219,7 +219,7 @@ private static void AppendGeometryCollectionTaggedText(IGeometryCollection geome
         /// </summary>
         /// <param name="coordinate">The Coordinate to process.</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendPointText(IPoint coordinate, StringWriter writer)
+        private static void AppendPointText(Point coordinate, StringWriter writer)
         {
             if (coordinate == null || coordinate.IsEmpty)
                 writer.Write("EMPTY");
@@ -265,7 +265,7 @@ private static string WriteNumber(double d)
         /// </summary>
         /// <param name="lineString">The LineString to process.</param>
         /// <param name="writer">The output stream to Append to.</param>
-        private static void AppendLineStringText(ILineString lineString, StringWriter writer)
+        private static void AppendLineStringText(LineString lineString, StringWriter writer)
         {
             if (lineString == null || lineString.IsEmpty)
                 writer.Write("EMPTY");
@@ -289,7 +289,7 @@ private static void AppendLineStringText(ILineString lineString, StringWriter wr
         /// </summary>
         /// <param name="polygon">The Polygon to process.</param>
         /// <param name="writer"></param>
-        private static void AppendPolygonText(IPolygon polygon, StringWriter writer)
+        private static void AppendPolygonText(Polygon polygon, StringWriter writer)
         {
             if (polygon == null || polygon.IsEmpty)
                 writer.Write("EMPTY");
@@ -315,7 +315,7 @@ private static void AppendPolygonText(IPolygon polygon, StringWriter writer)
         /// </summary>
         /// <param name="multiPoint">The MultiPoint to process.</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendMultiPointText(IMultiPoint multiPoint, StringWriter writer)
+        private static void AppendMultiPointText(MultiPoint multiPoint, StringWriter writer)
         {
             if (multiPoint == null || multiPoint.IsEmpty)
                 writer.Write("EMPTY");
@@ -339,7 +339,7 @@ private static void AppendMultiPointText(IMultiPoint multiPoint, StringWriter wr
         /// </summary>
         /// <param name="multiLineString">The MultiLineString to process.</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendMultiLineStringText(IMultiLineString multiLineString, StringWriter writer)
+        private static void AppendMultiLineStringText(MultiLineString multiLineString, StringWriter writer)
         {
             if (multiLineString == null || multiLineString.IsEmpty)
                 writer.Write("EMPTY");
@@ -350,7 +350,7 @@ private static void AppendMultiLineStringText(IMultiLineString multiLineString,
                 {
                     if (i > 0)
                         writer.Write(", ");
-                    AppendLineStringText((ILineString)multiLineString.GetGeometryN(i), writer);
+                    AppendLineStringText((LineString)multiLineString.GetGeometryN(i), writer);
                 }
                 writer.Write(")");
             }
@@ -361,7 +361,7 @@ private static void AppendMultiLineStringText(IMultiLineString multiLineString,
         /// </summary>
         /// <param name="multiPolygon">The MultiPolygon to process.</param>
         /// <param name="writer">The output stream to Append to.</param>
-        private static void AppendMultiPolygonText(IMultiPolygon multiPolygon, StringWriter writer)
+        private static void AppendMultiPolygonText(MultiPolygon multiPolygon, StringWriter writer)
         {
             if (multiPolygon == null || multiPolygon.IsEmpty)
                 writer.Write("EMPTY");
@@ -372,7 +372,7 @@ private static void AppendMultiPolygonText(IMultiPolygon multiPolygon, StringWri
                 {
                     if (i > 0)
                         writer.Write(", ");
-                    AppendPolygonText((IPolygon)multiPolygon.GetGeometryN(i), writer);
+                    AppendPolygonText((Polygon)multiPolygon.GetGeometryN(i), writer);
                 }
                 writer.Write(")");
             }
@@ -383,7 +383,7 @@ private static void AppendMultiPolygonText(IMultiPolygon multiPolygon, StringWri
         /// </summary>
         /// <param name="geometryCollection">The GeometryCollection to process.</param>
         /// <param name="writer">The output stream writer to Append to.</param>
-        private static void AppendGeometryCollectionText(IGeometryCollection geometryCollection, StringWriter writer)
+        private static void AppendGeometryCollectionText(GeometryCollection geometryCollection, StringWriter writer)
         {
             if (geometryCollection == null || geometryCollection.IsEmpty)
                 writer.Write("EMPTY");
@@ -400,4 +400,4 @@ private static void AppendGeometryCollectionText(IGeometryCollection geometryCol
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Converters/WellKnownText/SpatialReference.cs b/SharpMap/Converters/WellKnownText/SpatialReference.cs
index e068d31d..83267f91 100644
--- a/SharpMap/Converters/WellKnownText/SpatialReference.cs
+++ b/SharpMap/Converters/WellKnownText/SpatialReference.cs
@@ -31,7 +31,7 @@ public class SpatialReference
     {
         private static readonly Dictionary<int, string> _wkts = new Dictionary<int, string>();
         private static readonly Dictionary<int, string> _proj4s = new Dictionary<int, string>();
-        
+
         /// <summary>
         /// Converts a Spatial Reference ID to a Well-known Text representation
         /// </summary>
@@ -81,7 +81,7 @@ public static IEnumerable<KeyValuePair<int, string>> GetAllReferenceSystems()
                 nodes = null;
             }
 
-            if (nodes == null) 
+            if (nodes == null)
                 yield break;
 
             foreach (XmlNode referenceNode in nodes)
@@ -135,9 +135,9 @@ private static void DownloadSrs(string path)
         {
             using (var wc = new WebClient())
                 wc.DownloadFile(
-                    new Uri("https://raw.githubusercontent.com/SharpMap/SharpMap/Branches/1.0/SharpMap/SpatialRefSys.xml"), 
+                    new Uri("https://raw.githubusercontent.com/SharpMap/SharpMap/Branches/1.0/SharpMap/SpatialRefSys.xml"),
                     path);
-            
+
         }
     }
 }
diff --git a/SharpMap/Converters/WellKnownText/WKTStreamTokenizer.cs b/SharpMap/Converters/WellKnownText/WKTStreamTokenizer.cs
index 7b7ae1df..b226a86b 100644
--- a/SharpMap/Converters/WellKnownText/WKTStreamTokenizer.cs
+++ b/SharpMap/Converters/WellKnownText/WKTStreamTokenizer.cs
@@ -37,9 +37,9 @@
 
 #region Using
 
+using SharpMap.Converters.WellKnownText.IO;
 using System;
 using System.IO;
-using SharpMap.Converters.WellKnownText.IO;
 
 #endregion
 
diff --git a/SharpMap/CoordinateSystems/CoordinateSystemExtensions.cs b/SharpMap/CoordinateSystems/CoordinateSystemExtensions.cs
index 693c2957..6e431cef 100644
--- a/SharpMap/CoordinateSystems/CoordinateSystemExtensions.cs
+++ b/SharpMap/CoordinateSystems/CoordinateSystemExtensions.cs
@@ -1,11 +1,9 @@
-using System;
-using System.Runtime.CompilerServices;
 using Common.Logging;
-using System.Collections.Generic;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
+using System.Runtime.CompilerServices;
 
 namespace SharpMap.CoordinateSystems
 {
@@ -18,16 +16,16 @@ public static class CoordinateSystemExtensions
 
         //private static Dictionary<int, string> _sridDefinition;
 
-        private static readonly Dictionary<int, ICoordinateSystem> _sridCoordinateSystem = new Dictionary<int, ICoordinateSystem>();
+        //private static readonly Dictionary<int, CoordinateSystem> _sridCoordinateSystem = new Dictionary<int, CoordinateSystem>();
 
         /// <summary>
         /// Gets a coordinate system for the map based on the <see cref="Map.SRID"/> property
         /// </summary>
         /// <param name="self">The map</param>
         /// <returns>A coordinate system</returns>
-        public static ICoordinateSystem GetCoordinateSystem(this Map self)
+        public static CoordinateSystem GetCoordinateSystem(this Map self)
         {
-            _logger.Debug( fmh => fmh("Getting coordinate system for map"));
+            _logger.Debug(fmh => fmh("Getting coordinate system for map"));
             return GetCoordinateSystemForSrid(self.SRID);
         }
 
@@ -36,7 +34,7 @@ public static ICoordinateSystem GetCoordinateSystem(this Map self)
         /// </summary>
         /// <param name="self">The layer</param>
         /// <returns>A coordinate system</returns>
-        public static ICoordinateSystem GetCoordinateSystem(this ILayer self)
+        public static CoordinateSystem GetCoordinateSystem(this ILayer self)
         {
             _logger.Debug(fmh => fmh("Getting coordinate system for {0} '{1}'", self.GetType().Name, self.LayerName));
             return GetCoordinateSystemForSrid(self.SRID);
@@ -47,24 +45,24 @@ public static ICoordinateSystem GetCoordinateSystem(this ILayer self)
         /// </summary>
         /// <param name="self">The provider</param>
         /// <returns>A coordinate system</returns>
-        public static ICoordinateSystem GetCoordinateSystem(this IProvider self)
+        public static CoordinateSystem GetCoordinateSystem(this IProvider self)
         {
             _logger.Debug(fmh => fmh("Getting coordinate system for {0} '{1}'", self.GetType().Name, self.ConnectionID));
             return GetCoordinateSystemForSrid(self.SRID);
         }
 
         /// <summary>
-        /// Gets a coordinate system for the map based on the <see cref="IGeometry.SRID"/> property
+        /// Gets a coordinate system for the map based on the <see cref="Geometry.SRID"/> property
         /// </summary>
         /// <param name="self">The layer</param>
         /// <returns>A coordinate system</returns>
-        public static ICoordinateSystem GetCoordinateSystem(this IGeometry self)
+        public static CoordinateSystem GetCoordinateSystem(this Geometry self)
         {
             return GetCoordinateSystemForSrid(self.SRID);
         }
 
         [MethodImpl(MethodImplOptions.Synchronized)]
-        private static ICoordinateSystem GetCoordinateSystemForSrid(int srid)
+        private static CoordinateSystem GetCoordinateSystemForSrid(int srid)
         {
             if (srid <= 0)
                 return null;
@@ -73,34 +71,34 @@ private static ICoordinateSystem GetCoordinateSystemForSrid(int srid)
         }
 
         /// <summary>
-        /// Method to get a <see cref="IGeometryFactory"/> for the specified <paramref name="self">map</paramref>
+        /// Method to get a <see cref="GeometryFactory"/> for the specified <paramref name="self">map</paramref>
         /// </summary>
         /// <param name="self">The map</param>
         /// <returns>A geometry factory</returns>
-        public static IGeometryFactory GetFactory(this Map self)
+        public static GeometryFactory GetFactory(this Map self)
         {
-            return GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(self.SRID);
+            return NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(self.SRID);
         }
 
         /// <summary>
-        /// Method to get a <see cref="IGeometryFactory"/> for the specified <paramref name="self">layer</paramref>
+        /// Method to get a <see cref="GeometryFactory"/> for the specified <paramref name="self">layer</paramref>
         /// </summary>
         /// <param name="self">The layer</param>
         /// <returns>A geometry factory</returns>
-        public static IGeometryFactory GetFactory(this ILayer self)
+        public static GeometryFactory GetFactory(this ILayer self)
         {
-            return GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(self.SRID);
+            return NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(self.SRID);
         }
 
         /// <summary>
-        /// Method to get a <see cref="IGeometryFactory"/> for the specified <paramref name="self">provider</paramref>
+        /// Method to get a <see cref="GeometryFactory"/> for the specified <paramref name="self">provider</paramref>
         /// </summary>
         /// <param name="self">The provider</param>
         /// <returns>A geometry factory</returns>
-        public static IGeometryFactory GetFactory(this IProvider self)
+        public static GeometryFactory GetFactory(this IProvider self)
         {
-            return GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(self.SRID);
+            return NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(self.SRID);
         }
-        
+
     }
 }
diff --git a/SharpMap/CoordinateSystems/CoordinateSystemServices.cs b/SharpMap/CoordinateSystems/CoordinateSystemServices.cs
index d3021770..07bea2a6 100644
--- a/SharpMap/CoordinateSystems/CoordinateSystemServices.cs
+++ b/SharpMap/CoordinateSystems/CoordinateSystemServices.cs
@@ -1,94 +1,30 @@
-using System;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
+using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
-using GeoAPI;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
-using SharpMap.Converters.WellKnownText;
 
 namespace SharpMap.CoordinateSystems
 {
     /// <summary>
     /// A coordinate system services class
     /// </summary>
-    public class CoordinateSystemServices : ICoordinateSystemServices, ICoordinateSystemRepository
+    public class CoordinateSystemServices : ProjNet.CoordinateSystemServices, ICoordinateSystemRepository
     {
-        private readonly Dictionary<int, ICoordinateSystem> _csBySrid;
-        private readonly Dictionary<IInfo, int> _sridByCs;
+        private readonly CoordinateSystemFactory _csFactory;
 
-        private readonly ICoordinateSystemFactory _coordinateSystemFactory;
-        private readonly ICoordinateTransformationFactory _ctFactory;
-
-        #region CsEqualityComparer class
-        private class CsEqualityComparer : EqualityComparer<IInfo>
-        {
-            public override bool Equals(IInfo x, IInfo y)
-            {
-                return x.AuthorityCode == y.AuthorityCode &&
-#if PCL
-                    string.Compare(x.Authority, y.Authority, CultureInfo.InvariantCulture, CompareOptions.OrdinalIgnoreCase) == 0;
-#else
- string.Compare(x.Authority, y.Authority, true, CultureInfo.InvariantCulture) == 0;
-#endif
-            }
-
-            public override int GetHashCode(IInfo obj)
-            {
-                if (obj == null) return 0;
-                return Convert.ToInt32(obj.AuthorityCode) + (obj.Authority != null ? obj.Authority.GetHashCode() : 0);
-            }
-        }
-        #endregion
-
-        #region CoordinateSystemKey class
-
-        private class CoordinateSystemKey : IInfo
-        {
-            public CoordinateSystemKey(string authority, long authorityCode)
-            {
-                Authority = authority;
-                AuthorityCode = authorityCode;
-            }
-
-            public bool EqualParams(object obj)
-            {
-                throw new NotSupportedException();
-            }
-
-            public string Name { get { return null; } }
-            public string Authority { get; private set; }
-            public long AuthorityCode { get; private set; }
-            public string Alias { get { return null; } }
-            public string Abbreviation { get { return null; } }
-            public string Remarks { get { return null; } }
-            public string WKT { get { return null; } }
-            public string XML { get { return null; } }
-        }
-
-        #endregion
-
-        #region ctors
         /// <summary>
         /// Creates an instance of this class using the provided <paramref name="coordinateSystemFactory"/>, 
         /// <paramref name="coordinateTransformationFactory"/> and enumeration of 
         /// </summary>
         /// <param name="coordinateSystemFactory">The factory to use for creating a coordinate system.</param>
         /// <param name="coordinateTransformationFactory">The factory to use for creating a coordinate transformation.</param>
-        public CoordinateSystemServices(ICoordinateSystemFactory coordinateSystemFactory,
-            ICoordinateTransformationFactory coordinateTransformationFactory)
+        public CoordinateSystemServices(
+            CoordinateSystemFactory coordinateSystemFactory,
+            CoordinateTransformationFactory coordinateTransformationFactory)
+            : base(coordinateSystemFactory, coordinateTransformationFactory)
         {
-            if (coordinateSystemFactory == null)
-                throw new ArgumentNullException("coordinateSystemFactory");
-
-            if (coordinateTransformationFactory == null)
-                throw new ArgumentNullException("coordinateTransformationFactory");
-
-            _coordinateSystemFactory = coordinateSystemFactory;
-            _ctFactory = coordinateTransformationFactory;
-
-            _csBySrid = new Dictionary<int, ICoordinateSystem>();
-            _sridByCs = new Dictionary<IInfo, int>(new CsEqualityComparer());
+            _csFactory = coordinateSystemFactory ?? throw new ArgumentNullException(nameof(coordinateSystemFactory));
         }
 
         /// <summary>
@@ -99,22 +35,15 @@ public CoordinateSystemServices(ICoordinateSystemFactory coordinateSystemFactory
         /// <param name="coordinateTransformationFactory">The factory to use for creating a coordinate transformation.</param>
         /// <param name="enumerable">An enumeration if spatial reference ids and coordinate system definition strings pairs</param>
         public CoordinateSystemServices(
-            ICoordinateSystemFactory coordinateSystemFactory,
-            ICoordinateTransformationFactory coordinateTransformationFactory,
+            CoordinateSystemFactory coordinateSystemFactory,
+            CoordinateTransformationFactory coordinateTransformationFactory,
             IEnumerable<KeyValuePair<int, string>> enumerable)
             : this(coordinateSystemFactory, coordinateTransformationFactory)
         {
-            PrivAddCoordinateSystems(enumerable);
-        } 
-        #endregion
-
-        #region private members
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
+            AddCoordinateSystems(enumerable);
         }
 
-        private void PrivAddCoordinateSystems(IEnumerable<KeyValuePair<int, string>> coordinateSystems)
+        private void AddCoordinateSystems(IEnumerable<KeyValuePair<int, string>> coordinateSystems)
         {
             foreach (var keyPair in coordinateSystems)
             {
@@ -122,46 +51,21 @@ private void PrivAddCoordinateSystems(IEnumerable<KeyValuePair<int, string>> coo
                 var wellKnownText = keyPair.Value;
 
                 var coordinateSystem = CreateCoordinateSystem(wellKnownText);
-                if (coordinateSystem == null) continue;
-                
-                if (_csBySrid.ContainsKey(srid))
-                {
-                    if (ReferenceEquals(coordinateSystem, _csBySrid[srid]))
-                        return;
-
-                    _sridByCs.Remove(_csBySrid[srid]);
-                    _csBySrid[srid] = coordinateSystem;
-                    _sridByCs.Add(coordinateSystem, srid);
-                }
-                else
-                {
-                    _csBySrid.Add(srid, coordinateSystem);
-                    _sridByCs.Add(coordinateSystem, srid);
-                }
+                if (coordinateSystem != null)
+                    AddCoordinateSystem(srid, coordinateSystem);
             }
         }
-        #endregion
-
-        #region public members
-
-        /// <summary>
-        /// Gets a value indicating that this coordinate system repository is readonly
-        /// </summary>
-        public virtual bool IsReadOnly
-        {
-            get { return false; }
-        }
 
         /// <summary>
         /// Method to create a coordinate system based on the <paramref name="wellKnownText"/> coordinate system definition.
         /// </summary>
         /// <param name="wellKnownText"></param>
         /// <returns>A coordinate system, <value>null</value> if no coordinate system could be created.</returns>
-        public ICoordinateSystem CreateCoordinateSystem(string wellKnownText)
+        public CoordinateSystem CreateCoordinateSystem(string wellKnownText)
         {
             try
             {
-                return _coordinateSystemFactory.CreateFromWkt(wellKnownText.Replace("ELLIPSOID", "SPHEROID"));
+                return _csFactory.CreateFromWkt(wellKnownText.Replace("ELLIPSOID", "SPHEROID"));
             }
             catch (Exception)
             {
@@ -171,199 +75,41 @@ public ICoordinateSystem CreateCoordinateSystem(string wellKnownText)
         }
 
         /// <summary>
-        /// Method to remove a coordinate system form the service by its <paramref name="srid"/> identifier
-        /// </summary>
-        /// <param name="srid">The identifier of the coordinate system to remove</param>
-        /// <returns><value>true</value> if the coordinate system was removed successfully, otherwise <value>false</value></returns>
-        public virtual bool RemoveCoordinateSystem(int srid)
-        {
-            if (IsReadOnly)
-                throw new NotSupportedException();
-
-            var cs = GetCoordinateSystem(srid);
-            if (cs == null)
-                return false;
-
-            _csBySrid.Remove(srid);
-            _sridByCs.Remove(cs);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Returns the coordinate system by <paramref name="srid"/> identifier
-        /// </summary>
-        /// <param name="srid">The initialization for the coordinate system</param>
-        /// <returns>
-        /// The coordinate system.
-        /// </returns>
-        public virtual ICoordinateSystem GetCoordinateSystem(int srid)
-        {
-            ICoordinateSystem cs;
-            return _csBySrid.TryGetValue(srid, out cs) ? cs : null;
-        }
-
-        /// <summary>
-        /// Returns the coordinate system by <paramref name="authority"/> and <paramref name="code"/>.
-        /// </summary>
-        /// <param name="authority">The authority for the coordinate system</param><param name="code">The code assigned to the coordinate system by <paramref name="authority"/>.</param>
-        /// <returns>
-        /// The coordinate system.
-        /// </returns>
-        public virtual ICoordinateSystem GetCoordinateSystem(string authority, long code)
-        {
-            var srid = GetSRID(authority, code);
-            return srid.HasValue ? GetCoordinateSystem(srid.Value) : null;
-        }
-
-        /// <summary>
-        /// Method to get the identifier, by which this coordinate system can be accessed.
+        /// Gets a value indicating that this coordinate system repository is readonly
         /// </summary>
-        /// <param name="authority">The authority name</param><param name="authorityCode">The code assigned by <paramref name="authority"/></param>
-        /// <returns>
-        /// The identifier or 
-        /// <value>
-        /// null
-        /// </value>
-        /// </returns>
-        public virtual int? GetSRID(string authority, long authorityCode)
+        public virtual bool IsReadOnly
         {
-            var key = new CoordinateSystemKey(authority, authorityCode);
-            int srid;
-            if (_sridByCs.TryGetValue(key, out srid))
-                return srid;
-
-            return null;
+            get { return false; }
         }
 
-        /// <summary>
-        /// Method to create a coordinate tranformation between two spatial reference systems, defined by their identifiers
-        /// </summary>
-        /// <remarks>
-        /// This is a convenience function for <see cref="M:GeoAPI.ICoordinateSystemServices.CreateTransformation(GeoAPI.CoordinateSystems.ICoordinateSystem,GeoAPI.CoordinateSystems.ICoordinateSystem)"/>.
-        /// </remarks>
-        /// <param name="sourceSrid">The identifier for the source spatial reference system.</param><param name="targetSrid">The identifier for the target spatial reference system.</param>
-        /// <returns>
-        /// A coordinate transformation, 
-        /// <value>
-        /// null
-        /// </value>
-        ///  if no transformation could be created.
-        /// </returns>
-        public ICoordinateTransformation CreateTransformation(int sourceSrid, int targetSrid)
-        {
-            return CreateTransformation(
-                GetCoordinateSystem(sourceSrid),
-                GetCoordinateSystem(targetSrid));
-        }
+        int ICoordinateSystemRepository.Count => Count;
 
-        /// <summary>
-        /// Method to create a coordinate tranformation between two spatial reference systems
-        /// </summary>
-        /// <param name="source">The source spatial reference system.</param><param name="target">The target spatial reference system.</param>
-        /// <returns>
-        /// A coordinate transformation, 
-        /// <value>
-        /// null
-        /// </value>
-        ///  if no transformation could be created.
-        /// </returns>
-        public ICoordinateTransformation CreateTransformation(ICoordinateSystem source, ICoordinateSystem target)
-        {
-            return _ctFactory.CreateFromCoordinateSystems(source, target);
-        }
+        bool ICoordinateSystemRepository.IsReadOnly => IsReadOnly;
 
-        /// <summary>
-        /// Returns an enumerator that iterates through the collection.
-        /// </summary>
-        /// <returns>
-        /// A <see cref="T:System.Collections.Generic.IEnumerator`1"/> that can be used to iterate through the collection.
-        /// </returns>
-        /// <filterpriority>1</filterpriority>
-        public virtual IEnumerator<KeyValuePair<int, ICoordinateSystem>> GetEnumerator()
-        {
-            return _csBySrid.GetEnumerator();
-        }
 
-        /// <summary>
-        /// Method to remove all coordinate systems from the service
-        /// </summary>
-        public virtual void Clear()
+        void ICoordinateSystemRepository.AddCoordinateSystem(int srid, CoordinateSystem coordinateSystem)
         {
-            if (IsReadOnly)
-                throw new NotSupportedException();
-
-            _csBySrid.Clear();
-            _sridByCs.Clear();
+            AddCoordinateSystem(srid, coordinateSystem);
         }
 
-        /// <summary>
-        /// Gets a value indicating the number of unique coordinate systems in the repository
-        /// </summary>
-        public virtual int Count
+        void ICoordinateSystemRepository.Clear()
         {
-            get { return _sridByCs.Count; }
+            Clear();
         }
 
-        /// <summary>
-        /// Method to add an enumeration of spatial reference id and coordinate system definition pairs to the repository.
-        /// </summary>
-        /// <param name="coordinateSystems">An enumeration of spatial reference id and coordinate system definition pairs.</param>
-        public void AddCoordinateSystems(IEnumerable<KeyValuePair<int, string>> coordinateSystems)
+        bool ICoordinateSystemRepository.RemoveCoordinateSystem(int srid)
         {
-            if (IsReadOnly)
-                throw new NotSupportedException();
-
-            PrivAddCoordinateSystems(coordinateSystems);
+            return RemoveCoordinateSystem(srid);
         }
 
-        /// <summary>
-        /// Method to add <paramref name="coordinateSystem"/> to the service and register it with the <paramref name="srid"/> value.
-        /// </summary>
-        /// <param name="srid">The identifier for the <paramref name="coordinateSystem"/> in the store.</param>
-        /// <param name="coordinateSystem">The coordinate system.</param>
-        public virtual void AddCoordinateSystem(int srid, ICoordinateSystem coordinateSystem)
+        IEnumerator<KeyValuePair<int, CoordinateSystem>> IEnumerable<KeyValuePair<int, CoordinateSystem>>.GetEnumerator()
         {
-            if (IsReadOnly)
-                throw new NotSupportedException();
-
-            if (_csBySrid.ContainsKey(srid))
-            {
-                if (ReferenceEquals(coordinateSystem, _csBySrid[srid]))
-                    return;
-
-                _sridByCs.Remove(_csBySrid[srid]);
-                _csBySrid[srid] = coordinateSystem;
-                _sridByCs.Add(coordinateSystem, srid);
-            }
-            else
-            {
-                _csBySrid.Add(srid, coordinateSystem);
-                _sridByCs.Add(coordinateSystem, srid);
-            }
+            return GetEnumerator();
         }
 
-        /// <summary>
-        /// Creates a CoordinateSystemServices built with all the values coming from the SpatialRefSys.xml
-        /// </summary>
-        /// <param name="coordinateSystemFactory">A coordinate system factory</param>
-        /// <param name="coordinateTransformationFactory">A coordinate transformation factory</param>
-        /// <returns>A coordinate system services instance.</returns>
-        /// <exception cref="ArgumentNullException">Thrown, if either <paramref name="coordinateSystemFactory"/> or <paramref name="coordinateTransformationFactory"/> is null.</exception>
-        public static ICoordinateSystemServices FromSpatialRefSys(ICoordinateSystemFactory coordinateSystemFactory, ICoordinateTransformationFactory coordinateTransformationFactory)
+        IEnumerator IEnumerable.GetEnumerator()
         {
-            if (coordinateSystemFactory == null)
-                throw new ArgumentNullException("coordinateSystemFactory");
-
-            if (coordinateTransformationFactory == null)
-                throw new ArgumentNullException("coordinateTransformationFactory");
-
-            var css = new CoordinateSystemServices(coordinateSystemFactory, coordinateTransformationFactory);
-            css.AddCoordinateSystems(SpatialReference.GetAllReferenceSystems());
-
-            return css;
+            return GetEnumerator();
         }
-
-        #endregion
     }
 }
diff --git a/SharpMap/CoordinateSystems/ICoordinateSystemRepository.cs b/SharpMap/CoordinateSystems/ICoordinateSystemRepository.cs
index c6f0a310..5163587f 100644
--- a/SharpMap/CoordinateSystems/ICoordinateSystemRepository.cs
+++ b/SharpMap/CoordinateSystems/ICoordinateSystemRepository.cs
@@ -1,14 +1,13 @@
-using System;
+using ProjNet.CoordinateSystems;
 using System.Collections.Generic;
-using GeoAPI.CoordinateSystems;
 
-namespace GeoAPI
+namespace SharpMap.CoordinateSystems
 {
     /// <summary>
-   /// An interface for classes that offer access to coordinate system creating facillities.
+    /// An interface for classes that offer access to coordinate system creating facillities.
     /// </summary>
-    //public interface ICoordinateSystemServicesRepository : ICoordinateSystemServices, IEnumerable<KeyValuePair<int, ICoordinateSystem>>
-    public interface ICoordinateSystemRepository : IEnumerable<KeyValuePair<int, ICoordinateSystem>>
+    //public interface ICoordinateSystemServicesRepository : CoordinateSystemServices, IEnumerable<KeyValuePair<int, CoordinateSystem>>
+    public interface ICoordinateSystemRepository : IEnumerable<KeyValuePair<int, CoordinateSystem>>
     {
         /// <summary>
         /// Gets a value indicating the number of unique coordinate systems in the repository
@@ -25,7 +24,7 @@ public interface ICoordinateSystemRepository : IEnumerable<KeyValuePair<int, ICo
         /// </summary>
         /// <param name="srid">The identifier for the <paramref name="coordinateSystem"/> in the store.</param>
         /// <param name="coordinateSystem">The coordinate system.</param>
-        void AddCoordinateSystem(int srid, ICoordinateSystem coordinateSystem);
+        void AddCoordinateSystem(int srid, CoordinateSystem coordinateSystem);
 
         /// <summary>
         /// Method to remove all coordinate systems from the service
@@ -39,4 +38,4 @@ public interface ICoordinateSystemRepository : IEnumerable<KeyValuePair<int, ICo
         /// <returns><value>true</value> if the coordinate system was removed successfully, otherwise <value>false</value></returns>
         bool RemoveCoordinateSystem(int srid);
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/CoordinateSystems/Transformations/GeometryTransform.cs b/SharpMap/CoordinateSystems/Transformations/GeometryTransform.cs
index 66f06fd8..2ad5208c 100644
--- a/SharpMap/CoordinateSystems/Transformations/GeometryTransform.cs
+++ b/SharpMap/CoordinateSystems/Transformations/GeometryTransform.cs
@@ -15,14 +15,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
 using System;
-using GeoAPI.Geometries;
 
 // ReSharper disable once CheckNamespace
-namespace GeoAPI.CoordinateSystems.Transformations
+namespace NetTopologySuite.CoordinateSystems.Transformations
 {
     /// <summary>
-    /// Helper class for transforming <see cref="T:GeoAPI.Geometries.IGeometry"/>
+    /// Helper class for transforming <see cref="T:NetTopologySuite.Geometries.Geometry"/>
     /// </summary>
     public class GeometryTransform
     {
@@ -32,7 +33,7 @@ public class GeometryTransform
         /// <param name="box">BoundingBox to transform</param>
         /// <param name="transform">Math Transform</param>
         /// <returns>Transformed object</returns>
-        public static Envelope TransformBox(Envelope box, IMathTransform transform)
+        public static Envelope TransformBox(Envelope box, MathTransform transform)
         {
             if (box == null)
                 return null;
@@ -40,41 +41,42 @@ public static Envelope TransformBox(Envelope box, IMathTransform transform)
             if (box.IsNull)
                 return new Envelope(box);
 
-            var factory = GeometryServiceProvider.Instance.CreateGeometryFactory();
+            var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory();
             var ring = factory.ToGeometry(box);
             ring = NetTopologySuite.Densify.Densifier.Densify(ring, ring.Length / 100d);
             ring = TransformGeometry(ring, transform, factory);
 
             var res = ring.EnvelopeInternal;
-            res.ExpandToInclude(transform.Transform(box.Centre));
+            var t = transform.Transform(new[] { box.Centre.X, box.Centre.Y });
+            res.ExpandToInclude(t[0], t[1]);
             return res;
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IGeometry"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.Geometry"/>.
         /// </summary>
         /// <param name="g">Geometry to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed Geometry</returns>
-        public static IGeometry TransformGeometry(IGeometry g, IMathTransform transform, IGeometryFactory targetFactory)
+        public static Geometry TransformGeometry(Geometry g, MathTransform transform, GeometryFactory targetFactory)
         {
             if (g == null)
                 return null;
-            if (g is IPoint)
-                return TransformPoint(g as IPoint, transform, targetFactory);
-            if (g is ILineString)
-                return TransformLineString(g as ILineString, transform, targetFactory);
-            if (g is IPolygon)
-                return TransformPolygon(g as IPolygon, transform, targetFactory);
-            if (g is IMultiPoint)
-                return TransformMultiPoint(g as IMultiPoint, transform, targetFactory);
-            if (g is IMultiLineString)
-                return TransformMultiLineString(g as IMultiLineString, transform, targetFactory);
-            if (g is IMultiPolygon)
-                return TransformMultiPolygon(g as IMultiPolygon, transform, targetFactory);
-            if (g is IGeometryCollection)
-                return TransformGeometryCollection(g as IGeometryCollection, transform, targetFactory);
+            if (g is Point)
+                return TransformPoint(g as Point, transform, targetFactory);
+            if (g is LineString)
+                return TransformLineString(g as LineString, transform, targetFactory);
+            if (g is Polygon)
+                return TransformPolygon(g as Polygon, transform, targetFactory);
+            if (g is MultiPoint)
+                return TransformMultiPoint(g as MultiPoint, transform, targetFactory);
+            if (g is MultiLineString)
+                return TransformMultiLineString(g as MultiLineString, transform, targetFactory);
+            if (g is MultiPolygon)
+                return TransformMultiPolygon(g as MultiPolygon, transform, targetFactory);
+            if (g is GeometryCollection)
+                return TransformGeometryCollection(g as GeometryCollection, transform, targetFactory);
             throw new ArgumentException("Could not transform geometry type '" + g.GetType() + "'");
         }
 
@@ -84,7 +86,7 @@ public static IGeometry TransformGeometry(IGeometry g, IMathTransform transform,
         /// <param name="c">The coordinate</param>
         /// <param name="transform">The transformation</param>
         /// <returns>A transformed coordinate</returns>
-        public static Coordinate TransformCoordinate(Coordinate c, IMathTransform transform)
+        public static Coordinate TransformCoordinate(Coordinate c, MathTransform transform)
         {
             var ordinates = transform.Transform(c.ToDoubleArray());
             return new Coordinate(ordinates[0], ordinates[1]);
@@ -96,7 +98,7 @@ public static Coordinate TransformCoordinate(Coordinate c, IMathTransform transf
         /// <param name="c">The array of coordinates</param>
         /// <param name="transform">The transformation</param>
         /// <returns>An array of transformed coordinates</returns>
-        private static Coordinate[] TransformCoordinates(Coordinate[] c, IMathTransform transform)
+        private static Coordinate[] TransformCoordinates(Coordinate[] c, MathTransform transform)
         {
             var res = new Coordinate[c.Length];
             for (var i = 0; i < c.Length; i++)
@@ -108,13 +110,13 @@ private static Coordinate[] TransformCoordinates(Coordinate[] c, IMathTransform
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IPoint"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.Point"/>.
         /// </summary>
         /// <param name="p">Point to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed Point</returns>
-        public static IPoint TransformPoint(IPoint p, IMathTransform transform, IGeometryFactory targetFactory)
+        public static Point TransformPoint(Point p, MathTransform transform, GeometryFactory targetFactory)
         {
             try
             {
@@ -128,13 +130,13 @@ public static IPoint TransformPoint(IPoint p, IMathTransform transform, IGeometr
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.ILineString"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.LineString"/>.
         /// </summary>
         /// <param name="l">LineString to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed LineString</returns>
-        public static ILineString TransformLineString(ILineString l, IMathTransform transform, IGeometryFactory targetFactory)
+        public static LineString TransformLineString(LineString l, MathTransform transform, GeometryFactory targetFactory)
         {
             try
             {
@@ -147,13 +149,13 @@ public static ILineString TransformLineString(ILineString l, IMathTransform tran
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.ILinearRing"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.LinearRing"/>.
         /// </summary>
         /// <param name="r">LinearRing to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed LinearRing</returns>
-        public static ILinearRing TransformLinearRing(ILinearRing r, IMathTransform transform, IGeometryFactory targetFactory)
+        public static LinearRing TransformLinearRing(LinearRing r, MathTransform transform, GeometryFactory targetFactory)
         {
             try
             {
@@ -166,84 +168,84 @@ public static ILinearRing TransformLinearRing(ILinearRing r, IMathTransform tran
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IPolygon"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.Polygon"/>.
         /// </summary>
         /// <param name="p">Polygon to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed Polygon</returns>
-        public static IPolygon TransformPolygon(IPolygon p, IMathTransform transform, IGeometryFactory targetFactory)
+        public static Polygon TransformPolygon(Polygon p, MathTransform transform, GeometryFactory targetFactory)
         {
-            var shell = TransformLinearRing((ILinearRing)p.ExteriorRing, transform, targetFactory);
-            ILinearRing[] holes = null;
+            var shell = TransformLinearRing((LinearRing)p.ExteriorRing, transform, targetFactory);
+            LinearRing[] holes = null;
             var holesCount = p.NumInteriorRings;
             if (holesCount > 0)
             {
-                holes = new ILinearRing[holesCount];
+                holes = new LinearRing[holesCount];
                 for (var i = 0; i < holesCount; i++)
-                    holes[i] = TransformLinearRing((ILinearRing)p.GetInteriorRingN(i), transform, targetFactory);
+                    holes[i] = TransformLinearRing((LinearRing)p.GetInteriorRingN(i), transform, targetFactory);
             }
             return targetFactory.CreatePolygon(shell, holes);
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IMultiPoint"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.MultiPoint"/>.
         /// </summary>
         /// <param name="points">MultiPoint to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed MultiPoint</returns>
-        public static IMultiPoint TransformMultiPoint(IMultiPoint points, IMathTransform transform, IGeometryFactory targetFactory)
+        public static MultiPoint TransformMultiPoint(MultiPoint points, MathTransform transform, GeometryFactory targetFactory)
         {
             return targetFactory.CreateMultiPointFromCoords(TransformCoordinates(points.Coordinates, transform));
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IMultiLineString"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.MultiLineString"/>.
         /// </summary>
         /// <param name="lines">MultiLineString to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed MultiLineString</returns>
-        public static IMultiLineString TransformMultiLineString(IMultiLineString lines, IMathTransform transform, IGeometryFactory targetFactory)
+        public static MultiLineString TransformMultiLineString(MultiLineString lines, MathTransform transform, GeometryFactory targetFactory)
         {
-            var lineList = new ILineString[lines.NumGeometries];
+            var lineList = new LineString[lines.NumGeometries];
             for (var i = 0; i < lines.NumGeometries; i++)
             {
-                var line = (ILineString)lines[i];
+                var line = (LineString)lines[i];
                 lineList[i] = TransformLineString(line, transform, targetFactory);
             }
             return targetFactory.CreateMultiLineString(lineList);
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IMultiPolygon"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.MultiPolygon"/>.
         /// </summary>
         /// <param name="polys">MultiPolygon to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed MultiPolygon</returns>
-        public static IMultiPolygon TransformMultiPolygon(IMultiPolygon polys, IMathTransform transform, IGeometryFactory targetFactory)
+        public static MultiPolygon TransformMultiPolygon(MultiPolygon polys, MathTransform transform, GeometryFactory targetFactory)
         {
-            var polyList = new IPolygon[polys.NumGeometries];
+            var polyList = new Polygon[polys.NumGeometries];
             for (var i = 0; i < polys.NumGeometries; i++)
             {
-                var poly = (IPolygon)polys[i];
+                var poly = (Polygon)polys[i];
                 polyList[i] = TransformPolygon(poly, transform, targetFactory);
             }
             return targetFactory.CreateMultiPolygon(polyList);
         }
 
         /// <summary>
-        /// Transforms a <see cref="GeoAPI.Geometries.IGeometryCollection"/>.
+        /// Transforms a <see cref="NetTopologySuite.Geometries.GeometryCollection"/>.
         /// </summary>
         /// <param name="geoms">GeometryCollection to transform</param>
         /// <param name="transform">MathTransform</param>
         /// <param name="targetFactory">The factory to create the target geometry</param>
         /// <returns>Transformed GeometryCollection</returns>
-        public static IGeometryCollection TransformGeometryCollection(IGeometryCollection geoms, IMathTransform transform, IGeometryFactory targetFactory)
+        public static GeometryCollection TransformGeometryCollection(GeometryCollection geoms, MathTransform transform, GeometryFactory targetFactory)
         {
-            var geomList = new IGeometry[geoms.NumGeometries];
+            var geomList = new Geometry[geoms.NumGeometries];
             for (var i = 0; i < geoms.NumGeometries; i++)
             {
                 geomList[i] = TransformGeometry(geoms[i], transform, targetFactory);
diff --git a/SharpMap/Data/FeatureDataSet.cs b/SharpMap/Data/FeatureDataSet.cs
index 04180aed..708955e4 100644
--- a/SharpMap/Data/FeatureDataSet.cs
+++ b/SharpMap/Data/FeatureDataSet.cs
@@ -16,6 +16,8 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.IO;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -26,9 +28,6 @@
 using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
-using GeoAPI;
-using GeoAPI.Geometries;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Data
 {
@@ -37,14 +36,14 @@ namespace SharpMap.Data
     /// </summary>
     /// <remarks>Serialization is achieved using the approach described in http://support.microsoft.com/kb/829740/en-us
     /// </remarks>
-    [Serializable] 
+    [Serializable]
     public class FeatureDataSet : DataSet, ISerializable
     {
         /// <summary>
         /// Initializes a new instance of the FeatureDataSet class.
         /// </summary>
         public FeatureDataSet()
-        {}
+        { }
 
         /// <summary>
         /// Initializes a new instance of the FeatureDataSet class.
@@ -59,8 +58,8 @@ protected FeatureDataSet(SerializationInfo info, StreamingContext context)
             CaseSensitive = info.GetBoolean("case");
             Locale = new CultureInfo(info.GetInt32("locale"));
             EnforceConstraints = info.GetBoolean("enforceCons");
-            
-            var tables = (DataTable[]) info.GetValue("tables", typeof (DataTable[]));
+
+            var tables = (DataTable[])info.GetValue("tables", typeof(DataTable[]));
             base.Tables.AddRange(tables);
 
             var constraints = (ArrayList)info.GetValue("constraints", typeof(ArrayList));
@@ -69,10 +68,11 @@ protected FeatureDataSet(SerializationInfo info, StreamingContext context)
             var relations = (ArrayList)info.GetValue("relations", typeof(ArrayList));
             SetRelations(relations);
 
-            var extendedProperties = (PropertyCollection)info.GetValue("extendedProperties", typeof (PropertyCollection));
+            var extendedProperties = (PropertyCollection)info.GetValue("extendedProperties", typeof(PropertyCollection));
             if (extendedProperties.Count > 0) // otherwise the next foreach throws exception... weird.
                 foreach (DictionaryEntry keyPair in extendedProperties)
-                    ExtendedProperties.Add(keyPair.Key, keyPair.Value);        }
+                    ExtendedProperties.Add(keyPair.Key, keyPair.Value);
+        }
 
         /// <summary>
         /// Gets the collection of tables contained in the FeatureDataSet
@@ -88,7 +88,7 @@ protected FeatureDataSet(SerializationInfo info, StreamingContext context)
         /// <returns></returns>
         public new FeatureDataSet Clone()
         {
-            var cln = ((FeatureDataSet) (base.Clone()));
+            var cln = ((FeatureDataSet)(base.Clone()));
             return cln;
         }
 
@@ -116,7 +116,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
         }
 
         private ArrayList GetForeignKeyConstraints()
-         {
+        {
             var constraintList = new ArrayList();
             var tables = base.Tables;
             for (int i = 0; i < tables.Count; i++)
@@ -165,7 +165,7 @@ private ArrayList GetForeignKeyConstraints()
                 }
             }
             return constraintList;
-         }
+        }
 
         private ArrayList GetRelations()
         {
@@ -189,7 +189,7 @@ private ArrayList GetRelations()
                     childInfo[j] = rel.ChildColumns[j - 1].Ordinal;
                 }
 
-                var list = new ArrayList {relationName, parentInfo, childInfo, rel.Nested};
+                var list = new ArrayList { relationName, parentInfo, childInfo, rel.Nested };
                 var extendedProperties = new Hashtable();
                 if (rel.ExtendedProperties.Keys.Count > 0)
                 {
@@ -315,7 +315,7 @@ private void SetRelations(ArrayList relationList)
                 Relations.Add(rel);
             }
         }
-   }
+    }
 
     /// <summary>
     /// Represents the method that will handle the RowChanging, RowChanged, RowDeleting, and RowDeleted events of a FeatureDataTable. 
@@ -334,7 +334,7 @@ public class FeatureDataTable : DataTable, IEnumerable
         /// <summary>
         /// Initializes a new instance of the FeatureDataTable class with no arguments.
         /// </summary>
-        public FeatureDataTable() 
+        public FeatureDataTable()
         {
             //InitClass();
         }
@@ -347,7 +347,7 @@ public FeatureDataTable()
         public FeatureDataTable(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
-            using (var ms = new MemoryStream((byte[]) info.GetValue("geometries", typeof(byte[]))))
+            using (var ms = new MemoryStream((byte[])info.GetValue("geometries", typeof(byte[]))))
             {
                 using (var reader = new BinaryReader(ms))
                 {
@@ -355,7 +355,7 @@ public FeatureDataTable(SerializationInfo info, StreamingContext context)
                     while (reader.BaseStream.Position < reader.BaseStream.Length)
                     {
                         var rowIndex = reader.ReadInt32();
-                        var row = (FeatureDataRow) Rows[rowIndex];
+                        var row = (FeatureDataRow)Rows[rowIndex];
                         var srid = reader.ReadInt32();
                         var wkbSize = reader.ReadInt32();
                         var wkb = reader.ReadBytes(wkbSize);
@@ -392,7 +392,7 @@ public FeatureDataTable(DataTable table)
             MinimumCapacity = table.MinimumCapacity;
             DisplayExpression = table.DisplayExpression;
         }
-        
+
         /// <summary>
         /// Gets the number of rows in the table
         /// </summary>
@@ -409,7 +409,7 @@ public int Count
         /// <returns>FeatureDataRow</returns>
         public FeatureDataRow this[int index]
         {
-            get { return (FeatureDataRow) Rows[index]; }
+            get { return (FeatureDataRow)Rows[index]; }
         }
 
         #region IEnumerable Members
@@ -460,7 +460,7 @@ public void AddRow(FeatureDataRow row)
         /// <returns></returns>
         public new FeatureDataTable Clone()
         {
-            var cln = ((FeatureDataTable) (base.Clone()));
+            var cln = ((FeatureDataTable)(base.Clone()));
             //cln.InitVars();
             return cln;
         }
@@ -481,7 +481,7 @@ protected override DataTable CreateInstance()
 
         //private void InitClass()
         //{
-        //    //this.columnFeatureGeometry = new DataColumn("FeatureGeometry", typeof(GeoAPI.Geometries.IGeometry), null, System.Data.MappingType.Element);
+        //    //this.columnFeatureGeometry = new DataColumn("FeatureGeometry", typeof(NetTopologySuite.Geometries.Geometry), null, System.Data.MappingType.Element);
         //    //this.Columns.Add(this.columnFeatureGeometry);
         //}
 
@@ -491,7 +491,7 @@ protected override DataTable CreateInstance()
         /// <returns></returns>
         public new FeatureDataRow NewRow()
         {
-            return (FeatureDataRow) base.NewRow();
+            return (FeatureDataRow)base.NewRow();
         }
 
         /// <summary>
@@ -510,7 +510,7 @@ protected override DataRow NewRowFromBuilder(DataRowBuilder builder)
         /// <returns></returns>
         protected override Type GetRowType()
         {
-            return typeof (FeatureDataRow);
+            return typeof(FeatureDataRow);
         }
 
         /// <summary>
@@ -522,7 +522,7 @@ protected override void OnRowChanged(DataRowChangeEventArgs e)
             base.OnRowChanged(e);
             if ((FeatureDataRowChanged != null))
             {
-                FeatureDataRowChanged(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow) (e.Row)), e.Action));
+                FeatureDataRowChanged(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow)(e.Row)), e.Action));
             }
         }
 
@@ -535,7 +535,7 @@ protected override void OnRowChanging(DataRowChangeEventArgs e)
             base.OnRowChanging(e);
             if ((FeatureDataRowChanging != null))
             {
-                FeatureDataRowChanging(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow) (e.Row)), e.Action));
+                FeatureDataRowChanging(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow)(e.Row)), e.Action));
             }
         }
 
@@ -548,7 +548,7 @@ protected override void OnRowDeleted(DataRowChangeEventArgs e)
             base.OnRowDeleted(e);
             if ((FeatureDataRowDeleted != null))
             {
-                FeatureDataRowDeleted(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow) (e.Row)), e.Action));
+                FeatureDataRowDeleted(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow)(e.Row)), e.Action));
             }
         }
 
@@ -561,7 +561,7 @@ protected override void OnRowDeleting(DataRowChangeEventArgs e)
             base.OnRowDeleting(e);
             if ((FeatureDataRowDeleting != null))
             {
-                FeatureDataRowDeleting(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow) (e.Row)), e.Action));
+                FeatureDataRowDeleting(this, new FeatureDataRowChangeEventArgs(((FeatureDataRow)(e.Row)), e.Action));
             }
         }
 
@@ -646,7 +646,7 @@ public IEnumerator<FeatureDataTable> GetEnumerator()
             foreach (var dataTable in dataTables)
             {
                 if (dataTable is FeatureDataTable)
-                    yield return (FeatureDataTable) dataTable;
+                    yield return (FeatureDataTable)dataTable;
             }
 
         }
@@ -679,7 +679,7 @@ public void Add(FeatureDataTable item)
                 if (itemDataSet.Tables.CanRemove(item))
                     itemDataSet.Tables.Remove(item);
                 else
-                    item = (FeatureDataTable) item.Copy();
+                    item = (FeatureDataTable)item.Copy();
             }
             _dataTables.Add(item);
         }
@@ -735,7 +735,7 @@ public void CopyTo(FeatureDataTable[] array, int arrayIndex)
                 {
                     if (j >= array.Length)
                         throw new ArgumentException("Insufficient space provided for array");
-                    array[j++] = (FeatureDataTable) _dataTables[i];
+                    array[j++] = (FeatureDataTable)_dataTables[i];
                 }
             }
         }
@@ -780,7 +780,7 @@ public bool RemoveAt(int index)
                         break;
                     }
                     tmp++;
-                }        
+                }
             }
 
             if (tableToRemove != null)
@@ -836,7 +836,7 @@ public FeatureDataTable this[int index]
                     if (dataTable is FeatureDataTable)
                     {
                         if (i == index)
-                            return (FeatureDataTable) dataTable;
+                            return (FeatureDataTable)dataTable;
                         i++;
                     }
                 }
@@ -854,7 +854,7 @@ public class FeatureDataRow : DataRow
     {
         //private FeatureDataTable tableFeatureTable;
 
-        private IGeometry _geometry;
+        private Geometry _geometry;
 
         /// <summary>
         /// Creates an instance of this class
@@ -868,14 +868,17 @@ public FeatureDataRow(DataRowBuilder rb)
         /// <summary>
         /// The geometry of the current feature
         /// </summary>
-        public IGeometry Geometry
+        public Geometry Geometry
         {
             get { return _geometry; }
             set
             {
-                if (_geometry == null) {
+                if (_geometry == null)
+                {
                     _geometry = value;
-                } else {
+                }
+                else
+                {
                     if (ReferenceEquals(_geometry, value))
                         return;
                     if (_geometry != null && _geometry.EqualsTopologically(value))
diff --git a/SharpMap/Data/Providers/BaseProvider.cs b/SharpMap/Data/Providers/BaseProvider.cs
index 8ac255cb..8081dd33 100644
--- a/SharpMap/Data/Providers/BaseProvider.cs
+++ b/SharpMap/Data/Providers/BaseProvider.cs
@@ -1,9 +1,8 @@
+using NetTopologySuite.Geometries;
+using SharpMap.Base;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
-using GeoAPI;
-using GeoAPI.Geometries;
-using SharpMap.Base;
 
 namespace SharpMap.Data.Providers
 {
@@ -17,7 +16,7 @@ static BaseProvider()
         {
             Map.Configure();
         }
-        
+
         private int _srid;
         private bool _isOpen;
 
@@ -29,14 +28,14 @@ static BaseProvider()
         /// <summary>
         /// Gets or sets the factory to create geometries.
         /// </summary>
-        public IGeometryFactory Factory { get; protected set; }
+        public GeometryFactory Factory { get; protected set; }
 
         /// <summary>
         /// Creates an instance of this class. The <see cref="ConnectionID"/> is set to <see cref="String.Empty"/>,
         /// the spatial reference id to <c>0</c> and an appropriate factory is chosen.
         /// </summary>
         protected BaseProvider()
-            :this(0)
+            : this(0)
         {
         }
 
@@ -49,7 +48,7 @@ protected BaseProvider(int srid)
         {
             ConnectionID = string.Empty;
             SRID = srid;
-            Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(SRID);
+            Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID);
         }
 
         /// <summary>
@@ -100,25 +99,25 @@ public int SRID
         /// <param name="eventArgs">Event arguments.</param>
         protected virtual void OnSridChanged(EventArgs eventArgs)
         {
-            Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(SRID);
-            
+            Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID);
+
             if (SridChanged != null)
                 SridChanged(this, eventArgs);
         }
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public abstract Collection<IGeometry> GetGeometriesInView(Envelope bbox);
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public abstract Collection<Geometry> GetGeometriesInView(Envelope bbox);
 
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -129,14 +128,14 @@ protected virtual void OnSridChanged(EventArgs eventArgs)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public abstract IGeometry GetGeometryByID(uint oid);
+        public abstract Geometry GetGeometryByID(uint oid);
 
         /// <summary>
         /// Returns the data associated with all the geometries that are intersected by 'geom'
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             OnBeginExecuteIntersectionQuery(geom);
             OnExecuteIntersectionQuery(geom, ds);
@@ -147,7 +146,7 @@ public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
         /// Method to perform preparatory things for executing an intersection query against the data source
         /// </summary>
         /// <param name="geom">The geometry to use as filter.</param>
-        protected virtual void OnBeginExecuteIntersectionQuery(IGeometry geom)
+        protected virtual void OnBeginExecuteIntersectionQuery(Geometry geom)
         {
         }
 
@@ -156,7 +155,7 @@ protected virtual void OnBeginExecuteIntersectionQuery(IGeometry geom)
         /// </summary>
         /// <param name="geom">The geometry to use as filter</param>
         /// <param name="ds">The feature data set to store the results in</param>
-        protected abstract void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds);
+        protected abstract void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds);
 
         /// <summary>
         /// Method to do cleanup work after having performed the intersection query against the data source
@@ -221,9 +220,9 @@ protected static FeatureDataTable CloneTableStructure(FeatureDataTable baseTable
             foreach (DataColumn column in baseTable.Columns)
             {
                 cols.Add(new DataColumn(column.ColumnName, column.DataType, column.Expression, column.ColumnMapping)
-                    
-                /*{AllowDBNull = column.AllowDBNull, AutoIncrement = column.AutoIncrement, AutoIncrementSeed = column.AutoIncrementSeed,
-                    AutoIncrementStep = column.AutoIncrementStep, Caption = column.Caption}*/);
+
+                                                                                                                                                        /*{AllowDBNull = column.AllowDBNull, AutoIncrement = column.AutoIncrement, AutoIncrementSeed = column.AutoIncrementSeed,
+                                                                                                                                                            AutoIncrementStep = column.AutoIncrementStep, Caption = column.Caption}*/);
             }
             /*
             var constraints = res.Constraints;
@@ -244,7 +243,7 @@ protected static FeatureDataTable CloneTableStructure(FeatureDataTable baseTable
     /// </summary>
     [Serializable]
     public abstract class BaseProvider<TOid> : DisposableObject, IProvider<TOid>
-        where TOid: IComparable<TOid>
+        where TOid : IComparable<TOid>
     {
         static BaseProvider()
         {
@@ -262,7 +261,7 @@ static BaseProvider()
         /// <summary>
         /// Gets or sets the factory to create geometries.
         /// </summary>
-        public IGeometryFactory Factory { get; protected set; }
+        public GeometryFactory Factory { get; protected set; }
 
         /// <summary>
         /// Creates an instance of this class. The <see cref="ConnectionID"/> is set to <see cref="String.Empty"/>,
@@ -282,7 +281,7 @@ protected BaseProvider(int srid)
         {
             ConnectionID = string.Empty;
             SRID = srid;
-            Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(SRID);
+            Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID);
         }
 
         /// <summary>
@@ -333,25 +332,25 @@ public int SRID
         /// <param name="eventArgs">Event arguments.</param>
         protected virtual void OnSridChanged(EventArgs eventArgs)
         {
-            Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(SRID);
+            Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID);
 
             if (SridChanged != null)
                 SridChanged(this, eventArgs);
         }
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public abstract Collection<IGeometry> GetGeometriesInView(Envelope bbox);
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public abstract Collection<Geometry> GetGeometriesInView(Envelope bbox);
 
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -362,14 +361,14 @@ protected virtual void OnSridChanged(EventArgs eventArgs)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public abstract IGeometry GetGeometryByID(TOid oid);
+        public abstract Geometry GetGeometryByID(TOid oid);
 
         /// <summary>
         /// Returns the data associated with all the geometries that are intersected by 'geom'
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             OnBeginExecuteIntersectionQuery(geom);
             OnExecuteIntersectionQuery(geom, ds);
@@ -380,7 +379,7 @@ public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
         /// Method to perform preparatory things for executing an intersection query against the data source
         /// </summary>
         /// <param name="geom">The geometry to use as filter.</param>
-        protected virtual void OnBeginExecuteIntersectionQuery(IGeometry geom)
+        protected virtual void OnBeginExecuteIntersectionQuery(Geometry geom)
         {
         }
 
@@ -389,7 +388,7 @@ protected virtual void OnBeginExecuteIntersectionQuery(IGeometry geom)
         /// </summary>
         /// <param name="geom">The geometry to use as filter</param>
         /// <param name="ds">The feature data set to store the results in</param>
-        protected abstract void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds);
+        protected abstract void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds);
 
         /// <summary>
         /// Method to do cleanup work after having performed the intersection query against the data source
@@ -455,8 +454,8 @@ protected static FeatureDataTable CloneTableStructure(FeatureDataTable baseTable
             {
                 cols.Add(new DataColumn(column.ColumnName, column.DataType, column.Expression, column.ColumnMapping)
 
-                    /*{AllowDBNull = column.AllowDBNull, AutoIncrement = column.AutoIncrement, AutoIncrementSeed = column.AutoIncrementSeed,
-                        AutoIncrementStep = column.AutoIncrementStep, Caption = column.Caption}*/);
+                                                                                                                                                            /*{AllowDBNull = column.AllowDBNull, AutoIncrement = column.AutoIncrement, AutoIncrementSeed = column.AutoIncrementSeed,
+                                                                                                                                                                AutoIncrementStep = column.AutoIncrementStep, Caption = column.Caption}*/);
             }
             /*
             var constraints = res.Constraints;
@@ -471,4 +470,4 @@ protected static FeatureDataTable CloneTableStructure(FeatureDataTable baseTable
             return res;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Data/Providers/Database/SharpMapFeatureColumn.cs b/SharpMap/Data/Providers/Database/SharpMapFeatureColumn.cs
index f9cc8be3..e16f0da0 100644
--- a/SharpMap/Data/Providers/Database/SharpMapFeatureColumn.cs
+++ b/SharpMap/Data/Providers/Database/SharpMapFeatureColumn.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Data;
 
 namespace SharpMap.Data.Providers
@@ -68,7 +67,7 @@ public int Ordinal
         /// The name of the function to apply to <see cref="Column"/>
         /// </summary>
         public string Function { get; set; }
-        
+
         /// <summary>
         /// The additional parameters
         /// </summary>
@@ -89,7 +88,7 @@ public string OrderBy
             {
                 if (!string.IsNullOrEmpty(value))
                 {
-                    if (!(value.Equals("ASC", StringComparison.InvariantCultureIgnoreCase)) || 
+                    if (!(value.Equals("ASC", StringComparison.InvariantCultureIgnoreCase)) ||
                         value.Equals("DESC", StringComparison.InvariantCultureIgnoreCase))
                         return;
                 }
diff --git a/SharpMap/Data/Providers/Database/SpatialDbProvider.cs b/SharpMap/Data/Providers/Database/SpatialDbProvider.cs
index 6e0b5224..d929fad5 100644
--- a/SharpMap/Data/Providers/Database/SpatialDbProvider.cs
+++ b/SharpMap/Data/Providers/Database/SpatialDbProvider.cs
@@ -1,10 +1,10 @@
+using NetTopologySuite.Geometries;
+using SharpMap.Converters.WellKnownBinary;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.Common;
 using System.Text;
-using GeoAPI.Geometries;
-using SharpMap.Converters.WellKnownBinary;
 
 namespace SharpMap.Data.Providers
 {
@@ -15,7 +15,7 @@ namespace SharpMap.Data.Providers
     public abstract class SpatialDbProvider : BaseProvider
     {
         private static readonly Common.Logging.ILog Logger = Common.Logging.LogManager.GetLogger(typeof(SpatialDbProvider));
-        
+
         private bool Initialized { get; set; }
 
         //private bool _isOpen;
@@ -459,7 +459,7 @@ public Envelope AreaOfInterest
             {
                 if (ReferenceEquals(_areaOfInterest, value))
                     return;
-                
+
                 if (_areaOfInterest != null && _areaOfInterest.Equals(value))
                     return;
 
@@ -584,7 +584,7 @@ protected string Name
         }
 
         private FeatureDataTable _baseTable;
-        
+
         private string _geometryExpression;
 
         /// <summary>
@@ -666,7 +666,7 @@ protected virtual FeatureDataRow GetFeatureInternal(uint oid)
                             FeatureDataRow row = null;
                             fdt.BeginLoadData();
                             var numColumns = fdt.Columns.Count;
-                            var data = new object[numColumns+1];
+                            var data = new object[numColumns + 1];
                             if (dr.GetValues(data) > 0)
                             {
                                 var loadData = new object[numColumns];
@@ -701,7 +701,7 @@ private static string PrintCommand(DbCommand cmd)
         /// </summary>
         /// <param name="oid">The object id</param>
         /// <returns>A geometry</returns>
-        public override sealed IGeometry GetGeometryByID(uint oid)
+        public override sealed Geometry GetGeometryByID(uint oid)
         {
             Initialize();
             return GetGeometryByIDInternal(oid);
@@ -712,7 +712,7 @@ public override sealed IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="oid">The object id</param>
         /// <returns>A geometry</returns>
-        protected virtual IGeometry GetGeometryByIDInternal(uint oid)
+        protected virtual Geometry GetGeometryByIDInternal(uint oid)
         {
             using (var cn = CreateOpenDbConnection())
             {
@@ -737,24 +737,24 @@ protected virtual IGeometry GetGeometryByIDInternal(uint oid)
         }
 
         /// <summary>
-        /// Gets the geometries of features that lie within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the geometries of features that lie within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox">The bounding box</param>
-        /// <returns>Geometries within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public override sealed Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        /// <returns>Geometries within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public override sealed Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
             Initialize();
             return GetGeometriesInViewInternal(bbox);
         }
 
         /// <summary>
-        /// Gets the geometries of features that lie within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the geometries of features that lie within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox">The bounding box</param>
-        /// <returns>Geometries within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        protected virtual Collection<IGeometry> GetGeometriesInViewInternal(Envelope bbox)
+        /// <returns>Geometries within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        protected virtual Collection<Geometry> GetGeometriesInViewInternal(Envelope bbox)
         {
-            var res = new Collection<IGeometry>();
+            var res = new Collection<Geometry>();
 
             using (var cn = CreateOpenDbConnection())
             {
@@ -789,10 +789,10 @@ protected virtual Collection<IGeometry> GetGeometriesInViewInternal(Envelope bbo
         /// <param name="bbox">The geometry</param>
         /// <param name="command">The command object, that is supposed to execute the query.</param>
         /// <returns>The spatial component of a SQL where clause</returns>
-        protected abstract string GetSpatialWhere(IGeometry bbox, DbCommand command);
+        protected abstract string GetSpatialWhere(Geometry bbox, DbCommand command);
 
         /// <summary>
-        /// Gets the object of features that lie within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the object of features that lie within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox">The bounding box</param>
         /// <returns>A collection of object ids</returns>
@@ -803,7 +803,7 @@ public override sealed Collection<uint> GetObjectIDsInView(Envelope bbox)
         }
 
         /// <summary>
-        /// Gets the object ids of features that lie within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the object ids of features that lie within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox">The bounding box</param>
         /// <returns>A collection of object ids</returns>
@@ -868,7 +868,7 @@ protected virtual void ExecuteIntersectionQueryInternal(object spatialWhere, Fea
                     }
                     else
                     {
-                        var geom = spatialWhere as IGeometry;
+                        var geom = spatialWhere as Geometry;
                         if (geom != null)
                         {
                             from = GetFrom(geom, cmd);
@@ -897,7 +897,7 @@ protected virtual void ExecuteIntersectionQueryInternal(object spatialWhere, Fea
                     {
                         while (dr.Read())
                         {
-                            var data = new object[numColumns+1];
+                            var data = new object[numColumns + 1];
                             if (dr.GetValues(data) > 0)
                             {
                                 var loadData = new object[geomIndex];
@@ -932,7 +932,7 @@ protected virtual string GetFrom(Envelope envelope, DbCommand command)
         /// <param name="geometry">The envelope to query</param>
         /// <param name="command">The command object that is supposed to perform the query</param>
         /// <returns>A SQL From statement string</returns>
-        protected virtual string GetFrom(IGeometry geometry, DbCommand command)
+        protected virtual string GetFrom(Geometry geometry, DbCommand command)
         {
             return _dbUtility.DecorateTable(_schema, _table);
         }
@@ -941,7 +941,7 @@ protected virtual string GetFrom(IGeometry geometry, DbCommand command)
         /// Method to perform preparatory things for executing an intersection query against the data source
         /// </summary>
         /// <param name="geom">The geometry to use as filter.</param>
-        protected override sealed void OnBeginExecuteIntersectionQuery(IGeometry geom)
+        protected override sealed void OnBeginExecuteIntersectionQuery(Geometry geom)
         {
             Initialize();
             OnBeginExecuteIntersectionQueryInternal(geom);
@@ -963,7 +963,7 @@ protected virtual void ExecuteIntersectionQueryInternal(Envelope box, FeatureDat
         /// Method to perform preparatory things for executing an intersection query against the data source
         /// </summary>
         /// <param name="geom">The geometry to use as filter.</param>
-        protected virtual void OnBeginExecuteIntersectionQueryInternal(IGeometry geom)
+        protected virtual void OnBeginExecuteIntersectionQueryInternal(Geometry geom)
         {
         }
 
@@ -972,7 +972,7 @@ protected virtual void OnBeginExecuteIntersectionQueryInternal(IGeometry geom)
         /// </summary>
         /// <param name="geom">The geometry to use as filter</param>
         /// <param name="ds">The feature data set to store the results in</param>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             ExecuteIntersectionQueryInternal(geom, ds);
         }
@@ -987,4 +987,4 @@ protected override void OnSridChanged(EventArgs eventArgs)
             base.OnSridChanged(eventArgs);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Data/Providers/Database/SpatialDbUtility.cs b/SharpMap/Data/Providers/Database/SpatialDbUtility.cs
index b606eaeb..5e133e25 100644
--- a/SharpMap/Data/Providers/Database/SpatialDbUtility.cs
+++ b/SharpMap/Data/Providers/Database/SpatialDbUtility.cs
@@ -1,9 +1,8 @@
-using System;
+using NetTopologySuite.IO;
+using System;
 using System.Data;
 using System.Data.Common;
 using System.Text;
-using GeoAPI.IO;
-using NetTopologySuite.IO;
 
 namespace SharpMap.Data.Providers
 {
@@ -42,7 +41,7 @@ public SpatialDbUtility(string entityDecoratorFormat, string literalDecoratorFor
         /// <param name="reader"> </param>
         /// <param name="writer"> </param>
         public SpatialDbUtility(string entityDecoratorFormat, string literalDecoratorFormat, string parameterDecoratorFormat,
-            IBinaryGeometryReader reader, IBinaryGeometryWriter writer)
+            WKBReader reader, WKBWriter writer) // TODO: IBinaryGeometryReader/Writer were used...
         {
             EntityDecoratorFormat = entityDecoratorFormat;
             LiteralDecoratorFormat = literalDecoratorFormat;
@@ -284,7 +283,7 @@ public virtual object ToDbType(object obj, DbType type)
                 case DbType.DateTime2:
                 case DbType.DateTimeOffset:
                     return Convert.ToDateTime(obj);
-                
+
                 case DbType.Decimal:
                     return Convert.ToDecimal(obj);
                 case DbType.Double:
@@ -311,7 +310,7 @@ public virtual object ToDbType(object obj, DbType type)
 
                 case DbType.Single:
                     return Convert.ToSingle(obj);
-                
+
                 case DbType.Currency:
                     return Convert.ToDecimal(obj);
 
@@ -335,12 +334,12 @@ public virtual object ToDbType(object obj, DbType type)
         /// <summary>
         /// Reader for geometry data
         /// </summary>
-        public IBinaryGeometryReader Reader { get; private set; }
+        public WKBReader Reader { get; private set; }
 
         /// <summary>
         /// Writer for geometry
         /// </summary>
-        public IBinaryGeometryWriter Writer { get; private set; }
+        public WKBWriter Writer { get; private set; }
 
         #endregion SpatialFunctions
     }
diff --git a/SharpMap/Data/Providers/DbPoint.cs b/SharpMap/Data/Providers/DbPoint.cs
index eabf19b2..98c94572 100644
--- a/SharpMap/Data/Providers/DbPoint.cs
+++ b/SharpMap/Data/Providers/DbPoint.cs
@@ -15,11 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.Common;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -120,9 +120,9 @@ public string DefinitionQuery
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = DbProvider.CreateConnection())
             {
                 conn.ConnectionString = ConnectionString;
@@ -207,7 +207,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
             using (var conn = DbProvider.CreateConnection())
             {
@@ -280,7 +280,7 @@ private string GetDefinitionQueryConstraint(bool addAnd)
         /// <param name="ds">FeatureDataSet to fill data into</param>
         public override void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
         {
-            //List<Geometries.Geometry> features = new List<GeoAPI.Geometries.IGeometry>();
+            //List<Geometries.Geometry> features = new List<NetTopologySuite.Geometries.Geometry>();
             using (var conn = DbProvider.CreateConnection())
             {
                 conn.ConnectionString = ConnectionString;
diff --git a/SharpMap/Data/Providers/DbTwoPointLine.cs b/SharpMap/Data/Providers/DbTwoPointLine.cs
index d0906a87..98069c09 100644
--- a/SharpMap/Data/Providers/DbTwoPointLine.cs
+++ b/SharpMap/Data/Providers/DbTwoPointLine.cs
@@ -15,11 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.Common;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -126,9 +126,9 @@ public string DefinitionQuery
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = DbProvider.CreateConnection())
             {
                 conn.ConnectionString = ConnectionString;
@@ -215,7 +215,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
             using (var conn = DbProvider.CreateConnection())
             {
diff --git a/SharpMap/Data/Providers/DbaseReader.cs b/SharpMap/Data/Providers/DbaseReader.cs
index 2ed60322..ca918c44 100644
--- a/SharpMap/Data/Providers/DbaseReader.cs
+++ b/SharpMap/Data/Providers/DbaseReader.cs
@@ -18,12 +18,12 @@
 // Note:
 // Good stuff on DBase format: http://www.clicketyclick.dk/databases/xbase/format/
 
+using SharpMap.Utilities.Indexing;
 using System;
 using System.Data;
 using System.Globalization;
 using System.IO;
 using System.Text;
-using SharpMap.Utilities.Indexing;
 
 namespace SharpMap.Data.Providers
 {
@@ -45,7 +45,7 @@ public class DbaseReader : IDisposable
         /// Event raised when the <see cref="Encoding"/> property has changed
         /// </summary>
         public event EventHandler EncodingChanged;
-        
+
         private struct DbaseField
         {
             public int Address;
@@ -62,7 +62,7 @@ private struct DbaseField
         private Int16 _recordLength;
         private readonly string _filename;
         private DbaseField[] _dbaseColumns;
-        
+
         private Stream _dbfStream;
         //private BinaryReader br;
         private bool _headerIsParsed;
@@ -132,14 +132,14 @@ public void Open()
                 ParseDbfHeader(_filename);
         }
 
-//        private Stream GetStream()
-//        {
-//#if USE_MEMORYMAPPED_FILE
-//            return MemMappedFiles[_filename].CreateViewStream();
-//#else
-//            return new FileStream(_filename, FileMode.Open, FileAccess.Read);
-//#endif
-//        }
+        //        private Stream GetStream()
+        //        {
+        //#if USE_MEMORYMAPPED_FILE
+        //            return MemMappedFiles[_filename].CreateViewStream();
+        //#else
+        //            return new FileStream(_filename, FileMode.Open, FileAccess.Read);
+        //#endif
+        //        }
 
         /// <summary>
         /// Closes the dbase file stream
@@ -197,7 +197,7 @@ public BinaryTree<T, UInt32> CreateDbfIndex<T>(int columnId) where T : IComparab
         {
             var tree = new BinaryTree<T, uint>();
             for (uint i = 0; i < ((_numberOfRecords > 10000) ? 10000 : _numberOfRecords); i++)
-                tree.Add(new BinaryTree<T, uint>.ItemValue((T) GetValue(i, columnId), i));
+                tree.Add(new BinaryTree<T, uint>.ItemValue((T)GetValue(i, columnId), i));
             return tree;
         }
 #endif
@@ -304,7 +304,7 @@ private void ParseDbfHeader(string filename)
 
             if (buffer32[0] != 0x03)
                 throw new NotSupportedException("Unsupported DBF Type");
-            
+
             //Get last modified date
             _lastUpdate = new DateTime(buffer32[1] + 1900, buffer32[2], buffer32[3]);
 
@@ -324,7 +324,7 @@ private void ParseDbfHeader(string filename)
             // (   headerlength 
             //   - 32 bytes for the base header
             //   - 1 byte for the header terminator ) / 32 bytes for each field
-            int numberOfColumns = (_headerLength - 32 - 1) / 32; 
+            int numberOfColumns = (_headerLength - 32 - 1) / 32;
             _dbaseColumns = new DbaseField[numberOfColumns];
             for (int i = 0; i < numberOfColumns; i++)
             {
@@ -362,7 +362,7 @@ private void ParseDbfHeader(string filename)
                     _dbaseColumns[i].Address = br.ReadInt32();
                     if (i == 0) //Set it to 0 for first column and calculate it for the rest
                         _dbaseColumns[i].Address = 0;
-                    else 
+                    else
                         _dbaseColumns[i].Address = _dbaseColumns[i - 1].Address + _dbaseColumns[i - 1].Length;
 
                     int length = br.ReadByte();
@@ -388,7 +388,7 @@ private void ParseDbfHeader(string filename)
 
             _currentRecordBuffer = new byte[_recordLength];
             _headerIsParsed = true;
-            
+
             CreateBaseTable();
         }
 
@@ -538,11 +538,11 @@ private static Encoding GetDbaseLanguageDriver(byte dbaseCode, string fileName)
                     if (!string.IsNullOrEmpty(fileName))
                     {
                         fileName = Path.ChangeExtension(fileName, "cpg");
-                        if (!File.Exists(fileName)) 
+                        if (!File.Exists(fileName))
                             fileName = Path.ChangeExtension(fileName, "cst");
                         if (File.Exists(fileName))
                         {
-                            var encoding = File.ReadAllText(fileName).Trim('\r','\n');
+                            var encoding = File.ReadAllText(fileName).Trim('\r', '\n');
                             try
                             {
                                 return Encoding.GetEncoding(encoding);
@@ -564,20 +564,20 @@ public DataTable GetSchemaTable()
         {
             var tab = new DataTable();
             // all of common, non "base-table" fields implemented
-            tab.Columns.Add("ColumnName", typeof (String));
-            tab.Columns.Add("ColumnSize", typeof (Int32));
-            tab.Columns.Add("ColumnOrdinal", typeof (Int32));
-            tab.Columns.Add("NumericPrecision", typeof (Int16));
-            tab.Columns.Add("NumericScale", typeof (Int16));
-            tab.Columns.Add("DataType", typeof (Type));
-            tab.Columns.Add("AllowDBNull", typeof (bool));
-            tab.Columns.Add("IsReadOnly", typeof (bool));
-            tab.Columns.Add("IsUnique", typeof (bool));
-            tab.Columns.Add("IsRowVersion", typeof (bool));
-            tab.Columns.Add("IsKey", typeof (bool));
-            tab.Columns.Add("IsAutoIncrement", typeof (bool));
-            tab.Columns.Add("IsLong", typeof (bool));
-            
+            tab.Columns.Add("ColumnName", typeof(String));
+            tab.Columns.Add("ColumnSize", typeof(Int32));
+            tab.Columns.Add("ColumnOrdinal", typeof(Int32));
+            tab.Columns.Add("NumericPrecision", typeof(Int16));
+            tab.Columns.Add("NumericScale", typeof(Int16));
+            tab.Columns.Add("DataType", typeof(Type));
+            tab.Columns.Add("AllowDBNull", typeof(bool));
+            tab.Columns.Add("IsReadOnly", typeof(bool));
+            tab.Columns.Add("IsUnique", typeof(bool));
+            tab.Columns.Add("IsRowVersion", typeof(bool));
+            tab.Columns.Add("IsKey", typeof(bool));
+            tab.Columns.Add("IsAutoIncrement", typeof(bool));
+            tab.Columns.Add("IsLong", typeof(bool));
+
             //Why do we need to add the dbase columns?
             //foreach (DbaseField dbf in _dbaseColumns)
             //    tab.Columns.Add(dbf.ColumnName, Type. dbf.DataType);
@@ -632,23 +632,23 @@ private static Type TypeByTypeCode(TypeCode dataTypeCode)
             switch (dataTypeCode)
             {
                 case TypeCode.SByte:
-                    return typeof (sbyte);
+                    return typeof(sbyte);
                 case TypeCode.Boolean:
-                    return typeof (bool);
+                    return typeof(bool);
                 case TypeCode.Int16:
-                    return typeof (short);
+                    return typeof(short);
                 case TypeCode.Int32:
-                    return typeof (int);
+                    return typeof(int);
                 case TypeCode.Int64:
-                    return typeof (long);
+                    return typeof(long);
                 case TypeCode.Single:
-                    return typeof (float);
+                    return typeof(float);
                 case TypeCode.Double:
-                    return typeof (double);
+                    return typeof(double);
                 case TypeCode.String:
-                    return typeof (string);
+                    return typeof(string);
                 case TypeCode.DateTime:
-                    return typeof (DateTime);
+                    return typeof(DateTime);
                 case TypeCode.Object: // HACK
                     return typeof(byte[]);
                 default:
@@ -668,7 +668,7 @@ private void CreateBaseTable()
                 _baseTable.Columns.Add("Oid", typeof(uint));
                 _baseTable.PrimaryKey = new DataColumn[] { _baseTable.Columns[0] };
             }
-              
+
             foreach (var dbf in _dbaseColumns)
             {
                 //_baseTable.Columns.Add(dbf.ColumnName, dbf.DataType);
@@ -764,7 +764,7 @@ public Encoding Encoding
 
                 _encoding = value;
                 OnEncodingChanged(EventArgs.Empty);
-                
+
             }
         }
 
@@ -804,7 +804,7 @@ internal FeatureDataRow GetFeature(uint oid, FeatureDataTable table)
         }
 
         private static readonly NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
-        
+
         private unsafe object ReadDbfValue(DbaseField dbf)
         {
             var tmpBuffer = new ReadOnlySpan<byte>(_currentRecordBuffer, dbf.Address + 1, dbf.Length);
diff --git a/SharpMap/Data/Providers/FilterProvider.cs b/SharpMap/Data/Providers/FilterProvider.cs
index eb92f392..80fd0361 100644
--- a/SharpMap/Data/Providers/FilterProvider.cs
+++ b/SharpMap/Data/Providers/FilterProvider.cs
@@ -39,17 +39,17 @@ public abstract class FilterProvider
         /// [...]
         /// public static bool CountryFilter(SharpMap.Data.FeatureDataRow row)
         /// {
-        ///		if(row.Geometry.GetType()==typeof(GeoAPI.Geometries.IPolygon))
-        ///			return ((row.Geometry as GeoAPI.Geometries.IPolygon).Area>5);
-        ///		if (row.Geometry.GetType() == typeof(GeoAPI.Geometries.IMultiPolygon))
-        ///			return ((row.Geometry as GeoAPI.Geometries.IMultiPolygon).Area > 5);
+        ///		if(row.Geometry.GetType()==typeof(NetTopologySuite.Geometries.Polygon))
+        ///			return ((row.Geometry as NetTopologySuite.Geometries.Polygon).Area>5);
+        ///		if (row.Geometry.GetType() == typeof(NetTopologySuite.Geometries.MultiPolygon))
+        ///			return ((row.Geometry as NetTopologySuite.Geometries.MultiPolygon).Area > 5);
         ///		else return true;
         /// }
         /// </code>
         /// </example>
         /// </remarks>
         /// <seealso cref="FilterMethod"/>
-        public FilterMethod FilterDelegate {get;set;}
-        
+        public FilterMethod FilterDelegate { get; set; }
+
     }
 }
diff --git a/SharpMap/Data/Providers/GeometryFeatureProvider.cs b/SharpMap/Data/Providers/GeometryFeatureProvider.cs
index 998b2d96..d8b5ab07 100644
--- a/SharpMap/Data/Providers/GeometryFeatureProvider.cs
+++ b/SharpMap/Data/Providers/GeometryFeatureProvider.cs
@@ -16,12 +16,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Data;
-using GeoAPI.Geometries;
 using System.ComponentModel;
+using System.Data;
 
 namespace SharpMap.Data.Providers
 {
@@ -46,8 +46,8 @@ namespace SharpMap.Data.Providers
     /// <example>
     /// Adding points of interest to the map. This is useful for vehicle tracking etc.
     /// <code lang="C#">
-    /// GeoAPI.Geometries.IGeometryFactory gf = new NetTopologySuite.Geometries.GeometryFactory();
-    /// List&#60;GeoAPI.Geometries.IGeometry&#62; geometries = new List&#60;GeoAPI.Geometries.IGeometry&#62;();
+    /// NetTopologySuite.Geometries.GeometryFactory gf = new NetTopologySuite.Geometries.GeometryFactory();
+    /// List&#60;NetTopologySuite.Geometries.Geometry&#62; geometries = new List&#60;NetTopologySuite.Geometries.Geometry&#62;();
     /// //Add two points
     /// geometries.Add(gf.CreatePoint(23.345,64.325));
     /// geometries.Add(gf.CreatePoint(23.879,64.194));
@@ -70,7 +70,7 @@ public class GeometryFeatureProvider : FilterProvider, IProvider
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
         /// <param name="geometries">Set of geometries that this datasource should contain</param>
-        public GeometryFeatureProvider(IEnumerable<IGeometry> geometries)
+        public GeometryFeatureProvider(IEnumerable<Geometry> geometries)
         {
             _features = new FeatureDataTable();
             _features.BeginLoadData();
@@ -113,7 +113,7 @@ public GeometryFeatureProvider(FeatureDataTable features)
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
         /// <param name="geometry">Geometry to be in this datasource</param>
-        public GeometryFeatureProvider(IGeometry geometry)
+        public GeometryFeatureProvider(Geometry geometry)
         {
             _features = new FeatureDataTable();
             var fdr = _features.NewRow();
@@ -195,9 +195,9 @@ public FeatureDataTable Features
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var list = new Collection<IGeometry>();
+            var list = new Collection<Geometry>();
 
             lock (_features.Rows.SyncRoot)
             {
@@ -260,7 +260,7 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public IGeometry GetGeometryByID(uint oid)
+        public Geometry GetGeometryByID(uint oid)
         {
             lock (_features.Rows.SyncRoot)
             {
@@ -288,7 +288,7 @@ public IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="geom"></param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             FeatureDataTable fdt;
             lock (_features.Columns.SyncRoot)
@@ -304,7 +304,7 @@ public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
                     fdt.LoadDataRow(fdr.ItemArray, true);
                     var tmpGeom = fdr.Geometry;
                     if (tmpGeom != null)
-                        ((FeatureDataRow)fdt.Rows[fdt.Rows.Count - 1]).Geometry = (IGeometry)tmpGeom.Clone();
+                        ((FeatureDataRow)fdt.Rows[fdt.Rows.Count - 1]).Geometry = tmpGeom.Copy();
                 }
             }
             fdt.EndLoadData();
@@ -330,7 +330,7 @@ public void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                 fdt.LoadDataRow(fdr.ItemArray, false);
                 var geom = fdr.Geometry;
                 if (geom != null)
-                    ((FeatureDataRow)fdt.Rows[fdt.Rows.Count - 1]).Geometry = (IGeometry)geom.Clone();
+                    ((FeatureDataRow)fdt.Rows[fdt.Rows.Count - 1]).Geometry = geom.Copy();
             }
             fdt.AcceptChanges();
             fdt.EndLoadData();
diff --git a/SharpMap/Data/Providers/GeometryProvider.cs b/SharpMap/Data/Providers/GeometryProvider.cs
index b2e6899a..b3c24332 100644
--- a/SharpMap/Data/Providers/GeometryProvider.cs
+++ b/SharpMap/Data/Providers/GeometryProvider.cs
@@ -15,13 +15,13 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using NetTopologySuite.Geometries;
 using SharpMap.Converters.WellKnownBinary;
 using SharpMap.Converters.WellKnownText;
-using GeoAPI.Geometries;
+using System;
 using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace SharpMap.Data.Providers
 {
@@ -46,8 +46,8 @@ namespace SharpMap.Data.Providers
     /// <example>
     /// Adding points of interest to the map. This is useful for vehicle tracking etc.
     /// <code lang="C#">
-    /// GeoAPI.Geometries.IGeometryFactory gf = new NetTopologySuite.Geometries.GeometryFactory();
-    /// List&#60;GeoAPI.Geometries.IGeometry&#62; geometries = new List&#60;GeoAPI.Geometries.IGeometry&#62;();
+    /// NetTopologySuite.Geometries.GeometryFactory gf = new NetTopologySuite.Geometries.GeometryFactory();
+    /// List&#60;NetTopologySuite.Geometries.Geometry&#62; geometries = new List&#60;NetTopologySuite.Geometries.Geometry&#62;();
     /// //Add two points
     /// geometries.Add(new gf.CreatePoint(23.345,64.325));
     /// geometries.Add(new gf.CreatePoint(23.879,64.194));
@@ -62,19 +62,19 @@ namespace SharpMap.Data.Providers
     public class GeometryProvider : PreparedGeometryProvider
     {
         static GeometryProvider() { Map.Configure(); }
-        private List<IGeometry> _geometries;
+        private List<Geometry> _geometries;
 
         /// <summary>
         /// Gets or sets the geometries this datasource contains
         /// </summary>
-        public IList<IGeometry> Geometries
+        public IList<Geometry> Geometries
         {
             get { return _geometries; }
             set
             {
                 if (!ReferenceEquals(_geometries, value))
                 {
-                    var list = value as List<IGeometry> ?? new List<IGeometry>(value);
+                    var list = value as List<Geometry> ?? new List<Geometry>(value);
                     _geometries = list;
 
                     if (_geometries != null && _geometries.Count > 0)
@@ -89,9 +89,9 @@ public IList<IGeometry> Geometries
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
         /// <param name="geometries">Set of geometries that this datasource should contain</param>
-        public GeometryProvider(IEnumerable<IGeometry> geometries)
+        public GeometryProvider(IEnumerable<Geometry> geometries)
         {
-            Geometries = new List<IGeometry>(geometries);
+            Geometries = new List<Geometry>(geometries);
         }
 
         /// <summary>
@@ -100,7 +100,7 @@ public GeometryProvider(IEnumerable<IGeometry> geometries)
         /// <param name="feature">Feature to be in this datasource</param>
         public GeometryProvider(FeatureDataRow feature)
         {
-            Geometries = new List<IGeometry> { feature.Geometry };
+            Geometries = new List<Geometry> { feature.Geometry };
         }
 
         /// <summary>
@@ -109,7 +109,7 @@ public GeometryProvider(FeatureDataRow feature)
         /// <param name="features">Features to be included in this datasource</param>
         public GeometryProvider(FeatureDataTable features)
         {
-            var geometries = new List<IGeometry>();
+            var geometries = new List<Geometry>();
             for (var i = 0; i < features.Count; i++)
                 geometries.Add(features[i].Geometry);
             Geometries = geometries;
@@ -119,24 +119,24 @@ public GeometryProvider(FeatureDataTable features)
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
         /// <param name="geometry">Geometry to be in this datasource</param>
-        public GeometryProvider(IGeometry geometry)
+        public GeometryProvider(Geometry geometry)
         {
-            Geometries = geometry != null ? new List<IGeometry> { geometry } : new List<IGeometry>();
+            Geometries = geometry != null ? new List<Geometry> { geometry } : new List<Geometry>();
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
-        /// <param name="wellKnownBinaryGeometry"><see cref="GeoAPI.Geometries.IGeometry"/> as Well-known Binary to be included in this datasource</param>
+        /// <param name="wellKnownBinaryGeometry"><see cref="NetTopologySuite.Geometries.Geometry"/> as Well-known Binary to be included in this datasource</param>
         public GeometryProvider(byte[] wellKnownBinaryGeometry)
-            : this(GeometryFromWKB.Parse(wellKnownBinaryGeometry, GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory()))
+            : this(GeometryFromWKB.Parse(wellKnownBinaryGeometry, NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory()))
         {
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GeometryProvider"/>
         /// </summary>
-        /// <param name="wellKnownTextGeometry"><see cref="GeoAPI.Geometries.IGeometry"/> as Well-known Text to be included in this datasource</param>
+        /// <param name="wellKnownTextGeometry"><see cref="NetTopologySuite.Geometries.Geometry"/> as Well-known Text to be included in this datasource</param>
         public GeometryProvider(string wellKnownTextGeometry) : this(GeometryFromWKT.Parse(wellKnownTextGeometry))
         {
         }
@@ -150,9 +150,9 @@ public GeometryProvider(string wellKnownTextGeometry) : this(GeometryFromWKT.Par
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var list = new Collection<IGeometry>();
+            var list = new Collection<Geometry>();
             lock (((ICollection)_geometries).SyncRoot)
             {
                 for (var i = 0; i < _geometries.Count; i++)
@@ -185,7 +185,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
             lock (((ICollection)_geometries).SyncRoot)
                 return _geometries[(int)oid];
@@ -196,7 +196,7 @@ public override IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="geom"></param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             throw new NotSupportedException("Attribute data is not supported by the GeometryProvider.");
         }
@@ -268,4 +268,4 @@ protected override void ReleaseManagedResources()
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Data/Providers/IProvider.cs b/SharpMap/Data/Providers/IProvider.cs
index c98b4f7e..bdc7484e 100644
--- a/SharpMap/Data/Providers/IProvider.cs
+++ b/SharpMap/Data/Providers/IProvider.cs
@@ -15,10 +15,9 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.ObjectModel;
-using GeoAPI.Geometries;
-using IGeometry = GeoAPI.Geometries.IGeometry;
 
 namespace SharpMap.Data.Providers
 {
@@ -37,14 +36,14 @@ public interface IGuidProvider : IProvider<Guid>
     /// <summary>
     /// Interface for data providers
     /// </summary>
-    public interface IProvider<TOid> : IBaseProvider where TOid: IComparable<TOid>
+    public interface IProvider<TOid> : IBaseProvider where TOid : IComparable<TOid>
     {
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -55,7 +54,7 @@ public interface IProvider<TOid> : IBaseProvider where TOid: IComparable<TOid>
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        IGeometry GetGeometryByID(TOid oid);
+        Geometry GetGeometryByID(TOid oid);
 
         /// <summary>
         /// Returns a <see cref="SharpMap.Data.FeatureDataRow"/> based on a RowID
diff --git a/SharpMap/Data/Providers/IProviderBase.cs b/SharpMap/Data/Providers/IProviderBase.cs
index 8187adbd..611ff22c 100644
--- a/SharpMap/Data/Providers/IProviderBase.cs
+++ b/SharpMap/Data/Providers/IProviderBase.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.ObjectModel;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -30,18 +30,18 @@ public interface IBaseProvider : IDisposable
         int SRID { get; set; }
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        Collection<IGeometry> GetGeometriesInView(Envelope bbox);
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        Collection<Geometry> GetGeometriesInView(Envelope bbox);
 
         /// <summary>
         /// Returns the data associated with all the geometries that are intersected by 'geom'
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds);
+        void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds);
 
         /// <summary>
         /// Returns the data associated with all the geometries that are intersected by 'geom'
diff --git a/SharpMap/Data/Providers/IProviderConfiguration.cs b/SharpMap/Data/Providers/IProviderConfiguration.cs
index 05c181ad..ae493aa4 100644
--- a/SharpMap/Data/Providers/IProviderConfiguration.cs
+++ b/SharpMap/Data/Providers/IProviderConfiguration.cs
@@ -83,7 +83,7 @@ public class SqlServer2008Configuration : IProviderConfiguration
         /// Gets or sets the spatial object type
         /// </summary>
         public SqlServerSpatialObjectType SpatialObjectType { get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether or not to use the spatial index
         /// </summary>
@@ -115,7 +115,7 @@ public bool UseSpatialIndexForEnvelope
         /// <returns>The created provider</returns>
         public IProvider Create()
         {
-            return new SqlServer2008(ConnectionString, TableName, GeometryColumnName, ObjectIdColumnName, 
+            return new SqlServer2008(ConnectionString, TableName, GeometryColumnName, ObjectIdColumnName,
                 SpatialObjectType, SRID, ExtentsMode);
         }
     }
diff --git a/SharpMap/Data/Providers/MsSql.cs b/SharpMap/Data/Providers/MsSql.cs
index acbaf1c4..ef72eef9 100644
--- a/SharpMap/Data/Providers/MsSql.cs
+++ b/SharpMap/Data/Providers/MsSql.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Converters.WellKnownBinary;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.SqlClient;
-using SharpMap.Converters.WellKnownBinary;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -56,14 +56,14 @@ public class MsSql : IProvider
         private int _srid = -2;
 
         private string _Table;
-        private IGeometryFactory _factory;
+        private GeometryFactory _factory;
 
         /// <summary>
         /// Gets or sets the geometry factory used to create geometries
         /// </summary>
-        public IGeometryFactory Factory
+        public GeometryFactory Factory
         {
-            get { return _factory ?? (_factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(_srid)); }
+            get { return _factory ?? (_factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(_srid)); }
             set { _factory = value; }
         }
 
@@ -169,9 +169,9 @@ public void Close()
         /// </summary>
         /// <param name="bbox"></param>
         /// <returns></returns>
-        public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = new SqlConnection(_ConnectionString))
             {
                 string BoxIntersect = GetBoxClause(bbox);
@@ -191,7 +191,7 @@ public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                var geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                var geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                                 if (geom != null)
                                     features.Add(geom);
                             }
@@ -208,9 +208,9 @@ public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         /// </summary>
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
-        public IGeometry GetGeometryByID(uint oid)
+        public Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             using (SqlConnection conn = new SqlConnection(_ConnectionString))
             {
                 string strSQL = "SELECT " + GeometryColumn + " AS Geom FROM " + Table + " WHERE " + ObjectIdColumn +
@@ -223,7 +223,7 @@ public IGeometry GetGeometryByID(uint oid)
                         while (dr.Read())
                         {
                             if (dr[0] != DBNull.Value)
-                                geom = GeometryFromWKB.Parse((byte[]) dr[0], Factory);
+                                geom = GeometryFromWKB.Parse((byte[])dr[0], Factory);
                         }
                     }
                 }
@@ -259,7 +259,7 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
                         {
                             if (dr[0] != DBNull.Value)
                             {
-                                uint ID = (uint) (int) dr[0];
+                                uint ID = (uint)(int)dr[0];
                                 objectlist.Add(ID);
                             }
                         }
@@ -275,7 +275,7 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// </summary>
         /// <param name="geom"></param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             throw new NotImplementedException();
         }
@@ -295,7 +295,7 @@ public int GetFeatureCount()
                 using (SqlCommand command = new SqlCommand(strSQL, conn))
                 {
                     conn.Open();
-                    count = (int) command.ExecuteScalar();
+                    count = (int)command.ExecuteScalar();
                     conn.Close();
                 }
             }
@@ -350,7 +350,7 @@ public FeatureDataRow GetFeature(uint rowId)
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                                fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             return fdr;
                         }
                         else
@@ -382,7 +382,7 @@ public Envelope GetExtents()
                     using (SqlDataReader dr = command.ExecuteReader())
                         if (dr.Read())
                         {
-                            box = new Envelope(new Coordinate((float) dr[0], (float) dr[1]), new Coordinate((float) dr[2], (float) dr[3]));
+                            box = new Envelope(new Coordinate((float)dr[0], (float)dr[1]), new Coordinate((float)dr[2], (float)dr[3]));
                         }
                     conn.Close();
                 }
@@ -405,7 +405,7 @@ public string ConnectionID
         /// <param name="ds">FeatureDataSet to fill data into</param>
         public void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
         {
-            //List<Geometries.Geometry> features = new List<GeoAPI.Geometries.IGeometry>();
+            //List<Geometries.Geometry> features = new List<NetTopologySuite.Geometries.Geometry>();
             using (SqlConnection conn = new SqlConnection(_ConnectionString))
             {
                 string strSQL = "SELECT *, " + GeometryColumn + " AS sharpmap_tempgeometry ";
@@ -436,7 +436,7 @@ public void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
                                     !col.ColumnName.StartsWith("Envelope_"))
                                     fdr[col.ColumnName] = dr[col];
                             if (dr["sharpmap_tempgeometry"] != DBNull.Value)
-                                fdr.Geometry = GeometryFromWKB.Parse((byte[]) dr["sharpmap_tempgeometry"], Factory);
+                                fdr.Geometry = GeometryFromWKB.Parse((byte[])dr["sharpmap_tempgeometry"], Factory);
                             fdt.AddRow(fdr);
                         }
                         ds.Tables.Add(fdt);
@@ -549,7 +549,7 @@ public static int CreateDataTable(IProvider datasource, string tablename, string
                 string sql = "CREATE TABLE " + tablename + " (oid INTEGER IDENTITY PRIMARY KEY, WKB_Geometry Image, " +
                              "Envelope_MinX real, Envelope_MinY real, Envelope_MaxX real, Envelope_MaxY real";
                 foreach (DataColumn col in columns)
-                    if (col.DataType != typeof (String))
+                    if (col.DataType != typeof(String))
                         sql += ", " + col.ColumnName + " " + Type2SqlType(col.DataType).ToString();
                     else
                         sql += ", " + col.ColumnName + " VARCHAR(256)";
@@ -592,8 +592,8 @@ public static int CreateDataTable(IProvider datasource, string tablename, string
                     if (feature.Geometry != null)
                     {
                         command.Parameters["@WKB_Geometry"].Value = feature.Geometry.AsBinary();
-                            //Add the geometry as Well-Known Binary
-                        Envelope  box = feature.Geometry.EnvelopeInternal;
+                        //Add the geometry as Well-Known Binary
+                        Envelope box = feature.Geometry.EnvelopeInternal;
                         command.Parameters["@Envelope_MinX"].Value = box.MinX;
                         command.Parameters["@Envelope_MinY"].Value = box.MinY;
                         command.Parameters["@Envelope_MaxX"].Value = box.MaxX;
diff --git a/SharpMap/Data/Providers/MsSqlSpatial.cs b/SharpMap/Data/Providers/MsSqlSpatial.cs
index 81aba707..136848fe 100644
--- a/SharpMap/Data/Providers/MsSqlSpatial.cs
+++ b/SharpMap/Data/Providers/MsSqlSpatial.cs
@@ -19,13 +19,13 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Converters.WellKnownBinary;
 using System;
 using System.Collections.ObjectModel;
 using System.Data;
 using System.Data.Common;
 using System.Data.SqlClient;
-using SharpMap.Converters.WellKnownBinary;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -83,17 +83,17 @@ protected static SpatialDbUtility CreateSpatialDbUtility()
 
         private static string GetSchemaName(string qualifiedTable)
         {
-            var tmp = qualifiedTable.Split(new [] {'.'}, 2);
-            return tmp.Length == 1 
-                ? "dbo" 
+            var tmp = qualifiedTable.Split(new[] { '.' }, 2);
+            return tmp.Length == 1
+                ? "dbo"
                 : tmp[0].Replace("\"", "");
         }
 
         private static string GetTableName(string qualifiedTable)
         {
             var tmp = qualifiedTable.Split(new[] { '.' }, 2);
-            return tmp.Length == 1 
-                ? tmp[0].Replace("\"", "") 
+            return tmp.Length == 1
+                ? tmp[0].Replace("\"", "")
                 : tmp[1].Replace("\"", "");
         }
 
@@ -157,7 +157,7 @@ public DataColumnCollection Columns
                 //                        col.DataType = typeof(bool);
                 //                        break;
                 //                    case "geometry":
-                //                        col.DataType = typeof(GeoAPI.Geometries.IGeometry);
+                //                        col.DataType = typeof(NetTopologySuite.Geometries.Geometry);
                 //                        break;
                 //                    default:
                 //                        col.DataType = typeof(object);
@@ -180,7 +180,7 @@ public DataColumnCollection Columns
         /// <returns>An open connection to the database backend.</returns>
         protected override DbConnection CreateOpenDbConnection()
         {
- 	        var conn = new SqlConnection(ConnectionString);
+            var conn = new SqlConnection(ConnectionString);
             conn.Open();
             return conn;
         }
@@ -191,7 +191,7 @@ protected override DbConnection CreateOpenDbConnection()
         /// <returns>An open connection to the database backend.</returns>
         protected override DbDataAdapter CreateDataAdapter()
         {
- 	        return new SqlDataAdapter();
+            return new SqlDataAdapter();
         }
 
         ///// <summary>
@@ -199,9 +199,9 @@ protected override DbDataAdapter CreateDataAdapter()
         ///// </summary>
         ///// <param name="bbox"></param>
         ///// <returns></returns>
-        //protected override Collection<IGeometry> GetGeometriesInViewInternal(Envelope bbox)
+        //protected override Collection<Geometry> GetGeometriesInViewInternal(Envelope bbox)
         //{
-        //    var features = new Collection<IGeometry>();
+        //    var features = new Collection<Geometry>();
         //    using (var conn = CreateOpenDbConnection())
         //    {
         //        var strSQL = "SELECT ST.AsBinary(" + BuildGeometryExpression() + ") ";
@@ -239,7 +239,7 @@ protected override DbDataAdapter CreateDataAdapter()
         ///// </summary>
         ///// <param name="oid">Object ID</param>
         ///// <returns>geometry</returns>
-        //protected override IGeometry GetGeometryByIDInternal(uint oid)
+        //protected override Geometry GetGeometryByIDInternal(uint oid)
         //{
         //    using (var conn = CreateOpenDbConnection())
         //    {
@@ -263,7 +263,7 @@ protected override DbDataAdapter CreateDataAdapter()
 
 
         /// <summary>
-        /// Gets the object of features that lie within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the object of features that lie within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox">The bounding box</param>
         /// <returns>A collection of object ids</returns>
@@ -276,7 +276,7 @@ protected override Collection<uint> GetObjectIDsInViewInternal(Envelope bbox)
                 {
 #pragma warning disable 612,618
                     var @where = !string.IsNullOrEmpty(DefinitionQuery)
-                        ? DefinitionQuery 
+                        ? DefinitionQuery
                         : FeatureColumns.GetWhereClause(null);
 #pragma warning restore 612,618
                     var strSQL = string.Format("SELECT _sm_.{4} FROM ST.FilterQueryWhere('{0}','{1}',{3},'{2}') AS _sm_;",
@@ -311,9 +311,9 @@ protected override Collection<uint> GetObjectIDsInViewInternal(Envelope bbox)
         ///// </summary>
         ///// <param name="geom"></param>
         ///// <param name="ds">FeatureDataSet to fill data into</param>
-        //protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        //protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         //{
-        //    var features = new List<IGeometry>();
+        //    var features = new List<Geometry>();
         //    using (var conn = CreateOpenDbConnection())
         //    {
         //        string strGeom;
@@ -473,13 +473,13 @@ protected override Envelope GetExtentsInternal()
 
                 var strSQL = string.Format("SELECT ST.AsBinary(ST.EnvelopeQueryWhere('{0}', '{1}', '{2}'))", /*DbUtility.DecorateTable(Schema, Table)*/ /* Schema, */Table,
                                               GeometryColumn, where);
-                
+
                 using (var command = new SqlCommand(strSQL, conn))
                 {
                     var result = command.ExecuteScalar();
-                    return result == DBNull.Value 
-                        ? null : 
-                        GeometryFromWKB.Parse((byte[]) result, Factory).EnvelopeInternal;
+                    return result == DBNull.Value
+                        ? null :
+                        GeometryFromWKB.Parse((byte[])result, Factory).EnvelopeInternal;
                 }
             }
         }
@@ -564,7 +564,7 @@ private string GetGeometryColumn()
                     var columnname = command.ExecuteScalar();
                     if (columnname == DBNull.Value)
                         throw new ApplicationException("Table '" + Table + "' does not contain a geometry column");
-                    return (string) columnname;
+                    return (string)columnname;
                 }
             }
         }
@@ -587,7 +587,7 @@ private string BuildSpatialQuerySuffix()
         /// <returns>The spatial component of a SQL where clause</returns>
         protected override string GetSpatialWhere(Envelope bbox, DbCommand command)
         {
-            var sqlCommand = (SqlCommand) command;
+            var sqlCommand = (SqlCommand)command;
 
 #pragma warning disable 612,618
             var pwhere = new SqlParameter("@PWhere", !string.IsNullOrEmpty(DefinitionQuery)
@@ -624,7 +624,7 @@ private string BuildEnvelope(Envelope bbox, SqlCommand command)
             return res;
         }
 
-        private string BuildGeometry(IGeometry geometry, SqlCommand command)
+        private string BuildGeometry(Geometry geometry, SqlCommand command)
         {
             var res = "ST.GeomFromWKB(@PGeom,@PTargetSrid)";
 
@@ -651,7 +651,7 @@ private string BuildGeometry(IGeometry geometry, SqlCommand command)
         /// <param name="bbox">The geometry</param>
         /// <param name="command">The command object, that is supposed to execute the query.</param>
         /// <returns>The spatial component of a SQL where clause</returns>
-        protected override string GetSpatialWhere(IGeometry bbox, DbCommand command)
+        protected override string GetSpatialWhere(Geometry bbox, DbCommand command)
         {
             var sqlCommand = (SqlCommand)command;
 
diff --git a/SharpMap/Data/Providers/PreparedGeometryProvider.cs b/SharpMap/Data/Providers/PreparedGeometryProvider.cs
index e091a7b9..94b79ab2 100644
--- a/SharpMap/Data/Providers/PreparedGeometryProvider.cs
+++ b/SharpMap/Data/Providers/PreparedGeometryProvider.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries.Prepared;
 using System;
-using GeoAPI.Geometries;
-using GeoAPI.Geometries.Prepared;
 
 namespace SharpMap.Data.Providers
 {
@@ -14,12 +14,12 @@ public abstract class PreparedGeometryProvider : BaseProvider
         /// Gets or sets a value indicating the <see cref="IPreparedGeometry"/>.
         /// </summary>
         protected IPreparedGeometry PreparedGeometry { get; set; }
-        
+
         /// <summary>
         /// Creates an instance of this class. <see cref="BaseProvider.SRID"/> is set to <value>0</value>.
         /// </summary>
         protected PreparedGeometryProvider()
-            :this(0)
+            : this(0)
         {
         }
 
@@ -35,17 +35,17 @@ protected PreparedGeometryProvider(int srid)
         /// <summary>
         /// Releases all managed resources
         /// </summary>
-        protected override void  ReleaseManagedResources()
+        protected override void ReleaseManagedResources()
         {
             PreparedGeometry = null;
- 	        base.ReleaseManagedResources();
+            base.ReleaseManagedResources();
         }
 
         /// <summary>
         /// Method to perform preparatory things for executing an intersection query against the data source
         /// </summary>
         /// <param name="geom">The geometry to use as filter.</param>
-        protected override void OnBeginExecuteIntersectionQuery(IGeometry geom)
+        protected override void OnBeginExecuteIntersectionQuery(Geometry geom)
         {
             PreparedGeometry = NetTopologySuite.Geometries.Prepared.PreparedGeometryFactory.Prepare(geom);
             base.OnBeginExecuteIntersectionQuery(geom);
@@ -56,7 +56,7 @@ protected override void OnBeginExecuteIntersectionQuery(IGeometry geom)
         /// </summary>
         /// <param name="geom">The geometry to use as filter</param>
         /// <param name="ds">The feature data set to store the results in</param>
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             ExecuteIntersectionQuery(geom.EnvelopeInternal, ds);
 
@@ -92,4 +92,4 @@ protected override void OnEndExecuteIntersectionQuery()
             base.OnEndExecuteIntersectionQuery();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Data/Providers/ShapeFile.cs b/SharpMap/Data/Providers/ShapeFile.cs
index 3ed44bc6..c1e99fef 100644
--- a/SharpMap/Data/Providers/ShapeFile.cs
+++ b/SharpMap/Data/Providers/ShapeFile.cs
@@ -15,6 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems;
+using SharpMap.Utilities.Indexing;
+using SharpMap.Utilities.SpatialIndexing;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -22,13 +27,6 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
-using GeoAPI;
-using GeoAPI.Geometries;
-using SharpMap.Utilities.Indexing;
-using SharpMap.Utilities.SpatialIndexing;
-using Common.Logging;
-using GeoAPI.CoordinateSystems;
-using SharpMap.CoordinateSystems;
 using Exception = System.Exception;
 
 namespace SharpMap.Data.Providers
@@ -56,8 +54,8 @@ namespace SharpMap.Data.Providers
 	/// </code>
 	/// </example>
 	public class ShapeFile : FilterProvider, IProvider
-	{
-	    readonly ILog _logger = LogManager.GetLogger(typeof(ShapeFile));
+    {
+        readonly ILog _logger = LogManager.GetLogger(typeof(ShapeFile));
 
         //#region Delegates
 
@@ -78,19 +76,19 @@ public class ShapeFile : FilterProvider, IProvider
 
         private ShapeFileHeader _header;
         private ShapeFileIndex _index;
-        
-		private ICoordinateSystem _coordinateSystem;
+
+        private CoordinateSystem _coordinateSystem;
 
         private bool _coordsysReadFromFile;
-		private bool _fileBasedIndex;
-		private string _filename;
+        private bool _fileBasedIndex;
+        private string _filename;
         private string _dbfFile;
         private Encoding _dbfSpecifiedEncoding;
-		private int _srid = -1;
+        private int _srid = -1;
 
-	    //private readonly object _shapeFileLock = new object();
-		
-	    private IGeometryFactory _factory;
+        //private readonly object _shapeFileLock = new object();
+
+        private GeometryFactory _factory;
         private static int _memoryCacheLimit = 50000;
         private static readonly object _gspLock = new object();
 
@@ -118,41 +116,41 @@ static ShapeFile()
         }
 #endif
         private readonly bool _useMemoryCache;
-		private DateTime _lastCleanTimestamp = DateTime.Now;
-		private readonly TimeSpan _cacheExpireTimeout = TimeSpan.FromMinutes(1);
+        private DateTime _lastCleanTimestamp = DateTime.Now;
+        private readonly TimeSpan _cacheExpireTimeout = TimeSpan.FromMinutes(1);
         private readonly object _cacheLock = new object();
-        private readonly Dictionary <uint,FeatureDataRow> _cacheDataTable = new Dictionary<uint,FeatureDataRow>();
+        private readonly Dictionary<uint, FeatureDataRow> _cacheDataTable = new Dictionary<uint, FeatureDataRow>();
 
-		/// <summary>
-		/// Tree used for fast query of data
-		/// </summary>
-		private ISpatialIndex<uint> _tree;
+        /// <summary>
+        /// Tree used for fast query of data
+        /// </summary>
+        private ISpatialIndex<uint> _tree;
 
-		/// <summary>
-		/// Initializes a ShapeFile DataProvider without a file-based spatial index.
-		/// </summary>
-		/// <param name="filename">Path to shape file</param>
-		public ShapeFile(string filename) 
+        /// <summary>
+        /// Initializes a ShapeFile DataProvider without a file-based spatial index.
+        /// </summary>
+        /// <param name="filename">Path to shape file</param>
+        public ShapeFile(string filename)
             : this(filename, false)
-		{
-		}
+        {
+        }
 
-		/// <summary>
-		/// Initializes a ShapeFile DataProvider.
-		/// </summary>
-		/// <remarks>
-		/// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
-		/// it will be generated and saved to [filename] + '.sidx'.</para>
-		/// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
-		/// start-up time when the cache has been emptied.
-		/// </para>
-		/// </remarks>
-		/// <param name="filename">Path to shape file</param>
-		/// <param name="fileBasedIndex">Use file-based spatial index</param>
-		public ShapeFile(string filename, bool fileBasedIndex)
-		{
-			_filename = filename;
-		    _fileBasedIndex = fileBasedIndex;
+        /// <summary>
+        /// Initializes a ShapeFile DataProvider.
+        /// </summary>
+        /// <remarks>
+        /// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
+        /// it will be generated and saved to [filename] + '.sidx'.</para>
+        /// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
+        /// start-up time when the cache has been emptied.
+        /// </para>
+        /// </remarks>
+        /// <param name="filename">Path to shape file</param>
+        /// <param name="fileBasedIndex">Use file-based spatial index</param>
+        public ShapeFile(string filename, bool fileBasedIndex)
+        {
+            _filename = filename;
+            _fileBasedIndex = fileBasedIndex;
 
             //Parse shape header
             ParseHeader();
@@ -160,55 +158,55 @@ public ShapeFile(string filename, bool fileBasedIndex)
             ParseProjection();
 
             //If no spatial index is wanted, just build a pseudo tree
-		    if (!fileBasedIndex)
-		        _tree = new AllFeaturesTree(_header.BoundingBox, (uint) _index.FeatureCount);
+            if (!fileBasedIndex)
+                _tree = new AllFeaturesTree(_header.BoundingBox, (uint)_index.FeatureCount);
 
             _dbfFile = Path.ChangeExtension(filename, ".dbf");
 
-			//Read projection file
-			ParseProjection();
-        
+            //Read projection file
+            ParseProjection();
+
             //By default, don't enable _MemoryCache if there are a lot of features
             _useMemoryCache = GetFeatureCount() <= MemoryCacheLimit;
         }
 
-	    /// <summary>
-	    /// Initializes a ShapeFile DataProvider.
-	    /// </summary>
-	    /// <remarks>
-	    /// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
-	    /// it will be generated and saved to [filename] + '.sidx'.</para>
-	    /// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
-	    /// start-up time when the cache has been emptied.
-	    /// </para>
-	    /// </remarks>
-	    /// <param name="filename">Path to shape file</param>
-	    /// <param name="fileBasedIndex">Use file-based spatial index</param>
-	    /// <param name="useMemoryCache">Use the memory cache. BEWARE in case of large shapefiles</param>
-	    public ShapeFile(string filename, bool fileBasedIndex, bool useMemoryCache) 
-	        : this(filename, fileBasedIndex,useMemoryCache,0)
-		{
-		}
-
-	    /// <summary>
-	    /// Initializes a ShapeFile DataProvider.
-	    /// </summary>
-	    /// <remarks>
-	    /// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
-	    /// it will be generated and saved to [filename] + '.sidx'.</para>
-	    /// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
-	    /// start-up time when the cache has been emptied.
-	    /// </para>
-	    /// </remarks>
-	    /// <param name="filename">Path to shape file</param>
-	    /// <param name="fileBasedIndex">Use file-based spatial index</param>
-	    /// <param name="useMemoryCache">Use the memory cache. BEWARE in case of large shapefiles</param>
-	    /// <param name="srid">The spatial reference id</param>
-	    public ShapeFile(string filename, bool fileBasedIndex, bool useMemoryCache,int srid) : this(filename, fileBasedIndex)
-		{
-			_useMemoryCache = useMemoryCache;
-			SRID=srid;
-		}
+        /// <summary>
+        /// Initializes a ShapeFile DataProvider.
+        /// </summary>
+        /// <remarks>
+        /// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
+        /// it will be generated and saved to [filename] + '.sidx'.</para>
+        /// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
+        /// start-up time when the cache has been emptied.
+        /// </para>
+        /// </remarks>
+        /// <param name="filename">Path to shape file</param>
+        /// <param name="fileBasedIndex">Use file-based spatial index</param>
+        /// <param name="useMemoryCache">Use the memory cache. BEWARE in case of large shapefiles</param>
+        public ShapeFile(string filename, bool fileBasedIndex, bool useMemoryCache)
+            : this(filename, fileBasedIndex, useMemoryCache, 0)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a ShapeFile DataProvider.
+        /// </summary>
+        /// <remarks>
+        /// <para>If FileBasedIndex is true, the spatial index will be read from a local copy. If it doesn't exist,
+        /// it will be generated and saved to [filename] + '.sidx'.</para>
+        /// <para>Using a file-based index is especially recommended for ASP.NET applications which will speed up
+        /// start-up time when the cache has been emptied.
+        /// </para>
+        /// </remarks>
+        /// <param name="filename">Path to shape file</param>
+        /// <param name="fileBasedIndex">Use file-based spatial index</param>
+        /// <param name="useMemoryCache">Use the memory cache. BEWARE in case of large shapefiles</param>
+        /// <param name="srid">The spatial reference id</param>
+        public ShapeFile(string filename, bool fileBasedIndex, bool useMemoryCache, int srid) : this(filename, fileBasedIndex)
+        {
+            _useMemoryCache = useMemoryCache;
+            SRID = srid;
+        }
 
         /// <summary>
         /// Cleans the internal memory cached, expurging the objects that are not in the viewarea anymore
@@ -274,43 +272,43 @@ protected static int MemoryCacheLimit
 		/// If this is not the case, the coordinate system will default to null.
 		/// </summary>
 		/// <exception cref="ApplicationException">An exception is thrown if the coordinate system is read from file.</exception>
-		public ICoordinateSystem CoordinateSystem
-		{
-			get { return _coordinateSystem; }
-			set
-			{
-				if (_coordsysReadFromFile)
-					throw new ApplicationException("Coordinate system is specified in projection file and is read only");
-				_coordinateSystem = value;
-			}
-		}
-
-
-		/// <summary>
-		/// Gets the <see cref="SharpMap.Data.Providers.ShapeType">shape geometry type</see> in this shapefile.
-		/// </summary>
-		/// <remarks>
-		/// The property isn't set until the first time the datasource has been opened,
-		/// and will throw an exception if this property has been called since initialization. 
-		/// <para>All the non-Null shapes in a shapefile are required to be of the same shape
-		/// type.</para>
-		/// </remarks>
-		public ShapeType ShapeType
-		{
-			get { return _header.ShapeType; }
-		}
-
-
-		/// <summary>
-		/// Gets or sets the filename of the shapefile
-		/// </summary>
-		/// <remarks>If the filename changes, indexes will be rebuilt</remarks>
-		public string Filename
-		{
-			get { return _filename; }
-			set
-			{
-				if (value == _filename)
+		public CoordinateSystem CoordinateSystem
+        {
+            get { return _coordinateSystem; }
+            set
+            {
+                if (_coordsysReadFromFile)
+                    throw new ApplicationException("Coordinate system is specified in projection file and is read only");
+                _coordinateSystem = value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the <see cref="SharpMap.Data.Providers.ShapeType">shape geometry type</see> in this shapefile.
+        /// </summary>
+        /// <remarks>
+        /// The property isn't set until the first time the datasource has been opened,
+        /// and will throw an exception if this property has been called since initialization. 
+        /// <para>All the non-Null shapes in a shapefile are required to be of the same shape
+        /// type.</para>
+        /// </remarks>
+        public ShapeType ShapeType
+        {
+            get { return _header.ShapeType; }
+        }
+
+
+        /// <summary>
+        /// Gets or sets the filename of the shapefile
+        /// </summary>
+        /// <remarks>If the filename changes, indexes will be rebuilt</remarks>
+        public string Filename
+        {
+            get { return _filename; }
+            set
+            {
+                if (value == _filename)
                     return;
 
                 if (string.IsNullOrEmpty(value))
@@ -323,18 +321,18 @@ public string Filename
                 _fileBasedIndex = (_fileBasedIndex) && File.Exists(Path.ChangeExtension(value, SpatialIndexFactory.Extension));
 
                 _dbfFile = Path.ChangeExtension(value, ".dbf");
-				ParseHeader();
-				ParseProjection();
-				_tree = null;
-			}
-		}
-
-		/// <summary>
-		/// Gets or sets the encoding used for parsing strings from the DBase DBF file.
-		/// </summary>
-		/// <remarks>
-		/// The DBase default encoding is <see cref="System.Text.Encoding.UTF8"/>.
-		/// </remarks>
+                ParseHeader();
+                ParseProjection();
+                _tree = null;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the encoding used for parsing strings from the DBase DBF file.
+        /// </summary>
+        /// <remarks>
+        /// The DBase default encoding is <see cref="System.Text.Encoding.UTF8"/>.
+        /// </remarks>
         public Encoding Encoding
         {
             get
@@ -345,37 +343,37 @@ public Encoding Encoding
                 using (var dbf = OpenDbfStream())
                     return dbf.Encoding;
             }
-		    set
-		    {
-		        _dbfSpecifiedEncoding = value;
-		    }
+            set
+            {
+                _dbfSpecifiedEncoding = value;
+            }
         }
 
-		#region Disposers and finalizers
+        #region Disposers and finalizers
 
-		private bool _disposed;
+        private bool _disposed;
         private static ISpatialIndexFactory<uint> _spatialIndexFactory = new QuadTreeFactory();
 
         /// <summary>
 		/// Disposes the object
 		/// </summary>
 		public void Dispose()
-		{
-			Dispose(true);
-			GC.SuppressFinalize(this);
-		}
-
-		private void Dispose(bool disposing)
-		{
-			if (!_disposed)
-			{
-				if (disposing)
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        private void Dispose(bool disposing)
+        {
+            if (!_disposed)
+            {
+                if (disposing)
                 {
                     Close();
                     if (_tree != null)
                     {
                         bool disposeTree = true;
-                        
+
                         // If we are in a web-context we might not be entitled to dispose the spatial index!
                         if (Web.HttpCacheUtility.IsWebContext)
                         {
@@ -413,22 +411,22 @@ private void Dispose(bool disposing)
                         }
                     }
 #endif
-				}
-				_disposed = true;
-			}
-		}
+                }
+                _disposed = true;
+            }
+        }
 
-		/// <summary>
-		/// Finalizes the object
-		/// </summary>
-		~ShapeFile()
-		{
-			Dispose();
-		}
+        /// <summary>
+        /// Finalizes the object
+        /// </summary>
+        ~ShapeFile()
+        {
+            Dispose();
+        }
 
-		#endregion
+        #endregion
 
-		#region IProvider Members
+        #region IProvider Members
 
         private Stream OpenShapefileStream()
         {
@@ -464,14 +462,14 @@ private DbaseReader OpenDbfStream()
         /// </summary>
         public bool IncludeOid { get; set; }
 
-		/// <summary>
-		/// Opens the datasource
-		/// </summary>
-		public void Open()
-		{
+        /// <summary>
+        /// Opens the datasource
+        /// </summary>
+        public void Open()
+        {
             if (!File.Exists(_filename))
                 throw new FileNotFoundException(String.Format("Could not find file \"{0}\"", _filename));
-            
+
             if (!_filename.ToLower().EndsWith(".shp"))
                 throw (new Exception("Invalid shapefile filename: " + _filename));
 
@@ -487,39 +485,39 @@ public void Open()
                 //    s.Close();
                 //}
             }
-//            // TODO:
-//            // Get a Connector.  The connector returned is guaranteed to be connected and ready to go.
-//            // Pooling.Connector connector = Pooling.ConnectorPool.ConnectorPoolManager.RequestConnector(this,true);
-
-//        //	if (!_isOpen )
-//        //	{
-////                if (File.Exists(shxFile))
-////                {
-////#if USE_MEMORYMAPPED_FILE
-////                    _fsShapeIndex = CheckCreateMemoryMappedStream(shxFile, ref _haveRegistredForShxUsage);
-////#else
-////                    _fsShapeIndex = new FileStream(shxFile, FileMode.Open, FileAccess.Read);
-////#endif
-////                    _brShapeIndex = new BinaryReader(_fsShapeIndex, Encoding.Unicode);
-////                }
-//#if USE_MEMORYMAPPED_FILE
-
-//                _fsShapeFile = CheckCreateMemoryMappedStream(_filename, ref _haveRegistredForUsage);
-//#else
-//                _fsShapeFile = new FileStream(_filename, FileMode.Open, FileAccess.Read);
-//#endif
-//                //_brShapeFile = new BinaryReader(_fsShapeFile);
-//                //// Create array to hold the index array for this open session
-//                ////_offsetOfRecord = new int[_featureCount];
-//                //_offsetOfRecord = new ShapeFileIndexEntry[_featureCount];
-//                //PopulateIndexes(shxFile);
-//                InitializeShape(_filename, _fileBasedIndex);
-//                if (DbaseFile != null)
-//                    DbaseFile.Open();
-//                _isOpen = true;
-
-//            }
-		}
+            //            // TODO:
+            //            // Get a Connector.  The connector returned is guaranteed to be connected and ready to go.
+            //            // Pooling.Connector connector = Pooling.ConnectorPool.ConnectorPoolManager.RequestConnector(this,true);
+
+            //        //	if (!_isOpen )
+            //        //	{
+            ////                if (File.Exists(shxFile))
+            ////                {
+            ////#if USE_MEMORYMAPPED_FILE
+            ////                    _fsShapeIndex = CheckCreateMemoryMappedStream(shxFile, ref _haveRegistredForShxUsage);
+            ////#else
+            ////                    _fsShapeIndex = new FileStream(shxFile, FileMode.Open, FileAccess.Read);
+            ////#endif
+            ////                    _brShapeIndex = new BinaryReader(_fsShapeIndex, Encoding.Unicode);
+            ////                }
+            //#if USE_MEMORYMAPPED_FILE
+
+            //                _fsShapeFile = CheckCreateMemoryMappedStream(_filename, ref _haveRegistredForUsage);
+            //#else
+            //                _fsShapeFile = new FileStream(_filename, FileMode.Open, FileAccess.Read);
+            //#endif
+            //                //_brShapeFile = new BinaryReader(_fsShapeFile);
+            //                //// Create array to hold the index array for this open session
+            //                ////_offsetOfRecord = new int[_featureCount];
+            //                //_offsetOfRecord = new ShapeFileIndexEntry[_featureCount];
+            //                //PopulateIndexes(shxFile);
+            //                InitializeShape(_filename, _fileBasedIndex);
+            //                if (DbaseFile != null)
+            //                    DbaseFile.Open();
+            //                _isOpen = true;
+
+            //            }
+        }
 #if USE_MEMORYMAPPED_FILE
         private Stream CheckCreateMemoryMappedStream(string filename, ref bool haveRegistredForUsage)
         {
@@ -548,48 +546,48 @@ private Stream CheckCreateMemoryMappedStream(string filename, ref bool haveRegis
         public void Close()
         { }
 
-		/// <summary>
-		/// Returns true if the datasource is currently open
-		/// </summary>		
-		public bool IsOpen
-		{
+        /// <summary>
+        /// Returns true if the datasource is currently open
+        /// </summary>		
+        public bool IsOpen
+        {
             get { return false; }
-		}
+        }
 
-		/// <summary>
-		/// Returns geometries whose bounding box intersects 'bbox'
-		/// </summary>
-		/// <remarks>
-		/// <para>Please note that this method doesn't guarantee that the geometries returned actually intersect 'bbox', but only
-		/// that their boundingbox intersects 'bbox'.</para>
-		/// <para>This method is much faster than the QueryFeatures method, because intersection tests
-		/// are performed on objects simplified by their boundingbox, and using the Spatial Index.</para>
-		/// </remarks>
-		/// <param name="bbox"></param>
-		/// <returns></returns>
-		public Collection<IGeometry> GetGeometriesInView(Envelope bbox)
-		{
+        /// <summary>
+        /// Returns geometries whose bounding box intersects 'bbox'
+        /// </summary>
+        /// <remarks>
+        /// <para>Please note that this method doesn't guarantee that the geometries returned actually intersect 'bbox', but only
+        /// that their boundingbox intersects 'bbox'.</para>
+        /// <para>This method is much faster than the QueryFeatures method, because intersection tests
+        /// are performed on objects simplified by their boundingbox, and using the Spatial Index.</para>
+        /// </remarks>
+        /// <param name="bbox"></param>
+        /// <returns></returns>
+        public Collection<Geometry> GetGeometriesInView(Envelope bbox)
+        {
             //Use the spatial index to get a list of features whose boundingbox intersects bbox
-			var objectlist = GetObjectIDsInView(bbox);
-			if (objectlist.Count == 0) //no features found. Return an empty set
-				return new Collection<IGeometry>();
+            var objectlist = GetObjectIDsInView(bbox);
+            if (objectlist.Count == 0) //no features found. Return an empty set
+                return new Collection<Geometry>();
 
             if (FilterDelegate != null)
                 return GetGeometriesInViewWithFilter(objectlist);
 
-		    return GetGeometriesInViewWithoutFilter(objectlist);
-		}
+            return GetGeometriesInViewWithoutFilter(objectlist);
+        }
 
-        private Collection<IGeometry> GetGeometriesInViewWithFilter(Collection<uint> oids)
+        private Collection<Geometry> GetGeometriesInViewWithFilter(Collection<uint> oids)
         {
-            Collection<IGeometry> result = null;
+            Collection<Geometry> result = null;
             using (Stream s = OpenShapefileStream())
             {
                 using (BinaryReader br = new BinaryReader(s))
                 {
                     using (DbaseReader DbaseFile = OpenDbfStream())
                     {
-                        result = new Collection<IGeometry>();
+                        result = new Collection<Geometry>();
                         var table = DbaseFile.NewTable;
                         var tmpOids = new Collection<uint>();
                         foreach (var oid in oids)
@@ -610,9 +608,9 @@ private Collection<IGeometry> GetGeometriesInViewWithFilter(Collection<uint> oid
             return result;
         }
 
-        private Collection<IGeometry> GetGeometriesInViewWithoutFilter(Collection<uint> oids)
+        private Collection<Geometry> GetGeometriesInViewWithoutFilter(Collection<uint> oids)
         {
-            var result = new Collection<IGeometry>();
+            var result = new Collection<Geometry>();
             using (var s = OpenShapefileStream())
             {
                 using (var br = new BinaryReader(s))
@@ -635,18 +633,18 @@ private Collection<IGeometry> GetGeometriesInViewWithoutFilter(Collection<uint>
             return result;
         }
 
-		/// <summary>
-		/// Returns all objects whose boundingbox intersects bbox.
-		/// </summary>
-		/// <remarks>
-		/// <para>
-		/// Please note that this method doesn't guarantee that the geometries returned actually intersect 'bbox', but only
-		/// that their boundingbox intersects 'bbox'.
-		/// </para>
-		/// </remarks>
-		/// <param name="bbox"></param>
-		/// <param name="ds"></param>
-		/// <returns></returns>
+        /// <summary>
+        /// Returns all objects whose boundingbox intersects bbox.
+        /// </summary>
+        /// <remarks>
+        /// <para>
+        /// Please note that this method doesn't guarantee that the geometries returned actually intersect 'bbox', but only
+        /// that their boundingbox intersects 'bbox'.
+        /// </para>
+        /// </remarks>
+        /// <param name="bbox"></param>
+        /// <param name="ds"></param>
+        /// <returns></returns>
         public void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
         {
             // Do true intersection query
@@ -688,14 +686,14 @@ public void ExecuteIntersectionQuery(Envelope bbox, FeatureDataSet ds)
             CleanInternalCache(objectlist);
         }
 
-		/// <summary>
-		/// Returns geometry Object IDs whose bounding box intersects 'bbox'
-		/// </summary>
-		/// <param name="bbox"></param>
-		/// <returns></returns>
+        /// <summary>
+        /// Returns geometry Object IDs whose bounding box intersects 'bbox'
+        /// </summary>
+        /// <param name="bbox"></param>
+        /// <returns></returns>
         public Collection<uint> GetObjectIDsInView(Envelope bbox)
-		{
-		    if (!_tree.Box.Intersects(bbox))
+        {
+            if (!_tree.Box.Intersects(bbox))
                 return new Collection<uint>();
 
             var needBBoxFiltering = _tree is AllFeaturesTree && !bbox.Contains(_tree.Box);
@@ -704,9 +702,9 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
             var res = _tree.Search(bbox);
 
             if (needBBoxFiltering)
-		    {
-		        var tmp = new Collection<uint>();
-		        using (var dbr = OpenDbfStream())
+            {
+                var tmp = new Collection<uint>();
+                using (var dbr = OpenDbfStream())
                 using (var sbr = new BinaryReader(OpenShapefileStream()))
                 {
                     foreach (var oid in res)
@@ -714,9 +712,9 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
                         var geom = ReadGeometry(oid, sbr, dbr);
                         if (geom != null && bbox.Intersects(geom.EnvelopeInternal)) tmp.Add(oid);
                     }
-		        }
-		        res = tmp;
-		    }
+                }
+                res = tmp;
+            }
 
             /*Sort oids so we get a forward only read of the shapefile*/
             var ret = new List<uint>(res);
@@ -725,15 +723,15 @@ public Collection<uint> GetObjectIDsInView(Envelope bbox)
             return new Collection<uint>(ret);
         }
 
-		/// <summary>
-		/// Returns the geometry corresponding to the Object ID
-		/// </summary>
-		/// <remarks>FilterDelegate is no longer applied to this ge</remarks>
-		/// <param name="oid">Object ID</param>
-		/// <returns>The geometry at the Id</returns>
-        public IGeometry GetGeometryByID(uint oid)
+        /// <summary>
+        /// Returns the geometry corresponding to the Object ID
+        /// </summary>
+        /// <remarks>FilterDelegate is no longer applied to this ge</remarks>
+        /// <param name="oid">Object ID</param>
+        /// <returns>The geometry at the Id</returns>
+        public Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom;
+            Geometry geom;
             using (Stream s = OpenShapefileStream())
             {
                 using (BinaryReader br = new BinaryReader(s))
@@ -749,15 +747,15 @@ public IGeometry GetGeometryByID(uint oid)
             }
             return geom;
         }
-            /// <summary>
-		/// Returns the geometry corresponding to the Object ID
-		/// </summary>
-		/// <remarks>FilterDelegate is no longer applied to this ge</remarks>
-		/// <param name="oid">Object ID</param>
-		/// <param name="br">The binary reader for reading</param>
-		/// <param name="dbf">The dBase reader</param>
-		/// <returns>The geometry at the Id</returns>
-        private IGeometry GetGeometryByID(uint oid, BinaryReader br, DbaseReader dbf)
+        /// <summary>
+        /// Returns the geometry corresponding to the Object ID
+        /// </summary>
+        /// <remarks>FilterDelegate is no longer applied to this ge</remarks>
+        /// <param name="oid">Object ID</param>
+        /// <param name="br">The binary reader for reading</param>
+        /// <param name="dbf">The dBase reader</param>
+        /// <returns>The geometry at the Id</returns>
+        private Geometry GetGeometryByID(uint oid, BinaryReader br, DbaseReader dbf)
         {
             if (_useMemoryCache)
             {
@@ -774,12 +772,12 @@ private IGeometry GetGeometryByID(uint oid, BinaryReader br, DbaseReader dbf)
 
                 return fdr.Geometry;
             }
-            IGeometry geom = ReadGeometry(oid, br, dbf);
+            Geometry geom = ReadGeometry(oid, br, dbf);
             return geom;
         }
 
         /// <summary>
-        /// Gets or sets a value indicating that for <see cref="ExecuteIntersectionQuery(GeoAPI.Geometries.Envelope,SharpMap.Data.FeatureDataSet)"/> the intersection of the geometries and the envelope should be tested.
+        /// Gets or sets a value indicating that for <see cref="ExecuteIntersectionQuery(NetTopologySuite.Geometries.Envelope,SharpMap.Data.FeatureDataSet)"/> the intersection of the geometries and the envelope should be tested.
         /// </summary>
         public bool DoTrueIntersectionQuery { get; set; }
 
@@ -789,12 +787,12 @@ private IGeometry GetGeometryByID(uint oid, BinaryReader br, DbaseReader dbf)
         /// <remarks>This really slows rendering performance down</remarks>
         public bool CheckIfRecordIsDeleted { get; set; }
 
-		/// <summary>
-		/// Returns the data associated with all the geometries that are intersected by <paramref name="geom"/>.
-		/// </summary>
-		/// <param name="geom">The geometry to test intersection for</param>
-		/// <param name="ds">FeatureDataSet to fill data into</param>
-        public virtual void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        /// <summary>
+        /// Returns the data associated with all the geometries that are intersected by <paramref name="geom"/>.
+        /// </summary>
+        /// <param name="geom">The geometry to test intersection for</param>
+        /// <param name="ds">FeatureDataSet to fill data into</param>
+        public virtual void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             var bbox = new Envelope(geom.EnvelopeInternal);
 
@@ -855,84 +853,84 @@ public virtual void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
         }
 
 
-		/// <summary>
-		/// Returns the total number of features in the datasource (without any filter applied)
-		/// </summary>
-		/// <returns></returns>
-		public int GetFeatureCount()
-		{
-			return _index.FeatureCount;
-		}
+        /// <summary>
+        /// Returns the total number of features in the datasource (without any filter applied)
+        /// </summary>
+        /// <returns></returns>
+        public int GetFeatureCount()
+        {
+            return _index.FeatureCount;
+        }
 
-		
 
-		/// <summary>
-		/// Returns the extents of the datasource
-		/// </summary>
-		/// <returns></returns>
-		public Envelope GetExtents()
-		{
+
+        /// <summary>
+        /// Returns the extents of the datasource
+        /// </summary>
+        /// <returns></returns>
+        public Envelope GetExtents()
+        {
             if (_tree == null)
                 return _header.BoundingBox;
             /*    
             throw new ApplicationException(
                     "File hasn't been spatially indexed. Try opening the datasource before retriving extents");
              */
-			return _tree.Box;
-		}
+            return _tree.Box;
+        }
 
-		/// <summary>
-		/// Gets the connection ID of the datasource
-		/// </summary>
-		/// <remarks>
-		/// The connection ID of a shapefile is its filename
-		/// </remarks>
-		public string ConnectionID
-		{
-			get { return _filename; }
-		}
-
-		/// <summary>
-		/// Gets or sets the spatial reference ID (CRS)
-		/// </summary>
-		public virtual int SRID
-		{
-			get { return _srid; }
-			set
-			{
-			    _srid = value;
-			    lock (_gspLock)
-			        Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(value);
-			}
-		}
-
-		#endregion
-
-	    /// <summary>
-	    /// Reads and parses the header of the .shp index file
-	    /// </summary>
-	    private void ParseHeader()
-	    {
+        /// <summary>
+        /// Gets the connection ID of the datasource
+        /// </summary>
+        /// <remarks>
+        /// The connection ID of a shapefile is its filename
+        /// </remarks>
+        public string ConnectionID
+        {
+            get { return _filename; }
+        }
+
+        /// <summary>
+        /// Gets or sets the spatial reference ID (CRS)
+        /// </summary>
+        public virtual int SRID
+        {
+            get { return _srid; }
+            set
+            {
+                _srid = value;
+                lock (_gspLock)
+                    Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(value);
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Reads and parses the header of the .shp index file
+        /// </summary>
+        private void ParseHeader()
+        {
             _header = ShapeFileHeader.Read(_filename);
-	        var shxPath = Path.ChangeExtension(_filename, ".shx");
+            var shxPath = Path.ChangeExtension(_filename, ".shx");
             if (!File.Exists(shxPath))
                 ShapeFileIndex.Create(_filename);
             _index = ShapeFileIndex.Read(shxPath);
 
-		}
+        }
 
-		/// <summary>
-		/// Reads and parses the projection if a projection file exists
-		/// </summary>
-		private void ParseProjection()
-		{
-		    var projfile = Path.ChangeExtension(_filename, ".prj");
+        /// <summary>
+        /// Reads and parses the projection if a projection file exists
+        /// </summary>
+        private void ParseProjection()
+        {
+            var projfile = Path.ChangeExtension(_filename, ".prj");
             if (File.Exists(projfile))
             {
                 try
                 {
                     var wkt = File.ReadAllText(projfile);
-                    var css = (CoordinateSystemServices) Session.Instance.CoordinateSystemServices;
+                    var css = Session.Instance.CoordinateSystemServices;
                     _coordinateSystem = css.CreateCoordinateSystem(wkt);
                     SRID = (int)_coordinateSystem.AuthorityCode;
                     _coordsysReadFromFile = true;
@@ -950,10 +948,10 @@ private void ParseProjection()
                     SRID = 0;
                 else
                 {
-                    SRID = (int) _coordinateSystem.AuthorityCode;
+                    SRID = (int)_coordinateSystem.AuthorityCode;
                 }
             }
-		}
+        }
 
         ///// <summary>
         ///// If an index file is present (.shx) it reads the record offsets from the .shx index file and returns the information in an array.
@@ -993,16 +991,16 @@ private void ParseProjection()
 
         //        // Record the current position pointer for later
         //        var oldPosition = _brShapeFile.BaseStream.Position;
-  
+
         //        // Move to the start of the data
         //        _brShapeFile.BaseStream.Seek(100, 0); //Skip content length
         //        long offset = 100; // Start of the data records
-                
+
         //        for (int x = 0; x < _featureCount; ++x)
         //        {
         //            var recordOffset = offset;
         //            //_offsetOfRecord[x] = (int)offset;
-                   
+
         //            _brShapeFile.BaseStream.Seek(offset + 4, 0); //Skip content length
         //            int dataLength = 2 * SwapByteOrder(_brShapeFile.ReadInt32());
         //            _offsetOfRecord[x] = new ShapeFileIndexEntry((int)recordOffset, dataLength);
@@ -1013,35 +1011,35 @@ private void ParseProjection()
         //        // Return the position pointer
         //        _brShapeFile.BaseStream.Seek(oldPosition, 0);
         //    }
-		//}
-
-		///<summary>
-		///Swaps the byte order of an int32
-		///</summary>
-		/// <param name="i">Integer to swap</param>
-		/// <returns>Byte Order swapped int32</returns>
-		internal static int SwapByteOrder(int i)
-		{
-			var buffer = BitConverter.GetBytes(i);
-			Array.Reverse(buffer, 0, buffer.Length);
-			return BitConverter.ToInt32(buffer, 0);
-		}
-
-		/// <summary>
-		/// Loads a spatial index from a file. If it doesn't exist, one is created and saved
-		/// </summary>
-		/// <param name="filename"></param>
-		/// <returns>A spatial index</returns>
+        //}
+
+        ///<summary>
+        ///Swaps the byte order of an int32
+        ///</summary>
+        /// <param name="i">Integer to swap</param>
+        /// <returns>Byte Order swapped int32</returns>
+        internal static int SwapByteOrder(int i)
+        {
+            var buffer = BitConverter.GetBytes(i);
+            Array.Reverse(buffer, 0, buffer.Length);
+            return BitConverter.ToInt32(buffer, 0);
+        }
+
+        /// <summary>
+        /// Loads a spatial index from a file. If it doesn't exist, one is created and saved
+        /// </summary>
+        /// <param name="filename"></param>
+        /// <returns>A spatial index</returns>
         private ISpatialIndex<uint> CreateSpatialIndexFromFile(string filename)
-		{
-		    var tree = SpatialIndexFactory.Load(filename);
-		    if (tree == null)
-		    {
+        {
+            var tree = SpatialIndexFactory.Load(filename);
+            if (tree == null)
+            {
                 tree = SpatialIndexFactory.Create(GetExtents(), GetFeatureCount(), GetAllFeatureBoundingBoxes());
                 tree.SaveIndex(filename);
             }
-		    return tree;
-		}
+            return tree;
+        }
 
 
         //private void LoadSpatialIndex()
@@ -1113,16 +1111,16 @@ private static object GetOrCreateLock(string filename)
         }
 
         private void LoadSpatialIndex(bool forceRebuild)
-		{
-		    // if we want a new tree, force its creation
-		    if (_tree != null && forceRebuild)
-		    {
-		        _tree.DeleteIndex(_filename);
-		        _tree = null;
-		    }
-
-		    if (forceRebuild)
-		    {
+        {
+            // if we want a new tree, force its creation
+            if (_tree != null && forceRebuild)
+            {
+                _tree.DeleteIndex(_filename);
+                _tree = null;
+            }
+
+            if (forceRebuild)
+            {
                 lock (GetOrCreateLock(_filename))
                 {
                     _tree = SpatialIndexFactory.Create(GetExtents(), GetFeatureCount(), GetAllFeatureBoundingBoxes());
@@ -1131,12 +1129,12 @@ private void LoadSpatialIndex(bool forceRebuild)
                         Web.HttpCacheUtility.TryAddValue(_filename, _tree, TimeSpan.FromDays(1));
                 }
                 return;
-		    }
+            }
 
             // Is this a web application? If so lets store the index in the cache so we don't
-			// need to rebuild it for each request
-		    if (Web.HttpCacheUtility.IsWebContext)
-		    {
+            // need to rebuild it for each request
+            if (Web.HttpCacheUtility.IsWebContext)
+            {
                 lock (GetOrCreateLock(_filename))
                 {
                     if (!Web.HttpCacheUtility.TryGetValue(_filename, out _tree))
@@ -1146,11 +1144,11 @@ private void LoadSpatialIndex(bool forceRebuild)
                     }
                 }
             }
-		    else
-		    {
-		        _tree = CreateSpatialIndexFromFile(_filename);
-		    }
-		}
+            else
+            {
+                _tree = CreateSpatialIndexFromFile(_filename);
+            }
+        }
 
         /// <summary>
 		/// Forces a rebuild of the spatial index. If the instance of the ShapeFile provider
@@ -1160,81 +1158,84 @@ public void RebuildSpatialIndex()
         {
             _fileBasedIndex = true;
             LoadSpatialIndex(true);
-		}
+        }
 
-		/// <summary>
-		/// Reads all boundingboxes of features in the shapefile. This is used for spatial indexing.
-		/// </summary>
-		/// <returns></returns>
-		private IEnumerable<ISpatialIndexItem<uint>> GetAllFeatureBoundingBoxes()
-		{
-		    var fsShapeFile = new FileStream(Filename, FileMode.Open, FileAccess.Read, FileShare.Read);
-		    var shapeType = _header.ShapeType;
+        /// <summary>
+        /// Reads all boundingboxes of features in the shapefile. This is used for spatial indexing.
+        /// </summary>
+        /// <returns></returns>
+        private IEnumerable<ISpatialIndexItem<uint>> GetAllFeatureBoundingBoxes()
+        {
+            var fsShapeFile = new FileStream(Filename, FileMode.Open, FileAccess.Read, FileShare.Read);
+            var shapeType = _header.ShapeType;
 
             using (var brShapeFile = new BinaryReader(fsShapeFile, Encoding.Unicode))
-		    {
-		        if (shapeType == ShapeType.Point || shapeType == ShapeType.PointZ ||
-		            shapeType == ShapeType.PointM)
-		        {
-		            for (var a = 0; a < _index.FeatureCount; ++a)
-		            {
-		                //if (recDel((uint)a)) continue;
+            {
+                if (shapeType == ShapeType.Point || shapeType == ShapeType.PointZ ||
+                    shapeType == ShapeType.PointM)
+                {
+                    for (var a = 0; a < _index.FeatureCount; ++a)
+                    {
+                        //if (recDel((uint)a)) continue;
 
                         fsShapeFile.Seek(_index.GetOffset((uint)a) + 8, 0); //skip record number and content length
-		                if ((ShapeType) brShapeFile.ReadInt32() != ShapeType.Null)
-		                {
+                        if ((ShapeType)brShapeFile.ReadInt32() != ShapeType.Null)
+                        {
                             yield return new QuadTree.BoxObjects
                             {
                                 ID = (uint)a/*+1*/,
-                                Box = new Envelope(new Coordinate(brShapeFile.ReadDouble(), brShapeFile.ReadDouble()))};
-		                }
-		            }
-		        }
-		        else
-		        {
-		            for (var a = 0; a < _index.FeatureCount; ++a)
-		            {
-		                //if (recDel((uint)a)) continue;
-		                fsShapeFile.Seek(_index.GetOffset((uint)a) + 8, 0); //skip record number and content length
-		                if ((ShapeType) brShapeFile.ReadInt32() != ShapeType.Null)
-		                    yield return new QuadTree.BoxObjects{ 
-                                ID = (uint)a /*+1*/, 
+                                Box = new Envelope(new Coordinate(brShapeFile.ReadDouble(), brShapeFile.ReadDouble()))
+                            };
+                        }
+                    }
+                }
+                else
+                {
+                    for (var a = 0; a < _index.FeatureCount; ++a)
+                    {
+                        //if (recDel((uint)a)) continue;
+                        fsShapeFile.Seek(_index.GetOffset((uint)a) + 8, 0); //skip record number and content length
+                        if ((ShapeType)brShapeFile.ReadInt32() != ShapeType.Null)
+                            yield return new QuadTree.BoxObjects
+                            {
+                                ID = (uint)a /*+1*/,
                                 Box = new Envelope(new Coordinate(brShapeFile.ReadDouble(), brShapeFile.ReadDouble()),
-		                                           new Coordinate(brShapeFile.ReadDouble(), brShapeFile.ReadDouble()))};
-		                //boxes.Add(new BoundingBox(brShapeFile.ReadDouble(), brShapeFile.ReadDouble(),
-		                //                          brShapeFile.ReadDouble(), brShapeFile.ReadDouble()));
-		            }
-		        }
-		    }
-		    //return boxes;
-		}
-
-	    /// <summary>
+                                                   new Coordinate(brShapeFile.ReadDouble(), brShapeFile.ReadDouble()))
+                            };
+                        //boxes.Add(new BoundingBox(brShapeFile.ReadDouble(), brShapeFile.ReadDouble(),
+                        //                          brShapeFile.ReadDouble(), brShapeFile.ReadDouble()));
+                    }
+                }
+            }
+            //return boxes;
+        }
+
+        /// <summary>
         /// Gets or sets the geometry factory
         /// </summary>
-        protected IGeometryFactory Factory
-	    {
-	        get
-	        {
+        protected GeometryFactory Factory
+        {
+            get
+            {
                 if (_srid == -1)
                     SRID = 0;
                 return _factory;
-	        }
-	        set
-	        {
-	            _factory = value;
-	            _srid = _factory.SRID;
-	        }
-	    }
-
-	    /// <summary>
-		/// Reads and parses the geometry with ID 'oid' from the ShapeFile
-		/// </summary>
-		/// <param name="oid">Object ID</param>
+            }
+            set
+            {
+                _factory = value;
+                _srid = _factory.SRID;
+            }
+        }
+
+        /// <summary>
+        /// Reads and parses the geometry with ID 'oid' from the ShapeFile
+        /// </summary>
+        /// <param name="oid">Object ID</param>
         /// <param name="br">BinaryReader of the ShapeFileStream</param>
         /// <param name="dBaseReader">dBaseReader of the DBaseFile</param>
-		/// <returns>geometry</returns>
-        private IGeometry ReadGeometry(uint oid, BinaryReader br, DbaseReader dBaseReader)
+        /// <returns>geometry</returns>
+        private Geometry ReadGeometry(uint oid, BinaryReader br, DbaseReader dBaseReader)
         {
             // Do we want to receive geometries of deleted records as well?
             if (CheckIfRecordIsDeleted)
@@ -1248,151 +1249,185 @@ private IGeometry ReadGeometry(uint oid, BinaryReader br, DbaseReader dBaseReade
             return ParseGeometry(Factory, _header.ShapeType, br);
         }
 
-        private static IGeometry ParseGeometry(IGeometryFactory factory, ShapeType shapeType, BinaryReader brGeometryStream)
+        private static Geometry ParseGeometry(GeometryFactory factory, ShapeType shapeType, BinaryReader brGeometryStream)
         {
             //Skip record number and content length
-            brGeometryStream.BaseStream.Seek(8, SeekOrigin.Current); 
+            brGeometryStream.BaseStream.Seek(8, SeekOrigin.Current);
 
             var type = (ShapeType)brGeometryStream.ReadInt32(); //Shape type
-                if (type == ShapeType.Null)
+            if (type == ShapeType.Null)
+                return null;
+
+            if (shapeType == ShapeType.Point || shapeType == ShapeType.PointM || shapeType == ShapeType.PointZ)
+            {
+                var hasZ = shapeType == ShapeType.PointZ;
+                var coordinate = hasZ
+                    ? new CoordinateZ(
+                        brGeometryStream.ReadDouble(),
+                        brGeometryStream.ReadDouble(),
+                        brGeometryStream.ReadDouble())
+                    : new Coordinate(
+                        brGeometryStream.ReadDouble(),
+                        brGeometryStream.ReadDouble());
+                var point = factory.CreatePoint(coordinate);
+                return point;
+            }
+
+            if (shapeType == ShapeType.Multipoint || shapeType == ShapeType.MultiPointM ||
+                shapeType == ShapeType.MultiPointZ)
+            {
+                var hasZ = shapeType == ShapeType.MultiPointZ;
+                brGeometryStream.BaseStream.Seek(32, SeekOrigin.Current); //skip min/max box
+                var nPoints = brGeometryStream.ReadInt32(); // get the number of points
+                if (nPoints == 0)
                     return null;
 
-                if (shapeType == ShapeType.Point || shapeType == ShapeType.PointM || shapeType == ShapeType.PointZ)
+                var feature = new Coordinate[nPoints];
+                for (var i = 0; i < nPoints; i++)
                 {
-                    var point = factory.CreatePoint(new Coordinate(brGeometryStream.ReadDouble(), brGeometryStream.ReadDouble()));
-                    if (shapeType == ShapeType.PointZ)
-                    {
-                        point.Z = brGeometryStream.ReadDouble();
-                    }
-                    return point;
+                    feature[i] = hasZ
+                        ? new CoordinateZ(
+                            brGeometryStream.ReadDouble(),
+                            brGeometryStream.ReadDouble(),
+                            double.NaN)
+                        : new Coordinate(
+                            brGeometryStream.ReadDouble(),
+                            brGeometryStream.ReadDouble());
                 }
-
-                if (shapeType == ShapeType.Multipoint || shapeType == ShapeType.MultiPointM ||
-                    shapeType == ShapeType.MultiPointZ)
+                if (hasZ)
                 {
-                    brGeometryStream.BaseStream.Seek(32, SeekOrigin.Current); //skip min/max box
-                    var nPoints = brGeometryStream.ReadInt32(); // get the number of points
-                    if (nPoints == 0)
-                        return null;
-                    var feature = new Coordinate[nPoints];
+                    brGeometryStream.ReadDouble();
+                    brGeometryStream.ReadDouble();
                     for (var i = 0; i < nPoints; i++)
-                        feature[i] = new Coordinate(brGeometryStream.ReadDouble(), brGeometryStream.ReadDouble());
-
-                    if (shapeType == ShapeType.MultiPointZ)
-                    {
-                        brGeometryStream.ReadDouble();
-                        brGeometryStream.ReadDouble();
-                        for (var i = 0; i < nPoints; i++)
-                            feature[i].Z = brGeometryStream.ReadDouble();
-                    }
-                    return factory.CreateMultiPointFromCoords(feature);
+                        feature[i].Z = brGeometryStream.ReadDouble();
                 }
+                return factory.CreateMultiPointFromCoords(feature);
+            }
 
-                if (shapeType == ShapeType.PolyLine || shapeType == ShapeType.Polygon ||
-                    shapeType == ShapeType.PolyLineM || shapeType == ShapeType.PolygonM ||
-                    shapeType == ShapeType.PolyLineZ || shapeType == ShapeType.PolygonZ)
-                {
-                    brGeometryStream.BaseStream.Seek(32, SeekOrigin.Current); //skip min/max box
-
-                    var nParts = brGeometryStream.ReadInt32(); // get number of parts (segments)
-                    if (nParts == 0 || nParts < 0)
-                        return null;
+            if (shapeType == ShapeType.PolyLine || shapeType == ShapeType.Polygon ||
+                shapeType == ShapeType.PolyLineM || shapeType == ShapeType.PolygonM ||
+                shapeType == ShapeType.PolyLineZ || shapeType == ShapeType.PolygonZ)
+            {
+                var hasZ = shapeType == ShapeType.PolyLineZ || shapeType == ShapeType.PolygonZ;
+                brGeometryStream.BaseStream.Seek(32, SeekOrigin.Current); //skip min/max box
+                var nParts = brGeometryStream.ReadInt32(); // get number of parts (segments)
+                if (nParts == 0 || nParts < 0)
+                    return null;
 
-                    var nPoints = brGeometryStream.ReadInt32(); // get number of points
-                    var segments = new int[nParts + 1];
-                    //Read in the segment indexes
-                    for (var b = 0; b < nParts; b++)
-                        segments[b] = brGeometryStream.ReadInt32();
-                    //add end point
-                    segments[nParts] = nPoints;
+                var nPoints = brGeometryStream.ReadInt32(); // get number of points
+                var segments = new int[nParts + 1];
+                //Read in the segment indexes
+                for (var b = 0; b < nParts; b++)
+                    segments[b] = brGeometryStream.ReadInt32();
+                //add end point
+                segments[nParts] = nPoints;
 
-                    if ((int)shapeType % 10 == 3)
+                if ((int)shapeType % 10 == 3)
+                {
+                    var lineStrings = new LineString[nParts];
+                    for (var lineID = 0; lineID < nParts; lineID++)
                     {
-                        var lineStrings = new ILineString[nParts];
-                        for (var lineID = 0; lineID < nParts; lineID++)
+                        var line = new Coordinate[segments[lineID + 1] - segments[lineID]];
+                        var offset = segments[lineID];
+                        for (var i = segments[lineID]; i < segments[lineID + 1]; i++)
                         {
-                            var line = new Coordinate[segments[lineID + 1] - segments[lineID]];
-                            var offset = segments[lineID];
+                            line[i - offset] = hasZ
+                                ? new CoordinateZ(
+                                    brGeometryStream.ReadDouble(),
+                                    brGeometryStream.ReadDouble(),
+                                    double.NaN)
+                                : new Coordinate(
+                                    brGeometryStream.ReadDouble(),
+                                    brGeometryStream.ReadDouble());
+                        }
+                        if (hasZ)
+                        {
+                            brGeometryStream.ReadDouble();
+                            brGeometryStream.ReadDouble();
                             for (var i = segments[lineID]; i < segments[lineID + 1]; i++)
-                                line[i - offset] = new Coordinate(brGeometryStream.ReadDouble(), brGeometryStream.ReadDouble());
-
-                            if (shapeType == ShapeType.PolyLineZ)
                             {
-                                brGeometryStream.ReadDouble();
-                                brGeometryStream.ReadDouble();
-                                for (var i = segments[lineID]; i < segments[lineID + 1]; i++)
-                                    line[i - offset].Z = brGeometryStream.ReadDouble();
+                                line[i - offset].Z = brGeometryStream.ReadDouble();
                             }
-                            lineStrings[lineID] = factory.CreateLineString(line);
                         }
+                        lineStrings[lineID] = factory.CreateLineString(line);
+                    }
 
-                        if (lineStrings.Length == 1)
-                            return lineStrings[0];
+                    if (lineStrings.Length == 1)
+                        return lineStrings[0];
 
-                        return factory.CreateMultiLineString(lineStrings);
-                    }
+                    return factory.CreateMultiLineString(lineStrings);
+                }
 
-                    //First read all the rings
-                    var rings = new ILinearRing[nParts];
-                    for (var ringID = 0; ringID < nParts; ringID++)
+                //First read all the rings
+                var rings = new LinearRing[nParts];
+                for (var ringID = 0; ringID < nParts; ringID++)
+                {
+                    var ring = new Coordinate[segments[ringID + 1] - segments[ringID]];
+                    var offset = segments[ringID];
+                    for (var i = segments[ringID]; i < segments[ringID + 1]; i++)
                     {
-                        var ring = new Coordinate[segments[ringID + 1] - segments[ringID]];
-                        var offset = segments[ringID];
-                        for (var i = segments[ringID]; i < segments[ringID + 1]; i++)
-                            ring[i - offset] = new Coordinate(brGeometryStream.ReadDouble(), brGeometryStream.ReadDouble());
-                        if (shapeType == ShapeType.PolygonZ)
-                        {
-                            brGeometryStream.ReadDouble();
-                            brGeometryStream.ReadDouble();
-                            for (var i = segments[ringID]; i < segments[ringID + 1]; i++)
-                                ring[i - offset].Z = brGeometryStream.ReadDouble();
-                        }
-                        rings[ringID] = factory.CreateLinearRing(ring);
+                        ring[i - offset] = hasZ
+                            ? new CoordinateZ(
+                                brGeometryStream.ReadDouble(),
+                                brGeometryStream.ReadDouble(),
+                                double.NaN)
+                            : new Coordinate(
+                                brGeometryStream.ReadDouble(),
+                                brGeometryStream.ReadDouble());
                     }
-
-                    ILinearRing exteriorRing;
-                    var isCounterClockWise = new bool[rings.Length];
-                    var polygonCount = 0;
-                    for (var i = 0; i < rings.Length; i++)
+                    if (hasZ)
                     {
-                        isCounterClockWise[i] = rings[i].IsCCW();
-                        if (!isCounterClockWise[i])
-                            polygonCount++;
+                        brGeometryStream.ReadDouble();
+                        brGeometryStream.ReadDouble();
+                        for (var i = segments[ringID]; i < segments[ringID + 1]; i++)
+                            ring[i - offset].Z = brGeometryStream.ReadDouble();
                     }
-                    if (polygonCount == 1) //We only have one polygon
+                    rings[ringID] = factory.CreateLinearRing(ring);
+                }
+
+                LinearRing exteriorRing;
+                var isCounterClockWise = new bool[rings.Length];
+                var polygonCount = 0;
+                for (var i = 0; i < rings.Length; i++)
+                {
+                    isCounterClockWise[i] = rings[i].IsCCW();
+                    if (!isCounterClockWise[i])
+                        polygonCount++;
+                }
+                if (polygonCount == 1) //We only have one polygon
+                {
+                    exteriorRing = rings[0];
+                    LinearRing[] interiorRings = null;
+                    if (rings.Length > 1)
                     {
-                        exteriorRing = rings[0];
-                        ILinearRing[] interiorRings = null;
-                        if (rings.Length > 1)
-                        {
-                            interiorRings = new ILinearRing[rings.Length - 1];
-                            Array.Copy(rings, 1, interiorRings, 0, interiorRings.Length);
-                        }
-                        return factory.CreatePolygon(exteriorRing, interiorRings);
+                        interiorRings = new LinearRing[rings.Length - 1];
+                        Array.Copy(rings, 1, interiorRings, 0, interiorRings.Length);
                     }
+                    return factory.CreatePolygon(exteriorRing, interiorRings);
+                }
 
-                    var polygons = new List<IPolygon>();
-                    exteriorRing = rings[0];
-                    var holes = new List<ILinearRing>();
+                var polygons = new List<Polygon>();
+                exteriorRing = rings[0];
+                var holes = new List<LinearRing>();
 
-                    for (var i = 1; i < rings.Length; i++)
+                for (var i = 1; i < rings.Length; i++)
+                {
+                    if (!isCounterClockWise[i])
                     {
-                        if (!isCounterClockWise[i])
-                        {
-                            polygons.Add(factory.CreatePolygon(exteriorRing, holes.ToArray()));
-                            holes.Clear();
-                            exteriorRing = rings[i];
-                        }
-                        else
-                            holes.Add(rings[i]);
+                        polygons.Add(factory.CreatePolygon(exteriorRing, holes.ToArray()));
+                        holes.Clear();
+                        exteriorRing = rings[i];
                     }
-                    polygons.Add(factory.CreatePolygon(exteriorRing, holes.ToArray()));
-
-                    return factory.CreateMultiPolygon(polygons.ToArray());
+                    else
+                        holes.Add(rings[i]);
                 }
+                polygons.Add(factory.CreatePolygon(exteriorRing, holes.ToArray()));
 
-	        throw (new ApplicationException("Shapefile type " + shapeType + " not supported"));
-	    }
+                return factory.CreateMultiPolygon(polygons.ToArray());
+            }
+
+            throw new ApplicationException("Shapefile type " + shapeType + " not supported");
+        }
 
         /// <summary>
         /// Gets a <see cref="FeatureDataRow"/> from the datasource at the specified index
@@ -1409,8 +1444,8 @@ public FeatureDataRow GetFeature(uint rowId)
             return GetFeature(rowId, null);
         }
 
-		/// <summary>
-		/// Gets a datarow from the datasource at the specified index belonging to the specified datatable
+        /// <summary>
+        /// Gets a datarow from the datasource at the specified index belonging to the specified datatable
         /// <para/>
         /// Please note well: It is not checked whether 
         /// <list type="Bullet">
@@ -1496,5 +1531,5 @@ private FeatureDataRow getFeature(uint rowid, FeatureDataTable dt, BinaryReader
                 "An attempt was made to read DBase data from a shapefile without a valid .DBF file"));
         }
 
-	}
+    }
 }
diff --git a/SharpMap/Data/Providers/ShapeFileHeader.cs b/SharpMap/Data/Providers/ShapeFileHeader.cs
index f854b1d9..9fca0840 100644
--- a/SharpMap/Data/Providers/ShapeFileHeader.cs
+++ b/SharpMap/Data/Providers/ShapeFileHeader.cs
@@ -1,7 +1,7 @@
+using NetTopologySuite.DataStructures;
+using NetTopologySuite.Geometries;
 using System;
 using System.IO;
-using GeoAPI.DataStructures;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Data.Providers
 {
@@ -37,13 +37,13 @@ public static Double ParseNoDataValue(double measure)
         }
 
         private readonly Envelope _envelope;
-        
+
         /// <summary>
         /// Creates an instance of this class using the provided <paramref name="header"/> buffer
         /// </summary>
         /// <param name="header">The buffer holding the header information</param>
         public ShapeFileHeader(byte[] header)
-            :this(new MemoryStream(header))
+            : this(new MemoryStream(header))
         {
         }
 
@@ -52,7 +52,7 @@ public ShapeFileHeader(byte[] header)
         /// </summary>
         /// <param name="header">The stream holding the header information</param>
         public ShapeFileHeader(Stream header)
-            :this(new BinaryReader(header))
+            : this(new BinaryReader(header))
         {
         }
 
@@ -81,7 +81,7 @@ public ShapeFileHeader(BinaryReader headerReader)
 
             // Get file length
             headerReader.BaseStream.Seek(20, SeekOrigin.Current);
-            FileLength = 2*ShapeFile.SwapByteOrder(headerReader.ReadInt32());
+            FileLength = 2 * ShapeFile.SwapByteOrder(headerReader.ReadInt32());
 
             // Check file Version
             if (headerReader.ReadInt32() != ShapeFileVersion)
@@ -90,7 +90,7 @@ public ShapeFileHeader(BinaryReader headerReader)
             }
 
             // Get the shape type
-            ShapeType = (ShapeType) headerReader.ReadInt32();
+            ShapeType = (ShapeType)headerReader.ReadInt32();
 
             // Get the bounding box
             _envelope = new Envelope(new Coordinate(headerReader.ReadDouble(), headerReader.ReadDouble()),
@@ -118,7 +118,7 @@ public ShapeFileHeader(BinaryReader headerReader)
         /// <summary>
         /// Gets the extent of the shape file
         /// </summary>
-        public Envelope BoundingBox { get { return new Envelope(_envelope);} }
+        public Envelope BoundingBox { get { return new Envelope(_envelope); } }
 
         /// <summary>
         /// Gets the range of Z-Values in the shape file, if there are any
diff --git a/SharpMap/Data/Providers/ShapeFileIndex.cs b/SharpMap/Data/Providers/ShapeFileIndex.cs
index b9be12a8..0a76ec87 100644
--- a/SharpMap/Data/Providers/ShapeFileIndex.cs
+++ b/SharpMap/Data/Providers/ShapeFileIndex.cs
@@ -18,7 +18,7 @@ private class ShapeFileEnumerator : IEnumerator<ShapeFileIndexEntry>
             private int _lastOid;
 
             private ShapeFileIndexEntry _current;
-            
+
             public ShapeFileEnumerator(string shpPath)
                 : this(new FileStream(shpPath, FileMode.Open, FileAccess.Read, FileShare.Read))
             {
@@ -50,7 +50,7 @@ public bool MoveNext()
 
                 // Get the record offset
                 var recordOffset = (int)_shpStream.Position;
-                
+
                 // Get the oid
                 var oid = ShapeFile.SwapByteOrder(_shpReader.ReadInt32());
                 Debug.Assert(oid == _lastOid + 1);
@@ -58,12 +58,12 @@ public bool MoveNext()
 
                 // Get the record length
                 var recordLength = 2 * ShapeFile.SwapByteOrder(_shpReader.ReadInt32());
-                
+
                 // Set the current ShapeFileIndexEntry
                 _current = new ShapeFileIndexEntry(recordOffset, recordLength);
-                
+
                 // Adjust the streams position
-                _shpStream.Seek(recordLength , SeekOrigin.Current);
+                _shpStream.Seek(recordLength, SeekOrigin.Current);
 
                 return true;
             }
@@ -99,7 +99,7 @@ public static void Create(string shpPath)
             {
                 throw new FileNotFoundException("The specified path does not lead to a file", shpPath);
             }
-            
+
             var shxPath = Path.ChangeExtension(shpPath, ".shx");
             if (File.Exists(shxPath))
             {
@@ -110,7 +110,7 @@ public static void Create(string shpPath)
             {
                 var fs = new FileStream(shxPath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
                 fs.Seek(100, SeekOrigin.Begin);
-                
+
                 using (var bw = new BinaryWriter(fs))
                 {
                     var count = 0;
@@ -171,14 +171,14 @@ public ShapeFileIndex(Stream stream)
             stream.Seek(24, SeekOrigin.Begin);
             var buf = new byte[4];
             stream.Read(buf, 0, 4);
-            var bufferSize = 2*ShapeFile.SwapByteOrder(BitConverter.ToInt32(buf, 0)) - 100;
+            var bufferSize = 2 * ShapeFile.SwapByteOrder(BitConverter.ToInt32(buf, 0)) - 100;
             _shxBuffer = new byte[bufferSize];
             stream.Seek(100, SeekOrigin.Begin);
             stream.Read(_shxBuffer, 0, bufferSize);
 
-            for (var i = 0; i < bufferSize; i+= 4)
+            for (var i = 0; i < bufferSize; i += 4)
             {
-                var value = 2*ShapeFile.SwapByteOrder(BitConverter.ToInt32(_shxBuffer, i));
+                var value = 2 * ShapeFile.SwapByteOrder(BitConverter.ToInt32(_shxBuffer, i));
                 var tmp = BitConverter.GetBytes(value);
                 Buffer.BlockCopy(tmp, 0, _shxBuffer, i, 4);
             }
diff --git a/SharpMap/Data/Providers/ShapeType.cs b/SharpMap/Data/Providers/ShapeType.cs
index c16dc794..00cc7a83 100644
--- a/SharpMap/Data/Providers/ShapeType.cs
+++ b/SharpMap/Data/Providers/ShapeType.cs
@@ -11,14 +11,14 @@ public enum ShapeType
         Null = 0,
         /// <summary>
         /// A point consists of a pair of double-precision coordinates.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.Point"/>
         /// </summary>
         Point = 1,
         /// <summary>
         /// PolyLine is an ordered set of vertices that consists of one or more parts. A part is a
         /// connected sequence of two or more points. Parts may or may not be connected to one
         ///	another. Parts may or may not intersect one another.
-        /// SharpMap interprets this as either <see cref="GeoAPI.Geometries.ILineString"/> or <see cref="GeoAPI.Geometries.IMultiLineString"/>
+        /// SharpMap interprets this as either <see cref="NetTopologySuite.Geometries.LineString"/> or <see cref="NetTopologySuite.Geometries.MultiLineString"/>
         /// </summary>
         PolyLine = 3,
         /// <summary>
@@ -30,58 +30,58 @@ public enum ShapeType
         /// holes in polygons are in a counterclockwise direction. Vertices for a single, ringed
         /// polygon are, therefore, always in clockwise order. The rings of a polygon are referred to
         /// as its parts.
-        /// SharpMap interprets this as either <see cref="GeoAPI.Geometries.IPolygon"/> or <see cref="GeoAPI.Geometries.IMultiPolygon"/>
+        /// SharpMap interprets this as either <see cref="NetTopologySuite.Geometries.Polygon"/> or <see cref="NetTopologySuite.Geometries.MultiPolygon"/>
         /// </summary>
         Polygon = 5,
         /// <summary>
         /// A MultiPoint represents a set of points.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IMultiPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.MultiPoint"/>
         /// </summary>
         Multipoint = 8,
         /// <summary>
         /// A PointZ consists of a triplet of double-precision coordinates plus a measure.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.Point"/>
         /// </summary>
         PointZ = 11,
         /// <summary>
         /// A PolyLineZ consists of one or more parts. A part is a connected sequence of two or
         /// more points. Parts may or may not be connected to one another. Parts may or may not
         /// intersect one another.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.ILineString"/> or <see cref="GeoAPI.Geometries.IMultiLineString"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.LineString"/> or <see cref="NetTopologySuite.Geometries.MultiLineString"/>
         /// </summary>
         PolyLineZ = 13,
         /// <summary>
         /// A PolygonZ consists of a number of rings. A ring is a closed, non-self-intersecting loop.
         /// A PolygonZ may contain multiple outer rings. The rings of a PolygonZ are referred to as
         /// its parts.
-        /// SharpMap interprets this as either <see cref="GeoAPI.Geometries.IPolygon"/> or <see cref="GeoAPI.Geometries.IMultiPolygon"/>
+        /// SharpMap interprets this as either <see cref="NetTopologySuite.Geometries.Polygon"/> or <see cref="NetTopologySuite.Geometries.MultiPolygon"/>
         /// </summary>
         PolygonZ = 15,
         /// <summary>
         /// A MultiPointZ represents a set of <see cref="PointZ"/>s.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IMultiPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.MultiPoint"/>
         /// </summary>
         MultiPointZ = 18,
         /// <summary>
         /// A PointM consists of a pair of double-precision coordinates in the order X, Y, plus a measure M.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.Point"/>
         /// </summary>
         PointM = 21,
         /// <summary>
         /// A shapefile PolyLineM consists of one or more parts. A part is a connected sequence of
         /// two or more points. Parts may or may not be connected to one another. Parts may or may
         /// not intersect one another.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.ILineString"/> or <see cref="GeoAPI.Geometries.IMultiLineString"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.LineString"/> or <see cref="NetTopologySuite.Geometries.MultiLineString"/>
         /// </summary>
         PolyLineM = 23,
         /// <summary>
         /// A PolygonM consists of a number of rings. A ring is a closed, non-self-intersecting loop.
-        /// SharpMap interprets this as either <see cref="GeoAPI.Geometries.IPolygon"/> or <see cref="GeoAPI.Geometries.IMultiPolygon"/>
+        /// SharpMap interprets this as either <see cref="NetTopologySuite.Geometries.Polygon"/> or <see cref="NetTopologySuite.Geometries.MultiPolygon"/>
         /// </summary>
         PolygonM = 25,
         /// <summary>
         /// A MultiPointM represents a set of <see cref="PointM"/>s.
-        /// SharpMap interprets this as <see cref="GeoAPI.Geometries.IMultiPoint"/>
+        /// SharpMap interprets this as <see cref="NetTopologySuite.Geometries.MultiPoint"/>
         /// </summary>
         MultiPointM = 28,
         /// <summary>
@@ -91,5 +91,5 @@ public enum ShapeType
         /// SharpMap doesn't support this feature type.
         /// </summary>
         MultiPatch = 31
-    } ;
-}
\ No newline at end of file
+    };
+}
diff --git a/SharpMap/Data/Providers/SqlServer2008.cs b/SharpMap/Data/Providers/SqlServer2008.cs
index fbec3140..e3499b14 100644
--- a/SharpMap/Data/Providers/SqlServer2008.cs
+++ b/SharpMap/Data/Providers/SqlServer2008.cs
@@ -22,7 +22,7 @@
 // Note - Supports both Geometry AND Geography types for SQL Server 2008 onwards. 
 // The '2008' suffix in the class name is to distinguish from SharpMap.Data.Providers.MsSqlSpatial provider (Sql Server 2005).
 // SqlServer2008 requests WKB from the database (hence will work with Sql Server 2008, 2012, 2016 etc), 
-// and WKB is then parsed to an IGeometry instance using NetTopologySuite.IO.WkbReader
+// and WKB is then parsed to an Geometry instance using NetTopologySuite.IO.WkbReader
 //
 // Alternatively, to work with native Sql Spatial types, see SharpMap.SqlServerSpatialObjects which requests
 // raw spatial bytes from the database and uses Microsoft.SqlServer.Types to convert Sql bytes on the client.
@@ -30,15 +30,13 @@
 // By default, the provider ignores invalid spatial objects. This behaviour can be changed by setting 
 // SqlServer2008.ValidateGeometries = True BUT take note of comments on this property.
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
 using System;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Data.SqlClient;
-using System.Globalization;
 using System.Text;
-using GeoAPI.Geometries;
-using Common.Logging;
-using GeoAPI;
 
 namespace SharpMap.Data.Providers
 {
@@ -494,9 +492,9 @@ protected string BuildTableHints()
         /// </summary>   
         /// <param name="bbox"></param>   
         /// <returns></returns>   
-        public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        public override Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            var features = new Collection<IGeometry>();
+            var features = new Collection<Geometry>();
             using (var conn = new SqlConnection(ConnectionString))
             {
                 var sb = new StringBuilder($"SELECT {GeometryColumn}{GetMakeValidString()}.STAsBinary() FROM {QualifiedTable} {BuildTableHints()} WHERE ");
@@ -518,7 +516,7 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
                     conn.Open();
                     using (SqlDataReader dr = command.ExecuteReader())
                     {
-                        var wkbReader = new NetTopologySuite.IO.WKBReader(GeometryServiceProvider.Instance);
+                        var wkbReader = new NetTopologySuite.IO.WKBReader(NetTopologySuite.NtsGeometryServices.Instance);
                         while (dr.Read())
                         {
                             if (dr[0] != DBNull.Value)
@@ -539,9 +537,9 @@ public override Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         /// </summary>   
         /// <param name="oid">Object ID</param>   
         /// <returns>geometry</returns>   
-        public override IGeometry GetGeometryByID(uint oid)
+        public override Geometry GetGeometryByID(uint oid)
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             using (var conn = new SqlConnection(ConnectionString))
             {
                 string strSql = $"SELECT {GeometryColumn}{GetMakeValidString()}.STAsBinary() FROM {QualifiedTable} " +
@@ -554,7 +552,7 @@ public override IGeometry GetGeometryByID(uint oid)
                     conn.Open();
                     using (SqlDataReader dr = command.ExecuteReader())
                     {
-                        var wkbReader = new NetTopologySuite.IO.WKBReader(GeometryServiceProvider.Instance);
+                        var wkbReader = new NetTopologySuite.IO.WKBReader(NetTopologySuite.NtsGeometryServices.Instance);
                         while (dr.Read())
                         {
                             if (dr[0] != DBNull.Value)
@@ -585,7 +583,7 @@ public override Collection<uint> GetObjectIDsInView(Envelope bbox)
                     (SpatialObjectType == SqlServerSpatialObjectType.Geometry && (ForceSeekHint || !string.IsNullOrEmpty(ForceIndex))))
                     // Geometry sensitive to invalid geometries, and BuildTableHints (ForceSeekHint, ForceIndex) do not suppport .MakeValid() in GetBoxFilterStr
                     sb.Append($"{GeometryColumn}.STIsValid() = 1 AND ");
-                
+
                 sb.Append($"{GetBoxFilterStr(bbox)} {GetExtraOptions()}");
 
                 if (_logger.IsDebugEnabled) _logger.DebugFormat("GetObjectIDsInView {0}", sb.ToString());
@@ -635,7 +633,7 @@ protected string GetBoxFilterStr(Envelope bbox)
         /// </summary>   
         /// <param name="geom"></param>   
         /// <param name="fds">FeatureDataSet to fill data into</param>   
-        protected override void OnExecuteIntersectionQuery(IGeometry geom, FeatureDataSet fds)
+        protected override void OnExecuteIntersectionQuery(Geometry geom, FeatureDataSet fds)
         {
             var sb = new StringBuilder($"SELECT {GetAttributeColumnNames()}, {GeometryColumn}{GetMakeValidString()}.STAsBinary() As {SharpMapWkb} " +
                                        $"FROM {QualifiedTable} {BuildTableHints()} WHERE ");
@@ -738,7 +736,7 @@ public override FeatureDataRow GetFeature(uint rowId)
 
                             if (dr[SharpMapWkb] != null && dr[SharpMapWkb] != DBNull.Value)
                             {
-                                var wkbReader = new NetTopologySuite.IO.WKBReader(GeometryServiceProvider.Instance);
+                                var wkbReader = new NetTopologySuite.IO.WKBReader(NetTopologySuite.NtsGeometryServices.Instance);
                                 fdr.Geometry = wkbReader.Read((byte[])dr[SharpMapWkb]);
                             }
 
@@ -760,7 +758,7 @@ public override Envelope GetExtents()
             using (var conn = new SqlConnection(ConnectionString))
             {
                 conn.Open();
-                var wkbReader = new NetTopologySuite.IO.WKBReader(GeometryServiceProvider.Instance);
+                var wkbReader = new NetTopologySuite.IO.WKBReader(NetTopologySuite.NtsGeometryServices.Instance);
                 string sql;
                 switch (ExtentsMode)
                 {
@@ -926,7 +924,7 @@ protected virtual void ExecuteIntersectionQuery(string sql, FeatureDataSet fds)
                             if (col.ColumnName != GeometryColumn && col.ColumnName != SharpMapWkb)
                                 fdt.Columns.Add(col.ColumnName, col.DataType, col.Expression);
 
-                        var wkbReader = new NetTopologySuite.IO.WKBReader(GeometryServiceProvider.Instance);
+                        var wkbReader = new NetTopologySuite.IO.WKBReader(NetTopologySuite.NtsGeometryServices.Instance);
                         foreach (System.Data.DataRow dr in ds.Tables[0].Rows)
                         {
                             FeatureDataRow fdr = fdt.NewRow();
diff --git a/SharpMap/Data/Providers/WFSClient.cs b/SharpMap/Data/Providers/WFSClient.cs
index 816807f8..12d96c84 100644
--- a/SharpMap/Data/Providers/WFSClient.cs
+++ b/SharpMap/Data/Providers/WFSClient.cs
@@ -1,6 +1,11 @@
 // WFS provider by Peter Robineau (peter.robineau@gmx.at)
 // This file can be redistributed and/or modified under the terms of the GNU Lesser General Public License.
 
+using NetTopologySuite.Geometries;
+using SharpMap.CoordinateSystems;
+using SharpMap.Utilities.Indexing;
+using SharpMap.Utilities.SpatialIndexing;
+using SharpMap.Utilities.Wfs;
 using System;
 using System.Collections;
 using System.Collections.ObjectModel;
@@ -8,11 +13,7 @@
 using System.Linq;
 using System.Net;
 using System.Xml.XPath;
-using GeoAPI.Geometries;
-using SharpMap.CoordinateSystems;
-using SharpMap.Utilities.Indexing;
-using SharpMap.Utilities.SpatialIndexing;
-using SharpMap.Utilities.Wfs;
+using GeometryFactory = SharpMap.Utilities.Wfs.GeometryFactory;
 
 namespace SharpMap.Data.Providers
 {
@@ -148,7 +149,7 @@ namespace SharpMap.Data.Providers
     ///demoMap.Layers.Add(layer6);
     ///demoMap.Layers.Add(layLabel);
     ///
-    ///demoMap.Center = new GeoAPI.Geometries.Coordinate(-74.0, 40.7);
+    ///demoMap.Center = new NetTopologySuite.Geometries.Coordinate(-74.0, 40.7);
     ///demoMap.Zoom = 10;
     /// // Alternatively zoom closer
     /// // demoMap.Zoom = 0.2;
@@ -173,7 +174,7 @@ public enum WFSVersionEnum
             /// Version 1.1.0
             /// </summary>
             WFS1_1_0
-        } ;
+        };
 
         #endregion
 
@@ -249,7 +250,7 @@ public int[] AxisOrder
                 {
                     if (value.Length != 2)
                         throw new ArgumentException("Axis order array must have 2 elements");
-                    if (!((value[0] == 0 && value[1] == 1)||
+                    if (!((value[0] == 0 && value[1] == 1) ||
                           (value[0] == 1 && value[1] == 0)))
                         throw new ArgumentException("Axis order array values must be 0 or 1");
                     if (value[0] + value[1] != 1)
@@ -361,7 +362,7 @@ public WFS(string getCapabilitiesURI, string nsPrefix, string featureType, Geome
 
             if (wfsVersion == WFSVersionEnum.WFS1_0_0)
                 _textResources = new WFS_1_0_0_TextResources();
-            else 
+            else
                 _textResources = new WFS_1_1_0_TextResources();
 
             _wfsVersion = wfsVersion;
@@ -491,7 +492,7 @@ public WFS(IXPathQueryManager getCapabilitiesCache, string nsPrefix, string feat
 
             if (wfsVersion == WFSVersionEnum.WFS1_0_0)
                 _textResources = new WFS_1_0_0_TextResources();
-            else 
+            else
                 _textResources = new WFS_1_1_0_TextResources();
 
             _wfsVersion = wfsVersion;
@@ -533,13 +534,13 @@ public WFS(IXPathQueryManager getCapabilitiesCache, string nsPrefix, string feat
         #region IProvider Member
 
         /// <summary>
-        /// Gets the features within the specified <see cref="GeoAPI.Geometries.Envelope"/>
+        /// Gets the features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/>
         /// </summary>
         /// <param name="bbox"></param>
-        /// <returns>Features within the specified <see cref="GeoAPI.Geometries.Envelope"/></returns>
-        public virtual Collection<IGeometry> GetGeometriesInView(Envelope bbox)
+        /// <returns>Features within the specified <see cref="NetTopologySuite.Geometries.Envelope"/></returns>
+        public virtual Collection<Geometry> GetGeometriesInView(Envelope bbox)
         {
-            if (_featureTypeInfo == null) 
+            if (_featureTypeInfo == null)
                 return null;
 
             // if cache is not enabled make a call to server with the provided bounding box
@@ -560,16 +561,16 @@ public virtual Collection<IGeometry> GetGeometriesInView(Envelope bbox)
                 _tree = SpatialIndexFactory.Create(extent, _labelInfo.Count,
                     _labelInfo.Rows
                         .Cast<FeatureDataRow>()
-                        .Select((row, idx) => SpatialIndexFactory.Create((uint) idx, row.Geometry.EnvelopeInternal)));
+                        .Select((row, idx) => SpatialIndexFactory.Create((uint)idx, row.Geometry.EnvelopeInternal)));
             }
 
             // we then must filter the geometries locally
             var ids = _tree.Search(bbox);
 
-            var coll = new Collection<IGeometry>();
+            var coll = new Collection<Geometry>();
             for (var i = 0; i < ids.Count; i++)
             {
-                var featureRow = (FeatureDataRow) _labelInfo.Rows[(int)ids[i]];
+                var featureRow = (FeatureDataRow)_labelInfo.Rows[(int)ids[i]];
                 coll.Add(featureRow.Geometry);
             }
 
@@ -577,11 +578,11 @@ public virtual Collection<IGeometry> GetGeometriesInView(Envelope bbox)
         }
 
         /// <summary>
-        /// Returns all objects whose <see cref="GeoAPI.Geometries.Envelope"/> intersects 'bbox'.
+        /// Returns all objects whose <see cref="NetTopologySuite.Geometries.Envelope"/> intersects 'bbox'.
         /// </summary>
         /// <remarks>
         /// This method is usually much faster than the QueryFeatures method, because intersection tests
-        /// are performed on objects simplified by their <see cref="GeoAPI.Geometries.Envelope"/>, and using the Spatial Index
+        /// are performed on objects simplified by their <see cref="NetTopologySuite.Geometries.Envelope"/>, and using the Spatial Index
         /// </remarks>
         /// <param name="bbox">Box that objects should intersect</param>
         /// <returns></returns>
@@ -597,7 +598,7 @@ public virtual Collection<uint> GetObjectIDsInView(Envelope bbox)
         /// <param name="oid">Object ID</param>
         /// <returns>geometry</returns>
         /// <exception cref="Exception">Thrown in any case</exception>
-        public virtual IGeometry GetGeometryByID(uint oid)
+        public virtual Geometry GetGeometryByID(uint oid)
         {
             throw new Exception("The method or operation is not implemented.");
         }
@@ -607,7 +608,7 @@ public virtual IGeometry GetGeometryByID(uint oid)
         /// </summary>
         /// <param name="geom">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public virtual void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
+        public virtual void ExecuteIntersectionQuery(Geometry geom, FeatureDataSet ds)
         {
             if (_labelInfo == null) return;
 
@@ -623,7 +624,7 @@ public virtual void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
                     var featureGeometry = featureRow.Geometry;
                     if (featureGeometry.Intersects(geom))
                     {
-                        var newRow = (FeatureDataRow) table.Rows.Add(featureRow.ItemArray);
+                        var newRow = (FeatureDataRow)table.Rows.Add(featureRow.ItemArray);
                         newRow.Geometry = featureGeometry;
                     }
                 }
@@ -632,11 +633,11 @@ public virtual void ExecuteIntersectionQuery(IGeometry geom, FeatureDataSet ds)
             {
                 for (var i = 0; i < _labelInfo.Rows.Count; i++)
                 {
-                    var featureRow = (FeatureDataRow) _labelInfo.Rows[i];
+                    var featureRow = (FeatureDataRow)_labelInfo.Rows[i];
                     var featureGeometry = featureRow.Geometry;
                     if (featureGeometry.Intersects(geom))
                     {
-                        var newRow = (FeatureDataRow) table.Rows.Add(featureRow.ItemArray);
+                        var newRow = (FeatureDataRow)table.Rows.Add(featureRow.ItemArray);
                         newRow.Geometry = featureGeometry;
                     }
                 }
@@ -662,7 +663,7 @@ public virtual void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
             if (_tree != null)
             {
                 // use the index for fast query
-                
+
                 var ids = _tree.Search(box);
                 for (var i = 0; i < ids.Count; i++)
                 {
@@ -677,11 +678,11 @@ public virtual void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
                 // we must filter the geometries locally
                 for (var i = 0; i < _labelInfo.Rows.Count; i++)
                 {
-                    var featureRow = (FeatureDataRow) _labelInfo.Rows[i];
+                    var featureRow = (FeatureDataRow)_labelInfo.Rows[i];
                     var featureGeometry = featureRow.Geometry;
                     if (box.Intersects(featureGeometry.EnvelopeInternal))
                     {
-                        var newRow = (FeatureDataRow) table.Rows.Add(featureRow.ItemArray);
+                        var newRow = (FeatureDataRow)table.Rows.Add(featureRow.ItemArray);
                         newRow.Geometry = featureGeometry;
                     }
                 }
@@ -828,7 +829,7 @@ protected virtual void Dispose(bool disposing)
 
         #region Private Member
 
-        private Collection<IGeometry> LoadGeometries(Envelope bbox)
+        private Collection<Geometry> LoadGeometries(Envelope bbox)
         {
             var geometryTypeString = _featureTypeInfo.Geometry._GeometryType;
 
@@ -858,7 +859,7 @@ private Collection<IGeometry> LoadGeometries(Envelope bbox)
 
             try
             {
-                Collection<IGeometry> geoms;
+                Collection<Geometry> geoms;
                 switch (geometryTypeString)
                 {
                     /* Primitive geometry elements */
@@ -1014,7 +1015,7 @@ private void GetFeatureTypeInfo()
                 /* Spatial reference ID */
                 var crs = _featureTypeInfoQueryManager.GetValueFromNode(
                     _featureTypeInfoQueryManager.Compile(_textResources.XPATH_SRS),
-                    new[] {new DictionaryEntry("_param1", featureQueryName)});
+                    new[] { new DictionaryEntry("_param1", featureQueryName) });
                 /* If no SRID could be found, try '4326' by default */
                 if (crs == null) _featureTypeInfo.SRID = "4326";
                 else
@@ -1024,7 +1025,7 @@ private void GetFeatureTypeInfo()
                 /* Bounding Box */
                 IXPathQueryManager bboxQuery = _featureTypeInfoQueryManager.GetXPathQueryManagerInContext(
                     _featureTypeInfoQueryManager.Compile(_textResources.XPATH_BBOX),
-                    new[] {new DictionaryEntry("_param1", featureQueryName)});
+                    new[] { new DictionaryEntry("_param1", featureQueryName) });
 
                 if (bboxQuery != null)
                 {
@@ -1274,7 +1275,7 @@ private void GetFeatureTypeInfo()
                                     case "gml:multiSurfaceProperty":
                                         geomType = "MultiSurfacePropertyType";
                                         break;
-                                        // e.g. 'gml:_geometryProperty' 
+                                    // e.g. 'gml:_geometryProperty' 
                                     default:
                                         break;
                                 }
diff --git a/SharpMap/Drawing/Color.cs b/SharpMap/Drawing/Color.cs
index 0942cd93..caf081d3 100644
--- a/SharpMap/Drawing/Color.cs
+++ b/SharpMap/Drawing/Color.cs
@@ -16,7 +16,7 @@ static Color()
             foreach (KnownColor knownColor in System.Enum.GetValues(typeof(KnownColor)))
             {
                 var fldInfo = type.GetField(knownColor.ToString());
-                var argb = (ArgbValueAttribute) fldInfo.GetCustomAttribute(typeof(ArgbValueAttribute));
+                var argb = (ArgbValueAttribute)fldInfo.GetCustomAttribute(typeof(ArgbValueAttribute));
                 KnownColorLookup.Add(knownColor, argb.Argb);
 
             }
diff --git a/SharpMap/Drawing/Matrix.cs b/SharpMap/Drawing/Matrix.cs
index 4aa8b2f8..9cb2adc9 100644
--- a/SharpMap/Drawing/Matrix.cs
+++ b/SharpMap/Drawing/Matrix.cs
@@ -10,10 +10,10 @@ public sealed class Matrix
         public static Matrix Identity { get { return _identity; } }
 
 
-        private readonly double[] _elements ;
+        private readonly double[] _elements;
 
         public Matrix()
-            : this(new[] {1d, 0, 0, 1, 0, 0, 0, 0, 0})
+            : this(new[] { 1d, 0, 0, 1, 0, 0, 0, 0, 0 })
         {
         }
 
@@ -26,7 +26,7 @@ public Matrix(double[] elements)
 
         public bool IsIdentity { get; }
 
-        public double [] Elements { get { return _elements; } }
+        public double[] Elements { get { return _elements; } }
 
         public double ScaleX { get { return M11; } set { M11 = value; } }
 
@@ -64,7 +64,7 @@ public void Scale(double scaleX, double scaleY)
 
         public void Scale(double scaleX, double scaleY, MatrixOrder matrixOrder)
         {
-            var scaleMatrix = new Matrix {M11 = scaleX, M22 = scaleY};
+            var scaleMatrix = new Matrix { M11 = scaleX, M22 = scaleY };
             var m1 = matrixOrder == MatrixOrder.Append
                 ? this
                 : scaleMatrix;
@@ -86,8 +86,8 @@ public Point Transform(Point input)
         {
             return new Point
             {
-                X = (int)Math.Round(input.X*M11 + input.Y*M12 + OffsetX, MidpointRounding.AwayFromZero),
-                Y = (int)Math.Round(input.X*M21 + input.Y*M22 + OffsetY, MidpointRounding.AwayFromZero)
+                X = (int)Math.Round(input.X * M11 + input.Y * M12 + OffsetX, MidpointRounding.AwayFromZero),
+                Y = (int)Math.Round(input.X * M21 + input.Y * M22 + OffsetY, MidpointRounding.AwayFromZero)
             };
         }
 
diff --git a/SharpMap/Drawing/Point.cs b/SharpMap/Drawing/Point.cs
index 4f723faa..d240088f 100644
--- a/SharpMap/Drawing/Point.cs
+++ b/SharpMap/Drawing/Point.cs
@@ -1,5 +1,4 @@
-using System.Drawing.Drawing2D;
-#pragma warning disable 1591
+#pragma warning disable 1591
 
 namespace SharpMap.Drawing
 {
@@ -11,7 +10,7 @@ public struct Point
 
     public struct PointF
     {
-        public PointF Empty { get { return new PointF();} }
+        public PointF Empty { get { return new PointF(); } }
         public float X { get; set; }
         public float Y { get; set; }
     }
@@ -21,7 +20,7 @@ public struct PointD
         public double X { get; set; }
         public double Y { get; set; }
 
-        
+
     }
 
     public enum MatrixOrder
diff --git a/SharpMap/Geometries/GeoAPIEx.cs b/SharpMap/Geometries/NtsExtensions.cs
similarity index 88%
rename from SharpMap/Geometries/GeoAPIEx.cs
rename to SharpMap/Geometries/NtsExtensions.cs
index 54406978..2638f95c 100644
--- a/SharpMap/Geometries/GeoAPIEx.cs
+++ b/SharpMap/Geometries/NtsExtensions.cs
@@ -1,19 +1,18 @@
 using SharpMap;
+using SharpMap.Rendering;
+using SharpMap.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Reflection;
-using NetTopologySuite.Geometries;
-using SharpMap.Rendering;
-using SharpMap.Utilities;
 
-namespace GeoAPI.Geometries
+namespace NetTopologySuite.Geometries
 {
     /// <summary>
-    /// Set of extension methods for use of GeoAPI within SharpMap
+    /// Set of extension methods for use of NetTopologySuite within SharpMap
     /// </summary>
-    public static class GeoAPIEx
+    public static class NtsExtensions
     {
 
         /// <summary>
@@ -37,7 +36,7 @@ public static Coordinate Min(this Envelope self)
         /// <param name="fact">The CoordinateSequenceFactory to use to create the new sequence</param>
         /// <param name="seq">The sequence to test</param>
         /// <returns>The original sequence, if it was a valid ring, or a new sequence which is valid.</returns>
-        public static ICoordinateSequence EnsureValidRing(ICoordinateSequenceFactory fact, ICoordinateSequence seq)
+        public static CoordinateSequence EnsureValidRing(CoordinateSequenceFactory fact, CoordinateSequence seq)
         {
             var n = seq.Count;
             // empty sequence is valid
@@ -53,7 +52,7 @@ public static ICoordinateSequence EnsureValidRing(ICoordinateSequenceFactory fac
             return CreateClosedRing(fact, seq, n + 1);
         }
 
-        private static ICoordinateSequence CreateClosedRing(ICoordinateSequenceFactory fact, ICoordinateSequence seq, int size)
+        private static CoordinateSequence CreateClosedRing(CoordinateSequenceFactory fact, CoordinateSequence seq, int size)
         {
             var newseq = fact.Create(size, seq.Dimension);
             int n = seq.Count;
@@ -65,7 +64,7 @@ private static ICoordinateSequence CreateClosedRing(ICoordinateSequenceFactory f
         }
 
         ///<summary>
-        /// Copies a section of a <see cref="ICoordinateSequence"/> to another <see cref="ICoordinateSequence"/>.
+        /// Copies a section of a <see cref="CoordinateSequence"/> to another <see cref="CoordinateSequence"/>.
         /// The sequences may have different dimensions;
         /// in this case only the common dimensions are copied.
         ///</summary>
@@ -74,14 +73,14 @@ private static ICoordinateSequence CreateClosedRing(ICoordinateSequenceFactory f
         /// <param name="dest">The sequence to which the coordinates should be copied to</param>
         /// <param name="destPos">The starting index of the coordinates in <see paramref="dest"/></param>
         /// <param name="length">The number of coordinates to copy</param>
-        public static void Copy(ICoordinateSequence src, int srcPos, ICoordinateSequence dest, int destPos, int length)
+        public static void Copy(CoordinateSequence src, int srcPos, CoordinateSequence dest, int destPos, int length)
         {
             for (int i = 0; i < length; i++)
                 CopyCoord(src, srcPos + i, dest, destPos + i);
         }
 
         ///<summary>
-        /// Copies a coordinate of a <see cref="ICoordinateSequence"/> to another <see cref="ICoordinateSequence"/>.
+        /// Copies a coordinate of a <see cref="CoordinateSequence"/> to another <see cref="CoordinateSequence"/>.
         /// The sequences may have different dimensions;
         /// in this case only the common dimensions are copied.
         ///</summary>
@@ -89,7 +88,7 @@ public static void Copy(ICoordinateSequence src, int srcPos, ICoordinateSequence
         /// <param name="srcPos">The index of the coordinate to copy</param>
         /// <param name="dest">The sequence to which the coordinate should be copied to</param>
         /// <param name="destPos">The index of the coordinate in <see paramref="dest"/></param>
-        public static void CopyCoord(ICoordinateSequence src, int srcPos, ICoordinateSequence dest, int destPos)
+        public static void CopyCoord(CoordinateSequence src, int srcPos, CoordinateSequence dest, int destPos)
         {
             int minDim = Math.Min(src.Dimension, dest.Dimension);
             for (int dim = 0; dim < minDim; dim++)
@@ -112,8 +111,8 @@ public static void CopyCoord(ICoordinateSequence src, int srcPos, ICoordinateSeq
         /// <returns>The original sequence, if it was a valid ring, or a new sequence which is valid.</returns>
         public static void EnsureValidRing(this List<Coordinate> coordinates)
         {
-            var seq = GeometryServiceProvider.Instance.DefaultCoordinateSequenceFactory.Create(coordinates.ToArray());
-            seq = EnsureValidRing(GeometryServiceProvider.Instance.DefaultCoordinateSequenceFactory, seq);
+            var seq = NetTopologySuite.NtsGeometryServices.Instance.DefaultCoordinateSequenceFactory.Create(coordinates.ToArray());
+            seq = EnsureValidRing(NetTopologySuite.NtsGeometryServices.Instance.DefaultCoordinateSequenceFactory, seq);
             if (seq.Count != coordinates.Count)
             {
                 for (int i = coordinates.Count; i < seq.Count; i++)
@@ -166,7 +165,7 @@ public static Coordinate Subtract(this Coordinate self, Coordinate summand)
                 return new Coordinate(-summand.X, -summand.Y);
 
             // for now we only care for 2D
-            return new Coordinate(self.X - summand.X, self.Y - summand.Y);  
+            return new Coordinate(self.X - summand.X, self.Y - summand.Y);
         }
 
         /// <summary>
@@ -262,17 +261,17 @@ public static double Right(this Envelope self)
         }
 
         /// <summary>
-        /// Transforms a <see cref="ILineString"/> to an array of <see cref="PointF"/>s.
+        /// Transforms a <see cref="LineString"/> to an array of <see cref="PointF"/>s.
         /// </summary>
         /// <param name="self">The linestring</param>
         /// <param name="map">The mapviewport defining transformation parameters</param>
         /// <returns>The array of <see cref="PointF"/>s</returns>
-        public static PointF[] TransformToImage(this ILineString self, MapViewport map)
+        public static PointF[] TransformToImage(this LineString self, MapViewport map)
         {
             if (map.MapTransformRotation.Equals(0f))
                 return Transform.WorldToMap(self.Coordinates, map.Left, map.Top, map.PixelWidth, map.PixelHeight);
 
-            return Transform.WorldToMap(self.Coordinates,map.WorldToMapTransform(false));
+            return Transform.WorldToMap(self.Coordinates, map.WorldToMapTransform(false));
         }
 
         /// <summary>
@@ -280,7 +279,7 @@ public static PointF[] TransformToImage(this ILineString self, MapViewport map)
         /// </summary>
         /// <param name="self">The coordinate</param>
         /// <returns>An array of doubles</returns>
-        public static double [] ToDoubleArray(this Coordinate self)
+        public static double[] ToDoubleArray(this Coordinate self)
         {
             return new[] { self.X, self.Y /*, self.Z */};
         }
@@ -290,7 +289,7 @@ public static double [] ToDoubleArray(this Coordinate self)
         /// </summary>
         /// <param name="self">The ring</param>
         /// <returns><c>true</c> if the ring is oriented counter clockwise</returns>
-        public static bool IsCCW(this ILinearRing self)
+        public static bool IsCCW(this LinearRing self)
         {
             return NetTopologySuite.Algorithm.Orientation.IsCCW(self.Coordinates);
         }
@@ -319,13 +318,13 @@ public static Envelope Grow(this Envelope self, double amountInX, double amountI
         }
 
         /// <summary>
-        /// Transforms a <see cref="IPolygon"/> to an array of <see cref="PointF"/>s
+        /// Transforms a <see cref="Polygon"/> to an array of <see cref="PointF"/>s
         /// </summary>
         /// <param name="self">The polygon</param>
         /// <param name="map">The map that defines the affine coordinate transformation.</param>
         /// <param name="useClipping">Use clipping for the polygon</param>
         /// <returns>An array of PointFs</returns>
-        public static GraphicsPath TransformToImage(this IPolygon self, MapViewport map, bool useClipping = false)
+        public static GraphicsPath TransformToImage(this Polygon self, MapViewport map, bool useClipping = false)
         {
             var res = new GraphicsPath(FillMode.Alternate);
             if (useClipping)
@@ -335,7 +334,7 @@ public static GraphicsPath TransformToImage(this IPolygon self, MapViewport map,
                     map.Size.Width, map.Size.Height));
                 for (var i = 0; i < self.NumInteriorRings; i++)
                     res.AddPolygon(VectorRenderer.ClipPolygon(
-                        VectorRenderer.LimitValues(self.GetInteriorRingN(i).TransformToImage(map),VectorRenderer.ExtremeValueLimit),
+                        VectorRenderer.LimitValues(self.GetInteriorRingN(i).TransformToImage(map), VectorRenderer.ExtremeValueLimit),
                         map.Size.Width, map.Size.Height));
             }
             else
@@ -365,7 +364,7 @@ public static bool IsEmpty(this Coordinate c)
         /// <param name="self"></param>
         /// <param name="wkt"></param>
         /// <returns></returns>
-        public static IGeometry GeomFromText(this IGeometry self, string wkt)
+        public static Geometry GeomFromText(this Geometry self, string wkt)
         {
             var factory = self == null ? new NetTopologySuite.Geometries.GeometryFactory() : self.Factory;
             var reader = new NetTopologySuite.IO.WKTReader(factory);
@@ -374,13 +373,13 @@ public static IGeometry GeomFromText(this IGeometry self, string wkt)
 
 
         private static readonly FieldInfo _envFi;
-        static GeoAPIEx()
+        static NtsExtensions()
         {
             try
             {
                 _envFi = typeof(Geometry).GetField("_envelope", BindingFlags.Instance | BindingFlags.NonPublic);
             }
-            catch{}
+            catch { }
         }
 
         /// <summary>
diff --git a/SharpMap/ISession.cs b/SharpMap/ISession.cs
index 1c8310d0..8a01c475 100644
--- a/SharpMap/ISession.cs
+++ b/SharpMap/ISession.cs
@@ -1,4 +1,5 @@
-using GeoAPI;
+using NetTopologySuite;
+using SharpMap.CoordinateSystems;
 
 namespace SharpMap
 {
@@ -10,42 +11,42 @@ public interface ISession
         /// <summary>
         /// The geometry services instance
         /// </summary>
-        IGeometryServices GeometryServices { get; }
+        NtsGeometryServices GeometryServices { get; }
 
         /// <summary>
         /// Gets the coordinate system services instance
         /// </summary>
-        ICoordinateSystemServices CoordinateSystemServices { get; }
+        CoordinateSystemServices CoordinateSystemServices { get; }
 
         /// <summary>
         /// Gets the coordinate system repository
         /// </summary>
         ICoordinateSystemRepository CoordinateSystemRepository { get; }
 
-#region Fluent configuration
+        #region Fluent configuration
 
         /// <summary>
         /// Method to set the <see cref="GeometryServices"/> for a session
         /// </summary>
         /// <param name="geometryServices">The geometry services object</param>
         /// <returns>The updated session</returns>
-        ISession SetGeometryServices(IGeometryServices geometryServices);
+        ISession SetGeometryServices(NtsGeometryServices geometryServices);
 
         /// <summary>
         /// Method to set the <see cref="CoordinateSystemServices"/> for a session
         /// </summary>
-        /// <param name="csServices">The <see cref="GeoAPI.CoordinateSystems.ICoordinateSystem"/>s services object</param>
+        /// <param name="csServices">The <see cref="ProjNet.CoordinateSystems.CoordinateSystem"/>s services object</param>
         /// <returns>The updated session</returns>
-        ISession SetCoordinateSystemServices(ICoordinateSystemServices csServices);
+        ISession SetCoordinateSystemServices(CoordinateSystemServices csServices);
 
         /// <summary>
         /// Method to set the <see cref="CoordinateSystemRepository"/> for a session
         /// </summary>
-        /// <param name="csRepository">The <see cref="GeoAPI.CoordinateSystems.ICoordinateSystem"/>s repository</param>
+        /// <param name="csRepository">The <see cref="ProjNet.CoordinateSystems.CoordinateSystem"/>s repository</param>
         /// <returns>The updated session</returns>
         ISession SetCoordinateSystemRepository(ICoordinateSystemRepository csRepository);
 
-#endregion
+        #endregion
 
     }
 }
diff --git a/SharpMap/Layers/AsyncLayerProxyLayer.cs b/SharpMap/Layers/AsyncLayerProxyLayer.cs
index cc9efed2..5c6708a9 100644
--- a/SharpMap/Layers/AsyncLayerProxyLayer.cs
+++ b/SharpMap/Layers/AsyncLayerProxyLayer.cs
@@ -15,14 +15,17 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Data;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.Serialization;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using SharpMap.Styles;
+using Envelope = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
+using Point = System.Drawing.Point;
 
 namespace SharpMap.Layers
 {
@@ -217,24 +220,24 @@ void ILayer.Render(Graphics g, MapViewport map)
             var mapViewport = map.Envelope;
             var mapSize = map.Size;
 
-            var mapColumnWidth = _cellSize.Width+_cellBuffer.Width;
+            var mapColumnWidth = _cellSize.Width + _cellBuffer.Width;
             var mapColumnHeight = _cellSize.Height + _cellBuffer.Width;
-            var columns = (int)Math.Ceiling((double) mapSize.Width/mapColumnWidth);
-            var rows = (int) Math.Ceiling((double) mapSize.Height/mapColumnHeight);
+            var columns = (int)Math.Ceiling((double)mapSize.Width / mapColumnWidth);
+            var rows = (int)Math.Ceiling((double)mapSize.Height / mapColumnHeight);
 
-            var renderMapSize = new Size(columns * _cellSize.Width + _cellBuffer.Width, 
+            var renderMapSize = new Size(columns * _cellSize.Width + _cellBuffer.Width,
                                          rows * _cellSize.Height + _cellBuffer.Height);
-            var horizontalFactor = (double) renderMapSize.Width/mapSize.Width;
-            var verticalFactor = (double) renderMapSize.Height/mapSize.Height;
+            var horizontalFactor = (double)renderMapSize.Width / mapSize.Width;
+            var verticalFactor = (double)renderMapSize.Height / mapSize.Height;
 
-            var diffX = 0.5d*(horizontalFactor*mapViewport.Width - mapViewport.Width);
-            var diffY = 0.5d*(verticalFactor*mapViewport.Height-mapViewport.Height);
+            var diffX = 0.5d * (horizontalFactor * mapViewport.Width - mapViewport.Width);
+            var diffY = 0.5d * (verticalFactor * mapViewport.Height - mapViewport.Height);
 
             var totalRenderMapViewport = mapViewport.Grow(diffX, diffY);
-            var columnWidth = totalRenderMapViewport.Width/columns;
-            var rowHeight = totalRenderMapViewport.Height/rows;
+            var columnWidth = totalRenderMapViewport.Width / columns;
+            var rowHeight = totalRenderMapViewport.Height / rows;
 
-            var rmdx = (int)((mapSize.Width-renderMapSize.Width) * 0.5f);
+            var rmdx = (int)((mapSize.Width - renderMapSize.Width) * 0.5f);
             var rmdy = (int)((mapSize.Height - renderMapSize.Height) * 0.5f);
 
             var tileSize = Size.Add(_cellSize, Size.Add(_cellBuffer, _cellBuffer));
@@ -242,14 +245,14 @@ void ILayer.Render(Graphics g, MapViewport map)
             var miny = totalRenderMapViewport.MinY;
             var pty = rmdy + renderMapSize.Height - tileSize.Height;
 
-            for (var i = 0; i < rows; i ++)
+            for (var i = 0; i < rows; i++)
             {
                 var minx = totalRenderMapViewport.MinX;
                 var ptx = rmdx;
                 for (var j = 0; j < columns; j++)
                 {
                     var tmpMap = new Map(_cellSize);
-                    
+
                     tmpMap.Layers.Add(_baseLayer);
                     tmpMap.DisposeLayersOnDispose = false;
                     tmpMap.ZoomToBox(new Envelope(minx, minx + columnWidth, miny, miny + rowHeight));
@@ -272,7 +275,7 @@ void ILayer.Render(Graphics g, MapViewport map)
                         }
 
                     }, token);
-                    var dt = new RenderTask {CancellationToken = cancelToken, Task = t};
+                    var dt = new RenderTask { CancellationToken = cancelToken, Task = t };
                     lock (_currentTasks)
                     {
                         _currentTasks.Add(dt);
@@ -291,7 +294,7 @@ void ILayer.Render(Graphics g, MapViewport map)
         /// Event raised when a new tile has been rendered an is now avalable
         /// </summary>
         public event MapNewTileAvaliabledHandler MapNewTileAvaliable;
-        
+
         /// <summary>
         /// Event raised when the rendering of tiles has made progress
         /// </summary>
@@ -388,7 +391,7 @@ void ICanQueryLayer.ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
             ((ICanQueryLayer)_baseLayer).ExecuteIntersectionQuery(box, ds);
         }
 
-        void ICanQueryLayer.ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        void ICanQueryLayer.ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             if (!((ICanQueryLayer)this).IsQueryEnabled)
                 return;
@@ -407,7 +410,7 @@ bool ICanQueryLayer.IsQueryEnabled
             set
             {
                 var cql = _baseLayer as ICanQueryLayer;
-                if (cql != null )
+                if (cql != null)
                     cql.IsQueryEnabled = value;
             }
         }
diff --git a/SharpMap/Layers/GdiImageLayer.cs b/SharpMap/Layers/GdiImageLayer.cs
index 300e5775..f995ab99 100644
--- a/SharpMap/Layers/GdiImageLayer.cs
+++ b/SharpMap/Layers/GdiImageLayer.cs
@@ -16,6 +16,7 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -24,8 +25,6 @@
 using System.Globalization;
 using System.IO;
 using System.Runtime.Serialization;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
 using Point = System.Drawing.Point;
 
 namespace SharpMap.Layers
@@ -39,12 +38,12 @@ public class GdiImageLayer : Layer
     {
         private Image _image;
 
-        [NonSerialized] 
+        [NonSerialized]
         private Image _tmpImage;
 
         [NonSerialized]
         private WorldFile _worldFile;
-        
+
         [NonSerialized]
         private Envelope _envelope;
 
@@ -65,7 +64,7 @@ public GdiImageLayer(string fileName)
         /// <param name="layerName">The name of the layer</param>
         /// <param name="fileName">The path to the file</param>
         public GdiImageLayer(string layerName, string fileName)
-            :this(layerName, Image.FromFile(fileName))
+            : this(layerName, Image.FromFile(fileName))
         {
             ImageFilename = fileName;
             SetEnvelope(fileName);
@@ -167,10 +166,10 @@ public override void Render(Graphics g, MapViewport map)
             if (_image == null)
                 throw new Exception("Image not set");
 
-        
+
             // View to render
             var mapView = map.Envelope;
-            
+
             // Layer view
             var lyrView = _envelope;
 
@@ -179,7 +178,7 @@ public override void Render(Graphics g, MapViewport map)
             if (!vi.IsNull)
             {
                 // Image part
-// ReSharper disable InconsistentNaming
+                // ReSharper disable InconsistentNaming
                 var imgLT = Clip(_worldFile.ToRaster(new Coordinate(vi.MinX, vi.MaxY)));
                 var imgRB = Clip(_worldFile.ToRaster(new Coordinate(vi.MaxX, vi.MinY)));
                 var imgRect = new Rectangle(imgLT, PointDiff(imgLT, imgRB, 1));
@@ -188,7 +187,7 @@ public override void Render(Graphics g, MapViewport map)
                 var mapLT = Point.Truncate(map.WorldToImage(new Coordinate(vi.MinX, vi.MaxY)));
                 var mapRB = Point.Ceiling(map.WorldToImage(new Coordinate(vi.MaxX, vi.MinY)));
                 var mapRect = new Rectangle(mapLT, PointDiff(mapLT, mapRB, 1));
-// ReSharper restore InconsistentNaming
+                // ReSharper restore InconsistentNaming
 
                 // Set the interpolation mode
                 var tmpInterpolationMode = g.InterpolationMode;
@@ -233,7 +232,7 @@ private Point Clip(Point pt)
 
         private static Size PointDiff(Point p1, Point p2, int invertY = -1)
         {
-            
+
             return new Size(p2.X - p1.X, invertY * (p2.Y - p1.Y));
         }
 
@@ -386,14 +385,14 @@ public void Load(string file)
 
                 using (var sr = new StreamReader(file))
                 {
-// ReSharper disable AssignNullToNotNullAttribute
+                    // ReSharper disable AssignNullToNotNullAttribute
                     _matrix.A11 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
                     _matrix.A21 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
                     _matrix.A12 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
                     _matrix.A22 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
                     B1 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
                     B2 = double.Parse(sr.ReadLine(), NumberStyles.Float, NumberFormatInfo.InvariantInfo);
-// ReSharper restore AssignNullToNotNullAttribute
+                    // ReSharper restore AssignNullToNotNullAttribute
                 }
                 _inverse = _matrix.Inverse();
             }
@@ -477,8 +476,8 @@ public Coordinate Location
             /// <returns>The ground coordinate</returns>
             public Coordinate ToGround(int x, int y)
             {
-                var resX = B1 + (A11*x + A21*y);
-                var resY = B2 + (A12*x + A22*y);
+                var resX = B1 + (A11 * x + A21 * y);
+                var resY = B2 + (A12 * x + A22 * y);
 
                 return new Coordinate(resX, resY);
             }
@@ -491,7 +490,7 @@ public Coordinate ToGround(int x, int y)
             /// <returns>The ground coordinate</returns>
             public double ToGroundX(int x, int y)
             {
-                return B1 + (A11*x + A21*y);
+                return B1 + (A11 * x + A21 * y);
             }
 
             /// <summary>
@@ -502,7 +501,7 @@ public double ToGroundX(int x, int y)
             /// <returns>The ground coordinate</returns>
             public double ToGroundY(int x, int y)
             {
-                return B2 + (A12*x + A22*y);
+                return B2 + (A12 * x + A22 * y);
             }
 
             /// <summary>
@@ -511,7 +510,7 @@ public double ToGroundY(int x, int y)
             /// <param name="width">The width pixel</param>
             /// <param name="height">The height pixel</param>
             /// <returns>The ground coordinate</returns>
-            public IPolygon ToGroundBounds(int width, int height)
+            public Polygon ToGroundBounds(int width, int height)
             {
                 var ringCoordinates = new List<Coordinate>(5);
                 var leftTop = ToGround(0, 0);
@@ -533,9 +532,9 @@ public Point ToRaster(Coordinate point)
                 point.X -= B1;
                 point.Y -= B2;
 
-                var x = (int) Math.Round(_inverse.A11*point.X + _inverse.A21*point.Y,
+                var x = (int)Math.Round(_inverse.A11 * point.X + _inverse.A21 * point.Y,
                     MidpointRounding.AwayFromZero);
-                var y = (int) Math.Round(_inverse.A12*point.X + _inverse.A22*point.Y,
+                var y = (int)Math.Round(_inverse.A12 * point.X + _inverse.A22 * point.Y,
                     MidpointRounding.AwayFromZero);
 
                 return new Point(x, y);
@@ -546,7 +545,7 @@ public int ToRasterX(Coordinate point)
                 point.X -= B1;
                 point.Y -= B2;
 
-                return (int) Math.Round(_inverse.A11*point.X + _inverse.A21*point.Y,
+                return (int)Math.Round(_inverse.A11 * point.X + _inverse.A21 * point.Y,
                     MidpointRounding.AwayFromZero);
             }
 
@@ -555,7 +554,7 @@ public int ToRasterY(Coordinate point)
                 point.X -= B1;
                 point.Y -= B2;
 
-                return (int) Math.Round(_inverse.A12*point.X + _inverse.A22*point.Y,
+                return (int)Math.Round(_inverse.A12 * point.X + _inverse.A22 * point.Y,
                     MidpointRounding.AwayFromZero);
             }
 
@@ -586,7 +585,7 @@ private class Matrix2D
                 /// </summary>
                 private double Determinant
                 {
-                    get { return A22*A11 - A21*A12; }
+                    get { return A22 * A11 - A21 * A12; }
                 }
 
                 /// <summary>
@@ -614,10 +613,10 @@ public Matrix2D Inverse()
 
                     return new Matrix2D
                     {
-                        A11 = A22/det,
-                        A21 = -A21/det,
-                        A12 = -A12/det,
-                        A22 = A11/det
+                        A11 = A22 / det,
+                        A21 = -A21 / det,
+                        A12 = -A12 / det,
+                        A22 = A11 / det
                     };
                 }
             }
diff --git a/SharpMap/Layers/GdiImageLayerProxy.cs b/SharpMap/Layers/GdiImageLayerProxy.cs
index 2fbe0f3e..ae2ce17a 100644
--- a/SharpMap/Layers/GdiImageLayerProxy.cs
+++ b/SharpMap/Layers/GdiImageLayerProxy.cs
@@ -15,13 +15,13 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
 using Common.Logging;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data;
 using SharpMap.Styles;
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace SharpMap.Layers
 {
@@ -35,7 +35,7 @@ namespace SharpMap.Layers
     // - What to do with large images
     [Serializable]
     public class GdiImageLayerProxy<T> : ICanQueryLayer, IDisposable
-        where T: class, ILayer
+        where T : class, ILayer
     {
         /// <summary>
         /// Creates a proxy class that transforms all colors to grey scale
@@ -68,7 +68,7 @@ public static GdiImageLayerProxy<T> CreateGreyScale(T baseLayer)
         /// <param name="layer">The layer to be proxied</param>
         /// <param name="opacity">An opacity value in the range of [0f, 1f]. Values outside of that range will be clipped.</param>
         public GdiImageLayerProxy(T layer, float opacity)
-            : this(layer, new ColorMatrix {Matrix33 = Math.Max(Math.Min(1f, opacity), 0f)})
+            : this(layer, new ColorMatrix { Matrix33 = Math.Max(Math.Min(1f, opacity), 0f) })
         {
         }
 
@@ -107,7 +107,7 @@ public GdiImageLayerProxy(T layer, params ColorMap[] colorMap)
         /// <summary>
         /// Gets a value indicating the proxied base layer
         /// </summary>
-        public T BaseLayer{ get { return _baseLayer; }}
+        public T BaseLayer { get { return _baseLayer; } }
 
         double ILayer.MinVisible
         {
@@ -187,7 +187,7 @@ void ILayer.Render(Graphics g, MapViewport map)
                 _baseLayer.Render(g, map);
                 return;
             }
-            
+
             var s = map.Size;
             using (var img = new Bitmap(s.Width, s.Height, PixelFormat.Format32bppArgb))
             {
@@ -198,7 +198,7 @@ void ILayer.Render(Graphics g, MapViewport map)
 
                 using (var ia = CreateImageAttributes())
                 {
-                    g.DrawImage(img, new Rectangle(0, 0, s.Width, s.Height), 
+                    g.DrawImage(img, new Rectangle(0, 0, s.Width, s.Height),
                         0, 0, s.Width, s.Height, GraphicsUnit.Pixel, ia);
                 }
             }
@@ -233,7 +233,7 @@ void ICanQueryLayer.ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
             }
         }
 
-        void ICanQueryLayer.ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        void ICanQueryLayer.ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             if (_baseLayer is ICanQueryLayer cqLayer)
             {
diff --git a/SharpMap/Layers/IAsyncLayer.cs b/SharpMap/Layers/IAsyncLayer.cs
index 1242f495..32397653 100644
--- a/SharpMap/Layers/IAsyncLayer.cs
+++ b/SharpMap/Layers/IAsyncLayer.cs
@@ -1,6 +1,6 @@
-using System.Drawing;
+using NetTopologySuite.Geometries;
+using System.Drawing;
 using System.Drawing.Imaging;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Layers
 {
diff --git a/SharpMap/Layers/ICanQueryLayer.cs b/SharpMap/Layers/ICanQueryLayer.cs
index 8041f715..f43eca24 100644
--- a/SharpMap/Layers/ICanQueryLayer.cs
+++ b/SharpMap/Layers/ICanQueryLayer.cs
@@ -1,4 +1,4 @@
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data;
 
 namespace SharpMap.Layers
@@ -24,7 +24,7 @@ public interface ICanQueryLayer : ILayer
         /// </summary>
         /// <param name="geometry">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds);
+        void ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds);
 
         /// <summary>
         /// Whether the layer is queryable when used in a SharpMap.Web.Wms.WmsServer, 
diff --git a/SharpMap/Layers/ILayer.cs b/SharpMap/Layers/ILayer.cs
index aae01d13..4c1b3fb6 100644
--- a/SharpMap/Layers/ILayer.cs
+++ b/SharpMap/Layers/ILayer.cs
@@ -15,9 +15,9 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Layers
 {
@@ -92,23 +92,23 @@ public interface ILayer
         /// </summary>
         /// <param name="g">Graphics object reference</param>
         /// <param name="map">Map which is rendered</param>
-        void Render(Graphics g, MapViewport  map);
+        void Render(Graphics g, MapViewport map);
 
         //SharpMap.CoordinateSystems.CoordinateSystem CoordinateSystem { get; set; }
     }
 
     internal static class LayerExtensions
     {
-        public static bool DoRender(this ILayer self, Graphics g, Map map )
+        public static bool DoRender(this ILayer self, Graphics g, Map map)
         {
             // Is the layer enabled for rendering at all
             if (!self.Enabled)
                 return false;
-            
+
             // Get the compare value, zoom or scale
             var compare = self.VisibilityUnits == Styles.VisibilityUnits.ZoomLevel
                 ? map.Zoom
-                : map.GetMapScale((int) g.DpiX);
+                : map.GetMapScale((int)g.DpiX);
 
             // Is the layer enabled for the current scale
             if (self.MinVisible <= compare || compare <= self.MaxVisible)
diff --git a/SharpMap/Layers/ILayerEx.cs b/SharpMap/Layers/ILayerEx.cs
index d259eac4..540f8ac3 100644
--- a/SharpMap/Layers/ILayerEx.cs
+++ b/SharpMap/Layers/ILayerEx.cs
@@ -25,5 +25,5 @@ public interface ILayerEx : ILayer
         /// Event raised when a layer needs to be rendered
         /// </summary>
         event EventHandler RenderRequired;
-   }
+    }
 }
diff --git a/SharpMap/Layers/ILayersContainer.cs b/SharpMap/Layers/ILayersContainer.cs
index c2d38922..f78509ed 100644
--- a/SharpMap/Layers/ILayersContainer.cs
+++ b/SharpMap/Layers/ILayersContainer.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace SharpMap.Layers
 {
     /// <summary>
     /// Interface to mark entities that expose layers.
     /// </summary>
-    public interface ILayersContainer 
+    public interface ILayersContainer
     {
         /// <summary>
         /// Gets the layers exposed.
diff --git a/SharpMap/Layers/LabelLayer.cs b/SharpMap/Layers/LabelLayer.cs
index b55ef8e6..55b2d1e9 100644
--- a/SharpMap/Layers/LabelLayer.cs
+++ b/SharpMap/Layers/LabelLayer.cs
@@ -15,6 +15,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries.Utilities;
+using NetTopologySuite.Utilities;
+using SharpMap.Data;
+using SharpMap.Data.Providers;
+using SharpMap.Rendering;
+using SharpMap.Rendering.Symbolizer;
+using SharpMap.Rendering.Thematics;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -22,16 +31,6 @@
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Globalization;
-using SharpMap.Data;
-using SharpMap.Data.Providers;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
-using NetTopologySuite.Geometries.Utilities;
-using NetTopologySuite.Utilities;
-using SharpMap.Rendering;
-using SharpMap.Rendering.Thematics;
-using SharpMap.Styles;
-using SharpMap.Rendering.Symbolizer;
 
 
 namespace SharpMap.Layers
@@ -153,7 +152,7 @@ public enum MultipartGeometryBehaviourEnum
         /// Creates a new instance of a LabelLayer
         /// </summary>
         public LabelLayer(string layername)
-            :base(new LabelStyle())
+            : base(new LabelStyle())
         {
             //_Style = new LabelStyle();
             LayerName = layername;
@@ -264,14 +263,14 @@ public GetLabelMethod LabelStringDelegate
         /// </summary>
         /// <remarks>
         /// <para>If this method is not null, it will override the position based on the centroid of the boundingbox of the feature </para>
-        /// <para>The label delegate must take a <see cref="SharpMap.Data.FeatureDataRow"/> and return a GeoAPI.Geometries.Coordinate.</para>
+        /// <para>The label delegate must take a <see cref="SharpMap.Data.FeatureDataRow"/> and return a NetTopologySuite.Geometries.Coordinate.</para>
         /// <para>If the delegate returns a null, the centroid of the feature will be used</para>
         /// <example>
         /// Creating a custom position by using X and Y values from the FeatureDataRow attributes "LabelX" and "LabelY", using
         /// an anonymous delegate:
         /// <code lang="C#">
         /// myLabelLayer.LabelPositionDelegate = delegate(SharpMap.Data.FeatureDataRow fdr)
-        ///				{ return new GeoAPI.Geometries.Coordinate(Convert.ToDouble(fdr["LabelX"]), Convert.ToDouble(fdr["LabelY"]));};
+        ///				{ return new NetTopologySuite.Geometries.Coordinate(Convert.ToDouble(fdr["LabelX"]), Convert.ToDouble(fdr["LabelY"]));};
         /// </code>
         /// </example>
         /// </remarks>
@@ -430,7 +429,7 @@ public override void Render(Graphics g, MapViewport map)
                     labels = CreateLabelDefinitions(g, map, ds.Tables[0]);
                 }
             }
-            
+
             if (labels == null || labels.Count == 0)
             {
                 // Obsolete (and will cause infinite loop)
@@ -442,29 +441,29 @@ public override void Render(Graphics g, MapViewport map)
                 _labelFilter?.Invoke(labels);
 
             var combinedArea = RectangleF.Empty;
-            
+
             for (int i = 0; i < labels.Count; i++)
             {
-                var baseLabel = labels[i]; 
+                var baseLabel = labels[i];
                 if (!baseLabel.Show)
                     continue;
 
                 var font = baseLabel.Style.GetFontForGraphics(g);
-                
+
                 if (labels[i] is Label)
                 {
                     var label = baseLabel as Label;
                     var canvasArea = VectorRenderer.DrawLabelEx(
                         g, label.Location, label.Style.Offset,
-                        font, label.Style.ForeColor, label.Style.BackColor, 
-                        label.Style.Halo, label.Rotation, label.Text, map, 
+                        font, label.Style.ForeColor, label.Style.BackColor,
+                        label.Style.Halo, label.Rotation, label.Text, map,
                         label.Style.HorizontalAlignment, label.LabelPoint);
 
                     combinedArea = canvasArea.ExpandToInclude(combinedArea);
                 }
                 else if (labels[i] is PathLabel)
                 {
-                    var pathLabel  = labels[i] as PathLabel;
+                    var pathLabel = labels[i] as PathLabel;
                     var lblStyle = pathLabel.Style;
 
                     var background = pathLabel.AffectedArea.ExteriorRing.TransformToImage(map);
@@ -475,15 +474,15 @@ public override void Render(Graphics g, MapViewport map)
                             g.FillPath(lblStyle.BackColor, gp);
                         }
 
-                    g.DrawString(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor), 
-                        pathLabel.Text, font.FontFamily, (int) font.Style, font.Size,
+                    g.DrawString(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor),
+                        pathLabel.Text, font.FontFamily, (int)font.Style, font.Size,
                         lblStyle.GetStringFormat(), lblStyle.IgnoreLength, pathLabel.Location, pathLabel.Box.Height);
-                    
+
                     combinedArea = background.ToRectangleF().ExpandToInclude(combinedArea);
                 }
             }
 
-            CanvasArea = combinedArea; 
+            CanvasArea = combinedArea;
             // Obsolete (and will cause infinite loop)
             //base.Render(g, map);
         }
@@ -545,8 +544,8 @@ private List<BaseLabel> CreateLabelDefinitions(Graphics g, MapViewport map, Feat
                     // but perhaps need complexity threshold (eg Pts < 500) so as not to impact rendering
                     // or new prop bool PartialPolygonalLabel
                 }
-                
-                if (feature.Geometry is IGeometryCollection geoms)
+
+                if (feature.Geometry is GeometryCollection geoms)
                 {
                     if (MultipartGeometryBehaviour == MultipartGeometryBehaviourEnum.All)
                     {
@@ -601,22 +600,22 @@ private List<BaseLabel> CreateLabelDefinitions(Graphics g, MapViewport map, Feat
                             for (var j = 0; j < geoms.NumGeometries; j++)
                             {
                                 var geom = geoms.GetGeometryN(j);
-                                if (geom is ILineString lineString && lineString.Length > largestVal)
+                                if (geom is LineString lineString && lineString.Length > largestVal)
                                 {
                                     largestVal = lineString.Length;
                                     idxOfLargest = j;
                                 }
-                                if (geom is IMultiLineString multiLineString && multiLineString.Length > largestVal)
+                                if (geom is MultiLineString multiLineString && multiLineString.Length > largestVal)
                                 {
                                     largestVal = multiLineString.Length;
                                     idxOfLargest = j;
                                 }
-                                if (geom is IPolygon polygon && polygon.Area > largestVal)
+                                if (geom is Polygon polygon && polygon.Area > largestVal)
                                 {
                                     largestVal = polygon.Area;
                                     idxOfLargest = j;
                                 }
-                                if (geom is IMultiPolygon multiPolygon && multiPolygon.Area > largestVal)
+                                if (geom is MultiPolygon multiPolygon && multiPolygon.Area > largestVal)
                                 {
                                     largestVal = multiPolygon.Area;
                                     idxOfLargest = j;
@@ -640,13 +639,13 @@ private List<BaseLabel> CreateLabelDefinitions(Graphics g, MapViewport map, Feat
 
             return labels;
         }
-        private static BaseLabel CreateLabelDefinition(FeatureDataRow fdr, IGeometry geom, string text, float rotation, 
+        private static BaseLabel CreateLabelDefinition(FeatureDataRow fdr, Geometry geom, string text, float rotation,
             int priority, LabelStyle style, MapViewport map, Graphics g, GetLocationMethod getLocationMethod)
         {
             //ONLY atomic geometries
-            Debug.Assert(!(geom is IGeometryCollection));
+            Debug.Assert(!(geom is GeometryCollection));
 
-            if (geom == null) 
+            if (geom == null)
                 return null;
 
             BaseLabel lbl;
@@ -654,7 +653,7 @@ private static BaseLabel CreateLabelDefinition(FeatureDataRow fdr, IGeometry geo
 
             var size = VectorRenderer.SizeOfString(g, text, font);
 
-            if (geom is ILineString ls)
+            if (geom is LineString ls)
                 return CreatePathLabel(ls, text, size, priority, style, map);
 
             var worldPosition = getLocationMethod == null
@@ -666,8 +665,8 @@ private static BaseLabel CreateLabelDefinition(FeatureDataRow fdr, IGeometry geo
             var position = map.WorldToImage(worldPosition);
 
             var location = new PointF(
-                position.X - size.Width*(short) style.HorizontalAlignment*0.5f,
-                position.Y - size.Height*(short) (2 - (int) style.VerticalAlignment)*0.5f);
+                position.X - size.Width * (short)style.HorizontalAlignment * 0.5f,
+                position.Y - size.Height * (short)(2 - (int)style.VerticalAlignment) * 0.5f);
 
             if (location.X - size.Width > map.Size.Width || location.X + size.Width < 0 ||
                 location.Y - size.Height > map.Size.Height || location.Y + size.Height < 0)
@@ -675,22 +674,22 @@ private static BaseLabel CreateLabelDefinition(FeatureDataRow fdr, IGeometry geo
 
             if (!style.CollisionDetection)
                 lbl = new Label(text, location, rotation, priority, null, style)
-                    {LabelPoint = position};
+                { LabelPoint = position };
             else
             {
                 //Collision detection is enabled so we need to measure the size of the string
                 lbl = new Label(text, location, rotation, priority,
                                 new LabelBox(location.X - style.CollisionBuffer.Width,
                                              location.Y - style.CollisionBuffer.Height,
-                                             size.Width + 2f*style.CollisionBuffer.Width,
-                                             size.Height + 2f*style.CollisionBuffer.Height), style) 
-                                { LabelPoint = position }; 
+                                             size.Width + 2f * style.CollisionBuffer.Width,
+                                             size.Height + 2f * style.CollisionBuffer.Height), style)
+                { LabelPoint = position };
             }
 
             return lbl;
         }
 
-        private static BaseLabel CreatePathLabel(ILineString line, string text, SizeF textMeasure,
+        private static BaseLabel CreatePathLabel(LineString line, string text, SizeF textMeasure,
             int priority, LabelStyle style, MapViewport map)
         {
             if (line == null)
@@ -735,7 +734,7 @@ private static BaseLabel CreatePathLabel(ILineString line, string text, SizeF te
                 // extract slightly more than label length to ensure offsetCurve follows line geometry
                 var halfLen = labelLength * 0.6;
                 // ensure non-negative indexes constrained to line length (due to special LengthIndexLine functionality) 
-                line = (LineString) lil.ExtractLine(Math.Max(0, mid - halfLen), Math.Min(mid + halfLen, line.Length));
+                line = (LineString)lil.ExtractLine(Math.Max(0, mid - halfLen), Math.Min(mid + halfLen, line.Length));
                 // reset start
                 lil = new NetTopologySuite.LinearReferencing.LengthIndexedLine(line);
                 mid = lil.IndexOf(midPt);
@@ -762,13 +761,13 @@ private static BaseLabel CreatePathLabel(ILineString line, string text, SizeF te
                 start = end;
                 end = start - labelLength;
             }
-            line = (ILineString) lil.ExtractLine(start, end);
+            line = (LineString)lil.ExtractLine(start, end);
 
             // Build offset curve
-            ILineString offsetCurve;
+            LineString offsetCurve;
             var bufferParameters =
                 new NetTopologySuite.Operation.Buffer.BufferParameters(4,
-                    GeoAPI.Operation.Buffer.EndCapStyle.Flat);
+                    NetTopologySuite.Operation.Buffer.EndCapStyle.Flat);
 
             // determine offset curve that will run through the vertical centre of the text
             if (style.VerticalAlignment != LabelStyle.VerticalAlignmentEnum.Middle)
@@ -778,7 +777,7 @@ private static BaseLabel CreatePathLabel(ILineString line, string text, SizeF te
 
                 // Left side positive
                 var offsetCurvePoints = ocb.GetOffsetCurve(line.Coordinates,
-                    ((int) style.VerticalAlignment - 1) * 0.5 * labelHeight - offsetY);
+                    ((int)style.VerticalAlignment - 1) * 0.5 * labelHeight - offsetY);
                 offsetCurve = factory.CreateLineString(offsetCurvePoints);
             }
             else
@@ -795,28 +794,28 @@ private static BaseLabel CreatePathLabel(ILineString line, string text, SizeF te
             }
 
             // enclosing polygon in world coords
-            var affectedArea = (IPolygon) offsetCurve.Buffer(0.5d * labelHeight, bufferParameters);
+            var affectedArea = (Polygon)offsetCurve.Buffer(0.5d * labelHeight, bufferParameters);
 
             // fast, basic check (technically should use polygons for rotated views)
             if (!map.Envelope.Contains(affectedArea.EnvelopeInternal))
                 return null;
 
             // using labelBox to pass text height to WarpedPath
-            return new PathLabel(text, LineStringToPath(offsetCurve, map), 0, priority, 
-                new LabelBox(0,0,textMeasure.Width,textMeasure.Height), style)
+            return new PathLabel(text, LineStringToPath(offsetCurve, map), 0, priority,
+                new LabelBox(0, 0, textMeasure.Width, textMeasure.Height), style)
             {
                 AffectedArea = affectedArea
             };
         }
 
-        private static ILineString ExtendLine(ILineString line, double startDist, double endDist)
+        private static LineString ExtendLine(LineString line, double startDist, double endDist)
         {
             var numPts = (startDist > 0 ? 1 : 0) + (endDist > 0 ? 1 : 0);
             if (numPts == 0) return line;
 
             var cs = line.Factory.CoordinateSequenceFactory.Create(line.CoordinateSequence.Count + numPts, line.CoordinateSequence.Dimension);
             var offset = 0;
-            
+
             if (startDist > 0)
             {
                 var rad = Azimuth(line.Coordinates[1], line.Coordinates[0]);
@@ -833,7 +832,7 @@ private static ILineString ExtendLine(ILineString line, double startDist, double
 
             if (endDist > 0)
             {
-                var endPoints = new  []
+                var endPoints = new[]
                 {
                     line.Coordinates[line.Coordinates.Length - 2],
                     line.Coordinates[line.Coordinates.Length - 1]
@@ -851,13 +850,13 @@ private static ILineString ExtendLine(ILineString line, double startDist, double
             return line.Factory.CreateLineString(cs);
         }
 
-        private static double Azimuth( Coordinate c1, Coordinate c2)
+        private static double Azimuth(Coordinate c1, Coordinate c2)
         {
             var dX = c2.X - c1.X;
             var dY = c2.Y - c1.Y;
-            return  Math.PI / 2 - Math.Atan2(dY, dX);
+            return Math.PI / 2 - Math.Atan2(dY, dX);
         }
-        
+
         private static Coordinate Traverse(Coordinate coord, double azimuth, double dist)
         {
             return new Coordinate(
@@ -865,18 +864,18 @@ private static Coordinate Traverse(Coordinate coord, double azimuth, double dist
                 coord.Y + dist * Math.Cos(azimuth)
             );
         }
-        private IGeometry ClipLinealGeomToViewExtents(MapViewport map, IGeometry geom)
+        private Geometry ClipLinealGeomToViewExtents(MapViewport map, Geometry geom)
         {
             if (map.MapTransform.IsIdentity)
             {
                 var lineClipping = new CohenSutherlandLineClipping(map.Envelope.MinX, map.Envelope.MinY,
                     map.Envelope.MaxX, map.Envelope.MaxY);
 
-                if (geom is ILineString)
-                    return lineClipping.ClipLineString(geom as ILineString);
-                
-                if (geom is IMultiLineString)
-                    return lineClipping.ClipLineString(geom as IMultiLineString);
+                if (geom is LineString)
+                    return lineClipping.ClipLineString(geom as LineString);
+
+                if (geom is MultiLineString)
+                    return lineClipping.ClipLineString(geom as MultiLineString);
             }
             else
             {
@@ -893,18 +892,18 @@ private IGeometry ClipLinealGeomToViewExtents(MapViewport map, IGeometry geom)
                 var at = AffineTransformation.RotationInstance(
                     Degrees.ToRadians(map.MapTransformRotation), map.Center.X, map.Center.Y);
 
-                clipPolygon = (Polygon) at.Transform(clipPolygon);
+                clipPolygon = (Polygon)at.Transform(clipPolygon);
 
-                if (geom is ILineString)
-                    return clipPolygon.Intersection(geom as ILineString);
-                
-                if (geom is IMultiLineString)
-                    return clipPolygon.Intersection(geom as IMultiLineString);
+                if (geom is LineString)
+                    return clipPolygon.Intersection(geom as LineString);
+
+                if (geom is MultiLineString)
+                    return clipPolygon.Intersection(geom as MultiLineString);
             }
 
             return null;
         }
-       
+
         /// <summary>
         /// Very basic test to check for positive direction of Linestring, taking into account map rotation
         /// </summary>
@@ -923,18 +922,18 @@ private static bool LineNeedsReversing(Coordinate start, Coordinate end, bool is
             }
             else
             {
-                var pts = map.WorldToImage(new[] {start, end}, true);
+                var pts = map.WorldToImage(new[] { start, end }, true);
                 startX = pts[0].X;
                 endX = pts[1].X;
             }
-            
+
             var dx = endX - startX;
             if (isRightToLeft && dx < 0)
                 return false;
-            
+
             return isRightToLeft || !(dx >= 0);
         }
-        
+
         /// <summary>
         /// Function to transform a linestring to a graphics path for further processing
         /// </summary>
@@ -942,10 +941,10 @@ private static bool LineNeedsReversing(Coordinate start, Coordinate end, bool is
         /// <param name="map">The map</param>
         /// <!--<param name="useClipping">A value indicating whether clipping should be applied or not</param>-->
         /// <returns>A GraphicsPath</returns>
-        public static GraphicsPath LineStringToPath(ILineString lineString, MapViewport map/*, bool useClipping*/)
+        public static GraphicsPath LineStringToPath(LineString lineString, MapViewport map/*, bool useClipping*/)
         {
             var gp = new GraphicsPath(FillMode.Alternate);
-                gp.AddLines(lineString.TransformToImage(map));
+            gp.AddLines(lineString.TransformToImage(map));
             return gp;
         }
     }
diff --git a/SharpMap/Layers/Layer.cs b/SharpMap/Layers/Layer.cs
index de842a52..03f82983 100644
--- a/SharpMap/Layers/Layer.cs
+++ b/SharpMap/Layers/Layer.cs
@@ -15,15 +15,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Drawing;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries.Utilities;
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
 using SharpMap.Base;
 using SharpMap.Rendering;
 using SharpMap.Styles;
-using SharpMap.Utilities;
+using System;
+using System.Drawing;
 
 namespace SharpMap.Layers
 {
@@ -101,8 +100,8 @@ protected virtual void OnLayerNameChanged(EventArgs eventArgs)
 
         private ICoordinateTransformation _coordinateTransform;
         private ICoordinateTransformation _reverseCoordinateTransform;
-        private IGeometryFactory _sourceFactory;
-        private IGeometryFactory _targetFactory;
+        private GeometryFactory _sourceFactory;
+        private GeometryFactory _targetFactory;
 
         private string _layerName;
         private string _layerTitle;
@@ -111,13 +110,13 @@ protected virtual void OnLayerNameChanged(EventArgs eventArgs)
         private int? _targetSrid;
         [field: NonSerialized]
         private bool _shouldNotResetCt;
-        
+
         /// <summary>
         /// The area of the map that was covered by this layer
         /// </summary>
         [field: NonSerialized]
         protected RectangleF CanvasArea = RectangleF.Empty;
-        
+
         // ReSharper disable PublicConstructorInAbstractClass
         ///<summary>
         /// Creates an instance of this class using the given Style
@@ -150,7 +149,7 @@ protected override void ReleaseManagedResources()
         }
 
         /// <summary>
-        /// Gets or sets the <see cref="GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation"/> applied 
+        /// Gets or sets the <see cref="ProjNet.CoordinateSystems.Transformations.CoordinateTransformation"/> applied 
         /// to this vectorlayer prior to rendering
         /// </summary>
         public virtual ICoordinateTransformation CoordinateTransformation
@@ -185,7 +184,7 @@ public virtual ICoordinateTransformation CoordinateTransformation
                     }
                     else
                     {
-                        _sourceFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(SRID);
+                        _sourceFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID);
                         // causes targetFactory to be cleared
                         TargetSRID = 0;
                     }
@@ -230,15 +229,15 @@ protected virtual void OnCoordinateTransformationChanged(EventArgs e)
         /// <summary>
         /// Gets the geometry factory to create source geometries
         /// </summary>
-        protected internal IGeometryFactory SourceFactory { get { return _sourceFactory ?? (_sourceFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(SRID)); } }
+        protected internal GeometryFactory SourceFactory { get { return _sourceFactory ?? (_sourceFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(SRID)); } }
 
         /// <summary>
         /// Gets the geometry factory to create target geometries
         /// </summary>
-        protected internal IGeometryFactory TargetFactory { get { return _targetFactory ?? _sourceFactory; } }
+        protected internal GeometryFactory TargetFactory { get { return _targetFactory ?? _sourceFactory; } }
 
         /// <summary>
-        /// Certain Transformations cannot be inverted in ProjNet, in those cases use this property to set the reverse <see cref="GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation"/> (of CoordinateTransformation) to fetch data from Datasource
+        /// Certain Transformations cannot be inverted in ProjNet, in those cases use this property to set the reverse <see cref="ProjNet.CoordinateSystems.Transformations.CoordinateTransformation"/> (of CoordinateTransformation) to fetch data from Datasource
         /// 
         /// If your CoordinateTransformation can be inverted you can leave this property to null
         /// </summary>
@@ -302,7 +301,7 @@ public virtual int SRID
                 {
                     _srid = value;
 
-                    _sourceFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(value);
+                    _sourceFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(value);
                     if (!_shouldNotResetCt)
                         _coordinateTransform = _reverseCoordinateTransform = null;
 
@@ -327,7 +326,7 @@ public virtual int TargetSRID
                 else if (_targetSrid != value)
                 {
                     _targetSrid = value;
-                    _targetFactory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(value);
+                    _targetFactory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(value);
                 }
                 if (!_shouldNotResetCt)
                     _coordinateTransform = _reverseCoordinateTransform = null;
@@ -367,7 +366,7 @@ public virtual void Render(Graphics g, MapViewport map)
         Rectangle ILayerEx.Render(Graphics g, MapViewport map)
         {
             Render(g, map, out var canvasArea);
-            return  canvasArea;
+            return canvasArea;
         }
 
         private bool _renderCalled;
@@ -381,12 +380,12 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte
         {
             if (_renderCalled)
                 return;
-            
+
             _renderCalled = true;
             Render(g, mvp);
             _renderCalled = false;
 
-            var mapRect = new Rectangle(new Point(0, 0), mvp.Size);
+            var mapRect = new Rectangle(new System.Drawing.Point(0, 0), mvp.Size);
             if (CanvasArea.IsEmpty)
             {
                 affectedArea = mapRect;
@@ -400,7 +399,7 @@ protected virtual void Render(Graphics g, MapViewport mvp, out Rectangle affecte
 
                 CanvasArea = RectangleF.Empty;
             }
-            
+
             OnLayerRendered(g);
         }
 
@@ -423,16 +422,16 @@ protected static Rectangle ToGraphicsCanvas(RectangleF area, System.Drawing.Draw
             // This is the area of the graphics canvas that needs to be refreshed when invalidating the image. 
             var affectedArea = area.ToRectangle();
 
-//                // proof of concept: draw affected area to screen aligned with graphics canvas
-//                using (var orig = g.Transform.Clone())
-//                {
-//                    var areaToBeRendered = affectedArea;
-//                    areaToBeRendered.Intersect(mapRect);
-//                    g.ResetTransform();
-//                    g.DrawRectangle(new Pen(Color.Red, 3f) {Alignment = System.Drawing.Drawing2D.PenAlignment.Inset},
-//                        areaToBeRendered);
-//                    g.Transform = orig;
-//                }
+            //                // proof of concept: draw affected area to screen aligned with graphics canvas
+            //                using (var orig = g.Transform.Clone())
+            //                {
+            //                    var areaToBeRendered = affectedArea;
+            //                    areaToBeRendered.Intersect(mapRect);
+            //                    g.ResetTransform();
+            //                    g.DrawRectangle(new Pen(Color.Red, 3f) {Alignment = System.Drawing.Drawing2D.PenAlignment.Inset},
+            //                        areaToBeRendered);
+            //                    g.Transform = orig;
+            //                }
 
             // allow for bleed and/or minor labelling misdemeanours
             affectedArea.Inflate(1, 1);
@@ -583,7 +582,7 @@ public void RaiseRenderRequired()
         /// Utility function to transform given envelope using a specific transformation
         /// </summary>
         /// <param name="envelope">The source envelope</param>
-        /// <param name="coordinateTransformation">The <see cref="GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation"/> to use.</param>
+        /// <param name="coordinateTransformation">The <see cref="ProjNet.CoordinateSystems.Transformations.ICoordinateTransformation"/> to use.</param>
         /// <returns>The target envelope</returns>
         protected virtual Envelope ToTarget(Envelope envelope, ICoordinateTransformation coordinateTransformation)
         {
@@ -633,7 +632,7 @@ protected virtual Envelope ToSource(Envelope envelope)
         /// </summary>
         /// <param name="geometry">A geometry</param>
         /// <returns>The transformed geometry</returns>
-        protected virtual IGeometry ToTarget(IGeometry geometry)
+        protected virtual Geometry ToTarget(Geometry geometry)
         {
             if (geometry.SRID == TargetSRID)
                 return geometry;
@@ -651,7 +650,7 @@ protected virtual IGeometry ToTarget(IGeometry geometry)
         /// </summary>
         /// <param name="geometry">A geometry</param>
         /// <returns>The transformed geometry</returns>
-        protected virtual IGeometry ToSource(IGeometry geometry)
+        protected virtual Geometry ToSource(Geometry geometry)
         {
             if (geometry.SRID == SRID)
                 return geometry;
diff --git a/SharpMap/Layers/LayerCollection.cs b/SharpMap/Layers/LayerCollection.cs
index 9d889a88..e30f8f7d 100644
--- a/SharpMap/Layers/LayerCollection.cs
+++ b/SharpMap/Layers/LayerCollection.cs
@@ -73,7 +73,7 @@ public LayerCollection Clone()
                 {
                     var cloneable = lay as ICloneable;
                     if (cloneable != null)
-                        newColl.Add((ILayer) cloneable.Clone());
+                        newColl.Add((ILayer)cloneable.Clone());
                     else
                         newColl.Add(lay);
                 }
diff --git a/SharpMap/Layers/LayerGroup.cs b/SharpMap/Layers/LayerGroup.cs
index e5a24ce3..b29d29d2 100644
--- a/SharpMap/Layers/LayerGroup.cs
+++ b/SharpMap/Layers/LayerGroup.cs
@@ -15,15 +15,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using ProjNet.CoordinateSystems.Transformations;
+using SharpMap.Data;
+using SharpMap.Styles;
 using System;
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Linq;
-using SharpMap.Data;
-using GeoAPI.Geometries;
-using SharpMap.Styles;
-using GeoAPI.CoordinateSystems.Transformations;
 
 namespace SharpMap.Layers
 {
@@ -121,13 +121,13 @@ public override Envelope Envelope
                     var layerEnvelope = layers[i].Envelope;
                     if (layerEnvelope != null)
                     {
-                        if(bbox == null)
+                        if (bbox == null)
                             bbox = new Envelope(layerEnvelope);
                         else
                             bbox.ExpandToInclude(layerEnvelope);
                     }
                 }
-                    
+
                 return bbox;
             }
         }
@@ -141,7 +141,7 @@ public override Envelope Envelope
         public virtual bool SkipTransformationPropagation { get; set; }
 
         /// <summary>
-        /// Gets or sets the <see cref="GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation"/> applied 
+        /// Gets or sets the <see cref="ProjNet.CoordinateSystems.Transformations.CoordinateTransformation"/> applied 
         /// to this vectorlayer prior to rendering
         /// </summary>
 
@@ -163,7 +163,7 @@ public override ICoordinateTransformation CoordinateTransformation
         }
 
         /// <summary>
-        /// Certain Transformations cannot be inverted in ProjNet, in those cases use this property to set the reverse <see cref="GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation"/> (of CoordinateTransformation) to fetch data from Datasource
+        /// Certain Transformations cannot be inverted in ProjNet, in those cases use this property to set the reverse <see cref="ProjNet.CoordinateSystems.Transformations.CoordinateTransformation"/> (of CoordinateTransformation) to fetch data from Datasource
         /// 
         /// If your CoordinateTransformation can be inverted you can leave this property to null
         /// </summary>
@@ -236,7 +236,7 @@ protected override void ReleaseManagedResources()
             var layers = GetSnapshot();
             foreach (var layer in layers.OfType<IDisposable>().Where(layer => layer != null))
                 layer.Dispose();
-            
+
             Layers.Clear();
             base.ReleaseManagedResources();
         }
@@ -263,8 +263,8 @@ public virtual ILayer GetLayerByName(string name)
         public override void Render(Graphics g, MapViewport map)
         {
             var layers = GetSnapshot();
-            var compare = VisibilityUnits == VisibilityUnits.ZoomLevel 
-                ? map.Zoom 
+            var compare = VisibilityUnits == VisibilityUnits.ZoomLevel
+                ? map.Zoom
                 : map.GetMapScale((int)g.DpiX);
 
             foreach (var layer in layers)
@@ -275,7 +275,7 @@ public override void Render(Graphics g, MapViewport map)
             }
         }
 
-         #region Implementation of ICanQueryLayer
+        #region Implementation of ICanQueryLayer
 
         /// <summary>
         /// Returns the data associated with all the geometries that are intersected by 'geom'
@@ -297,7 +297,7 @@ public virtual void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
         /// </summary>
         /// <param name="geometry">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public virtual void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        public virtual void ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             var layers = GetSnapshot();
 
@@ -307,7 +307,7 @@ public virtual void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet
             }
         }
 
-         #endregion
+        #endregion
 
         /// <summary>
         /// Create an empty new LayerGroup instance.
@@ -350,7 +350,7 @@ public virtual object Clone()
             {
                 var cloneable = layer as ICloneable;
                 if (cloneable != null)
-                    clonedGroup.Layers.Add((ILayer) cloneable.Clone());
+                    clonedGroup.Layers.Add((ILayer)cloneable.Clone());
                 else
                     clonedGroup.Layers.Add(layer);
             }
diff --git a/SharpMap/Layers/Symbolizer/AnyGeometryVectorLayer.cs b/SharpMap/Layers/Symbolizer/AnyGeometryVectorLayer.cs
index d708c65c..b64c4e26 100644
--- a/SharpMap/Layers/Symbolizer/AnyGeometryVectorLayer.cs
+++ b/SharpMap/Layers/Symbolizer/AnyGeometryVectorLayer.cs
@@ -1,7 +1,7 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data.Providers;
 using SharpMap.Rendering.Symbolizer;
+using System;
 
 namespace SharpMap.Layers.Symbolizer
 {
@@ -9,7 +9,7 @@ namespace SharpMap.Layers.Symbolizer
     /// Vector layer class than can symbolize any type of geometry
     /// </summary>
     [Serializable]
-    public class AnyGeometryVectorLayer : BaseVectorLayer<IGeometry>
+    public class AnyGeometryVectorLayer : BaseVectorLayer<Geometry>
     {
         /// <summary>
         /// Creates an instance of this class
@@ -17,7 +17,7 @@ public class AnyGeometryVectorLayer : BaseVectorLayer<IGeometry>
         /// <param name="layerName">The layer's name</param>
         public AnyGeometryVectorLayer(string layerName)
             : this(layerName, null)
-        {}
+        { }
 
         /// <summary>
         /// Creates an instance of this class
@@ -26,11 +26,11 @@ public AnyGeometryVectorLayer(string layerName)
         /// <param name="datasource">The layers's datasource</param>
         public AnyGeometryVectorLayer(string layerName, IProvider datasource)
             : this(layerName, datasource, new GeometrySymbolizer
-                             {
-                                 PointSymbolizer = new RasterPointSymbolizer(),
-                                 LineSymbolizer = new BasicLineSymbolizer(),
-                                 PolygonSymbolizer = new BasicPolygonSymbolizer()
-                             })
+            {
+                PointSymbolizer = new RasterPointSymbolizer(),
+                LineSymbolizer = new BasicLineSymbolizer(),
+                PolygonSymbolizer = new BasicPolygonSymbolizer()
+            })
         {
         }
 
diff --git a/SharpMap/Layers/Symbolizer/BaseVectorLayer.cs b/SharpMap/Layers/Symbolizer/BaseVectorLayer.cs
index 35da8071..e6f5a85c 100644
--- a/SharpMap/Layers/Symbolizer/BaseVectorLayer.cs
+++ b/SharpMap/Layers/Symbolizer/BaseVectorLayer.cs
@@ -1,14 +1,14 @@
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Data;
+using SharpMap.Data.Providers;
+using SharpMap.Rendering.Symbolizer;
 using System;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Runtime.CompilerServices;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using SharpMap.Data.Providers;
-using SharpMap.Rendering.Symbolizer;
-using IGeometry = GeoAPI.Geometries.IGeometry;
-using Common.Logging;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace SharpMap.Layers.Symbolizer
 {
@@ -18,18 +18,18 @@ namespace SharpMap.Layers.Symbolizer
     /// <typeparam name="TGeometry">The geometry type</typeparam>
     [Serializable]
     public abstract class BaseVectorLayer<TGeometry> : Layer, ICanQueryLayer
-        where TGeometry : class//, IGeometry
+        where TGeometry : class//, Geometry
     {
         #region Private fields
 
         private readonly object _dataSourceLock = new object();
         private IProvider _dataSource;
-        private Collection<IGeometry> _geometries;
+        private Collection<Geometry> _geometries;
 
         #endregion
 
         static readonly ILog logger = LogManager.GetLogger(typeof(BaseVectorLayer<TGeometry>));
-        
+
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
@@ -95,7 +95,7 @@ public override void Render(Graphics g, MapViewport map)
 
             // Initialize Rendering
             OnRender(g, map);
-            
+
             // Render
             OnRendering(g, map);
 
@@ -227,7 +227,7 @@ public void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
         /// </summary>
         /// <param name="geometry">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             geometry = ToSource(geometry);
 
diff --git a/SharpMap/Layers/Symbolizer/LinealVectorLayer.cs b/SharpMap/Layers/Symbolizer/LinealVectorLayer.cs
index 0e0fa2f4..fa43be26 100644
--- a/SharpMap/Layers/Symbolizer/LinealVectorLayer.cs
+++ b/SharpMap/Layers/Symbolizer/LinealVectorLayer.cs
@@ -1,7 +1,7 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data.Providers;
 using SharpMap.Rendering.Symbolizer;
+using System;
 
 namespace SharpMap.Layers.Symbolizer
 {
@@ -9,7 +9,7 @@ namespace SharpMap.Layers.Symbolizer
     /// A vector layer class that can symbolize lineal geometries
     /// </summary>
     [Serializable]
-    public class LinealVectorLayer : BaseVectorLayer<ILineal> 
+    public class LinealVectorLayer : BaseVectorLayer<ILineal>
     {
         /// <summary>
         /// Creates an instance of this class
diff --git a/SharpMap/Layers/Symbolizer/PolygonalVectorLayer.cs b/SharpMap/Layers/Symbolizer/PolygonalVectorLayer.cs
index 4e1a3798..5cf16311 100644
--- a/SharpMap/Layers/Symbolizer/PolygonalVectorLayer.cs
+++ b/SharpMap/Layers/Symbolizer/PolygonalVectorLayer.cs
@@ -1,7 +1,7 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data.Providers;
 using SharpMap.Rendering.Symbolizer;
+using System;
 
 namespace SharpMap.Layers.Symbolizer
 {
@@ -9,14 +9,14 @@ namespace SharpMap.Layers.Symbolizer
     /// A vector layer class that can symbolize polygonal geometries.
     /// </summary>
     [Serializable]
-    public class PolygonalVectorLayer : BaseVectorLayer<IPolygonal> 
+    public class PolygonalVectorLayer : BaseVectorLayer<IPolygonal>
     {
 
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
         /// <param name="layerName">The layers's name</param>
-        public PolygonalVectorLayer(string layerName) 
+        public PolygonalVectorLayer(string layerName)
             : this(layerName, null)
         {
         }
diff --git a/SharpMap/Layers/Symbolizer/PuntalVectorLayer.cs b/SharpMap/Layers/Symbolizer/PuntalVectorLayer.cs
index 7127c6f6..d331167c 100644
--- a/SharpMap/Layers/Symbolizer/PuntalVectorLayer.cs
+++ b/SharpMap/Layers/Symbolizer/PuntalVectorLayer.cs
@@ -1,7 +1,7 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Data.Providers;
 using SharpMap.Rendering.Symbolizer;
+using System;
 
 namespace SharpMap.Layers.Symbolizer
 {
diff --git a/SharpMap/Layers/TiledWmsLayer.cs b/SharpMap/Layers/TiledWmsLayer.cs
index c98144f7..b570ddc7 100644
--- a/SharpMap/Layers/TiledWmsLayer.cs
+++ b/SharpMap/Layers/TiledWmsLayer.cs
@@ -16,6 +16,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Rendering.Exceptions;
+using SharpMap.Web.Wms;
+using SharpMap.Web.Wms.Tiling;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -26,12 +31,6 @@
 using System.IO;
 using System.Net;
 using System.Text;
-using GeoAPI.Geometries;
-using SharpMap.Rendering.Exceptions;
-using SharpMap.Utilities;
-using SharpMap.Web.Wms;
-using SharpMap.Web.Wms.Tiling;
-using Common.Logging;
 
 namespace SharpMap.Layers
 {
@@ -51,10 +50,10 @@ namespace SharpMap.Layers
     /// TiledWmsLayer tiledWmsLayer = new TiledWmsLayer("Metacarta", url);
     /// tiledWmsLayer.TileSetsActive.Add(tiledWmsLayer.TileSets["satellite"].Name);
     /// map.Layers.Add(tiledWmsLayer);
-    /// map.ZoomToBox(new GeoAPI.Geometries.Envelope(-180.0, 180.0, -90.0, 90.0));
+    /// map.ZoomToBox(new NetTopologySuite.Geometries.Envelope(-180.0, 180.0, -90.0, 90.0));
     /// </code>
     /// </example>
-    [Obsolete("use TileLayer instead") ]
+    [Obsolete("use TileLayer instead")]
 
     public class TiledWmsLayer : Layer, ILayer
     {
@@ -258,13 +257,13 @@ public override void Render(Graphics g, MapViewport map)
                             PointF destMin = map.WorldToImage(tileExtent.Min());
                             PointF destMax = map.WorldToImage(tileExtent.Max());
 
-                            double minX = (int) Math.Round(destMin.X);
-                            double minY = (int) Math.Round(destMax.Y);
-                            double maxX = (int) Math.Round(destMax.X);
-                            double maxY = (int) Math.Round(destMin.Y);
+                            double minX = (int)Math.Round(destMin.X);
+                            double minY = (int)Math.Round(destMax.Y);
+                            double maxX = (int)Math.Round(destMax.X);
+                            double maxY = (int)Math.Round(destMin.Y);
 
                             g.DrawImage(bitmap,
-                                        new Rectangle((int) minX, (int) minY, (int) (maxX - minX), (int) (maxY - minY)),
+                                        new Rectangle((int)minX, (int)minY, (int)(maxX - minX), (int)(maxY - minY)),
                                         0, 0, tileSet.Width, tileSet.Height,
                                         GraphicsUnit.Pixel, _ImageAttributes);
                         }
@@ -286,7 +285,7 @@ public override void Render(Graphics g, MapViewport map)
         /// <returns>Bounding box corresponding to the extent of the features in the layer</returns>
         public override Envelope Envelope
         {
-            get 
+            get
             {
                 return _WmsClient.Layer.LatLonBoundingBox; //TODO: no box is allowed in capabilities so check for it
             }
@@ -336,7 +335,7 @@ private string GetRequestUrl(Envelope box, TileSet tileSet)
                                 box.MinX, box.MinY, box.MaxX, box.MaxY);
             strReq.AppendFormat("&WIDTH={0}&Height={1}", tileSet.Width, tileSet.Height);
             strReq.Append("&LAYERS=");
-                // LAYERS is set in caps because the current version of tilecache.py does not accept mixed case (a little bug)
+            // LAYERS is set in caps because the current version of tilecache.py does not accept mixed case (a little bug)
             if (tileSet.Layers != null && tileSet.Layers.Count > 0)
             {
                 foreach (string layer in tileSet.Layers)
@@ -395,13 +394,13 @@ private Bitmap WmsGetMap(Envelope extent, TileSet tileSet)
 
             try
             {
-                webResponse = (HttpWebResponse) webRequest.GetResponse();
+                webResponse = (HttpWebResponse)webRequest.GetResponse();
 
                 if (webResponse.ContentType.StartsWith("image"))
                 {
                     responseStream = webResponse.GetResponseStream();
-                    bitmap = (Bitmap) Bitmap.FromStream(responseStream);
-                    return (Bitmap) bitmap;
+                    bitmap = (Bitmap)Bitmap.FromStream(responseStream);
+                    return (Bitmap)bitmap;
                 }
                 else
                 {
@@ -477,7 +476,7 @@ private static Rectangle RoundRectangle(RectangleF dest)
             double minY = Math.Round(dest.Y);
             double maxX = Math.Round(dest.Right);
             double maxY = Math.Round(dest.Bottom);
-            return new Rectangle((int) minX, (int) minY, (int) (maxX - minX), (int) (maxY - minY));
+            return new Rectangle((int)minX, (int)minY, (int)(maxX - minX), (int)(maxY - minY));
         }
     }
 }
diff --git a/SharpMap/Layers/VariableLayerCollection.cs b/SharpMap/Layers/VariableLayerCollection.cs
index c1c6de99..e1049503 100644
--- a/SharpMap/Layers/VariableLayerCollection.cs
+++ b/SharpMap/Layers/VariableLayerCollection.cs
@@ -41,7 +41,7 @@ public enum LayerCollectionType
     public class VariableLayerCollection : LayerCollection
     {
         //private readonly LayerCollection _variableLayers;
-        
+
         //[NonSerialized]
         //private Timer _timer;
 
diff --git a/SharpMap/Layers/VectorLayer.cs b/SharpMap/Layers/VectorLayer.cs
index 9fd8ee6f..92e00aa4 100644
--- a/SharpMap/Layers/VectorLayer.cs
+++ b/SharpMap/Layers/VectorLayer.cs
@@ -15,18 +15,18 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Collections.ObjectModel;
-using System.Drawing;
-using System.Drawing.Drawing2D;
+using Common.Logging;
+using NetTopologySuite.Geometries;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
-using GeoAPI.Geometries;
 using SharpMap.Rendering;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
+using System;
 using System.Collections.Generic;
-using Common.Logging;
+using System.Collections.ObjectModel;
+using System.Drawing;
+using System.Drawing.Drawing2D;
 
 namespace SharpMap.Layers
 {
@@ -89,8 +89,8 @@ public ITheme Theme
         /// Specifies whether polygons should be clipped prior to rendering
         /// </summary>
         /// <remarks>
-        /// <para>Clipping will clip <see cref="GeoAPI.Geometries.IPolygon"/> and
-        /// <see cref="GeoAPI.Geometries.IMultiPolygon"/> to the current view prior
+        /// <para>Clipping will clip <see cref="NetTopologySuite.Geometries.Polygon"/> and
+        /// <see cref="NetTopologySuite.Geometries.MultiPolygon"/> to the current view prior
         /// to rendering the object.</para>
         /// <para>Enabling clipping might improve rendering speed if you are rendering 
         /// only small portions of very large objects.</para>
@@ -269,7 +269,7 @@ protected void RenderInternal(Graphics g, MapViewport map, Envelope envelope, IT
                 evalStyle = new ThemeExEvaluator((IThemeEx)theme).GetStyle;
             else
                 evalStyle = new ThemeEvaluator(theme).GetStyle;
-            
+
             foreach (FeatureDataTable features in ds.Tables)
             {
                 // Transform geometries if necessary
@@ -301,14 +301,14 @@ protected void RenderInternal(Graphics g, MapViewport map, Envelope envelope, IT
                             if (outlineStyle != null)
                             {
                                 //Draw background of all line-outlines first
-                                if (feature.Geometry is ILineString)
+                                if (feature.Geometry is LineString)
                                 {
-                                    canvasArea = VectorRenderer.DrawLineStringEx(g, feature.Geometry as ILineString, outlineStyle.Outline,
+                                    canvasArea = VectorRenderer.DrawLineStringEx(g, feature.Geometry as LineString, outlineStyle.Outline,
                                                                         map, outlineStyle.LineOffset);
                                 }
-                                else if (feature.Geometry is IMultiLineString)
+                                else if (feature.Geometry is MultiLineString)
                                 {
-                                    canvasArea = VectorRenderer.DrawMultiLineStringEx(g, feature.Geometry as IMultiLineString,
+                                    canvasArea = VectorRenderer.DrawMultiLineStringEx(g, feature.Geometry as MultiLineString,
                                                                         outlineStyle.Outline, map, outlineStyle.LineOffset);
                                 }
                                 combinedArea = canvasArea.ExpandToInclude(combinedArea);
@@ -374,7 +374,7 @@ protected void RenderInternal(Graphics g, MapViewport map, Envelope envelope)
             var canvasArea = RectangleF.Empty;
             var combinedArea = RectangleF.Empty;
 
-            Collection<IGeometry> geoms = null;
+            Collection<Geometry> geoms = null;
 
             foreach (var style in stylesToRender)
             {
@@ -428,17 +428,17 @@ protected void RenderInternal(Graphics g, MapViewport map, Envelope envelope)
                                     if (geom != null)
                                     {
                                         //Draw background of all line-outlines first
-                                        if (geom is ILineString)
-                                            canvasArea = VectorRenderer.DrawLineStringEx(g, geom as ILineString, vStyle.Outline, map, vStyle.LineOffset);
-                                        else if (geom is IMultiLineString)
-                                            canvasArea = VectorRenderer.DrawMultiLineStringEx(g, geom as IMultiLineString, vStyle.Outline, map, vStyle.LineOffset);
+                                        if (geom is LineString)
+                                            canvasArea = VectorRenderer.DrawLineStringEx(g, geom as LineString, vStyle.Outline, map, vStyle.LineOffset);
+                                        else if (geom is MultiLineString)
+                                            canvasArea = VectorRenderer.DrawMultiLineStringEx(g, geom as MultiLineString, vStyle.Outline, map, vStyle.LineOffset);
                                         combinedArea = canvasArea.ExpandToInclude(combinedArea);
                                     }
                                 }
                             }
                         }
 
-                        foreach (IGeometry geom in geoms)
+                        foreach (Geometry geom in geoms)
                         {
                             if (geom != null)
                             {
@@ -492,7 +492,7 @@ public static IEnumerable<IStyle> GetStylesToRender(IStyle style)
         /// <param name="map">The map</param>
         /// <param name="feature">The feature's geometry</param>
         /// <param name="style">The style to apply</param>
-        protected void RenderGeometry(Graphics g, MapViewport map, IGeometry feature, VectorStyle style)
+        protected void RenderGeometry(Graphics g, MapViewport map, Geometry feature, VectorStyle style)
         {
             RenderGeometryEx(g, map, feature, style);
         }
@@ -504,7 +504,7 @@ protected void RenderGeometry(Graphics g, MapViewport map, IGeometry feature, Ve
         /// <param name="map">The map</param>
         /// <param name="feature">The feature's geometry</param>
         /// <param name="style">The style to apply</param>
-        protected RectangleF RenderGeometryEx(Graphics g, MapViewport map, IGeometry feature, VectorStyle style)
+        protected RectangleF RenderGeometryEx(Graphics g, MapViewport map, Geometry feature, VectorStyle style)
         {
             if (feature == null) return RectangleF.Empty;
 
@@ -513,62 +513,62 @@ protected RectangleF RenderGeometryEx(Graphics g, MapViewport map, IGeometry fea
             {
                 case OgcGeometryType.Polygon:
                     if (style.EnableOutline)
-                        return VectorRenderer.DrawPolygonEx(g, (IPolygon)feature, style.Fill, style.Outline, _clippingEnabled,
+                        return VectorRenderer.DrawPolygonEx(g, (Polygon)feature, style.Fill, style.Outline, _clippingEnabled,
                                                    map);
                     else
-                        return VectorRenderer.DrawPolygonEx(g, (IPolygon)feature, style.Fill, null, _clippingEnabled, map);
+                        return VectorRenderer.DrawPolygonEx(g, (Polygon)feature, style.Fill, null, _clippingEnabled, map);
 
                 case OgcGeometryType.MultiPolygon:
                     if (style.EnableOutline)
-                        return VectorRenderer.DrawMultiPolygonEx(g, (IMultiPolygon)feature, style.Fill, style.Outline, _clippingEnabled, map);
-                    return VectorRenderer.DrawMultiPolygonEx(g, (IMultiPolygon)feature, style.Fill, null, _clippingEnabled, map);
+                        return VectorRenderer.DrawMultiPolygonEx(g, (MultiPolygon)feature, style.Fill, style.Outline, _clippingEnabled, map);
+                    return VectorRenderer.DrawMultiPolygonEx(g, (MultiPolygon)feature, style.Fill, null, _clippingEnabled, map);
                 case OgcGeometryType.LineString:
                     if (style.LineSymbolizer != null)
                     {
-                         style.LineSymbolizer.Render(map, (ILineString)feature, g);
-                         return RectangleF.Empty;
+                        style.LineSymbolizer.Render(map, (LineString)feature, g);
+                        return RectangleF.Empty;
                     }
-                    return VectorRenderer.DrawLineStringEx(g, (ILineString)feature, style.Line, map, style.LineOffset);
+                    return VectorRenderer.DrawLineStringEx(g, (LineString)feature, style.Line, map, style.LineOffset);
 
                 case OgcGeometryType.MultiLineString:
                     if (style.LineSymbolizer != null)
                     {
-                        style.LineSymbolizer.Render(map, (IMultiLineString)feature, g);
+                        style.LineSymbolizer.Render(map, (MultiLineString)feature, g);
                         return RectangleF.Empty;
                     }
-                    return VectorRenderer.DrawMultiLineStringEx(g, (IMultiLineString)feature, style.Line, map, style.LineOffset);
-                    
+                    return VectorRenderer.DrawMultiLineStringEx(g, (MultiLineString)feature, style.Line, map, style.LineOffset);
+
 
                 case OgcGeometryType.Point:
                     if (style.PointSymbolizer != null)
-                        return VectorRenderer.DrawPointEx(style.PointSymbolizer, g, (IPoint)feature, map);
+                        return VectorRenderer.DrawPointEx(style.PointSymbolizer, g, (NetTopologySuite.Geometries.Point)feature, map);
 
                     if (style.Symbol != null || style.PointColor == null)
-                        return VectorRenderer.DrawPointEx(g, (IPoint)feature, style.Symbol, style.SymbolScale, style.SymbolOffset,
+                        return VectorRenderer.DrawPointEx(g, (NetTopologySuite.Geometries.Point)feature, style.Symbol, style.SymbolScale, style.SymbolOffset,
                                                  style.SymbolRotation, map);
 
-                    return VectorRenderer.DrawPointEx(g, (IPoint)feature, style.PointColor, style.PointSize, style.SymbolOffset, map);
+                    return VectorRenderer.DrawPointEx(g, (NetTopologySuite.Geometries.Point)feature, style.PointColor, style.PointSize, style.SymbolOffset, map);
 
                 case OgcGeometryType.MultiPoint:
                     if (style.PointSymbolizer != null)
-                        return VectorRenderer.DrawMultiPointEx(style.PointSymbolizer, g, (IMultiPoint)feature, map);
-                    
+                        return VectorRenderer.DrawMultiPointEx(style.PointSymbolizer, g, (MultiPoint)feature, map);
+
                     if (style.Symbol != null || style.PointColor == null)
-                        return VectorRenderer.DrawMultiPointEx(g, (IMultiPoint)feature, style.Symbol, style.SymbolScale, style.SymbolOffset, style.SymbolRotation, map);
+                        return VectorRenderer.DrawMultiPointEx(g, (MultiPoint)feature, style.Symbol, style.SymbolScale, style.SymbolOffset, style.SymbolRotation, map);
 
-                    return VectorRenderer.DrawMultiPointEx(g, (IMultiPoint)feature, style.PointColor, style.PointSize, style.SymbolOffset, map);
+                    return VectorRenderer.DrawMultiPointEx(g, (MultiPoint)feature, style.PointColor, style.PointSize, style.SymbolOffset, map);
 
                 case OgcGeometryType.GeometryCollection:
-                    var coll = (IGeometryCollection)feature;
+                    var coll = (GeometryCollection)feature;
                     var combinedArea = RectangleF.Empty;
                     for (var i = 0; i < coll.NumGeometries; i++)
                     {
-                        IGeometry geom = coll[i];
+                        Geometry geom = coll[i];
                         var canvasArea = RenderGeometryEx(g, map, geom, style);
                         combinedArea = canvasArea.ExpandToInclude(combinedArea);
                     }
                     return combinedArea;
-                
+
             }
             throw new NotSupportedException();
         }
@@ -609,7 +609,7 @@ public void ExecuteIntersectionQuery(Envelope box, FeatureDataSet ds)
         /// </summary>
         /// <param name="geometry">Geometry to intersect with</param>
         /// <param name="ds">FeatureDataSet to fill data into</param>
-        public void ExecuteIntersectionQuery(IGeometry geometry, FeatureDataSet ds)
+        public void ExecuteIntersectionQuery(Geometry geometry, FeatureDataSet ds)
         {
             geometry = ToSource(geometry);
 
diff --git a/SharpMap/Layers/WmsLayer.cs b/SharpMap/Layers/WmsLayer.cs
index ff264797..ac792418 100644
--- a/SharpMap/Layers/WmsLayer.cs
+++ b/SharpMap/Layers/WmsLayer.cs
@@ -15,19 +15,19 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.CoordinateSystems;
+using SharpMap.Rendering.Exceptions;
+using SharpMap.Web.Wms;
 using System;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Net;
 using System.Text;
-using GeoAPI.Geometries;
-using SharpMap.CoordinateSystems;
-using SharpMap.Rendering.Exceptions;
-using SharpMap.Web.Wms;
-using Common.Logging;
 
 namespace SharpMap.Layers
 {
@@ -53,7 +53,7 @@ namespace SharpMap.Layers
     /// myLayer.SetImageFormat(layWms.OutputFormats[0]);
     /// myLayer.SRID = 4326;	
     /// myMap.Layers.Add(myLayer);
-    /// myMap.Center = new GeoAPI.Geometries.Coordinate(0, 0);
+    /// myMap.Center = new NetTopologySuite.Geometries.Coordinate(0, 0);
     /// myMap.Zoom = 360;
     /// myMap.MaximumZoom = 360;
     /// myMap.MinimumZoom = 0.1;
@@ -137,7 +137,7 @@ public WmsLayer(string layername, string url, TimeSpan cachetime, IWebProxy prox
         /// <param name="credentials"></param>
         public WmsLayer(string layername, string url, TimeSpan cachetime, IWebProxy proxy,
             ICredentials credentials)
-            :this(layername, GetClient(url, proxy, credentials, cachetime))
+            : this(layername, GetClient(url, proxy, credentials, cachetime))
         {
         }
 
@@ -207,7 +207,7 @@ public void ForceOnlineResourceUrl(string url)
             for (int i = 0; i < _wmsClient.GetMapRequests.Length; i++)
             {
                 _wmsClient.GetMapRequests[i].OnlineResource = url;
-            }        
+            }
         }
 
 
@@ -369,7 +369,7 @@ public ImageAttributes ImageAttributes
         /// Returns the extent of the layer
         /// </summary>
         /// <returns>Bounding box corresponding to the extent of the features in the layer</returns>
-        public override Envelope Envelope 
+        public override Envelope Envelope
         {
             get { return _envelope ?? (_envelope = GetEnvelope()); }
         }
@@ -608,7 +608,7 @@ public override void Render(Graphics g, MapViewport map)
                 if (Logger.IsDebugEnabled)
                     Logger.Debug("Beginning request");
 
-                using(var myWebResponse = (HttpWebResponse)myWebRequest.GetResponse())
+                using (var myWebResponse = (HttpWebResponse)myWebRequest.GetResponse())
                 {
                     if (Logger.IsDebugEnabled)
                         Logger.Debug("Got response");
@@ -620,7 +620,7 @@ public override void Render(Graphics g, MapViewport map)
                             if (Logger.IsDebugEnabled)
                                 Logger.Debug("Reading image from stream");
 
-                            var cLength = (int) myWebResponse.ContentLength;
+                            var cLength = (int)myWebResponse.ContentLength;
 
                             if (Logger.IsDebugEnabled)
                                 Logger.Debug("Content-Length: " + cLength);
diff --git a/SharpMap/Map/Map.cs b/SharpMap/Map/Map.cs
index 357d751c..80d1a189 100644
--- a/SharpMap/Map/Map.cs
+++ b/SharpMap/Map/Map.cs
@@ -15,30 +15,26 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Layers;
+using SharpMap.Rendering;
+using SharpMap.Rendering.Decoration;
+using SharpMap.Styles;
+using SharpMap.Utilities;
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
-using GeoAPI.Geometries;
-using NetTopologySuite;
-using SharpMap.Layers;
-using SharpMap.Rendering;
-using SharpMap.Rendering.Decoration;
-using SharpMap.Styles;
-using SharpMap.Utilities;
-using Point = GeoAPI.Geometries.Coordinate;
-using System.Drawing.Imaging;
-using Common.Logging;
 using System.Reflection;
+using Point = NetTopologySuite.Geometries.Coordinate;
 
 namespace SharpMap
 {
@@ -60,14 +56,14 @@ public static void Configure()
         }
 
         /// <summary>
-        /// Static constructor. Needed to get <see cref="GeoAPI.GeometryServiceProvider.Instance"/> set.
+        /// Static constructor. Needed to get <see cref="NetTopologySuite.NtsGeometryServices.Instance"/> set.
         /// </summary>
         static Map()
         {
             try
             {
-                _logger.Debug("Trying to get GeoAPI.GeometryServiceProvider.Instance");
-                var instance = GeoAPI.GeometryServiceProvider.Instance;
+                _logger.Debug("Trying to get NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance");
+                var instance = NetTopologySuite.NtsGeometryServices.Instance;
                 if (instance == null)
                 {
                     _logger.Debug("Returned null");
@@ -79,8 +75,8 @@ static Map()
                 _logger.Debug("Loading NetTopologySuite");
                 Assembly.Load("NetTopologySuite");
                 _logger.Debug("Loaded NetTopologySuite");
-                _logger.Debug("Trying to get GeoAPI.GeometryServiceProvider.Instance");
-                var instance = GeoAPI.GeometryServiceProvider.Instance;
+                _logger.Debug("Trying to get NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance");
+                var instance = NetTopologySuite.NtsGeometryServices.Instance;
                 if (instance == null)
                 {
                     _logger.Debug("Returned null");
@@ -94,23 +90,23 @@ static Map()
             {
                 _logger.Debug("In design mode");
                 Trace.WriteLine("In design mode");
-                // We have to do this initialization with reflection due to the fact that NTS can reference an older version of GeoAPI and redirection 
+                // We have to do this initialization with reflection due to the fact that NTS can reference an older version of NetTopologySuite and redirection 
                 // is not available at design time..
                 var ntsAssembly = Assembly.Load("NetTopologySuite");
                 _logger.Debug("Loaded NetTopologySuite");
                 Trace.WriteLine("Loaded NetTopologySuite");
                 try
                 {
-                    _logger.Debug("Trying to access GeoAPI.GeometryServiceProvider.Instance");
-                    Trace.WriteLine("Trying to access GeoAPI.GeometryServiceProvider.Instance");
-                    if (GeoAPI.GeometryServiceProvider.Instance == null)
+                    _logger.Debug("Trying to access NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance");
+                    Trace.WriteLine("Trying to access NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance");
+                    if (NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance == null)
                     {
                         _logger.Debug("Returned null, setting it to default");
                         Trace.WriteLine("Returned null, setting it to default");
                         var ntsApiGeometryServices = ntsAssembly.GetType("NetTopologySuite.NtsGeometryServices");
-                        GeoAPI.GeometryServiceProvider.Instance =
+                        NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance =
                             ntsApiGeometryServices.GetProperty("Instance").GetValue(null, null) as
-                                GeoAPI.IGeometryServices;
+                                NetTopologySuite.IGeometryServices;
                     }
                 }
 
@@ -119,9 +115,9 @@ static Map()
                     _logger.Debug("InvalidOperationException thrown, setting it to default");
                     Trace.WriteLine("InvalidOperationException thrown, setting it to default");
                     var ntsApiGeometryServices = ntsAssembly.GetType("NetTopologySuite.NtsGeometryServices");
-                    GeoAPI.GeometryServiceProvider.Instance =
+                    NetTopologySuite.NetTopologySuite.NtsGeometryServices.Instance =
                         ntsApiGeometryServices.GetProperty("Instance").GetValue(null, null) as
-                            GeoAPI.IGeometryServices;
+                            NetTopologySuite.IGeometryServices;
                 }
                 _logger.Debug("Exiting design mode handling");
                 Trace.WriteLine("Exiting design mode handling");
@@ -148,14 +144,14 @@ static Map()
         private readonly VariableLayerCollection _variableLayers;
 #pragma warning disable 169
         // both fields redundant, but unable to remove without violating serialization
-        private Matrix _mapTransform; 
+        private Matrix _mapTransform;
         private Matrix _mapTransformInverted;
 #pragma warning restore 169
         private readonly object _lockMapTransform = new object();
         private readonly object _lockMapTransformInverted = new object();
-        private float[] _mapTransformElements; 
+        private float[] _mapTransformElements;
         private float[] _mapTransformInvertedElements;
-        
+
         private readonly MapViewPortGuard _mapViewportGuard;
         private readonly Dictionary<object, List<ILayer>> _layersPerGroup = new Dictionary<object, List<ILayer>>();
         private ObservableCollection<ILayer> _replacingCollection;
@@ -190,7 +186,7 @@ public Map(Size size)
 
             if (LicenseManager.UsageMode != LicenseUsageMode.Designtime)
             {
-                Factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(_srid);
+                Factory = Session.Instance.GeometryServices.CreateGeometryFactory(_srid);
             }
             _layers = new LayerCollection();
             _layersPerGroup.Add(_layers, new List<ILayer>());
@@ -611,8 +607,8 @@ public void RenderMap(Graphics g)
                 throw new InvalidOperationException("No layers to render");
 
             g.Transform = MapTransform;
-            
-            var mvp = (MapViewport) this;
+
+            var mvp = (MapViewport)this;
 
             g.Clear(BackColor);
             g.PageUnit = GraphicsUnit.Pixel;
@@ -661,7 +657,7 @@ public void RenderMap(Graphics g)
                     OnLayerRendering(layer, LayerCollectionType.Static);
                     if (layer.Enabled && layer.MaxVisible >= visibleLevel && layer.MinVisible < visibleLevel)
                         LayerCollectionRenderer.RenderLayer(layer, g, mvp);
-                        
+
                     OnLayerRendered(layer, LayerCollectionType.Static);
                 }
             }
@@ -679,7 +675,7 @@ public void RenderMap(Graphics g)
                     double visibleLevel = layer.VisibilityUnits == VisibilityUnits.ZoomLevel ? zoom : scale;
                     if (layer.Enabled && layer.MaxVisible >= visibleLevel && layer.MinVisible < visibleLevel)
                         LayerCollectionRenderer.RenderLayer(layer, g, mvp);
-                    
+
                     OnLayerRendered(layer, LayerCollectionType.Variable);
                 }
             }
@@ -815,7 +811,7 @@ public void RenderMap(Graphics g, LayerCollectionType layerCollectionType, bool
 
             g.Transform = MapTransform;
 
-            var mvp = (MapViewport) this;
+            var mvp = (MapViewport)this;
 
             if (!drawTransparent)
                 g.Clear(BackColor);
@@ -1027,7 +1023,7 @@ public void ZoomToBox(Envelope bbox, bool careAboutTransform = false)
                     bbox.Centre.Y - newHeight * 0.5,
                     bbox.Centre.Y + newHeight * 0.5);
             }
-            
+
             //Ensure aspect ratio
             var resX = Size.Width == 0 ? double.MaxValue : bbox.Width / Size.Width;
             var resY = Size.Height == 0 ? double.MaxValue : bbox.Height / Size.Height;
@@ -1068,8 +1064,8 @@ public PointF[] WorldToImage(Coordinate[] coordinates, bool careAboutMapTransfor
             if (MapTransformRotation.Equals(0f))
             {
                 // simple case is non-rotated views (ie MapTransform does NOT need to be applied)
-                var left = Center.X - Zoom * 0.5;   
-                var top = Center.Y + MapHeight * 0.5; 
+                var left = Center.X - Zoom * 0.5;
+                var top = Center.Y + MapHeight * 0.5;
                 return Transform.WorldToMap(coordinates, left, top, PixelWidth, PixelHeight);
             }
 
@@ -1082,7 +1078,7 @@ public PointF[] WorldToImage(Coordinate[] coordinates, bool careAboutMapTransfor
                 Center, PixelWidth, PixelHeight, MapTransformRotation, Size, careAboutMapTransform);
             return Transform.WorldToMap(coordinates, matrix);
         }
-        
+
         /// <summary>
         /// Converts a point in world coordinates to image coordinates based on the current <see cref="Zoom"/>, <see cref="Center"/>,
         /// map <see cref="Size"/>, and (optionally) the <see cref="MapTransform"/>.
@@ -1093,7 +1089,7 @@ public PointF[] WorldToImage(Coordinate[] coordinates, bool careAboutMapTransfor
         /// <returns>PointF in image coordinates</returns>
         public PointF WorldToImage(Coordinate p, bool careAboutMapTransform = false)
         {
-            var points = WorldToImage(new Coordinate[] {p}, careAboutMapTransform);
+            var points = WorldToImage(new Coordinate[] { p }, careAboutMapTransform);
             return points[0];
         }
 
@@ -1113,7 +1109,7 @@ public Point[] ImageToWorld(PointF[] points, bool careAboutMapTransform = false)
 
             return Transform.MapToWorld(points, this);
         }
-        
+
         /// <summary>
         /// Converts a point from image coordinates to world coordinates based on the current <see cref="Zoom"/>, <see cref="Center"/>,
         /// map <see cref="Size"/>, and (optionally) the <see cref="MapTransform"/>.
@@ -1152,14 +1148,14 @@ public int SRID
                 if (_srid == value)
                     return;
                 _srid = value;
-                Factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(_srid);
+                Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(_srid);
             }
         }
 
         /// <summary>
         /// Factory used to create geometries
         /// </summary>
-        public IGeometryFactory Factory { get; private set; }
+        public GeometryFactory Factory { get; private set; }
 
         /// <summary>
         /// List of all map decorations
@@ -1190,26 +1186,26 @@ public Envelope Envelope
                 var ur = new Coordinate(Center.X + Zoom * .5, Center.Y + height * .5);
 
                 // simple, non-rotated view
-               if (MapTransformRotation.Equals(0f))
+                if (MapTransformRotation.Equals(0f))
                     return new Envelope(ll, ur);
 
-               // otherwise derive envelope containing rotated view (required for layers to select data)
-               if (Size.Width == 0 || Size.Height == 0)
-                   return new Envelope(0, 0, 0, 0);
+                // otherwise derive envelope containing rotated view (required for layers to select data)
+                if (Size.Width == 0 || Size.Height == 0)
+                    return new Envelope(0, 0, 0, 0);
 
-               var rad = (double) -MapTransformRotation * Math.PI / 180.0;
-               var newWidth = (ur.X - ll.X) * Math.Abs(Math.Cos(rad)) +
-                              (ur.Y - ll.Y) * Math.Abs(Math.Sin(rad));
-               var newHeight = (ur.X - ll.X) * Math.Abs(Math.Sin(rad)) +
-                               (ur.Y - ll.Y) * Math.Abs(Math.Cos(rad));
+                var rad = (double)-MapTransformRotation * Math.PI / 180.0;
+                var newWidth = (ur.X - ll.X) * Math.Abs(Math.Cos(rad)) +
+                               (ur.Y - ll.Y) * Math.Abs(Math.Sin(rad));
+                var newHeight = (ur.X - ll.X) * Math.Abs(Math.Sin(rad)) +
+                                (ur.Y - ll.Y) * Math.Abs(Math.Cos(rad));
 
-               ll = new Coordinate(Center.X - newWidth * .5, Center.Y - newHeight * .5);
-               ur = new Coordinate(Center.X + newWidth * .5, Center.Y + newHeight * .5);
+                ll = new Coordinate(Center.X - newWidth * .5, Center.Y - newHeight * .5);
+                ur = new Coordinate(Center.X + newWidth * .5, Center.Y + newHeight * .5);
 
-               return new Envelope(ll, ur);
-           }
+                return new Envelope(ll, ur);
+            }
         }
-        
+
         /// <summary>
         /// Using the <see cref="MapTransform"/> you can alter the coordinate system of the map rendering.
         /// This makes it possible to rotate the image, for instance to have another direction than north upwards.
@@ -1254,7 +1250,7 @@ public Matrix MapTransform
                         inverted.Invert();
                         _mapTransformInvertedElements = inverted.Elements;
                     }
-                    
+
                     if (value.IsIdentity)
                         MapTransformRotation = 0f;
                     else
@@ -1287,7 +1283,7 @@ internal Matrix MapTransformInverted
                         _mapTransformInvertedElements[5]);
             }
         }
-        
+
         /// <summary>
         /// MapTransform Rotation in degrees. Facilitates determining if map is rotated without locking MapTransform.
         /// Positive rotation is applied anti-clockwise, with the apparent effect of north arrow rotating clockwise. 
diff --git a/SharpMap/Map/MapViewport.cs b/SharpMap/Map/MapViewport.cs
index 1a87bc67..3feb0834 100644
--- a/SharpMap/Map/MapViewport.cs
+++ b/SharpMap/Map/MapViewport.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Drawing;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.Geometries.Utilities;
 using SharpMap.Utilities;
+using System;
+using System.Drawing;
 
 namespace SharpMap
 {
@@ -40,7 +40,7 @@ public class MapViewport
         /// <param name="mapTransform">An affine map transform matrix</param>
         /// <param name="mapTransformInverted">The affine map transformation that inverts <paramref name="mapTransform"/></param>
         /// <param name="mapTransformRotation">The rotation in degrees applied by <paramref name="mapTransform"/></param>
-        public MapViewport(Guid mapId, int srid, double zoom, double mapHeight, Envelope env, Size size, double pixelAspectRatio, 
+        public MapViewport(Guid mapId, int srid, double zoom, double mapHeight, Envelope env, Size size, double pixelAspectRatio,
             System.Drawing.Drawing2D.Matrix mapTransform, System.Drawing.Drawing2D.Matrix mapTransformInverted,
             float mapTransformRotation)
         {
@@ -55,7 +55,7 @@ public MapViewport(Guid mapId, int srid, double zoom, double mapHeight, Envelope
             _center = env.Centre;
 
             PixelAspectRatio = pixelAspectRatio;
-            PixelWidth = Zoom / size.Width; 
+            PixelWidth = Zoom / size.Width;
             PixelHeight = PixelWidth * pixelAspectRatio;
 
             _mapTransformElements = mapTransform.Elements;
@@ -182,7 +182,7 @@ internal AffineTransformation WorldToMapTransform(bool careAboutTransform)
                     _worldToMapElements[5]
                 );
         }
-        
+
         /// <summary>
         /// Gets a value indicating the center of the map viewport
         /// </summary>
@@ -218,7 +218,7 @@ public Coordinate CenterOfInterest
         /// Applicable to non-rotated views only, returning the minimum X value of the map viewport in world units
         /// </summary>
         public double Left { get; }
-        
+
         /// <summary>
         /// Applicable to non-rotated views only, returning the maximum Y value of the map viewport in world units
         /// </summary>
@@ -278,7 +278,7 @@ public PointF[] WorldToImage(Coordinate[] coordinates, bool careAboutMapTransfor
             var matrix = WorldToMapTransform(careAboutMapTransform);
             return Transform.WorldToMap(coordinates, matrix);
         }
-        
+
         /// <summary>
         /// Converts a point in world coordinates to image coordinates based on the current <see cref="Zoom"/>, <see cref="Center"/>,
         /// map <see cref="Size"/>, and (optionally) the <see cref="MapTransform"/>.
@@ -289,7 +289,7 @@ public PointF[] WorldToImage(Coordinate[] coordinates, bool careAboutMapTransfor
         /// <returns>PointF in image coordinates</returns>
         public PointF WorldToImage(Coordinate p, bool careAboutMapTransform = false)
         {
-            var points = WorldToImage(new Coordinate[] {p}, careAboutMapTransform);
+            var points = WorldToImage(new Coordinate[] { p }, careAboutMapTransform);
             return points[0];
         }
 
@@ -320,7 +320,7 @@ public Coordinate[] ImageToWorld(PointF[] points, bool careAboutMapTransform = f
         /// <returns>Point in world coordinates</returns>
         public Coordinate ImageToWorld(PointF p, bool careAboutMapTransform = false)
         {
-            var pts = ImageToWorld(new PointF[] {p}, careAboutMapTransform);
+            var pts = ImageToWorld(new PointF[] { p }, careAboutMapTransform);
             return pts[0];
         }
 
diff --git a/SharpMap/Map/MapViewportGuard.cs b/SharpMap/Map/MapViewportGuard.cs
index 3feb82c0..5eb525fd 100644
--- a/SharpMap/Map/MapViewportGuard.cs
+++ b/SharpMap/Map/MapViewportGuard.cs
@@ -1,6 +1,6 @@
-using System;
+using NetTopologySuite.Geometries;
+using System;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap
 {
@@ -107,7 +107,7 @@ public double VerifyZoom(double zoom, Coordinate center)
             if (!EnforceMaximumExtents)
                 return zoom;
 
-            double arWidth = (double)Size.Width/Size.Height;
+            double arWidth = (double)Size.Width / Size.Height;
 
             if (zoom > _maximumExtents.Width)
                 zoom = _maximumExtents.Width;
@@ -136,7 +136,7 @@ private double VerifyValidViewport(double zoom, Coordinate center)
             double maxZoomHeight = _maximumZoom < double.MaxValue ? _maximumZoom : double.MaxValue;
             if (2 * halfHeight > maxZoomHeight)
             {
-                halfHeight = 0.5d*maxZoomHeight;
+                halfHeight = 0.5d * maxZoomHeight;
                 halfWidth = halfHeight / (_pixelAspectRatio * ((double)Size.Height / Size.Width));
                 zoom = 2 * halfWidth;
             }
@@ -149,14 +149,14 @@ private double VerifyValidViewport(double zoom, Coordinate center)
 
             double dx = testEnvelope.MinX < maxExtents.MinX
                             ? maxExtents.MinX - testEnvelope.MinX
-                            : testEnvelope.MaxX > maxExtents.MaxX 
-                                ? maxExtents.MaxX - testEnvelope.MaxX 
+                            : testEnvelope.MaxX > maxExtents.MaxX
+                                ? maxExtents.MaxX - testEnvelope.MaxX
                                 : 0;
 
             double dy = testEnvelope.MinY < maxExtents.MinY
                             ? maxExtents.MinY - testEnvelope.MinY
-                            : testEnvelope.MaxY > maxExtents.MaxY 
-                                ? maxExtents.MaxY - testEnvelope.MaxY 
+                            : testEnvelope.MaxY > maxExtents.MaxY
+                                ? maxExtents.MaxY - testEnvelope.MaxY
                                 : 0;
 
             center.X += dx;
diff --git a/SharpMap/Rendering/Decoration/Disclaimer.cs b/SharpMap/Rendering/Decoration/Disclaimer.cs
index c2abad38..6b14ab49 100644
--- a/SharpMap/Rendering/Decoration/Disclaimer.cs
+++ b/SharpMap/Rendering/Decoration/Disclaimer.cs
@@ -1,7 +1,7 @@
-using System;
+using SharpMap.Rendering.Symbolizer;
+using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using SharpMap.Rendering.Symbolizer;
 
 namespace SharpMap.Rendering.Decoration
 {
@@ -44,7 +44,7 @@ public Disclaimer()
         /// </summary>
         public Color ForeColor
         {
-            get ; set;
+            get; set;
         }
 
         private Pen _halo;
@@ -56,7 +56,7 @@ public Color ForeColor
         /// </summary>
         public int Halo
         {
-            get { return _halo == null ? 0 : (int) _halo.Width; }
+            get { return _halo == null ? 0 : (int)_halo.Width; }
             set
             {
                 if (value < 0) value = 0;
@@ -73,7 +73,8 @@ public int Halo
         public Color HaloColor
         {
             get { return _haloColor; }
-            set { 
+            set
+            {
                 _haloColor = value;
                 if (Halo > 0)
                     _halo = new Pen(value, Halo);
@@ -102,7 +103,7 @@ protected override void OnRender(Graphics g, MapViewport map)
             if (Halo > 0)
             {
                 var gp = new GraphicsPath();
-                gp.AddString(Text, Font.FontFamily, (int) Font.Style,
+                gp.AddString(Text, Font.FontFamily, (int)Font.Style,
                     Utility.ScaleSizeToDeviceUnits(Font.SizeInPoints, GraphicsUnit.Point, g), layoutRectangle, Format);
                 g.DrawPath(_halo, gp);
                 g.FillPath(b, gp);
@@ -111,7 +112,7 @@ protected override void OnRender(Graphics g, MapViewport map)
                 g.DrawString(Text, Font, b, layoutRectangle);
 
         }
-        
+
         #endregion
     }
 }
diff --git a/SharpMap/Rendering/Decoration/EyeOfSight.cs b/SharpMap/Rendering/Decoration/EyeOfSight.cs
index 67f38724..af69173b 100644
--- a/SharpMap/Rendering/Decoration/EyeOfSight.cs
+++ b/SharpMap/Rendering/Decoration/EyeOfSight.cs
@@ -10,12 +10,12 @@ namespace SharpMap.Rendering.Decoration
     [Serializable]
     public class EyeOfSight : NorthArrow
     {
-        private static readonly string[] Directions = {"N", "E", "S", "W"};
+        private static readonly string[] Directions = { "N", "E", "S", "W" };
 
         private static Bitmap GetEyeOfSightImage()
         {
             var roestte = new Bitmap(120, 120);
-            
+
             //Anyone for a more sophisticated roestte?
             using (var g = Graphics.FromImage(roestte))
             {
@@ -25,8 +25,8 @@ private static Bitmap GetEyeOfSightImage()
                 var f = new Font(FontFamily.GenericSansSerif, 20, FontStyle.Bold);
                 var b = new SolidBrush(Color.Black);
                 var p = new Pen(Color.Black, 5);
-                var sf = new StringFormat(StringFormat.GenericTypographic) {Alignment = StringAlignment.Center};
-                var rect = new RectangleF(- 45f, - 45f, 90f, 90f);
+                var sf = new StringFormat(StringFormat.GenericTypographic) { Alignment = StringAlignment.Center };
+                var rect = new RectangleF(-45f, -45f, 90f, 90f);
 
                 foreach (var s in Directions)
                 {
@@ -44,17 +44,17 @@ public EyeOfSight()
         {
             NorthArrowImage = GetEyeOfSightImage();
         }
-        
+
         /// <summary>
         /// Gets or sets the outline color 
         /// </summary>
         public Color NeedleOutlineColor { get; set; }
-        
+
         /// <summary>
         /// The width of the needle outline
         /// </summary>
         public int NeedleOutlineWidth { get; set; }
-        
+
         /// <summary>
         /// The color to
         /// </summary>
@@ -67,10 +67,10 @@ protected override void OnRender(Graphics g, MapViewport mvp)
         {
             // Render the rosetta
             base.OnRender(g, mvp);
-            
+
             var clip = g.ClipBounds;
             //var oldTransform = g.Transform;
-            var newTransform = new Matrix(1f, 0f, 0f, 1f, clip.Left + Size.Width*0.5f, clip.Top + Size.Height*0.5f);
+            var newTransform = new Matrix(1f, 0f, 0f, 1f, clip.Left + Size.Width * 0.5f, clip.Top + Size.Height * 0.5f);
 
             g.Transform = newTransform;
 
@@ -86,13 +86,13 @@ protected override void OnRender(Graphics g, MapViewport mvp)
             };
 
             // need to outline the needle
-            if (NeedleOutlineWidth>0)
+            if (NeedleOutlineWidth > 0)
             {
                 g.DrawPolygon(new Pen(OpacityColor(NeedleOutlineColor), NeedleOutlineWidth), pts);
             }
 
             // need to outline the needle
-            g.FillPolygon(new SolidBrush(OpacityColor(NeedleFillColor)), pts );
+            g.FillPolygon(new SolidBrush(OpacityColor(NeedleFillColor)), pts);
 
             //g.Transform = oldTransform;
         }
diff --git a/SharpMap/Rendering/Decoration/Graticule/Graticule.cs b/SharpMap/Rendering/Decoration/Graticule/Graticule.cs
index 8a44492e..3925df87 100644
--- a/SharpMap/Rendering/Decoration/Graticule/Graticule.cs
+++ b/SharpMap/Rendering/Decoration/Graticule/Graticule.cs
@@ -1,17 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Linq;
 using Common.Logging;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
+using NetTopologySuite.CoordinateSystems.Transformations;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.Geometries.Utilities;
 using NetTopologySuite.Utilities;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
 using SharpMap.Styles;
 using SharpMap.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Linq;
 using Matrix = System.Drawing.Drawing2D.Matrix;
 using Point = NetTopologySuite.Geometries.Point;
 
@@ -40,13 +40,13 @@ public class Graticule : MapDecoration
 
         private const int PcsPowerRangeMin = -5;
         private const int PcsPowerRangeMax = 10;
-        private readonly double[] _pcsPreferredMultiples = {5, 2.5, 2, 1}; // MUST be in descending order
+        private readonly double[] _pcsPreferredMultiples = { 5, 2.5, 2, 1 }; // MUST be in descending order
 
         private const int GcsPowerRangeMin = -5;
         private const int GcsPowerRangeMax = 0;
 
         private readonly double[]
-            _gcsPreferredMultiples = {90, 60, 30, 20, 15, 10, 5, 2.5, 2, 1}; // MUST be in descending order
+            _gcsPreferredMultiples = { 90, 60, 30, 20, 15, 10, 5, 2.5, 2, 1 }; // MUST be in descending order
 
         private readonly Polygon _webMercatorClipPolygon = new Polygon(
             new LinearRing(new[]
@@ -61,14 +61,14 @@ private readonly double[]
         private int _srid;
         private Envelope _oldViewExtents;
         private Polygon _viewClipPolygon;
-        private ICoordinateSystem _coordinateSystem;
+        private CoordinateSystem _coordinateSystem;
         private string _pcsUnitSuffix;
         private double _mapScale;
 
         private Envelope _pcsDomain;
         private Envelope _gcsDomain;
-        private IMathTransform _unProject;
-        private IMathTransform _project;
+        private MathTransform _unProject;
+        private MathTransform _project;
         private Envelope _pcsConstrExtents;
         private Envelope _gcsConstrExtents;
         private int _oldPcsNumSubdivisions;
@@ -135,7 +135,7 @@ public Graticule()
                 GraticuleLineStyle.Continuous, true,
                 GraticuleBorders.LeftBottom)
             {
-                SecondaryPen = {DashStyle = DashStyle.Dash}
+                SecondaryPen = { DashStyle = DashStyle.Dash }
             };
 
             GcsGraticuleStyle = new GraticuleStyle(GraticuleStyle.GraticuleTheme.Subtle,
@@ -170,7 +170,7 @@ protected override void OnRender(Graphics g, MapViewport map)
                     PcsGraticuleMode != _oldPcsGraticuleMode)
                     CalculateMetrics(g, map, webMercatorScaleLinesActive);
 
-                if (_coordinateSystem is IProjectedCoordinateSystem)
+                if (_coordinateSystem is ProjectedCoordinateSystem)
                 {
                     OnRenderInternal(g, map, PcsGraticuleStyle, _pcsConstrExtents, _pcsDomain,
                         webMercatorScaleLinesActive);
@@ -222,7 +222,7 @@ private void OnRenderInternal(Graphics g, MapViewport map, GraticuleStyle style,
                 if (isGcsStyle && _project != null)
                 {
                     def.WcsGraticule =
-                        (LineString) GeometryTransform.TransformLineString(def.WcsGraticule, _project, targetFactory);
+                        (LineString)GeometryTransform.TransformLineString(def.WcsGraticule, _project, targetFactory);
                     def.WcsTickMarks = new MultiPoint(TransformPreserveZ(_project, def.WcsTickMarks.Coordinates));
                 }
 
@@ -234,19 +234,19 @@ private void OnRenderInternal(Graphics g, MapViewport map, GraticuleStyle style,
                     int same;
                     if (def.IsParallel)
                     {
-                        var initialY = def.WcsGraticule .Coordinates[0].Y;
+                        var initialY = def.WcsGraticule.Coordinates[0].Y;
                         same = def.WcsGraticule.Coordinates.Count(c => Math.Abs(c.Y - initialY) < tolerance);
                     }
                     else
                     {
-                        var initialX = def.WcsGraticule .Coordinates[0].X;
+                        var initialX = def.WcsGraticule.Coordinates[0].X;
                         same = def.WcsGraticule.Coordinates.Count(c => Math.Abs(c.X - initialX) < tolerance);
                     }
 
                     if (def.WcsGraticule.Coordinates.Length == same)
                     {
                         // simplify to single line segment
-                        def.WcsGraticule  = new LineString(new[]
+                        def.WcsGraticule = new LineString(new[]
                         {
                             def.WcsGraticule .Coordinates.First(),
                             def.WcsGraticule .Coordinates.Last()
@@ -377,7 +377,7 @@ private List<GraticuleDef> CalculateParallels(GraticuleStyle style, Envelope con
                     IsPrimary = isPrimaryParallel,
                     Label = GetFormattedLabel(isGeographicGraticule, thisY, AxisOrientationEnum.North),
                     WcsGraticule = new LineString(coordList.ToArray()),
-                    WcsTickMarks = (MultiPoint) MultiPoint.Empty // new List<IPoint>().ToArray())
+                    WcsTickMarks = (MultiPoint)MultiPoint.Empty // new List<Point>().ToArray())
                 });
             }
 
@@ -398,7 +398,7 @@ private List<GraticuleDef> CalculateMeridians(GraticuleStyle style, Envelope con
         {
             var meridians = new List<GraticuleDef>();
             var coordList = new List<Coordinate>();
-            var tickList = new List<IPoint>();
+            var tickList = new List<Point>();
             var isGeographicGraticule = style == GcsGraticuleStyle;
             var tolerance = isGeographicGraticule ? GeographicTolerance : ProjectedTolerance;
 
@@ -584,11 +584,11 @@ private string GetFormattedLabel(bool isGeographicCoordinateSystem, double value
 
             // DMS: 8dp approx = 1mm (= 1" arc to 4dp) 
             var deg = Math.Round(Math.Abs(value), 8, MidpointRounding.AwayFromZero);
-            var iDeg = (int) (deg); // equiv to Math.Truncate
+            var iDeg = (int)(deg); // equiv to Math.Truncate
             var dec = deg - iDeg;
 
             var mins = dec * 60;
-            var iMin = (int) (mins); // equiv to Math.Truncate
+            var iMin = (int)(mins); // equiv to Math.Truncate
 
             var secs = Math.Round(deg * 3600 - (iDeg * 3600) - (iMin * 60), 4, MidpointRounding.AwayFromZero);
 
@@ -640,9 +640,9 @@ private static int GetDecimalPlaces(double value, int maxPrecision)
         /// <param name="transform"></param>
         /// <param name="coords"></param>
         /// <returns>Transformed array with z ordinate preserved</returns>
-        private IPoint[] TransformPreserveZ(IMathTransform transform, Coordinate[] coords)
+        private Point[] TransformPreserveZ(MathTransform transform, Coordinate[] coords)
         {
-            var transformed = new IPoint[coords.Length];
+            var transformed = new Point[coords.Length];
             for (var i = 0; i < coords.Length; i++)
             {
                 var pt = transform.Transform(coords[i].ToDoubleArray());
@@ -725,7 +725,7 @@ private void RenderGraticuleTicks(Graphics g, IEnumerable<GraticuleDef> graticul
 
                         matrix.Reset();
                         matrix.Translate(tick.X, tick.Y, MatrixOrder.Append);
-                        matrix.RotateAt((float) deg, tick, MatrixOrder.Append);
+                        matrix.RotateAt((float)deg, tick, MatrixOrder.Append);
                         g.Transform = matrix;
 
                         g.DrawPath(def.ImageTickStyle[i] ? style.PrimaryPen : style.SecondaryPen,
@@ -764,7 +764,7 @@ private void RenderEdgeCuts(Graphics g, IEnumerable<GraticuleDef> graticuleDefs)
                 // starting cut
                 var dX = def.ImageGraticule[1].X - def.ImageGraticule[0].X;
                 var dY = def.ImageGraticule[1].Y - def.ImageGraticule[0].Y;
-                var ratio = (float) (margin / Math.Sqrt(Math.Pow(dX, 2) + Math.Pow(dY, 2)));
+                var ratio = (float)(margin / Math.Sqrt(Math.Pow(dX, 2) + Math.Pow(dY, 2)));
 
                 pt.X = def.ImageGraticule[0].X + dX * ratio;
                 pt.Y = def.ImageGraticule[0].Y + dY * ratio;
@@ -775,7 +775,7 @@ private void RenderEdgeCuts(Graphics g, IEnumerable<GraticuleDef> graticuleDefs)
                 var len = def.ImageGraticule.Length;
                 dX = def.ImageGraticule[len - 2].X - def.ImageGraticule[len - 1].X;
                 dY = def.ImageGraticule[len - 2].Y - def.ImageGraticule[len - 1].Y;
-                ratio = (float) (margin / Math.Sqrt(Math.Pow(dX, 2) + Math.Pow(dY, 2)));
+                ratio = (float)(margin / Math.Sqrt(Math.Pow(dX, 2) + Math.Pow(dY, 2)));
 
                 pt.X = def.ImageGraticule[len - 1].X + dX * ratio;
                 pt.Y = def.ImageGraticule[len - 1].Y + dY * ratio;
@@ -855,30 +855,30 @@ private LabelEnds GetLabelEnds(GraticuleStyle style, GraticuleDef def, float map
                     case var _ when mapTransformRotation.Equals((0f)):
                     case var _ when mapTransformRotation > 325f || mapTransformRotation <= 45f:
 
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Left) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Left) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Right) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Right) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 45f && mapTransformRotation <= 135f:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Top) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Top) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Bottom) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Bottom) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 135 && mapTransformRotation <= 225f:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Right) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Right) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Left) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Left) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 225 && mapTransformRotation <= 325:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Bottom) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Bottom) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Top) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Top) > 0)
                             ends |= LabelEnds.End;
                         break;
                 }
@@ -889,30 +889,30 @@ private LabelEnds GetLabelEnds(GraticuleStyle style, GraticuleDef def, float map
                     case var _ when mapTransformRotation.Equals((0f)):
                     case var _ when mapTransformRotation > 325f || mapTransformRotation <= 45f:
 
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Bottom) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Bottom) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Top) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Top) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 45f && mapTransformRotation <= 135f:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Left) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Left) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Right) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Right) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 135 && mapTransformRotation <= 225f:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Top) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Top) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Bottom) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Bottom) > 0)
                             ends |= LabelEnds.End;
                         break;
 
                     case var _ when mapTransformRotation > 225 && mapTransformRotation <= 325:
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Right) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Right) > 0)
                             ends |= LabelEnds.Start;
-                        if (((int) style.LabelBorders & (int) MapDecorationAnchorFlags.Left) > 0)
+                        if (((int)style.LabelBorders & (int)MapDecorationAnchorFlags.Left) > 0)
                             ends |= LabelEnds.End;
                         break;
                 }
@@ -929,7 +929,7 @@ private LabelEnds GetLabelEnds(GraticuleStyle style, GraticuleDef def, float map
         /// <param name="style">Graticule Style</param>
         /// <param name="labelSize">estimated label size from g.MeasureString</param>
         /// <param name="thisEnd">the end of the line to be labelled</param>
-        private void RenderLabel(Graphics g, Matrix matrix, GraticuleDef def, GraticuleStyle style, 
+        private void RenderLabel(Graphics g, Matrix matrix, GraticuleDef def, GraticuleStyle style,
             SizeF labelSize, LabelEnds thisEnd)
         {
             var origin = thisEnd == LabelEnds.Start ? def.ImageGraticule.First() : def.ImageGraticule.Last();
@@ -938,7 +938,7 @@ private void RenderLabel(Graphics g, Matrix matrix, GraticuleDef def, GraticuleS
             // NB invert Y axis
             var rad = Math.Atan2(-1 * (orientOn.Y - origin.Y), orientOn.X - origin.X);
             if (rad < 0) rad += 2 * Math.PI;
-            var deg = (float) Radians.ToDegrees(rad);
+            var deg = (float)Radians.ToDegrees(rad);
             if (deg < 0) deg += 360f;
 
             var offset = def.IsPrimary ? style.PrimaryLabelOffset : style.SecondaryLabelOffset;
@@ -972,7 +972,7 @@ private void RenderLabel(Graphics g, Matrix matrix, GraticuleDef def, GraticuleS
                 def.IsPrimary ? style.PrimaryLabelColor : style.SecondaryLabelColor,
                 origin);
         }
-        
+
         /// <summary>
         /// Render web mercator scale distortion meridians 
         /// </summary>
@@ -999,16 +999,16 @@ private void RenderScaleLineLabels(Graphics g, List<GraticuleDef> graticuleDefs,
                 PcsGraticuleStyle.PrimaryMargin + PcsGraticuleStyle.PrimaryLabelOffset.X);
 
             var dictIntersections = new Dictionary<MapDecorationAnchorFlags, List<Coordinate>>();
-            
+
             for (var i = 0; i < sides.Length; i++)
             {
-               var side = sides[i];
+                var side = sides[i];
 
                 // check to see if this is one of the borders to be labelled
-                if (((int) side & (int) PcsGraticuleStyle.LabelBorders) == 0) continue;
+                if (((int)side & (int)PcsGraticuleStyle.LabelBorders) == 0) continue;
 
                 // perform intersection in world units
-                dictIntersections[side] = CalculateScaleLineIntersections(filteredDefs, (LineString) intersectionLines[i]);
+                dictIntersections[side] = CalculateScaleLineIntersections(filteredDefs, (LineString)intersectionLines[i]);
             }
 
             // determine label size in world units
@@ -1067,7 +1067,7 @@ private void RenderScaleLineLabels(Graphics g, List<GraticuleDef> graticuleDefs,
 
             g.Transform = oldTransform;
         }
-        
+
         /// <summary>
         /// Construct lines inset from image border, then convert to world units to
         /// be used for calculating intersections with graticule lines in world units
@@ -1081,7 +1081,7 @@ private MultiLineString GetIntersectionLines(Graphics g, MapViewport map, MapDec
             int margin)
         {
             // Image space
-            var pts = new []
+            var pts = new[]
             {
                 new PointF(g.ClipBounds.Left + margin, g.ClipBounds.Bottom), // left side
                 new PointF(g.ClipBounds.Left + margin, g.ClipBounds.Top),
@@ -1097,23 +1097,23 @@ private MultiLineString GetIntersectionLines(Graphics g, MapViewport map, MapDec
             var coords = map.ImageToWorld(pts, true);
 
             // construct world lines
-            var lines = new ILineString[4]; 
+            var lines = new LineString[4];
             for (var i = 0; i < sides.Length; i++)
             {
                 var side = sides[i];
                 switch (side)
                 {
                     case MapDecorationAnchorFlags.Left:
-                        lines[i] = new LineString(new[] {coords[0], coords[1]}); // left
+                        lines[i] = new LineString(new[] { coords[0], coords[1] }); // left
                         break;
                     case MapDecorationAnchorFlags.Top:
-                        lines[i] = new LineString(new[] {coords[2], coords[3]}); // top
+                        lines[i] = new LineString(new[] { coords[2], coords[3] }); // top
                         break;
                     case MapDecorationAnchorFlags.Right:
-                        lines[i] = new LineString(new[] {coords[4], coords[5]}); // right
+                        lines[i] = new LineString(new[] { coords[4], coords[5] }); // right
                         break;
                     case MapDecorationAnchorFlags.Bottom:
-                        lines[i] = new LineString(new[] {coords[6], coords[7]}); // bottom
+                        lines[i] = new LineString(new[] { coords[6], coords[7] }); // bottom
                         break;
                 }
             }
@@ -1185,11 +1185,11 @@ private void InitCoordinateSystem(int mapSrid)
                 case null:
                     return;
 
-                case IGeographicCoordinateSystem _:
+                case GeographicCoordinateSystem _:
                     _gcsDomain = GetCrsDomain(_coordinateSystem);
                     return;
 
-                case IProjectedCoordinateSystem pcs:
+                case ProjectedCoordinateSystem pcs:
                     _pcsDomain = GetCrsDomain(pcs);
 
                     _gcsDomain = _srid == GeoSpatialMath.WebMercatorSrid
@@ -1220,7 +1220,7 @@ private void InitCoordinateSystem(int mapSrid)
         /// </summary>
         /// <param name="crs"></param>
         /// <returns>Crs Domain envelope, or null Envelope if not defined and cannot be derived</returns>
-        private Envelope GetCrsDomain(ICoordinateSystem crs)
+        private Envelope GetCrsDomain(CoordinateSystem crs)
         {
             if (crs.DefaultEnvelope != null && crs.DefaultEnvelope.Length == 4)
                 // supplied PCS constraints (currently not defined on any coordinate systems)
@@ -1232,7 +1232,7 @@ private Envelope GetCrsDomain(ICoordinateSystem crs)
             if (crs.AuthorityCode == GeoSpatialMath.WebMercatorSrid)
                 return GeoSpatialMath.WebMercatorEnv;
 
-            if (crs is IGeographicCoordinateSystem)
+            if (crs is GeographicCoordinateSystem)
                 return new Envelope(-180, 180, -90, 90);
 
             return new Envelope();
@@ -1256,9 +1256,9 @@ private void CalculateMetrics(Graphics g, MapViewport map, bool webMercatorScale
             _oldGcsNumSubdivisions = GcsGraticuleStyle.NumSubdivisions;
             _oldPcsGraticuleMode = PcsGraticuleMode;
 
-            _mapScale = map.GetMapScale((int) g.DpiX);
+            _mapScale = map.GetMapScale((int)g.DpiX);
 
-            if (_coordinateSystem is IProjectedCoordinateSystem)
+            if (_coordinateSystem is ProjectedCoordinateSystem)
             {
                 // pcsConstrExtents is expanded to the next multiple of division 
                 _pcsConstrExtents = CalcPcsConstrExtents(_oldViewExtents, webMercatorScaleLinesActive);
@@ -1267,20 +1267,20 @@ private void CalculateMetrics(Graphics g, MapViewport map, bool webMercatorScale
                 try
                 {
                     var coords = _unProject.TransformList(
-                        new List<Coordinate>()
+                        new[]
                         {
                             _oldViewExtents.BottomLeft(),
                             _oldViewExtents.TopLeft(),
                             _oldViewExtents.TopRight(),
                             _oldViewExtents.BottomRight()
-                        });
+                        }.Select(c => new[] { c.X, c.Y }).ToArray());
 
                     _gcsConstrExtents = CalcGcsConstrExtents(
                         new Envelope(
-                            coords.Min(c => c.X),
-                            coords.Max(c => c.X),
-                            coords.Min(c => c.Y),
-                            coords.Max(c => c.Y)
+                            coords.Min(c => c[0]),
+                            coords.Max(c => c[0]),
+                            coords.Min(c => c[1]),
+                            coords.Max(c => c[1])
                         ));
                 }
                 catch (Exception ex)
@@ -1308,12 +1308,12 @@ private void CalculateMetrics(Graphics g, MapViewport map, bool webMercatorScale
                 var at = AffineTransformation.RotationInstance(
                     Degrees.ToRadians(map.MapTransformRotation), map.Center.X, map.Center.Y);
 
-                _viewClipPolygon = (Polygon) at.Transform(_viewClipPolygon);
+                _viewClipPolygon = (Polygon)at.Transform(_viewClipPolygon);
             }
 
             // special handling for Web Mercator to ensure curved meridian lines are correctly trimmed
             if (_srid == GeoSpatialMath.WebMercatorSrid && _viewClipPolygon.Intersects(_webMercatorClipPolygon))
-                _viewClipPolygon = (Polygon) _viewClipPolygon.Intersection(_webMercatorClipPolygon);
+                _viewClipPolygon = (Polygon)_viewClipPolygon.Intersection(_webMercatorClipPolygon);
         }
 
         /// <summary>
diff --git a/SharpMap/Rendering/Decoration/Graticule/GraticuleStyle.cs b/SharpMap/Rendering/Decoration/Graticule/GraticuleStyle.cs
index e2b2288d..14f04d63 100644
--- a/SharpMap/Rendering/Decoration/Graticule/GraticuleStyle.cs
+++ b/SharpMap/Rendering/Decoration/Graticule/GraticuleStyle.cs
@@ -1,6 +1,6 @@
+using SharpMap.Styles;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using SharpMap.Styles;
 
 namespace SharpMap.Rendering.Decoration.Graticule
 {
@@ -58,7 +58,7 @@ public int PrimaryTickSize
             {
                 _primaryTickSize = value;
                 _isDirty = true;
-            } 
+            }
         }
 
         /// <summary>
@@ -151,13 +151,13 @@ public int SecondaryTickSize
         /// <summary>
         /// True if secondary edge cuts (ie subdivisions) should be labelled in addition to primary labels (ie division)/>
         /// </summary>
-        public bool LabelSubdivisions { get; set; } 
+        public bool LabelSubdivisions { get; set; }
 
         /// <summary>
         /// Background color to assist reading labels, or null for no halo
         /// </summary>
         public Brush LabelHalo { get; set; }
-        
+
         /// <summary>
         /// Interval between Primary graticule lines (calculated to provide at least 2 cuts along shortest border)
         /// </summary>
@@ -195,8 +195,8 @@ public int SecondaryTickSize
         /// <param name="lineStyle"></param>
         /// <param name="withSecondaryIntervals"></param>
         /// <param name="labelBorders"></param>
-        public GraticuleStyle(GraticuleTheme theme, 
-            GraticuleLineStyle lineStyle, 
+        public GraticuleStyle(GraticuleTheme theme,
+            GraticuleLineStyle lineStyle,
             bool withSecondaryIntervals,
             GraticuleBorders labelBorders) : this()
         {
@@ -225,14 +225,14 @@ public GraticuleStyle(GraticuleTheme theme,
                     SecondaryLabelOffset = new Point(2, 1);
 
                     LabelBorders = labelBorders;
-                    LabelHalo = Brushes.AliceBlue; 
+                    LabelHalo = Brushes.AliceBlue;
                     LabelSubdivisions = true;
 
                     break;
 
 
                 default:
-                    
+
                     PrimaryPen = new Pen(Brushes.Gray, 2);
                     PrimaryLineStyle = lineStyle;
                     PrimaryTickSize = 10;
@@ -251,7 +251,7 @@ public GraticuleStyle(GraticuleTheme theme,
 
                     SecondaryLabelFont = new Font(FontFamily.GenericSansSerif, 6, FontStyle.Regular);
                     SecondaryLabelColor = Brushes.LightGray;
-                    SecondaryLabelOffset = new Point(SecondaryMargin + 1, -1 - SecondaryLabelFont.Height/2 );
+                    SecondaryLabelOffset = new Point(SecondaryMargin + 1, -1 - SecondaryLabelFont.Height / 2);
 
                     LabelBorders = labelBorders;
                     LabelHalo = Brushes.Gainsboro; // Brushes.PowderBlue; 
@@ -270,8 +270,8 @@ public GraticuleStyle(GraticuleTheme theme,
         /// <summary>
         /// Creates an instance of this class.
         /// </summary>
-        public GraticuleStyle() {}
-        
+        public GraticuleStyle() { }
+
         /// <summary>
         /// Returns true if a primary or secondary tick is required for given combination of primary and secondary meridians and parallels 
         /// </summary>
@@ -284,7 +284,7 @@ public bool IsTickRequired(bool isPrimaryMeridian, bool isPrimaryParallel)
                 return SecondaryLineStyle == GraticuleLineStyle.SolidTick ||
                        SecondaryLineStyle == GraticuleLineStyle.HollowTick;
         }
-        
+
         /// <summary>
         /// Returns the appropriate tick
         /// </summary>
@@ -299,7 +299,7 @@ public GraphicsPath GetTick(bool isPrimaryTick)
                 _secondaryTick = CreateTick(SecondaryMargin, SecondaryLineStyle);
                 _isDirty = false;
             }
-                
+
             return isPrimaryTick ? _primaryTick : _secondaryTick;
         }
 
@@ -316,7 +316,7 @@ private GraphicsPath CreateTick(int primaryTickSize, GraticuleLineStyle lineStyl
 
             var tickSize50 = primaryTickSize * 0.5f;
             var tickSize20 = primaryTickSize * 0.2f;
-            
+
             switch (lineStyle)
             {
                 case GraticuleLineStyle.SolidTick:
@@ -325,7 +325,7 @@ private GraphicsPath CreateTick(int primaryTickSize, GraticuleLineStyle lineStyl
                     points[1] = new PointF(tickSize50, 0);
                     points[2] = new PointF(0, -tickSize50);
                     points[3] = new PointF(0, tickSize50);
-                    
+
                     break;
                 case GraticuleLineStyle.HollowTick:
                     points = new PointF[8];
@@ -333,22 +333,22 @@ private GraphicsPath CreateTick(int primaryTickSize, GraticuleLineStyle lineStyl
                     points[1] = new PointF(-tickSize20, 0);
                     points[2] = new PointF(tickSize20, 0);
                     points[3] = new PointF(tickSize50, 0);
-                    
-                    points[4] = new PointF(0,-tickSize50);
-                    points[5] = new PointF(0,-tickSize20);
-                    points[6] = new PointF(0,tickSize20);
-                    points[7] = new PointF(0,tickSize50);
+
+                    points[4] = new PointF(0, -tickSize50);
+                    points[5] = new PointF(0, -tickSize20);
+                    points[6] = new PointF(0, tickSize20);
+                    points[7] = new PointF(0, tickSize50);
                     break;
-                
+
                 default:
                     return null;
             }
-            
+
             var gp = new GraphicsPath();
             for (var i = 0; i < points.Length; i += 2)
             {
                 gp.StartFigure();
-                gp.AddLine(points[i], points[i+1]);
+                gp.AddLine(points[i], points[i + 1]);
             }
 
             return gp;
diff --git a/SharpMap/Rendering/Decoration/MapDecoration.cs b/SharpMap/Rendering/Decoration/MapDecoration.cs
index d78197fb..071395ac 100644
--- a/SharpMap/Rendering/Decoration/MapDecoration.cs
+++ b/SharpMap/Rendering/Decoration/MapDecoration.cs
@@ -119,7 +119,7 @@ protected Color OpacityColor(Color color)
         public Color BackgroundColor { get; set; }
 
         private float _opacity;
-        
+
         /// <summary>
         /// Gets or sets the opacity of map decoration
         /// </summary>
@@ -177,7 +177,7 @@ public float Opacity
         [Obsolete("Use InternalSize(Graphics, MapViewport")]
         protected virtual Size InternalSize(Graphics g, Map map)
         {
-            return InternalSize(g, (MapViewport) map);
+            return InternalSize(g, (MapViewport)map);
         }
 
         private void CalcMapDecorationMetrics(Graphics g, MapViewport map)
@@ -207,8 +207,8 @@ private static GraphicsPath CreateRoundedRectangle(Rectangle rectangle, Size mar
             int y1 = rectangle.Top + margin.Height;
             int y2 = rectangle.Bottom - margin.Height;
 
-            int arcWidth = 2*margin.Width;
-            int arcHeight = 2*margin.Height;
+            int arcWidth = 2 * margin.Width;
+            int arcHeight = 2 * margin.Height;
 
             if (arcWidth > 0 && arcHeight > 0)
             {
@@ -248,7 +248,7 @@ public void Render(Graphics g, MapViewport mvp)
             // remove any image to world rotation
             var oldTransform = g.Transform;
             g.ResetTransform();
-            
+
             //Preparing rendering
             OnRendering(g, mvp);
 
@@ -273,7 +273,7 @@ public void Render(Graphics g, MapViewport mvp)
 
             //Restore old clip region
             g.Clip = oldClip;
-            
+
             // restore any image to world rotation
             g.Transform = oldTransform;
 
@@ -317,7 +317,7 @@ protected virtual void OnRender(Graphics g, MapViewport mvp)
         [Obsolete("Use OnRender(Graphics, MapViewport")]
         protected virtual void OnRender(Graphics g, Map map)
         {
-            OnRender(g, (MapViewport) map);
+            OnRender(g, (MapViewport)map);
         }
 
         /// <summary>
@@ -362,7 +362,7 @@ protected virtual void OnRendered(Graphics g, MapViewport mvp)
         [Obsolete("Use OnRendered(Graphics, MapViewport")]
         protected virtual void OnRendered(Graphics g, Map map)
         {
-            OnRendered(g, (MapViewport) map);
+            OnRendered(g, (MapViewport)map);
         }
     }
 }
diff --git a/SharpMap/Rendering/Decoration/MapDecorationAnchorFlags.cs b/SharpMap/Rendering/Decoration/MapDecorationAnchorFlags.cs
index e03dc492..d4dfe173 100644
--- a/SharpMap/Rendering/Decoration/MapDecorationAnchorFlags.cs
+++ b/SharpMap/Rendering/Decoration/MapDecorationAnchorFlags.cs
@@ -12,7 +12,7 @@ public enum MapDecorationAnchorFlags
         /// No anchor specified
         /// </summary>
         None = 0,
-        
+
         /// <summary>
         /// Left anchor
         /// </summary>
@@ -47,12 +47,12 @@ public enum MapDecorationAnchorFlags
         /// 
         /// </summary>
         Vertical = Top | VerticalCenter | Bottom,
-        
+
         /// <summary>
         /// 
         /// </summary>
         Horizontal = Left | HorizontalCenter | Right
     }
 
-    
+
 }
\ No newline at end of file
diff --git a/SharpMap/Rendering/Decoration/NorthArrow.cs b/SharpMap/Rendering/Decoration/NorthArrow.cs
index 2eb30fdf..978eec2e 100644
--- a/SharpMap/Rendering/Decoration/NorthArrow.cs
+++ b/SharpMap/Rendering/Decoration/NorthArrow.cs
@@ -1,8 +1,8 @@
-using System;
+using SharpMap.Utilities;
+using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using SharpMap.Utilities;
 
 namespace SharpMap.Rendering.Decoration
 {
@@ -17,24 +17,24 @@ public class NorthArrow : MapDecoration
 
         static NorthArrow()
         {
-            lock(_lockObject)
+            lock (_lockObject)
             {
                 DefaultNorthArrowBitmap = new Bitmap(120, 120);
                 using (var g = Graphics.FromImage(DefaultNorthArrowBitmap))
                 {
                     g.Clear(Color.Transparent);
                     var b = new SolidBrush(Color.Black);
-                    var p = new Pen(new SolidBrush(Color.Black), 10) {LineJoin = LineJoin.Miter};
+                    var p = new Pen(new SolidBrush(Color.Black), 10) { LineJoin = LineJoin.Miter };
                     g.FillEllipse(b, new RectangleF(50, 50, 20, 20));
                     g.DrawLine(p, 60, 110, 60, 40);
-                    var pts = new[] {new PointF(45, 40), new PointF(60, 10), new PointF(75, 40), new PointF(45, 40)};
+                    var pts = new[] { new PointF(45, 40), new PointF(60, 10), new PointF(75, 40), new PointF(45, 40) };
                     g.FillPolygon(b, pts);
                     g.DrawPolygon(p, pts);
 
                     b = new SolidBrush(Color.White);
                     g.DrawString("N", new Font(FontFamily.GenericSansSerif, 20, FontStyle.Bold, GraphicsUnit.Pixel), b, new RectangleF(50, 25, 20, 20),
                                  new StringFormat
-                                     {LineAlignment = StringAlignment.Center, Alignment = StringAlignment.Center});
+                                 { LineAlignment = StringAlignment.Center, Alignment = StringAlignment.Center });
                 }
             }
         }
@@ -83,35 +83,35 @@ protected override void OnRender(Graphics g, MapViewport mvp)
             var mapSize = mvp.Size;
 
             //Get rotation
-            var ptTop = mvp.ImageToWorld(new PointF(mapSize.Width/2f, 0f),true);
+            var ptTop = mvp.ImageToWorld(new PointF(mapSize.Width / 2f, 0f), true);
             var ptBottom = mvp.ImageToWorld(new PointF(mapSize.Width / 2f, mapSize.Height * 0.5f), true);
 
             var dx = ptTop.X - ptBottom.X;
             var dy = ptBottom.Y - ptTop.Y;
-            var length = Math.Sqrt(dx*dx + dy*dy);
+            var length = Math.Sqrt(dx * dx + dy * dy);
 
-            var cos = dx/length;
+            var cos = dx / length;
 
             var rot = -90 + (dy > 0 ? -1 : 1) * Math.Acos(cos) / GeoSpatialMath.DegToRad;
-            var halfSize = new Size((int)(0.5f*Size.Width), (int)(0.5f*Size.Height));
+            var halfSize = new Size((int)(0.5f * Size.Width), (int)(0.5f * Size.Height));
             //var oldTransform = g.Transform;
-            
+
             var clip = g.ClipBounds;
-            var newTransform = new Matrix(1f, 0f, 0f, 1f, 
+            var newTransform = new Matrix(1f, 0f, 0f, 1f,
                 clip.Left + halfSize.Width,
                 clip.Top + halfSize.Height);
             newTransform.Rotate((float)rot);
 
             // Setup image attributes
             var ia = new ImageAttributes();
-            var cmap = new [] { 
+            var cmap = new[] {
                 new ColorMap { OldColor = Color.Transparent, NewColor = OpacityColor(BackgroundColor) },
                 new ColorMap { OldColor = Color.Black, NewColor = OpacityColor(ForeColor) }
             };
-            ia.SetRemapTable( cmap );
+            ia.SetRemapTable(cmap);
 
             g.Transform = newTransform;
-            
+
             var rect = new Rectangle(-halfSize.Width, -halfSize.Height, Size.Width, Size.Height);
             g.DrawImage(image, rect, 0, 0, image.Size.Width, image.Size.Height, GraphicsUnit.Pixel, ia);
 
diff --git a/SharpMap/Rendering/Decoration/ScaleBar/ScaleBar.cs b/SharpMap/Rendering/Decoration/ScaleBar/ScaleBar.cs
index 798a25cc..1adba033 100644
--- a/SharpMap/Rendering/Decoration/ScaleBar/ScaleBar.cs
+++ b/SharpMap/Rendering/Decoration/ScaleBar/ScaleBar.cs
@@ -1,7 +1,7 @@
-using System;
+using SharpMap.Utilities;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
-using SharpMap.Utilities;
 
 namespace SharpMap.Rendering.Decoration.ScaleBar
 {
@@ -134,7 +134,7 @@ protected override Size InternalSize(Graphics g, MapViewport mvp)
         protected override void OnRender(Graphics g, MapViewport mvp)
         {
             var rectF = g.ClipBounds;
-            
+
             if (MapUnit == (int)Unit.Degree)
             {
                 // do not use map.Envelope as this is not apparent width on rotated viewports
@@ -149,7 +149,7 @@ protected override void OnRender(Graphics g, MapViewport mvp)
 
             switch (mvp.SRID)
             {
-                case 3857: 
+                case 3857:
                     //other spherical variations (all of which are deprecated except 900913): 900913 54004 41001 102113 102100 3785 
 
                     // constrain to 85deg N/S
@@ -464,8 +464,8 @@ private static void RenderTicBarMeridian1(Graphics g, int nNumTics, int nBarWidt
             }
         }
 
-private void CalcLargeOrSmallUnit(int dpi, int widthOnDevice, int numTics, double mapScale, double fBarUnitFactor,
-            out int pixelsPerTic, out double scaleBarUnitsPerTic)
+        private void CalcLargeOrSmallUnit(int dpi, int widthOnDevice, int numTics, double mapScale, double fBarUnitFactor,
+                    out int pixelsPerTic, out double scaleBarUnitsPerTic)
         {
             if (_forceRecalc)
             {
@@ -668,7 +668,7 @@ private void CalcScale(int dpi)
                 fScale = ScaleCalculations.CalculateScaleNonLatLong(_mapWidth, _pageWidth, _mapUnitFactor, dpi);
             Scale = fScale;
         }
-        
+
         private void SetScaleD(int dpi, double lon1, double lon2, double lat, int widthInPixel)
         {
             _lon1 = lon1;
@@ -977,7 +977,7 @@ public double Scale
             private set
             {
                 if (_scale == value) return;
-                    
+
                 _scale = value;
                 OnViewChanged();
             }
@@ -996,7 +996,7 @@ public void SetCustomUnit(double factor, string name, string shortName)
             if (factor <= 0.0) //factor should be >0
                 factor = 1.0;
 
-            ScaleBar.Units[(int)Unit.Custom] =  new UnitInfo((int)Unit.Custom, factor, name, shortName);
+            ScaleBar.Units[(int)Unit.Custom] = new UnitInfo((int)Unit.Custom, factor, name, shortName);
             MapUnit = (int)Unit.Custom;
 
             _barUnitLargeScale = (int)Unit.Custom;
@@ -1030,7 +1030,7 @@ private void GetBarUnitInfo(out double factor, out string name, out string short
         }
         */
 
-        
+
 
         /// <summary>
         /// Gets or sets the number of ticks
@@ -1148,7 +1148,7 @@ public UnitInfo(int unit, double toMeter, string name, string abbreviation)
         }
 
         #region Private static helpers
-        
+
         //for multipliers ranging from .00001 to 10000000000
 
         //  Candidates are 1, 2, 2.5, and 5 * multiplier
diff --git a/SharpMap/Rendering/Decoration/ScaleBar/Unit.cs b/SharpMap/Rendering/Decoration/ScaleBar/Unit.cs
index 534ec979..68ad3be3 100644
--- a/SharpMap/Rendering/Decoration/ScaleBar/Unit.cs
+++ b/SharpMap/Rendering/Decoration/ScaleBar/Unit.cs
@@ -35,7 +35,7 @@ public enum Unit
         /// Kilometer
         /// </summary>
         Kilometer,
-        
+
         /// <summary>
         /// Degree
         /// </summary>
diff --git a/SharpMap/Rendering/Label.cs b/SharpMap/Rendering/Label.cs
index 0884af0d..01c0de54 100644
--- a/SharpMap/Rendering/Label.cs
+++ b/SharpMap/Rendering/Label.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
-using SharpMap.Styles;
 
 namespace SharpMap.Rendering
 {
@@ -112,7 +112,7 @@ public float Bottom
         {
             get { return _top - _height; }
         }
-       
+
         #region IComparable<LabelBox> Members
 
         /// <summary>
@@ -205,7 +205,7 @@ protected BaseLabel(string text, float rotation, int priority,
             _Text = text;
             //_LabelPoint = labelpoint;
             _Rotation = rotation;
-            _Priority = priority;            
+            _Priority = priority;
             _Style = style;
             _show = true;
         }
@@ -282,10 +282,10 @@ public LabelStyle Style
         /// <returns></returns>
         public virtual int CompareTo(BaseLabel other)
         {
-//            if (this.TextOnPathLabel != null)
-//            {
-//                return CompareToTextOnPath(other);
-//            }
+            //            if (this.TextOnPathLabel != null)
+            //            {
+            //                return CompareToTextOnPath(other);
+            //            }
             if (this == other)
                 return 0;
             if (_box == null)
@@ -294,33 +294,33 @@ public virtual int CompareTo(BaseLabel other)
                 return 1;
             return _box.CompareTo(other.Box);
         }
-//        private int CompareToTextOnPath(BaseLabel other)
-//        {
-//            if (this == other)
-//                return 0;
-//            if (TextOnPathLabel == null)
-//                return -1;
-//            if (other.TextOnPathLabel == null)
-//                return 1;
-//            
-//            for (int i = 0; i < TextOnPathLabel.RegionList.Count; i++)
-//            {
-//                for (int j = 0; j < other.TextOnPathLabel.RegionList.Count; j++)
-//                {
-//                    if (TextOnPathLabel.RegionList[i].IntersectsWith(other.TextOnPathLabel.RegionList[j]))
-//                        return 0;
-//                }
-//            }
-//            if (_box == null)
-//                return -1;
-//            if (other.Box == null)
-//                return 1;
-//            if (other.Box.Left > this.Box.Right ||
-//                other.Box.Bottom > this.Box.Top)
-//                return 1;
-//            else
-//                return -1;
-//        }
+        //        private int CompareToTextOnPath(BaseLabel other)
+        //        {
+        //            if (this == other)
+        //                return 0;
+        //            if (TextOnPathLabel == null)
+        //                return -1;
+        //            if (other.TextOnPathLabel == null)
+        //                return 1;
+        //            
+        //            for (int i = 0; i < TextOnPathLabel.RegionList.Count; i++)
+        //            {
+        //                for (int j = 0; j < other.TextOnPathLabel.RegionList.Count; j++)
+        //                {
+        //                    if (TextOnPathLabel.RegionList[i].IntersectsWith(other.TextOnPathLabel.RegionList[j]))
+        //                        return 0;
+        //                }
+        //            }
+        //            if (_box == null)
+        //                return -1;
+        //            if (other.Box == null)
+        //                return 1;
+        //            if (other.Box.Left > this.Box.Right ||
+        //                other.Box.Bottom > this.Box.Top)
+        //                return 1;
+        //            else
+        //                return -1;
+        //        }
 
         #endregion
 
@@ -359,7 +359,7 @@ protected BaseLabel(string text, T location, float rotation, int priority, Label
             : base(text, rotation, priority, collisionbox, style)
         {
             //if (typeof(T) is ValueType)
-            if (location==null)
+            if (location == null)
                 return;
 
             if (!(location is PointF || location is GraphicsPath))
@@ -413,7 +413,7 @@ public PathLabel(string text, GraphicsPath location, float rotation, int priorit
         /// <summary>
         /// Bounding polygon in world coordinates 
         /// </summary>
-        public IPolygon AffectedArea { get; set; }
+        public Polygon AffectedArea { get; set; }
 
         /// <inheritdoc cref="BaseLabel.CompareTo"/>
         public override int CompareTo(BaseLabel other)
@@ -468,6 +468,6 @@ public PointF LabelPoint
             get;
             set;
         }
-        
+
     }
 }
diff --git a/SharpMap/Rendering/LabelCollisionDetection.cs b/SharpMap/Rendering/LabelCollisionDetection.cs
index 6f7ee0f9..a07b11d6 100644
--- a/SharpMap/Rendering/LabelCollisionDetection.cs
+++ b/SharpMap/Rendering/LabelCollisionDetection.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
 
 namespace SharpMap.Rendering
-{      
+{
     /// <summary>
     /// Class defining delegate for label collision detection and static predefined methods
     /// </summary>
diff --git a/SharpMap/Rendering/LayerCollectionRenderer.cs b/SharpMap/Rendering/LayerCollectionRenderer.cs
index 2fbbae29..e10f1f6b 100644
--- a/SharpMap/Rendering/LayerCollectionRenderer.cs
+++ b/SharpMap/Rendering/LayerCollectionRenderer.cs
@@ -1,13 +1,13 @@
-using System;
+using Common.Logging;
+using SharpMap.Layers;
+using SharpMap.Styles;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
-using Common.Logging;
-using SharpMap.Layers;
-using SharpMap.Styles;
 
 namespace SharpMap.Rendering
 {
@@ -119,7 +119,7 @@ private void RenderParellel(Graphics g)
             _images = new Image[_layers.Length];
 
             var res = Parallel.For(0, _layers.Length, RenderToImage);
-            
+
             var tmpTransform = g.Transform;
             g.Transform = new Matrix();
             if (res.IsCompleted)
@@ -142,7 +142,7 @@ private void RenderToImage(int layerIndex, ParallelLoopState pls)
                 return;
 
             var layer = _layers[layerIndex];
-            
+
             if (layer.Enabled)
             {
                 double compare = layer.VisibilityUnits == VisibilityUnits.ZoomLevel ? _mapViewPort.Zoom : _mapScale;
@@ -152,10 +152,10 @@ private void RenderToImage(int layerIndex, ParallelLoopState pls)
                     using (var g = Graphics.FromImage(image))
                     {
                         g.PageUnit = GraphicsUnit.Pixel;
-                        ApplyTransform(_mapViewPort.MapTransform , g);
+                        ApplyTransform(_mapViewPort.MapTransform, g);
 
                         g.Clear(Color.Transparent);
-                        RenderLayer(layer, g, _mapViewPort );
+                        RenderLayer(layer, g, _mapViewPort);
                     }
                 }
             }
@@ -182,10 +182,10 @@ public static void RenderLayer(ILayer layer, Graphics g, MapViewport mapViewport
                     var size = mapViewport.Size;
 
                     g.DrawLine(pen, 0, 0, size.Width, size.Height);
-                    g.DrawLine(pen, size.Width,0, 0, size.Height);
+                    g.DrawLine(pen, size.Width, 0, 0, size.Height);
                     g.DrawRectangle(pen, 0, 0, size.Width, size.Height);
                 }
-                
+
             }
         }
 
@@ -202,7 +202,7 @@ public void Dispose()
             {
                 foreach (var image in _images)
                 {
-                    if (image != null)image.Dispose();
+                    if (image != null) image.Dispose();
                 }
             }
         }
diff --git a/SharpMap/Rendering/Symbolizer/BaseSymbolizer.cs b/SharpMap/Rendering/Symbolizer/BaseSymbolizer.cs
index 21ad5f49..80951a6a 100644
--- a/SharpMap/Rendering/Symbolizer/BaseSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/BaseSymbolizer.cs
@@ -1,7 +1,7 @@
+using SharpMap.Base;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using SharpMap.Base;
 
 namespace SharpMap.Rendering.Symbolizer
 {
diff --git a/SharpMap/Rendering/Symbolizer/BasicLineSymbolizer.cs b/SharpMap/Rendering/Symbolizer/BasicLineSymbolizer.cs
index 5899f2b0..fde3b1bb 100644
--- a/SharpMap/Rendering/Symbolizer/BasicLineSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/BasicLineSymbolizer.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -17,7 +17,7 @@ public class BasicLineSymbolizer : LineSymbolizer
         /// <returns>A symbolizer exactly like this one</returns>
         public override object Clone()
         {
-            return new BasicLineSymbolizer {Line = (Pen) Line.Clone()};
+            return new BasicLineSymbolizer { Line = (Pen)Line.Clone() };
         }
 
         /// <summary>
@@ -26,7 +26,7 @@ public override object Clone()
         /// <param name="map">The map</param>
         /// <param name="lineString">The linestring</param>
         /// <param name="graphics">The graphics object</param>
-        protected override void OnRenderInternal(MapViewport map, ILineString lineString, Graphics graphics)
+        protected override void OnRenderInternal(MapViewport map, LineString lineString, Graphics graphics)
         {
             graphics.DrawLines(Line, VectorRenderer.LimitValues(lineString.TransformToImage(map), VectorRenderer.ExtremeValueLimit));
         }
@@ -46,7 +46,7 @@ public class BasicLineSymbolizerWithOffset : LineSymbolizer
         /// <returns>A symbolizer exactly like this one</returns>
         public override object Clone()
         {
-            return new BasicLineSymbolizerWithOffset {Line = (Pen) Line.Clone(), Offset = Offset};
+            return new BasicLineSymbolizerWithOffset { Line = (Pen)Line.Clone(), Offset = Offset };
         }
 
         /// <summary>
@@ -60,7 +60,7 @@ public override object Clone()
         /// <param name="map">The map</param>
         /// <param name="lineString">The linestring</param>
         /// <param name="graphics">The graphics object</param>
-        protected override void OnRenderInternal(MapViewport map, ILineString lineString, Graphics graphics)
+        protected override void OnRenderInternal(MapViewport map, LineString lineString, Graphics graphics)
         {
             var pts = VectorRenderer.LimitValues(VectorRenderer.OffsetRight(lineString.TransformToImage(map), Offset), VectorRenderer.ExtremeValueLimit);
             graphics.DrawLines(Line, pts);
@@ -68,4 +68,4 @@ protected override void OnRenderInternal(MapViewport map, ILineString lineString
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/BasicPolygonSymbolizer.cs b/SharpMap/Rendering/Symbolizer/BasicPolygonSymbolizer.cs
index d011d818..40c3ec34 100644
--- a/SharpMap/Rendering/Symbolizer/BasicPolygonSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/BasicPolygonSymbolizer.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -49,12 +49,12 @@ protected override void ReleaseManagedResources()
         public override object Clone()
         {
             return new BasicPolygonSymbolizer
-                       {
-                           Fill = (Brush) Fill.Clone(),
-                           Outline = (Pen) Outline.Clone(),
-                           RenderOrigin = RenderOrigin,
-                           UseClipping = UseClipping,
-                       };
+            {
+                Fill = (Brush)Fill.Clone(),
+                Outline = (Pen)Outline.Clone(),
+                RenderOrigin = RenderOrigin,
+                UseClipping = UseClipping,
+            };
         }
 
         /// <summary>
@@ -63,7 +63,7 @@ public override object Clone()
         /// <param name="map">The map</param>
         /// <param name="polygon">The feature</param>
         /// <param name="g">The graphics object</param>
-        protected override void OnRenderInternal(MapViewport map, IPolygon polygon, Graphics g)
+        protected override void OnRenderInternal(MapViewport map, Polygon polygon, Graphics g)
         {
             // convert points
             var pts = /*LimitValues(*/polygon.TransformToImage(map, UseClipping)/*)*/;
@@ -71,11 +71,11 @@ protected override void OnRenderInternal(MapViewport map, IPolygon polygon, Grap
             //// clip
             //if (UseClipping)
             //    pts = VectorRenderer.ClipPolygon(pts, map.Size.Width, map.Size.Height);
-            
+
             // fill the polygon
             if (Fill != null)
                 g.FillPath(Fill, pts);
-            
+
             // outline the polygon
             if (Outline != null)
                 g.DrawPath(Outline, pts);
@@ -126,12 +126,12 @@ protected override void ReleaseManagedResources()
         public override object Clone()
         {
             return new PolygonSymbolizerUsingLineSymbolizer
-                       {
-                           Fill = (Brush) Fill.Clone(),
-                           Outline = (LineSymbolizer) Outline.Clone(),
-                           RenderOrigin = RenderOrigin,
-                           UseClipping = UseClipping
-                       };
+            {
+                Fill = (Brush)Fill.Clone(),
+                Outline = (LineSymbolizer)Outline.Clone(),
+                RenderOrigin = RenderOrigin,
+                UseClipping = UseClipping
+            };
         }
 
         /// <summary>
@@ -140,11 +140,11 @@ public override object Clone()
         /// <param name="map">The map</param>
         /// <param name="polygon">The polygon to render</param>
         /// <param name="g">The graphics object to use</param>
-        protected override void OnRenderInternal(MapViewport map, IPolygon polygon, Graphics g)
+        protected override void OnRenderInternal(MapViewport map, Polygon polygon, Graphics g)
         {
             // convert points
             var pts = /*VectorRenderer.LimitValues*(*/polygon.TransformToImage(map)/*, VectorRenderer.ExtremeValueLimit))*/;
-            
+
             //// clip
             //if (UseClipping)
             //    pts = VectorRenderer.ClipPolygon(pts, map.Size.Width, map.Size.Height);
@@ -157,7 +157,7 @@ protected override void OnRenderInternal(MapViewport map, IPolygon polygon, Grap
             if (Outline != null)
             {
                 Outline.Render(map, polygon.ExteriorRing, g);
-                foreach( var ls in polygon.InteriorRings )
+                foreach (var ls in polygon.InteriorRings)
                     Outline.Render(map, ls, g);
             }
         }
@@ -196,4 +196,4 @@ public override void End(Graphics g, MapViewport map)
             base.End(g, map);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/CachedLineSymbolizer.cs b/SharpMap/Rendering/Symbolizer/CachedLineSymbolizer.cs
index cbab507a..fd99cdd8 100644
--- a/SharpMap/Rendering/Symbolizer/CachedLineSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/CachedLineSymbolizer.cs
@@ -1,9 +1,9 @@
+using NetTopologySuite.Geometries;
+using SharpMap.Base;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
-using SharpMap.Base;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -71,7 +71,7 @@ protected override void ReleaseManagedResources()
                 Fill.Dispose();
             if (Pattern != null)
                 Pattern.Dispose();
-            
+
             base.ReleaseManagedResources();
         }
 
@@ -106,7 +106,7 @@ public void SymbolizePaths(Graphics g, IEnumerable<GraphicsPath> paths)
             {
                 var clonedPattern = (GraphicsPath)Pattern.Clone();
                 var warpedPath = WarpPathToPath.Warp(graphicsPath, clonedPattern, true, Interval);
-                
+
                 if (warpedPath == null) continue;
 
                 if (Fill != null)
@@ -125,7 +125,7 @@ public class CachedLineSymbolizer : LineSymbolizer
     {
         private List<GraphicsPath> _graphicsPaths;
         private readonly List<ILineSymbolizeHandler> _lineSymbolizeHandlers;
-        private readonly ILineSymbolizeHandler _fallback = new PlainLineSymbolizeHandler {Line = new Pen(Color.Black)};
+        private readonly ILineSymbolizeHandler _fallback = new PlainLineSymbolizeHandler { Line = new Pen(Color.Black) };
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
@@ -156,7 +156,7 @@ protected override void ReleaseManagedResources()
 
             if (_fallback != null)
                 _fallback.Dispose();
-            
+
             base.ReleaseManagedResources();
         }
 
@@ -200,13 +200,13 @@ public List<ILineSymbolizeHandler> LineSymbolizeHandlers
         /// <param name="map"></param>
         /// <param name="lineString"></param>
         /// <param name="graphics"></param>
-        protected override void OnRenderInternal(MapViewport map, ILineString lineString, Graphics graphics)
+        protected override void OnRenderInternal(MapViewport map, LineString lineString, Graphics graphics)
         {
             var gp = new GraphicsPath();
             gp.AddLines(VectorRenderer.LimitValues(lineString.TransformToImage(map), VectorRenderer.ExtremeValueLimit));
             if (ImmediateMode)
             {
-                var tmp = new List<GraphicsPath>(new[] {gp});
+                var tmp = new List<GraphicsPath>(new[] { gp });
                 Symbolize(graphics, map, tmp);
             }
             else
@@ -257,4 +257,4 @@ public override void End(Graphics g, MapViewport map)
             base.End(g, map);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/CharacterPointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/CharacterPointSymbolizer.cs
index 48eaedec..9d8ab938 100644
--- a/SharpMap/Rendering/Symbolizer/CharacterPointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/CharacterPointSymbolizer.cs
@@ -30,7 +30,7 @@ public class CharacterPointSymbolizer : PointSymbolizer
         private string _text;
 
         private int _characterIndex;
-        
+
         /// <summary>
         /// Initializes a new TextPointStyle
         /// </summary>
@@ -41,7 +41,7 @@ public CharacterPointSymbolizer()
             Foreground = Brushes.Firebrick;
             Halo = 0;
             HaloBrush = Brushes.Transparent;
-            StringFormat = new StringFormat(StringFormatFlags.NoClip){ Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center, Trimming = StringTrimming.None };
+            StringFormat = new StringFormat(StringFormatFlags.NoClip) { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center, Trimming = StringTrimming.None };
         }
 
         /// <summary>
@@ -76,11 +76,11 @@ protected override void ReleaseManagedResources()
         /// <returns>A <see cref="T:SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer"/> that matches this instance</returns>
         public override object Clone()
         {
-            var res = (CharacterPointSymbolizer) MemberwiseClone();
-            res.Font = (Font) Font.Clone();
-            res.Foreground = (Brush) Foreground.Clone();
-            res.HaloBrush = (Brush) HaloBrush.Clone();
-            
+            var res = (CharacterPointSymbolizer)MemberwiseClone();
+            res.Font = (Font)Font.Clone();
+            res.Foreground = (Brush)Foreground.Clone();
+            res.HaloBrush = (Brush)HaloBrush.Clone();
+
             return res;
         }
 
@@ -114,9 +114,9 @@ public override object Clone()
         /// <summary>
         /// The index of the character, -1 if the <see cref="Text"/> is longer than 1 character.
         /// </summary>
-        public int CharacterIndex 
+        public int CharacterIndex
         {
-            get {return _characterIndex;}
+            get { return _characterIndex; }
             set
             {
                 _characterIndex = value;
@@ -134,7 +134,7 @@ public string Text
             {
                 if (string.IsNullOrEmpty(value))
                     return;
-                
+
                 _text = value;
 
                 if (_text.Length > 1)
@@ -179,7 +179,7 @@ public override Size Size
         /// <summary>
         /// Gets or sets the scale factor for this symbol<br/>Always returns <c>1f</c>
         /// </summary>
-        public override float  Scale
+        public override float Scale
         {
             get
             {
@@ -199,9 +199,9 @@ internal override void OnRenderInternal(PointF pt, Graphics g)
             {
                 //need to look it up
                 using (var path = new GraphicsPath(FillMode.Winding))
-                using (var haloPen = new Pen(HaloBrush, 2 * Halo) {MiterLimit = 1.0f})
+                using (var haloPen = new Pen(HaloBrush, 2 * Halo) { MiterLimit = 1.0f })
                 {
-                    path.AddString(_text, Font.FontFamily, (int) Font.Style, Font.Size, pt, StringFormat);
+                    path.AddString(_text, Font.FontFamily, (int)Font.Style, Font.Size, pt, StringFormat);
                     g.DrawPath(haloPen, path);
                     g.FillPath(Foreground, path);
                     CanvasArea = path.GetBounds();
@@ -212,7 +212,7 @@ internal override void OnRenderInternal(PointF pt, Graphics g)
                 // g.DrawString(_text, Font, Foreground, pt, StringFormat);    
                 using (var path = new GraphicsPath(FillMode.Winding))
                 {
-                    path.AddString(_text, Font.FontFamily, (int) Font.Style, Font.Size, pt, StringFormat);
+                    path.AddString(_text, Font.FontFamily, (int)Font.Style, Font.Size, pt, StringFormat);
                     g.FillPath(Foreground, path);
                     CanvasArea = path.GetBounds();
                 }
diff --git a/SharpMap/Rendering/Symbolizer/CohenSutherlandLineClipping.cs b/SharpMap/Rendering/Symbolizer/CohenSutherlandLineClipping.cs
index 586b9237..7b4ed228 100644
--- a/SharpMap/Rendering/Symbolizer/CohenSutherlandLineClipping.cs
+++ b/SharpMap/Rendering/Symbolizer/CohenSutherlandLineClipping.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -20,7 +20,7 @@ private enum OutsideClipCodes
             Top = 8
         }
 
-        private readonly double _xmin, _xmax, _ymin, _ymax ;
+        private readonly double _xmin, _xmax, _ymin, _ymax;
 
         /// <summary>
         /// Creates an instance of this class
@@ -55,17 +55,17 @@ private OutsideClipCodes ComputeClipCode(double x, double y)
         }
 
         /// <summary>
-        /// Clips a <see cref="ILineString"/> to the bounding box defined by <see cref="CohenSutherlandLineClipping(double,double,double,double)"/>.
+        /// Clips a <see cref="LineString"/> to the bounding box defined by <see cref="CohenSutherlandLineClipping(double,double,double,double)"/>.
         /// </summary>
         /// <param name="lineString">The line string to clip</param>
         /// <returns>A (possibly multi) line string</returns>
-        public IMultiLineString ClipLineString(ILineString lineString)
+        public MultiLineString ClipLineString(LineString lineString)
         {
             //Factory
             var factory = lineString.Factory;
 
             //List of line strings that make up the multi line string result
-            var lineStrings = new List<ILineString>();
+            var lineStrings = new List<LineString>();
 
             //list of clipped vertices for current pass
             var clippedVertices = new List<Coordinate>();
@@ -78,10 +78,10 @@ public IMultiLineString ClipLineString(ILineString lineString)
             double x0, y0;
             OutsideClipCodes oc0Initial;
             var oc0 = oc0Initial = ComputeClipCode(vertices[0], out x0, out y0);
-            
+
             //Point is inside => add it to the list
             if (oc0 == OutsideClipCodes.Inside)
-                clippedVertices.Add( vertices[0] );
+                clippedVertices.Add(vertices[0]);
 
             double x1Old = double.NaN, y1Old = double.NaN;
 
@@ -122,25 +122,25 @@ public IMultiLineString ClipLineString(ILineString lineString)
                     if ((ocOut & OutsideClipCodes.Top) == OutsideClipCodes.Top)
                     {
                         // point is above the clip rectangle
-                        x = x0 + (x1 - x0)*(_ymax - y0)/(y1 - y0);
+                        x = x0 + (x1 - x0) * (_ymax - y0) / (y1 - y0);
                         y = _ymax;
                     }
                     else if ((ocOut & OutsideClipCodes.Bottom) == OutsideClipCodes.Bottom)
                     {
                         // point is below the clip rectangle
-                        x = x0 + (x1 - x0)*(_ymin - y0)/(y1 - y0);
+                        x = x0 + (x1 - x0) * (_ymin - y0) / (y1 - y0);
                         y = _ymin;
                     }
                     else if ((ocOut & OutsideClipCodes.Right) == OutsideClipCodes.Right)
                     {
                         // point is to the right of clip rectangle
-                        y = y0 + (y1 - y0)*(_xmax - x0)/(x1 - x0);
+                        y = y0 + (y1 - y0) * (_xmax - x0) / (x1 - x0);
                         x = _xmax;
                     }
                     else if ((ocOut & OutsideClipCodes.Left) == OutsideClipCodes.Left)
                     {
                         // point is to the left of clip rectangle
-                        y = y0 + (y1 - y0)*(_xmin - x0)/(x1 - x0);
+                        y = y0 + (y1 - y0) * (_xmin - x0) / (x1 - x0);
                         x = _xmin;
                     }
                     // Now we move outside point to intersection point to clip
@@ -158,12 +158,12 @@ public IMultiLineString ClipLineString(ILineString lineString)
                         oc1 = ComputeClipCode(x, y);
                     }
                 }
-                
+
                 if (accept)
                 {
                     if (oc0Initial != oc0)
                         clippedVertices.Add(new Coordinate(x0, y0));
-                    
+
                     if (x1Old != x1 || y1Old != y1)
                         clippedVertices.Add(new Coordinate(x1, y1));
 
@@ -189,22 +189,22 @@ public IMultiLineString ClipLineString(ILineString lineString)
 
 
         /// <summary>
-        /// Clips a <see cref="IMultiLineString"/> to the bounding box defined by <see cref="CohenSutherlandLineClipping(double,double,double,double)"/>.
+        /// Clips a <see cref="MultiLineString"/> to the bounding box defined by <see cref="CohenSutherlandLineClipping(double,double,double,double)"/>.
         /// </summary>
         /// <param name="lineStrings">The multi-line string to clip</param>
         /// <returns>A (possibly multi) line string</returns>
-        public IMultiLineString ClipLineString(IMultiLineString lineStrings)
+        public MultiLineString ClipLineString(MultiLineString lineStrings)
         {
-            var clippedLineStringList = new List<ILineString>();
+            var clippedLineStringList = new List<LineString>();
 
 
             for (var i = 0; i < lineStrings.NumGeometries; i++)
             {
-                var s = (ILineString) lineStrings.GetGeometryN(i);
+                var s = (LineString)lineStrings.GetGeometryN(i);
                 var clippedLineStrings = ClipLineString(s);
                 for (var j = 0; j < clippedLineStrings.NumGeometries; j++)
                 {
-                    var clippedLineString = (ILineString)clippedLineStrings.GetGeometryN(j);
+                    var clippedLineString = (LineString)clippedLineStrings.GetGeometryN(j);
                     clippedLineStringList.Add(clippedLineString);
                 }
             }
@@ -213,4 +213,4 @@ public IMultiLineString ClipLineString(IMultiLineString lineStrings)
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/GeometrySymbolizer.cs b/SharpMap/Rendering/Symbolizer/GeometrySymbolizer.cs
index 6bf839b5..db4a0c9c 100644
--- a/SharpMap/Rendering/Symbolizer/GeometrySymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/GeometrySymbolizer.cs
@@ -1,8 +1,6 @@
-using System;
+using NetTopologySuite.Geometries;
+using System;
 using System.Drawing;
-using GeoAPI.Geometries;
-using SharpMap.Data;
-using SharpMap.Rendering.Thematics;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -10,7 +8,7 @@ namespace SharpMap.Rendering.Symbolizer
     /// Multi geometry symbolizer class
     /// </summary>
     [Serializable]
-    public class GeometrySymbolizer : ISymbolizer<IGeometry>
+    public class GeometrySymbolizer : ISymbolizer<Geometry>
     {
         private IPointSymbolizer _pointSymbolizer;
         private ILineSymbolizer _lineSymbolizer;
@@ -30,11 +28,11 @@ public GeometrySymbolizer()
         public object Clone()
         {
             return new GeometrySymbolizer
-                       {
-                           _pointSymbolizer = (IPointSymbolizer) _pointSymbolizer.Clone(),
-                           _lineSymbolizer = (ILineSymbolizer) _lineSymbolizer.Clone(),
-                           _polygonSymbolizer = (IPolygonSymbolizer) _polygonSymbolizer.Clone()
-                       };
+            {
+                _pointSymbolizer = (IPointSymbolizer)_pointSymbolizer.Clone(),
+                _lineSymbolizer = (ILineSymbolizer)_lineSymbolizer.Clone(),
+                _polygonSymbolizer = (IPolygonSymbolizer)_polygonSymbolizer.Clone()
+            };
 
         }
 
@@ -45,7 +43,7 @@ public IPointSymbolizer PointSymbolizer
         {
             get { return _pointSymbolizer; }
             set { _pointSymbolizer = value; }
-            
+
         }
 
         /// <summary>
@@ -74,7 +72,7 @@ public IPolygonSymbolizer PolygonSymbolizer
         /// <param name="map">The map object, mainly needed for transformation purposes.</param>
         /// <param name="geometry">The geometry to symbolize.</param>
         /// <param name="graphics">The graphics object to use.</param>
-        public void Render(MapViewport map, IGeometry geometry, Graphics graphics)
+        public void Render(MapViewport map, Geometry geometry, Graphics graphics)
         {
             switch (geometry.OgcGeometryType)
             {
@@ -94,7 +92,7 @@ public void Render(MapViewport map, IGeometry geometry, Graphics graphics)
                     return;
 
                 case OgcGeometryType.GeometryCollection:
-                    foreach (var g in ((IGeometryCollection)geometry))
+                    foreach (var g in ((GeometryCollection)geometry))
                     {
                         Render(map, g, graphics);
                     }
@@ -170,4 +168,4 @@ public System.Drawing.Drawing2D.PixelOffsetMode PixelOffsetMode
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/ILineSymbolizer.cs b/SharpMap/Rendering/Symbolizer/ILineSymbolizer.cs
index ec182848..cc234e9a 100644
--- a/SharpMap/Rendering/Symbolizer/ILineSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/ILineSymbolizer.cs
@@ -15,8 +15,7 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System.Drawing;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -43,4 +42,4 @@ public interface ILineSymbolizer : ISymbolizer<ILineal>
         void Render(Map map, MultiLineString multiLineString, Graphics g);
          */
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/IPointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/IPointSymbolizer.cs
index 375e33bd..da4720b7 100644
--- a/SharpMap/Rendering/Symbolizer/IPointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/IPointSymbolizer.cs
@@ -15,9 +15,8 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System.Drawing;
-using GeoAPI.Geometries;
-using Point = GeoAPI.Geometries.IPoint;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -57,4 +56,4 @@ public interface IPointSymbolizer : ISymbolizer<IPuntal>
         //Image ToSymbol();
 
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Rendering/Symbolizer/IPointSymbolizerEx.cs b/SharpMap/Rendering/Symbolizer/IPointSymbolizerEx.cs
index 3f2ac771..1afba43f 100644
--- a/SharpMap/Rendering/Symbolizer/IPointSymbolizerEx.cs
+++ b/SharpMap/Rendering/Symbolizer/IPointSymbolizerEx.cs
@@ -2,7 +2,7 @@
 
 namespace SharpMap.Rendering.Symbolizer
 {
-    
+
     /// <summary>
     /// An extended interface for <see cref="IPointSymbolizer"/>
     /// </summary>
diff --git a/SharpMap/Rendering/Symbolizer/IPolygonSymbolizer.cs b/SharpMap/Rendering/Symbolizer/IPolygonSymbolizer.cs
index a4b92fec..4bb4925b 100644
--- a/SharpMap/Rendering/Symbolizer/IPolygonSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/IPolygonSymbolizer.cs
@@ -1,4 +1,4 @@
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -6,6 +6,6 @@ namespace SharpMap.Rendering.Symbolizer
     /// Interface for classes that can symbolize polygons
     /// </summary>
     public interface IPolygonSymbolizer : ISymbolizer<IPolygonal>
-    { 
+    {
     }
 }
\ No newline at end of file
diff --git a/SharpMap/Rendering/Symbolizer/LineSymbolizer.cs b/SharpMap/Rendering/Symbolizer/LineSymbolizer.cs
index 461baa8f..3a784e2c 100644
--- a/SharpMap/Rendering/Symbolizer/LineSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/LineSymbolizer.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
 
 //using KnownColor = System.Drawing.KnownColor
 namespace SharpMap.Rendering.Symbolizer
@@ -33,9 +33,9 @@ protected override void ReleaseManagedResources()
         {
             CheckDisposed();
 
-            if (Line != null) 
+            if (Line != null)
                 Line.Dispose();
-            
+
             base.ReleaseManagedResources();
         }
 
@@ -47,17 +47,17 @@ protected override void ReleaseManagedResources()
         /// <param name="g">The graphics object to use.</param>
         public void Render(MapViewport map, ILineal lineal, Graphics g)
         {
-            var ms = lineal as IMultiLineString;
+            var ms = lineal as MultiLineString;
             if (ms != null)
             {
                 for (var i = 0; i < ms.NumGeometries; i++)
                 {
-                    var lineString = (ILineString) ms[i];
+                    var lineString = (LineString)ms[i];
                     OnRenderInternal(map, lineString, g);
                 }
                 return;
             }
-            OnRenderInternal(map, (ILineString)lineal, g);
+            OnRenderInternal(map, (LineString)lineal, g);
         }
 
         /// <summary>
@@ -66,7 +66,7 @@ public void Render(MapViewport map, ILineal lineal, Graphics g)
         /// <param name="map">The map</param>
         /// <param name="lineString">The line string to symbolize.</param>
         /// <param name="graphics">The graphics</param>
-        protected abstract void OnRenderInternal(MapViewport map, ILineString lineString, Graphics graphics);
+        protected abstract void OnRenderInternal(MapViewport map, LineString lineString, Graphics graphics);
 
         /// <summary>
         /// Function to transform a linestring to a graphics path for further processing
@@ -75,7 +75,7 @@ public void Render(MapViewport map, ILineal lineal, Graphics g)
         /// <param name="map">The map</param>
         /// <!--<param name="useClipping">A value indicating whether clipping should be applied or not</param>-->
         /// <returns>A GraphicsPath</returns>
-        public static GraphicsPath LineStringToPath(ILineString lineString, MapViewport map)
+        public static GraphicsPath LineStringToPath(LineString lineString, MapViewport map)
         {
             var gp = new GraphicsPath(FillMode.Alternate);
             gp.AddLines(lineString.TransformToImage(map));
diff --git a/SharpMap/Rendering/Symbolizer/ListPointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/ListPointSymbolizer.cs
index 30d06d04..0606c16a 100644
--- a/SharpMap/Rendering/Symbolizer/ListPointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/ListPointSymbolizer.cs
@@ -15,15 +15,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Base;
 using System;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
-using SharpMap.Base;
-using Point = GeoAPI.Geometries.IPoint;
 
-namespace SharpMap.Rendering.Symbolizer    
+namespace SharpMap.Rendering.Symbolizer
 {
     /// <summary>
     /// ListPointSymbolizer class
@@ -132,7 +131,7 @@ public Size Size
         /// <summary>
         /// Gets or sets the scale 
         /// </summary>
-        public float  Scale
+        public float Scale
         {
             get => 1;
             set { }
diff --git a/SharpMap/Rendering/Symbolizer/PathPointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/PathPointSymbolizer.cs
index bc4edde6..5f5f93bc 100644
--- a/SharpMap/Rendering/Symbolizer/PathPointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/PathPointSymbolizer.cs
@@ -27,7 +27,7 @@ namespace SharpMap.Rendering.Symbolizer
     [Serializable]
     public class PathPointSymbolizer : PointSymbolizer
     {
-        
+
         ///<summary>
         /// Creates a <see cref="PathPointSymbolizer"/> that renders circles.
         ///</summary>
@@ -82,7 +82,7 @@ public static PathPointSymbolizer CreateRectangle(Pen line, Brush fill, float wi
         ///<returns>The PathPointSymbolizer object</returns>
         public static PathPointSymbolizer CreateSquare(Pen line, Brush fill, float size)
         {
-            
+
             GraphicsPath path = new GraphicsPath();
             path.AddRectangle(new RectangleF(-0.5f * size, -0.5f * size, size, size));
             return new PathPointSymbolizer(
@@ -156,11 +156,11 @@ public void Dispose()
             public object Clone()
             {
                 return new PathDefinition
-                           {
-                               Fill = (Brush) (Fill != null ? Fill.Clone() : null),
-                               Line = (Pen) (Line != null ? Line.Clone() : null),
-                               Path = (GraphicsPath) (Path != null ? Path.Clone() : null),
-                           };
+                {
+                    Fill = (Brush)(Fill != null ? Fill.Clone() : null),
+                    Line = (Pen)(Line != null ? Line.Clone() : null),
+                    Path = (GraphicsPath)(Path != null ? Path.Clone() : null),
+                };
             }
 
             #endregion
@@ -169,7 +169,7 @@ public object Clone()
 
         private readonly PathDefinition[] _paths;
 
-        
+
         /// <summary>
         /// Creates an instance of this class
         /// </summary>
@@ -199,8 +199,8 @@ public override object Clone()
         {
             var pathDefinitions = new PathDefinition[_paths.Length];
             for (var i = 0; i < _paths.Length; i++)
-                pathDefinitions[i] = (PathDefinition) _paths[i].Clone();
-            
+                pathDefinitions[i] = (PathDefinition)_paths[i].Clone();
+
             return new PathPointSymbolizer(pathDefinitions);
         }
 
diff --git a/SharpMap/Rendering/Symbolizer/PointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/PointSymbolizer.cs
index 4a34bfb2..1fdef01f 100644
--- a/SharpMap/Rendering/Symbolizer/PointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/PointSymbolizer.cs
@@ -15,10 +15,10 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -110,7 +110,7 @@ protected void RenderPoint(MapViewport map, Coordinate point, Graphics g)
 
                     g.Transform = origTrans;
                 }
-                
+
                 using (var symTrans = new Matrix())
                 {
                     symTrans.RotateAt(Rotation, rotationCenter);
@@ -165,7 +165,7 @@ public virtual IPointSymbolizer ToRasterPointSymbolizer()
         /// <param name="graphics">The graphics object to use.</param>
         public void Render(MapViewport map, IPuntal geometry, Graphics graphics)
         {
-            var mp = geometry as IMultiPoint;
+            var mp = geometry as MultiPoint;
             if (mp != null)
             {
                 var combinedArea = RectangleF.Empty;
@@ -177,7 +177,7 @@ public void Render(MapViewport map, IPuntal geometry, Graphics graphics)
                 CanvasArea = combinedArea;
                 return;
             }
-            RenderPoint(map, ((IPoint)geometry).Coordinate, graphics);
+            RenderPoint(map, ((NetTopologySuite.Geometries.Point)geometry).Coordinate, graphics);
         }
     }
 }
diff --git a/SharpMap/Rendering/Symbolizer/PolygonSymbolizer.cs b/SharpMap/Rendering/Symbolizer/PolygonSymbolizer.cs
index b647f3c5..bb217155 100644
--- a/SharpMap/Rendering/Symbolizer/PolygonSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/PolygonSymbolizer.cs
@@ -1,6 +1,6 @@
+using NetTopologySuite.Geometries;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
 using Point = System.Drawing.Point;
 
 namespace SharpMap.Rendering.Symbolizer
@@ -63,17 +63,17 @@ protected override void ReleaseManagedResources()
         /// <param name="graphics">The graphics object to use.</param>
         public void Render(MapViewport map, IPolygonal geometry, Graphics graphics)
         {
-            var mp = geometry as IMultiPolygon;
+            var mp = geometry as MultiPolygon;
             if (mp != null)
             {
-                for (var i = 0; i < mp.NumGeometries;i++)
+                for (var i = 0; i < mp.NumGeometries; i++)
                 {
-                    var poly = (IPolygon) mp[i];
+                    var poly = (Polygon)mp[i];
                     OnRenderInternal(map, poly, graphics);
                 }
                 return;
             }
-            OnRenderInternal(map, (IPolygon)geometry, graphics);
+            OnRenderInternal(map, (Polygon)geometry, graphics);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public void Render(MapViewport map, IPolygonal geometry, Graphics graphics)
         /// <param name="map">The map</param>
         /// <param name="polygon">The polygon to render</param>
         /// <param name="g">The graphics object to use</param>
-        protected abstract void OnRenderInternal(MapViewport map, IPolygon polygon, Graphics g);
+        protected abstract void OnRenderInternal(MapViewport map, Polygon polygon, Graphics g);
 
         private Point _renderOrigin;
 
@@ -116,7 +116,7 @@ public override void End(Graphics g, MapViewport map)
         /// <param name="map">The map</param>
         /// <param name="polygon">The polygon</param>
         /// <returns>A graphics path</returns>
-        protected static GraphicsPath PolygonToGraphicsPath(Map map, IPolygon polygon)
+        protected static GraphicsPath PolygonToGraphicsPath(Map map, Polygon polygon)
         {
             return polygon.TransformToImage(map);
         }
diff --git a/SharpMap/Rendering/Symbolizer/RasterPointSymbolizer.cs b/SharpMap/Rendering/Symbolizer/RasterPointSymbolizer.cs
index 3c1db07e..0cab8505 100644
--- a/SharpMap/Rendering/Symbolizer/RasterPointSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/RasterPointSymbolizer.cs
@@ -205,24 +205,24 @@ internal override void OnRenderInternal(PointF pt, Graphics g)
                 {
                     lock (symbol)
                     {
-                        g.DrawImageUnscaled(symbol, (int) (pt.X), (int) (pt.Y));
+                        g.DrawImageUnscaled(symbol, (int)(pt.X), (int)(pt.Y));
                     }
                 }
                 else
                 {
                     lock (symbol)
                     {
-                        g.DrawImage(symbol, (int) pt.X, (int) pt.Y, width, height);
+                        g.DrawImage(symbol, (int)pt.X, (int)pt.Y, width, height);
                     }
                 }
             }
             else
             {
-                int x = (int) (pt.X);
-                int y = (int) (pt.Y);
+                int x = (int)(pt.X);
+                int y = (int)(pt.Y);
                 g.DrawImage(
                     symbol,
-                    new Rectangle(x, y, (int) width, (int) height),
+                    new Rectangle(x, y, (int)width, (int)height),
                     0,
                     0,
                     symbol.Width,
diff --git a/SharpMap/Rendering/Symbolizer/Utility.cs b/SharpMap/Rendering/Symbolizer/Utility.cs
index 62c0a4c2..3b120371 100644
--- a/SharpMap/Rendering/Symbolizer/Utility.cs
+++ b/SharpMap/Rendering/Symbolizer/Utility.cs
@@ -22,9 +22,9 @@ static Utility()
         {
             //Get all known colors
             _knownColors = new List<KnownColor>();
-            _knownColors.AddRange((KnownColor[]) Enum.GetValues(typeof(KnownColor)));
+            _knownColors.AddRange((KnownColor[])Enum.GetValues(typeof(KnownColor)));
             //We remove the system colors
-            _knownColors.RemoveAll(x => (int) x < 27 || (int)x > 167);
+            _knownColors.RemoveAll(x => (int)x < 27 || (int)x > 167);
         }
 
         /// <summary>
@@ -73,15 +73,15 @@ public static float ScaleSizeToDeviceUnits(float size, GraphicsUnit unit, Graphi
                 case GraphicsUnit.World:
                     size *= g.DpiY / g.PageScale;
                     break;
-                /*
-            case GraphicsUnit.Pixel:
-            default:
-                //do nothing
-                break;
-             */
+                    /*
+                case GraphicsUnit.Pixel:
+                default:
+                    //do nothing
+                    break;
+                 */
             }
 
-            return (float) Math.Round(size, MidpointRounding.AwayFromZero);
+            return (float)Math.Round(size, MidpointRounding.AwayFromZero);
         }
     }
 }
diff --git a/SharpMap/Rendering/Symbolizer/WarpPathToPath.cs b/SharpMap/Rendering/Symbolizer/WarpPathToPath.cs
index ff48d7f0..697fbac9 100644
--- a/SharpMap/Rendering/Symbolizer/WarpPathToPath.cs
+++ b/SharpMap/Rendering/Symbolizer/WarpPathToPath.cs
@@ -265,7 +265,7 @@ internal static GraphicsPath PrepareTextPathToWarp(GraphicsPath path, Double tot
                     break;
             }
 
-            path.Transform(new Matrix(1f, 0f, 0f, 1f, (float)xStart,  yStart));
+            path.Transform(new Matrix(1f, 0f, 0f, 1f, (float)xStart, yStart));
 
             return path;
         }
@@ -456,14 +456,14 @@ private static bool CheckMaxX(Single x, Single maxX)
         /// <param name="ignoreLength"></param>
         /// <param name="path"></param>
         /// <param name="textHeight">actual text height as rendered by graphic</param>
-        public static void DrawString(this Graphics self, Pen halo, Brush fill, string text, FontFamily fontFamily, 
+        public static void DrawString(this Graphics self, Pen halo, Brush fill, string text, FontFamily fontFamily,
             int style, float emSize, StringFormat format, bool ignoreLength, GraphicsPath path,
            float textHeight)
         {
             if (path == null || path.PointCount == 0)
                 return;
 
-            var gp = new GraphicsPath(); 
+            var gp = new GraphicsPath();
             gp.AddString(text, fontFamily, style, emSize, new Point(0, 0), format);
 
             SortedList<float, GraphSegment> edges;
@@ -487,6 +487,6 @@ public static void DrawString(this Graphics self, Pen halo, Brush fill, string t
             gp.Dispose();
         }
 
-        
+
     }
 }
diff --git a/SharpMap/Rendering/Symbolizer/WarpedLineSymbolizer.cs b/SharpMap/Rendering/Symbolizer/WarpedLineSymbolizer.cs
index 3f53444a..e17a5446 100644
--- a/SharpMap/Rendering/Symbolizer/WarpedLineSymbolizer.cs
+++ b/SharpMap/Rendering/Symbolizer/WarpedLineSymbolizer.cs
@@ -1,7 +1,7 @@
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Rendering.Symbolizer
 {
@@ -30,9 +30,9 @@ public class WarpedLineSymbolizer : LineSymbolizer
         public static GraphicsPath GetGreaterSeries(float x, float y)
         {
             var gp = new GraphicsPath();
-            gp.AddLine(new PointF(0.5f*x, y), new PointF(1.5f * x, 0f));
+            gp.AddLine(new PointF(0.5f * x, y), new PointF(1.5f * x, 0f));
             gp.CloseFigure();
-            gp.AddLine(new PointF(1.5f * x, 0f), new PointF(0.5f*x, -y));
+            gp.AddLine(new PointF(1.5f * x, 0f), new PointF(0.5f * x, -y));
             gp.CloseFigure();
             return gp;
         }
@@ -48,9 +48,9 @@ public static GraphicsPath GetZigZag(float x, float y)
             var gp = new GraphicsPath();
             gp.AddLine(new PointF(0f, 0f), new PointF(0f, y));
             gp.CloseFigure();
-            gp.AddLine(new PointF(0f, y), new PointF(2*x, -y));
+            gp.AddLine(new PointF(0f, y), new PointF(2 * x, -y));
             gp.CloseFigure();
-            gp.AddLine(new PointF(2*x, -y), new PointF(2*x, 0));
+            gp.AddLine(new PointF(2 * x, -y), new PointF(2 * x, 0));
             gp.CloseFigure();
             return gp;
         }
@@ -68,16 +68,16 @@ public static GraphicsPath GetZigZag(float x, float y)
         /// <returns></returns>
         public static GraphicsPath GetTriangle(float size, int orientation)
         {
-            orientation = orientation%4;
-            var half = 0.5f*size;
-            var twoThirds = 2f*size/3f;
+            orientation = orientation % 4;
+            var half = 0.5f * size;
+            var twoThirds = 2f * size / 3f;
             var gp = new GraphicsPath();
             switch (orientation)
             {
                 case 0:
-                    gp.AddPolygon(new[] { 
-                        new PointF(size, 0f), new PointF(0f, 0f), 
-                        new PointF(half, twoThirds), new PointF(size, 0f) 
+                    gp.AddPolygon(new[] {
+                        new PointF(size, 0f), new PointF(0f, 0f),
+                        new PointF(half, twoThirds), new PointF(size, 0f)
                     });
                     break;
                 case 1:
@@ -88,7 +88,7 @@ public static GraphicsPath GetTriangle(float size, int orientation)
                     break;
                 case 2:
                     gp.AddPolygon(new[] {
-                        new PointF(size, 0f), new PointF(0f, 0f), 
+                        new PointF(size, 0f), new PointF(0f, 0f),
                         new PointF(half, -twoThirds), new PointF(size, 0f)
                     });
                     break;
@@ -114,9 +114,9 @@ public static GraphicsPath GetTriangle(float size, int orientation)
         public static GraphicsPath GetTriangleSeries(float x, float y)
         {
             var gp = new GraphicsPath();
-            gp.AddPolygon(new[] { new PointF(x, 0f), new PointF(0f, 0f), new PointF(0.5f*x, 2f*x/3f), new PointF(x, 0f) });
+            gp.AddPolygon(new[] { new PointF(x, 0f), new PointF(0f, 0f), new PointF(0.5f * x, 2f * x / 3f), new PointF(x, 0f) });
             gp.CloseFigure();
-            
+
             //Just to move to a new position
             gp.AddEllipse(y, 0f, 0f, 0f);
             gp.CloseFigure();
@@ -133,7 +133,7 @@ public static GraphicsPath GetTriangleSeries(float x, float y)
         public static GraphicsPath GetTriangleSeriesForward(float x, float y)
         {
             var gp = new GraphicsPath();
-            gp.AddPolygon(new[] { new PointF(0f, -0.5f*x), new PointF(0f, 0.5f*x), new PointF(2f * x / 3f, 0), new PointF(0f, -0.5f*x) });
+            gp.AddPolygon(new[] { new PointF(0f, -0.5f * x), new PointF(0f, 0.5f * x), new PointF(2f * x / 3f, 0), new PointF(0f, -0.5f * x) });
             gp.CloseFigure();
 
             //Just to move to a new position
@@ -166,10 +166,10 @@ protected override void ReleaseManagedResources()
         public override object Clone()
         {
             var res = (WarpedLineSymbolizer)MemberwiseClone();
-            res.Fill = (Brush) Fill.Clone();
-            res.Line = (Pen) Line.Clone();
-            res.Pattern = (GraphicsPath) Pattern.Clone();
-            
+            res.Fill = (Brush)Fill.Clone();
+            res.Line = (Pen)Line.Clone();
+            res.Pattern = (GraphicsPath)Pattern.Clone();
+
             return res;
         }
 
@@ -184,17 +184,17 @@ public override object Clone()
         /// <param name="map">The map</param>
         /// <param name="lineString">The line string to symbolize.</param>
         /// <param name="graphics">The graphics</param>
-        protected override void OnRenderInternal(MapViewport map, ILineString lineString, Graphics graphics)
+        protected override void OnRenderInternal(MapViewport map, LineString lineString, Graphics graphics)
         {
-            var clonedPattern = (GraphicsPath) Pattern.Clone();
+            var clonedPattern = (GraphicsPath)Pattern.Clone();
             var graphicsPath = WarpPathToPath.Warp(LineStringToPath(lineString, map), clonedPattern, true, Interval);
-            
+
             if (graphicsPath == null) return;
 
             // Fill?
             if (Fill != null)
                 graphics.FillPath(Fill, graphicsPath);
-            
+
             // Outline
             if (Line != null)
                 graphics.DrawPath(Line, graphicsPath);
diff --git a/SharpMap/Rendering/TextOnPath.cs b/SharpMap/Rendering/TextOnPath.cs
index 358ab089..2055ed6e 100644
--- a/SharpMap/Rendering/TextOnPath.cs
+++ b/SharpMap/Rendering/TextOnPath.cs
@@ -144,7 +144,7 @@ public static RectangleF[] MeasureString(Graphics graphics, string s, Font font,
         /// <returns>An array of <see cref="RectangleF"/>s</returns>
         public static void DrawString(Graphics graphics, string s, Font font, Brush brush, TextPathAlign textPathAlign, TextPathPosition textPathPosition, int letterSpace, GraphicsPath graphicsPath)
         {
-            DrawString(graphics, s, font, brush, textPathAlign, textPathPosition, 100, 0, graphicsPath,false);
+            DrawString(graphics, s, font, brush, textPathAlign, textPathPosition, 100, 0, graphicsPath, false);
         }
 
         /// <summary>
@@ -203,7 +203,7 @@ public static RectangleF[] MeasureString(Graphics graphics, string s, Font font,
         public static void DrawString(Graphics graphics, string s, Font font, Brush brush, TextPathAlign textPathAlign, TextPathPosition textPathPosition, int letterSpace, float rotateDegree, GraphicsPath graphicsPath, bool showPath)
         {
             var top = TextOnPath.TextOnPathInstance;
-            
+
             top.Text = s;
             top.Font = font;
             top.FillColorTop = brush;
@@ -233,7 +233,7 @@ public class TextOnPath
 
         private bool _measureString;
         private Font _font;
-        private Pen _colorHalo = new Pen(Color.Black,1);
+        private Pen _colorHalo = new Pen(Color.Black, 1);
         private Brush _fillBrush = new SolidBrush(Color.Black);
         private TextPathAlign _pathalign = TextPathAlign.Center;
         private double _letterspacepercentage = 1;
@@ -244,12 +244,12 @@ public class TextOnPath
         private List<PointF> _pointText = new List<PointF>();
         private List<Point> _pointTextUp = new List<Point>();
         private readonly List<float> _angles = new List<float>();
-        
+
         /// <summary>
         /// The last catched exception is stored here
         /// </summary>
         public Exception LastError;
-        
+
 
         /// <summary>
         /// Gets or sets the <see cref="Graphics"/> object
@@ -260,7 +260,7 @@ public class TextOnPath
         /// Gets or sets a value indicating the <see cref="GraphicsPath"/> used to render text along
         /// </summary>
         public GraphicsPath GraphicsPath { get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating whether the string should be measured
         /// </summary>
@@ -269,7 +269,7 @@ public bool MeasureString
             get { return _measureString; }
             set { _measureString = value; }
         }
-        
+
 
         /// <summary>
         /// Gets or sets a list of regions
@@ -288,7 +288,7 @@ public List<PointF> PointsText
             get { return _pointText; }
             set { _pointText = value; }
         }
-        
+
         /// <summary>
         /// Gets or sets a list of <see cref="PointF"/>s
         /// </summary>
@@ -309,7 +309,7 @@ public List<float> Angles
         /// <summary>
         /// Gets or sets a value indicating the rotation
         /// </summary>
-        public float RotateDegree { get; set; } 
+        public float RotateDegree { get; set; }
 
         /// <summary>
         /// Creates an instance of this class
@@ -391,7 +391,7 @@ public TextPathAlign TextPathAlignTop
         public int LetterSpacePercentage
         {
             get { return (int)(100 * _letterspacepercentage); }
-            set { _letterspacepercentage = value/100d; }
+            set { _letterspacepercentage = value / 100d; }
         }
 
         /// <summary>
@@ -414,7 +414,7 @@ public void DrawTextOnPath(PathData pathdata, string text, Font font, Pen haloPe
             _pathdata = pathdata;
             Text = text;
             _font = font;
-            _colorHalo= haloPen;
+            _colorHalo = haloPen;
             _fillBrush = fillcolor;
             _letterspacepercentage = letterspacepercentage / 100d;
 
@@ -435,8 +435,8 @@ public void DrawTextOnPath()
         /// <returns>The area covered by the rendering process</returns>
         public RectangleF DrawTextOnPathEx()
         {
-            var  affectedArea = new RectangleF();
-            
+            var affectedArea = new RectangleF();
+
             var points = new PointF[25001];
             var count = 0;
             var gp = new GraphicsPath(_pathdata.Points, _pathdata.Types) { FillMode = FillMode.Winding };
@@ -498,7 +498,7 @@ private static PointF[] CleanPoints(PointF[] points)
         {
             if (points == null)
                 return null;
-            if (points.Length == 0) 
+            if (points.Length == 0)
                 return new PointF[0];
             var tmpPoints = new List<PointF>(points.Length);
             tmpPoints.Add(points[0]);
@@ -524,8 +524,8 @@ private static PointF[] CleanPoints(PointF[] points)
         public bool IsVisible(PointF[] points, int maxPoints)
         {
             var result = true;
-            var g = Graphics;           
-            var count = 0;     
+            var g = Graphics;
+            var count = 0;
             var maxWidthText = default(double);
             int i;
             for (i = 0; i <= Text.Length - 1; i++)
@@ -534,14 +534,14 @@ public bool IsVisible(PointF[] points, int maxPoints)
             }
             switch (_pathalign)
             {
-                case TextPathAlign.Left:                  
+                case TextPathAlign.Left:
                     count = 0;
                     break;
                 case TextPathAlign.Center:
-                    count = (int)((maxPoints - maxWidthText) / 2);                    
+                    count = (int)((maxPoints - maxWidthText) / 2);
                     break;
                 case TextPathAlign.Right:
-                    count = (int)(maxPoints - maxWidthText - (double)StringRegion(g, Text.Length - 1) * LetterSpacePercentage / 100);                  
+                    count = (int)(maxPoints - maxWidthText - (double)StringRegion(g, Text.Length - 1) * LetterSpacePercentage / 100);
                     break;
             }
             var lStrWidth = (int)(StringRegion(g, 0) * LetterSpacePercentage / 100);
@@ -550,10 +550,10 @@ public bool IsVisible(PointF[] points, int maxPoints)
                 count = -(lStrWidth / 2);
             }
             double currentWidthText = 0;
-            for (int j =count+lStrWidth/2; j <= Text.Length - 1; j++)
+            for (int j = count + lStrWidth / 2; j <= Text.Length - 1; j++)
             {
                 currentWidthText += StringRegion(g, j) * LetterSpacePercentage / 100;
-            }          
+            }
             if ((int)currentWidthText >= maxPoints)
             {
                 result = false;
@@ -621,14 +621,14 @@ private void DrawText(Graphics g, PointF[] points, int maxPoints)
                     count += lStrWidth;
                     var point2 = points[count];
                     //PointF point = points[count - lStrWidth / 2];
-                    var point = new PointF((point2.X+point1.X)/2,(point2.Y+point1.Y)/2);
+                    var point = new PointF((point2.X + point1.X) / 2, (point2.Y + point1.Y) / 2);
                     var angle = GetAngle(point1, point2);
                     DrawRotatedText(g, Text[charStep].ToString(CultureInfo.InvariantCulture), (float)angle, point);
                     point1 = points[count];
                 }
                 else
                 {
-                    count += lStrWidth;                  
+                    count += lStrWidth;
                 }
                 charStep += 1;
             }
@@ -671,7 +671,7 @@ private float StringRegion(Graphics g, int textpos)
         /// <returns>An angle in degrees</returns>
         private static double GetAngle(PointF point1, PointF point2)
         {
-            const double rad2Deg = 180d/Math.PI;
+            const double rad2Deg = 180d / Math.PI;
 
             var c = Math.Sqrt(Math.Pow((point2.X - point1.X), 2) + Math.Pow((point2.Y - point1.Y), 2));
             if (c == 0d)
@@ -679,7 +679,7 @@ private static double GetAngle(PointF point1, PointF point2)
                 return 0;
             }
 
-            var res = Math.Asin((point2.Y - point1.Y)/c)*rad2Deg;
+            var res = Math.Asin((point2.Y - point1.Y) / c) * rad2Deg;
             return point1.X > point2.X
                        ? res - 180
                        : res;
@@ -695,31 +695,31 @@ private static double GetAngle(PointF point1, PointF point2)
         private void DrawRotatedText(Graphics gr, string text, float angle, PointF pointCenter)
         {
             angle -= RotateDegree;
-            var stringFormat =  new StringFormat { Alignment = StringAlignment.Center };
+            var stringFormat = new StringFormat { Alignment = StringAlignment.Center };
 
             //gr.SmoothingMode = SmoothingMode.HighQuality;
             //gr.CompositingQuality = CompositingQuality.HighQuality;
             //gr.TextRenderingHint = TextRenderingHint.AntiAlias;
             using (var graphicsPath = new GraphicsPath())
             {
-                var x = (int) pointCenter.X;
-                var y = (int) pointCenter.Y;
+                var x = (int)pointCenter.X;
+                var y = (int)pointCenter.Y;
                 var pOrigin = new Point();
                 switch (TextPathPathPosition)
                 {
                     case TextPathPosition.OverPath:
-                        pOrigin = new Point(x, (int) (y - _font.Size));
-                        graphicsPath.AddString(text, _font.FontFamily, (int) _font.Style, _font.Size,
-                                               new Point(x, (int) (y - _font.Size)), stringFormat);
+                        pOrigin = new Point(x, (int)(y - _font.Size));
+                        graphicsPath.AddString(text, _font.FontFamily, (int)_font.Style, _font.Size,
+                                               new Point(x, (int)(y - _font.Size)), stringFormat);
                         break;
                     case TextPathPosition.CenterPath:
-                        pOrigin = new Point(x, (int) (y - _font.Size/2));
-                        graphicsPath.AddString(text, _font.FontFamily, (int) _font.Style, _font.Size,
-                                               new Point(x, (int) (y - _font.Size/2)), stringFormat);
+                        pOrigin = new Point(x, (int)(y - _font.Size / 2));
+                        graphicsPath.AddString(text, _font.FontFamily, (int)_font.Style, _font.Size,
+                                               new Point(x, (int)(y - _font.Size / 2)), stringFormat);
                         break;
                     case TextPathPosition.UnderPath:
                         pOrigin = new Point(x, y);
-                        graphicsPath.AddString(text, _font.FontFamily, (int) _font.Style, _font.Size, new Point(x, y),
+                        graphicsPath.AddString(text, _font.FontFamily, (int)_font.Style, _font.Size, new Point(x, y),
                                                stringFormat);
                         break;
                 }
diff --git a/SharpMap/Rendering/Thematics/ColorBlend.cs b/SharpMap/Rendering/Thematics/ColorBlend.cs
index 4a391441..1e965da4 100644
--- a/SharpMap/Rendering/Thematics/ColorBlend.cs
+++ b/SharpMap/Rendering/Thematics/ColorBlend.cs
@@ -78,10 +78,10 @@ public Color[] Colors
         public float[] Positions
         {
             get { return _positions; }
-            set 
-            { 
+            set
+            {
                 _positions = value;
-                if ( value == null )
+                if (value == null)
                     _minimum = _maximum = float.NaN;
                 else
                 {
@@ -116,13 +116,13 @@ public Color GetColor(float pos)
             int i = 1;
             while (i < _positions.Length && _positions[i] < pos)
                 i++;
-            float frac = (pos - _positions[i - 1])/(_positions[i] - _positions[i - 1]);
+            float frac = (pos - _positions[i - 1]) / (_positions[i] - _positions[i - 1]);
             frac = Math.Max(frac, 0.0f);
             frac = Math.Min(frac, 1.0f);
-            int R = (int) Math.Round((_colors[i - 1].R*(1 - frac) + _colors[i].R*frac));
-            int G = (int) Math.Round((_colors[i - 1].G*(1 - frac) + _colors[i].G*frac));
-            int B = (int) Math.Round((_colors[i - 1].B*(1 - frac) + _colors[i].B*frac));
-            int A = (int) Math.Round((_colors[i - 1].A*(1 - frac) + _colors[i].A*frac));
+            int R = (int)Math.Round((_colors[i - 1].R * (1 - frac) + _colors[i].R * frac));
+            int G = (int)Math.Round((_colors[i - 1].G * (1 - frac) + _colors[i].G * frac));
+            int B = (int)Math.Round((_colors[i - 1].B * (1 - frac) + _colors[i].B * frac));
+            int A = (int)Math.Round((_colors[i - 1].A * (1 - frac) + _colors[i].A * frac));
             return Color.FromArgb(A, R, G, B);
         }
 
@@ -160,8 +160,8 @@ public static ColorBlend RainbowMOHID
             get
             {
                 return new ColorBlend(
-                    new Color[] {Color.FromArgb(0,0,127),   Color.FromArgb(0,0,255),   Color.FromArgb(0,255,255), Color.FromArgb(0,255,0), 
-                                 Color.FromArgb(127,255,0), Color.FromArgb(255,255,0), Color.FromArgb(255,127,0), Color.FromArgb(255,0,0), 
+                    new Color[] {Color.FromArgb(0,0,127),   Color.FromArgb(0,0,255),   Color.FromArgb(0,255,255), Color.FromArgb(0,255,0),
+                                 Color.FromArgb(127,255,0), Color.FromArgb(255,255,0), Color.FromArgb(255,127,0), Color.FromArgb(255,0,0),
                                  Color.FromArgb(127,0,0)},
                     new float[] { 0f, 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.75f, 0.875f, 1f });
             }
@@ -179,7 +179,7 @@ public static ColorBlend InverseRainbowMOHID
             get
             {
                 return new ColorBlend(
-                    new Color[] {Color.FromArgb(127,0,0), Color.FromArgb(255,0,0), Color.FromArgb(255,127,0), Color.FromArgb(255,255,0),  
+                    new Color[] {Color.FromArgb(127,0,0), Color.FromArgb(255,0,0), Color.FromArgb(255,127,0), Color.FromArgb(255,255,0),
                                  Color.FromArgb(127,255,0), Color.FromArgb(0,255,0), Color.FromArgb(0,255,255), Color.FromArgb(0,0,255),
                                  Color.FromArgb(0,0,127)},
                     new float[] { 0f, 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.75f, 0.875f, 1f });
@@ -197,8 +197,8 @@ public static ColorBlend DigitalTerrainModelMOHID
             get
             {
                 return new ColorBlend(
-                    new Color[] 
-                    {Color.FromArgb(16, 56, 0), Color.FromArgb(38, 127, 0), Color.FromArgb(58, 193, 0), Color.FromArgb(255, 247, 176), 
+                    new Color[]
+                    {Color.FromArgb(16, 56, 0), Color.FromArgb(38, 127, 0), Color.FromArgb(58, 193, 0), Color.FromArgb(255, 247, 176),
                         Color.FromArgb(244, 170, 81), Color.FromArgb(239, 139, 2), Color.FromArgb(205, 112, 9), Color.FromArgb(148, 82, 17),
                         Color.FromArgb(99, 66, 3)},
                     new float[] { 0f, 0.125f, 0.25f, 0.375f, 0.5f, 0.625f, 0.75f, 0.875f, 1f });
@@ -216,7 +216,7 @@ public static ColorBlend BathymetryMOHID
             get
             {
                 return new ColorBlend(
-                    new Color[] {Color.FromArgb(254, 255, 255), Color.FromArgb(223, 241, 251), Color.FromArgb(187, 228, 246), 
+                    new Color[] {Color.FromArgb(254, 255, 255), Color.FromArgb(223, 241, 251), Color.FromArgb(187, 228, 246),
                                  Color.FromArgb(133,208, 239), Color.FromArgb(63,189, 237), Color.FromArgb(87, 153, 203)},
                     new float[] { 0f, 0.2f, 0.4f, 0.6f, 0.8f, 1.0f });
             }
@@ -251,8 +251,8 @@ public static ColorBlend Rainbow5
             get
             {
                 return new ColorBlend(
-                    new[] {Color.Red, Color.Yellow, Color.Green, Color.Cyan, Color.Blue},
-                    new[] {0f, 0.25f, 0.5f, 0.75f, 1f});
+                    new[] { Color.Red, Color.Yellow, Color.Green, Color.Cyan, Color.Blue },
+                    new[] { 0f, 0.25f, 0.5f, 0.75f, 1f });
             }
         }
 
@@ -261,7 +261,7 @@ public static ColorBlend Rainbow5
         /// </summary>
         public static ColorBlend BlackToWhite
         {
-            get { return new ColorBlend(new[] {Color.Black, Color.White}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Black, Color.White }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -269,7 +269,7 @@ public static ColorBlend BlackToWhite
         /// </summary>
         public static ColorBlend WhiteToBlack
         {
-            get { return new ColorBlend(new[] {Color.White, Color.Black}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.White, Color.Black }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -277,7 +277,7 @@ public static ColorBlend WhiteToBlack
         /// </summary>
         public static ColorBlend RedToGreen
         {
-            get { return new ColorBlend(new[] {Color.Red, Color.Green}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Red, Color.Green }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -285,7 +285,7 @@ public static ColorBlend RedToGreen
         /// </summary>
         public static ColorBlend GreenToRed
         {
-            get { return new ColorBlend(new[] {Color.Green, Color.Red}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Green, Color.Red }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -293,7 +293,7 @@ public static ColorBlend GreenToRed
         /// </summary>
         public static ColorBlend BlueToGreen
         {
-            get { return new ColorBlend(new[] {Color.Blue, Color.Green}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Blue, Color.Green }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -301,7 +301,7 @@ public static ColorBlend BlueToGreen
         /// </summary>
         public static ColorBlend GreenToBlue
         {
-            get { return new ColorBlend(new[] {Color.Green, Color.Blue}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Green, Color.Blue }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -309,7 +309,7 @@ public static ColorBlend GreenToBlue
         /// </summary>
         public static ColorBlend RedToBlue
         {
-            get { return new ColorBlend(new[] {Color.Red, Color.Blue}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Red, Color.Blue }, new[] { 0f, 1f }); }
         }
 
         /// <summary>
@@ -317,7 +317,7 @@ public static ColorBlend RedToBlue
         /// </summary>
         public static ColorBlend BlueToRed
         {
-            get { return new ColorBlend(new[] {Color.Blue, Color.Red}, new[] {0f, 1f}); }
+            get { return new ColorBlend(new[] { Color.Blue, Color.Red }, new[] { 0f, 1f }); }
         }
 
         #endregion
@@ -332,7 +332,7 @@ public static ColorBlend BlueToRed
         /// <returns></returns>
         public static ColorBlend TwoColors(Color fromColor, Color toColor)
         {
-            return new ColorBlend(new[] {fromColor, toColor}, new[] {0f, 1f});
+            return new ColorBlend(new[] { fromColor, toColor }, new[] { 0f, 1f });
         }
 
         /// <summary>
@@ -340,7 +340,7 @@ public static ColorBlend TwoColors(Color fromColor, Color toColor)
         /// </summary>
         public static ColorBlend ThreeColors(Color fromColor, Color middleColor, Color toColor)
         {
-            return new ColorBlend(new[] {fromColor, middleColor, toColor}, new[] {0f, 0.5f, 1f});
+            return new ColorBlend(new[] { fromColor, middleColor, toColor }, new[] { 0f, 0.5f, 1f });
         }
 
         #endregion
diff --git a/SharpMap/Rendering/Thematics/CustomTheme.cs b/SharpMap/Rendering/Thematics/CustomTheme.cs
index 64746bc8..9e97d955 100644
--- a/SharpMap/Rendering/Thematics/CustomTheme.cs
+++ b/SharpMap/Rendering/Thematics/CustomTheme.cs
@@ -15,10 +15,10 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Runtime.Serialization;
 using SharpMap.Data;
 using SharpMap.Styles;
+using System;
+using System.Runtime.Serialization;
 
 namespace SharpMap.Rendering.Thematics
 {
@@ -84,7 +84,7 @@ public CustomTheme(GetStyleMethod getStyleMethod)
         {
             _getStyleDelegate = getStyleMethod;
         }
-             
+
         /// <summary>
         /// Gets or sets the default style when an attribute isn't found in any bucket
         /// </summary>
diff --git a/SharpMap/Rendering/Thematics/FontSizeTheme.cs b/SharpMap/Rendering/Thematics/FontSizeTheme.cs
index b782496d..4b27f961 100644
--- a/SharpMap/Rendering/Thematics/FontSizeTheme.cs
+++ b/SharpMap/Rendering/Thematics/FontSizeTheme.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Drawing;
-using SharpMap.Base;
+using SharpMap.Base;
 using SharpMap.Data;
 using SharpMap.Layers;
 using SharpMap.Styles;
+using System;
+using System.Drawing;
 
 namespace SharpMap.Rendering.Thematics
 {
@@ -66,7 +66,7 @@ private void HandleStyleChanged(object sender, EventArgs e)
         {
             if (_currentStyle != null)
                 _currentStyle.Dispose();
-            
+
             _currentStyle = _labelLayer.Style.Clone();
             _currentSize = _currentStyle.Font.Size;
         }
@@ -85,7 +85,7 @@ public IStyle GetStyle(FeatureDataRow attribute)
                 if (!style.Enabled) return style;
                 if (!(style is LabelStyle)) return style;
 
-                var labelStyle = (LabelStyle) style;
+                var labelStyle = (LabelStyle)style;
                 return UpdateStyle(labelStyle, CalculateSize(_map, labelStyle.Font.SizeInPoints));
             }
 
@@ -94,7 +94,7 @@ public IStyle GetStyle(FeatureDataRow attribute)
             {
                 // Get the new size
                 var newSize = CalculateSize(_map, _currentSize);
-                
+
                 // Update the style
                 _currentStyle = UpdateStyle(_currentStyle, newSize);
                 _currentZoom = _map.Zoom;
@@ -117,7 +117,7 @@ protected virtual LabelStyle UpdateStyle(LabelStyle labelStyle, float newSize)
                 labelStyle.Enabled = false;
                 return labelStyle;
             }
-            
+
             // Make sure label style is enabled
             labelStyle.Enabled = true;
 
@@ -160,7 +160,7 @@ public float TreatSizeAsMapUnits(Map map, float sizeInMapUnits)
         {
             if (FontSizeScale.HasValue)
                 sizeInMapUnits *= FontSizeScale.Value;
-            return (float)(sizeInMapUnits/_map.PixelHeight);
+            return (float)(sizeInMapUnits / _map.PixelHeight);
         }
 
         /// <summary>
diff --git a/SharpMap/Rendering/Thematics/GradientTheme.cs b/SharpMap/Rendering/Thematics/GradientTheme.cs
index 8354b071..f1dde146 100644
--- a/SharpMap/Rendering/Thematics/GradientTheme.cs
+++ b/SharpMap/Rendering/Thematics/GradientTheme.cs
@@ -15,11 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using SharpMap.Data;
+using SharpMap.Styles;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using SharpMap.Data;
-using SharpMap.Styles;
 
 namespace SharpMap.Rendering.Thematics
 {
@@ -257,9 +257,9 @@ protected SolidBrush InterpolateBrush(Brush min, Brush max, double attr)
         protected Pen InterpolatePen(Pen min, Pen max, double attr)
         {
             var oldMin = min;
-            min = (Pen) oldMin.Clone();
+            min = (Pen)oldMin.Clone();
             var oldMax = max;
-            max = (Pen) oldMax.Clone();
+            max = (Pen)oldMax.Clone();
 
             if (min.PenType != PenType.SolidColor || max.PenType != PenType.SolidColor)
                 throw (new ArgumentException("Only SolidColor pens are supported in GradientTheme"));
@@ -295,10 +295,10 @@ protected Pen InterpolatePen(Pen min, Pen max, double attr)
         protected Color InterpolateColor(Color minCol, Color maxCol, double attr)
         {
             double frac = Fraction(attr);
-            
+
             if (frac == 1)
                 return maxCol;
-            
+
             if (frac == 0)
                 return minCol;
 
@@ -310,7 +310,7 @@ protected Color InterpolateColor(Color minCol, Color maxCol, double attr)
             if (g > 255) g = 255;
             if (b > 255) b = 255;
             if (a > 255) a = 255;
-            
+
             return Color.FromArgb((int)a, (int)r, (int)g, (int)b);
         }
 
@@ -434,11 +434,11 @@ protected override double GetAttributeValue(FeatureDataRow row)
         /// <inheritdoc cref="ICloneable.Clone"/>
         public object Clone()
         {
-            var res = (GradientTheme) MemberwiseClone();
+            var res = (GradientTheme)MemberwiseClone();
             if (res.MinStyle is ICloneable)
-                res.MinStyle = (IStyle) ((ICloneable) MinStyle).Clone();
+                res.MinStyle = (IStyle)((ICloneable)MinStyle).Clone();
             if (res.MaxStyle is ICloneable)
-                res.MaxStyle = (IStyle) ((ICloneable) MaxStyle).Clone();
+                res.MaxStyle = (IStyle)((ICloneable)MaxStyle).Clone();
 
             return res;
         }
diff --git a/SharpMap/Rendering/Thematics/ITheme.cs b/SharpMap/Rendering/Thematics/ITheme.cs
index 1d74894c..e54c41d9 100644
--- a/SharpMap/Rendering/Thematics/ITheme.cs
+++ b/SharpMap/Rendering/Thematics/ITheme.cs
@@ -46,7 +46,7 @@ public interface ITheme
     /// when they make use of <see cref="T:System.Drawing.Pen"/>, <see cref="T:System.Drawing.Brush"/> or likewise 
     /// objects of the <see cref="N:System.Drawing"/> namespace. Otherwise they are prone to GDI+ rendering exceptions.
     /// </remarks>
-    public interface IThemeEx: ITheme
+    public interface IThemeEx : ITheme
     {
         /// <summary>
         /// Calculates a style for a given <paramref name="feature"/> based on a given <paramref name="mapViewPort"/>. 
diff --git a/SharpMap/Rendering/Thematics/UniqueValuesTheme.cs b/SharpMap/Rendering/Thematics/UniqueValuesTheme.cs
index be81400b..dd96d27e 100644
--- a/SharpMap/Rendering/Thematics/UniqueValuesTheme.cs
+++ b/SharpMap/Rendering/Thematics/UniqueValuesTheme.cs
@@ -12,9 +12,9 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
-using SharpMap.Styles;
 
 namespace SharpMap.Rendering.Thematics
 {
@@ -23,7 +23,7 @@ namespace SharpMap.Rendering.Thematics
     /// </summary>
     /// <typeparam name="T">Type of the featureattribute to match</typeparam>
     [Serializable]
-    public class UniqueValuesTheme<T>  : ITheme, ICloneable
+    public class UniqueValuesTheme<T> : ITheme, ICloneable
     {
         readonly IStyle _default;
 
@@ -68,7 +68,7 @@ public IStyle GetStyle(Data.FeatureDataRow attribute)
 
             var val = attribute[_attributeName].ToString();
             if (_styleMap.ContainsKey(val))
-                return _styleMap[val];          
+                return _styleMap[val];
 
             return _default;
         }
@@ -112,10 +112,10 @@ public IStyle GetStyle(string value)
         /// <inheritdoc cref="ICloneable.Clone()"/>
         public object Clone()
         {
-            var defStyle = (_default is ICloneable) ? (IStyle) ((ICloneable) _default).Clone() : _default;
+            var defStyle = (_default is ICloneable) ? (IStyle)((ICloneable)_default).Clone() : _default;
             var styleMap = new Dictionary<T, IStyle>(_styleMap.Count);
             foreach (var style in _styleMap)
-                styleMap.Add(_originalValue[style.Key], style.Value is ICloneable ? (IStyle) ((ICloneable) style.Value).Clone() : style.Value);
+                styleMap.Add(_originalValue[style.Key], style.Value is ICloneable ? (IStyle)((ICloneable)style.Value).Clone() : style.Value);
 
             return new UniqueValuesTheme<T>(_attributeName, styleMap, defStyle);
         }
diff --git a/SharpMap/Rendering/VectorRenderer.cs b/SharpMap/Rendering/VectorRenderer.cs
index 9a0591d5..8ecf25d0 100644
--- a/SharpMap/Rendering/VectorRenderer.cs
+++ b/SharpMap/Rendering/VectorRenderer.cs
@@ -15,17 +15,17 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using SharpMap.Rendering.Symbolizer;
+using SharpMap.Styles;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Reflection;
-using GeoAPI.Geometries;
-using SharpMap.Rendering.Symbolizer;
-using SharpMap.Styles;
-using Point=GeoAPI.Geometries.Coordinate;
 using System.Runtime.CompilerServices;
+using Point = NetTopologySuite.Geometries.Point;
 
 namespace SharpMap.Rendering
 {
@@ -56,7 +56,7 @@ static VectorRenderer()
         /// <param name="map">Map reference</param>
         /// <param name="offset">Offset by which line will be moved to right</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawMultiLineString(Graphics g, IMultiLineString lines, Pen pen, MapViewport map, float offset)
+        public static void DrawMultiLineString(Graphics g, MultiLineString lines, Pen pen, MapViewport map, float offset)
         {
             DrawMultiLineStringEx(g, lines, pen, map, offset);
         }
@@ -71,12 +71,12 @@ public static void DrawMultiLineString(Graphics g, IMultiLineString lines, Pen p
         /// <param name="offset">Offset by which line will be moved to right</param>
         /// <returns>The area of the map that was affected by the drawing operation</returns>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawMultiLineStringEx(Graphics g, IMultiLineString lines, Pen pen, MapViewport map, float offset)
+        public static RectangleF DrawMultiLineStringEx(Graphics g, MultiLineString lines, Pen pen, MapViewport map, float offset)
         {
             var canvasArea = RectangleF.Empty;
-            for(int i = 0; i < lines.NumGeometries; i++)
+            for (int i = 0; i < lines.NumGeometries; i++)
             {
-                var line = (ILineString) lines[i];
+                var line = (LineString)lines[i];
                 var rect = DrawLineStringEx(g, line, pen, map, offset);
                 canvasArea = rect.ExpandToInclude(canvasArea);
             }
@@ -143,7 +143,7 @@ internal static PointF[] OffsetRight(PointF[] points, float offset)
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
         [Obsolete("Not called, will be removed")]
-        public static void DrawLineString(Graphics g, ILineString line, Pen pen, MapViewport map)
+        public static void DrawLineString(Graphics g, LineString line, Pen pen, MapViewport map)
         {
             DrawLineString(g, line, pen, map, 0f);
         }
@@ -156,7 +156,7 @@ public static void DrawLineString(Graphics g, ILineString line, Pen pen, MapView
         /// <param name="pen">Pen style used for rendering</param>
         /// <param name="map">Map reference</param>
         /// <param name="offset">Offset by which line will be moved to right</param>
-        public static void DrawLineString(Graphics g, ILineString line, Pen pen, MapViewport map, float offset)
+        public static void DrawLineString(Graphics g, LineString line, Pen pen, MapViewport map, float offset)
         {
             DrawLineStringEx(g, line, pen, map, offset);
         }
@@ -170,7 +170,7 @@ public static void DrawLineString(Graphics g, ILineString line, Pen pen, MapView
         /// <param name="map">Map reference</param>
         /// <param name="offset">Offset by which line will be moved to right</param>
         /// <returns>The area of the map that was affected by the drawing of the geometry.</returns>
-        public static RectangleF DrawLineStringEx(Graphics g, ILineString line, Pen pen, MapViewport map, float offset)
+        public static RectangleF DrawLineStringEx(Graphics g, LineString line, Pen pen, MapViewport map, float offset)
         {
             var points = line.TransformToImage(map);
             if (points.Length < 2) return RectangleF.Empty;
@@ -199,7 +199,7 @@ public static RectangleF DrawLineStringEx(Graphics g, ILineString line, Pen pen,
         /// <param name="clip">Specifies whether polygon clipping should be applied</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawMultiPolygon(Graphics g, IMultiPolygon multiPolygon, Brush brush, Pen pen, bool clip, MapViewport map)
+        public static void DrawMultiPolygon(Graphics g, MultiPolygon multiPolygon, Brush brush, Pen pen, bool clip, MapViewport map)
         {
             DrawMultiPolygonEx(g, multiPolygon, brush, pen, clip, map);
         }
@@ -215,12 +215,12 @@ public static void DrawMultiPolygon(Graphics g, IMultiPolygon multiPolygon, Brus
         /// <param name="map">Map reference</param>
         /// <returns>The area of the map that was affected by the drawing of the geometry.</returns>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawMultiPolygonEx(Graphics g, IMultiPolygon multiPolygon, Brush brush, Pen pen, bool clip, MapViewport map)
+        public static RectangleF DrawMultiPolygonEx(Graphics g, MultiPolygon multiPolygon, Brush brush, Pen pen, bool clip, MapViewport map)
         {
             var canvasArea = RectangleF.Empty;
-            for (var i = 0; i < multiPolygon.NumGeometries;i++ )
+            for (var i = 0; i < multiPolygon.NumGeometries; i++)
             {
-                var p = (IPolygon)multiPolygon[i];
+                var p = (Polygon)multiPolygon[i];
                 var rect = DrawPolygonEx(g, p, brush, pen, clip, map);
                 canvasArea = rect.ExpandToInclude(canvasArea);
             }
@@ -237,7 +237,7 @@ public static RectangleF DrawMultiPolygonEx(Graphics g, IMultiPolygon multiPolyg
         /// <param name="clip">Specifies whether polygon clipping should be applied</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawPolygon(Graphics g, IPolygon pol, Brush brush, Pen pen, bool clip, MapViewport map)
+        public static void DrawPolygon(Graphics g, Polygon pol, Brush brush, Pen pen, bool clip, MapViewport map)
         {
             DrawPolygonEx(g, pol, brush, pen, clip, map);
         }
@@ -252,7 +252,7 @@ public static void DrawPolygon(Graphics g, IPolygon pol, Brush brush, Pen pen, b
         /// <param name="clip">Specifies whether polygon clipping should be applied</param>
         /// <param name="map">Map reference</param>
         /// <returns>The area of the map that was affected by the drawing of the geometry.</returns>
-        public static RectangleF DrawPolygonEx(Graphics g, IPolygon pol, Brush brush, Pen pen, bool clip, MapViewport map)
+        public static RectangleF DrawPolygonEx(Graphics g, Polygon pol, Brush brush, Pen pen, bool clip, MapViewport map)
         {
             if (pol.ExteriorRing == null)
                 return RectangleF.Empty;
@@ -272,7 +272,7 @@ public static RectangleF DrawPolygonEx(Graphics g, IPolygon pol, Brush brush, Pe
                 //Add the interior polygons (holes)
                 if (pol.NumInteriorRings > 0)
                 {
-                    foreach (ILinearRing ring in pol.InteriorRings)
+                    foreach (LinearRing ring in pol.InteriorRings)
                     {
                         points = ring.TransformToImage(map);
                         if (!clip)
@@ -352,9 +352,9 @@ public static PointF[] LimitValues(PointF[] vertices, float limit)
         public static SizeOfStringDelegate SizeOfString
         {
             get { return _sizeOfString ?? (_sizeOfString = SizeOfStringCeiling); }
-            set 
-            {  
-                if (value != null )
+            set
+            {
+                if (value != null)
                     _sizeOfString = value;
             }
         }
@@ -382,7 +382,7 @@ public static SizeF SizeOfStringBase(Graphics g, string text, Font font)
         public static SizeF SizeOfString74(Graphics g, string text, Font font)
         {
             var s = g.MeasureString(text, font);
-            return new SizeF(s.Width * 0.74f+1f, s.Height * 0.74f); 
+            return new SizeF(s.Width * 0.74f + 1f, s.Height * 0.74f);
         }
         /// <summary>
         /// Function to get the <see cref="SizeF"/> of a string when rendered with the given font.
@@ -472,7 +472,7 @@ public static RectangleF DrawLabelEx(Graphics g, PointF labelPoint, PointF offse
                 rotationPoint = rotationPoint ?? labelPoint;
 
                 origTrans = g.Transform.Clone();
-                
+
                 g.TranslateTransform(rotationPoint.Value.X, rotationPoint.Value.Y);
                 g.RotateTransform(rotation);
 
@@ -489,9 +489,9 @@ public static RectangleF DrawLabelEx(Graphics g, PointF labelPoint, PointF offse
 
             using (var path = new GraphicsPath())
             {
-                path.AddString(text, font.FontFamily, (int) font.Style, font.Size,
+                path.AddString(text, font.FontFamily, (int)font.Style, font.Size,
                     new RectangleF(labelPoint, labelSize),
-                    new StringFormat {Alignment = sAlign});
+                    new StringFormat { Alignment = sAlign });
 
                 if (halo != null)
                 {
@@ -509,9 +509,9 @@ public static RectangleF DrawLabelEx(Graphics g, PointF labelPoint, PointF offse
                 origTrans.Dispose();
             }
 
-            if (symTrans == null) 
+            if (symTrans == null)
                 return background;
-            
+
             var pts = background.ToPointArray();
             symTrans.TransformPoints(pts);
             symTrans.Dispose();
@@ -679,7 +679,7 @@ internal static PointF[] ClipPolygon(PointF[] vertices, int width, int height)
         /// <param name="offset">Symbol offset af scale=1</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawPoint(Graphics g, IPoint point, Brush b, float size, PointF offset, MapViewport map)
+        public static void DrawPoint(Graphics g, Point point, Brush b, float size, PointF offset, MapViewport map)
         {
             DrawPointEx(g, point, b, size, offset, map);
         }
@@ -693,7 +693,7 @@ public static void DrawPoint(Graphics g, IPoint point, Brush b, float size, Poin
         /// <param name="offset">Symbol offset af scale=1</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawPointEx(Graphics g, IPoint point, Brush b, float size, PointF offset, MapViewport map)
+        public static RectangleF DrawPointEx(Graphics g, Point point, Brush b, float size, PointF offset, MapViewport map)
         {
             if (point == null)
                 return RectangleF.Empty;
@@ -702,10 +702,10 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Brush b, float si
 
             var width = size;
             var height = size;
-            
+
             float minX = (int)pp.X - width / 2 + offset.X;
-            float minY = (int) pp.Y - height / 2 + offset.Y;
-            
+            float minY = (int)pp.Y - height / 2 + offset.Y;
+
             g.FillEllipse(b, minX, minY, width, height);
 
             return new RectangleF(minX, minY, width, height);
@@ -719,7 +719,7 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Brush b, float si
         /// <param name="symbolizer">Symbolizer to decorate point</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawPoint(IPointSymbolizer symbolizer, Graphics g, IPoint point, MapViewport map) => DrawPointEx(symbolizer, g, point, map);
+        public static void DrawPoint(IPointSymbolizer symbolizer, Graphics g, Point point, MapViewport map) => DrawPointEx(symbolizer, g, point, map);
 
         /// <summary>
         /// Renders a point to the map.
@@ -729,13 +729,13 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Brush b, float si
         /// <param name="symbolizer">Symbolizer to decorate point</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawPointEx(IPointSymbolizer symbolizer, Graphics g, IPoint point, MapViewport map)
+        public static RectangleF DrawPointEx(IPointSymbolizer symbolizer, Graphics g, Point point, MapViewport map)
         {
             if (point == null)
-                return RectangleF.Empty; 
+                return RectangleF.Empty;
 
             symbolizer.Render(map, point, g);
-             return ((IPointSymbolizerEx)symbolizer).CanvasArea; 
+            return ((IPointSymbolizerEx)symbolizer).CanvasArea;
         }
 
         /// <summary>
@@ -749,7 +749,7 @@ public static RectangleF DrawPointEx(IPointSymbolizer symbolizer, Graphics g, IP
         /// <param name="rotation">Symbol rotation in degrees</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawPoint(Graphics g, IPoint point, Image symbol, float symbolscale, PointF offset,
+        public static void DrawPoint(Graphics g, Point point, Image symbol, float symbolscale, PointF offset,
             float rotation, MapViewport map) => DrawPointEx(g, point, symbol, symbolscale, offset, rotation, map);
 
         /// <summary>
@@ -763,7 +763,7 @@ public static void DrawPoint(Graphics g, IPoint point, Image symbol, float symbo
         /// <param name="rotation">Symbol rotation in degrees</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawPointEx(Graphics g, IPoint point, Image symbol, float symbolScale, PointF offset,
+        public static RectangleF DrawPointEx(Graphics g, Point point, Image symbol, float symbolScale, PointF offset,
             float rotation, MapViewport map)
         {
             if (point == null)
@@ -779,7 +779,7 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Image symbol, flo
             float left = pp.X - width / 2 + offset.X * symbolScale;
             float top = pp.Y - height / 2 + offset.Y * symbolScale;
 
-            Matrix symTrans = null; 
+            Matrix symTrans = null;
             Matrix origTrans = null;
 
             if (rotation != 0 && !Single.IsNaN(rotation))
@@ -800,16 +800,16 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Image symbol, flo
             {
                 g.DrawImage(symbol, left, top, width, height);
             }
-            
+
             if (origTrans != null)
             {
                 g.Transform = origTrans;
                 origTrans.Dispose();
             }
 
-            if (symTrans== null)
+            if (symTrans == null)
                 return new RectangleF(left, top, width, height);
-            
+
             var pts = new[]
             {
                 new PointF(left, top),
@@ -823,7 +823,7 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Image symbol, flo
         }
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
@@ -833,11 +833,11 @@ public static RectangleF DrawPointEx(Graphics g, IPoint point, Image symbol, flo
         /// <param name="rotation">Symbol rotation in degrees</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawMultiPoint(Graphics g, IMultiPoint points, Image symbol, float symbolScale,
+        public static void DrawMultiPoint(Graphics g, MultiPoint points, Image symbol, float symbolScale,
             PointF offset, float rotation, MapViewport map) => DrawMultiPointEx(g, points, symbol, symbolScale, offset, rotation, map);
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
@@ -847,45 +847,45 @@ public static void DrawMultiPoint(Graphics g, IMultiPoint points, Image symbol,
         /// <param name="rotation">Symbol rotation in degrees</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawMultiPointEx(Graphics g, IMultiPoint points, Image symbol, float symbolScale,
+        public static RectangleF DrawMultiPointEx(Graphics g, MultiPoint points, Image symbol, float symbolScale,
             PointF offset, float rotation, MapViewport map)
         {
             var canvasArea = RectangleF.Empty;
             for (var i = 0; i < points.NumGeometries; i++)
             {
-                var rect = DrawPointEx(g, (IPoint) points[i], symbol, symbolScale, offset, rotation, map);
-                canvasArea  = rect.ExpandToInclude(canvasArea);
+                var rect = DrawPointEx(g, (Point)points[i], symbol, symbolScale, offset, rotation, map);
+                canvasArea = rect.ExpandToInclude(canvasArea);
             }
             return canvasArea;
         }
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
         /// <param name="symbolizer">Symbolizer to decorate point</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawMultiPoint(IPointSymbolizer symbolizer, Graphics g, IMultiPoint points, MapViewport map)
+        public static void DrawMultiPoint(IPointSymbolizer symbolizer, Graphics g, MultiPoint points, MapViewport map)
             => DrawMultiPointEx(symbolizer, g, points, map);
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
         /// <param name="symbolizer">Symbolizer to decorate point</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawMultiPointEx(IPointSymbolizer symbolizer, Graphics g, IMultiPoint points, MapViewport map)
+        public static RectangleF DrawMultiPointEx(IPointSymbolizer symbolizer, Graphics g, MultiPoint points, MapViewport map)
         {
             symbolizer.Render(map, points, g);
             return ((IPointSymbolizerEx)symbolizer).CanvasArea;
         }
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
@@ -894,11 +894,11 @@ public static RectangleF DrawMultiPointEx(IPointSymbolizer symbolizer, Graphics
         /// <param name="offset">Symbol offset af scale=1</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static void DrawMultiPoint(Graphics g, IMultiPoint points, Brush brush, float size, PointF offset, MapViewport map)
+        public static void DrawMultiPoint(Graphics g, MultiPoint points, Brush brush, float size, PointF offset, MapViewport map)
             => DrawMultiPointEx(g, points, brush, size, offset, map);
 
         /// <summary>
-        /// Renders a <see cref="GeoAPI.Geometries.IMultiPoint"/> to the map.
+        /// Renders a <see cref="NetTopologySuite.Geometries.MultiPoint"/> to the map.
         /// </summary>
         /// <param name="g">Graphics reference</param>
         /// <param name="points">MultiPoint to render</param>
@@ -907,12 +907,12 @@ public static void DrawMultiPoint(Graphics g, IMultiPoint points, Brush brush, f
         /// <param name="offset">Symbol offset af scale=1</param>
         /// <param name="map">Map reference</param>
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static RectangleF DrawMultiPointEx(Graphics g, IMultiPoint points, Brush brush, float size, PointF offset, MapViewport map)
+        public static RectangleF DrawMultiPointEx(Graphics g, MultiPoint points, Brush brush, float size, PointF offset, MapViewport map)
         {
             var canvasArea = RectangleF.Empty;
             for (var i = 0; i < points.NumGeometries; i++)
             {
-                var point = (IPoint) points[i];
+                var point = (Point)points[i];
                 var rect = DrawPointEx(g, point, brush, size, offset, map);
                 canvasArea = rect.ExpandToInclude(canvasArea);
             }
@@ -1040,7 +1040,7 @@ internal static RectangleF ToRectangleF(this PointF[] self)
         /// <returns></returns>
         internal static PointF[] ToPointArray(this RectangleF self)
         {
-            return new []
+            return new[]
             {
                 new PointF(self.X, self.Y),
                 new PointF(self.X + self.Width, self.Y),
@@ -1074,23 +1074,23 @@ internal static System.Drawing.Point[] ToPointArray(this Rectangle self)
         /// <remarks>Either of the arrays could be empty, so must return new array</remarks>
         internal static PointF[] Union(this PointF[] self, PointF[] other)
         {
-            if (other.Length == 0) 
+            if (other.Length == 0)
                 return self;
 
             if (self.Length == 0)
                 return other;
 
-            float minX = Math.Min(self.Min(p => p.X), other.Min(p => p.X)); 
+            float minX = Math.Min(self.Min(p => p.X), other.Min(p => p.X));
             float maxX = Math.Max(self.Max(p => p.X), other.Max(p => p.X));
             float minY = Math.Min(self.Min(p => p.Y), other.Min(p => p.Y));
             float maxY = Math.Max(self.Max(p => p.Y), other.Max(p => p.Y));
 
             float width = maxX - minX;
             float height = maxY - minY;
-            
-            return new []
+
+            return new[]
             {
-                new PointF(minX, minY), 
+                new PointF(minX, minY),
                 new PointF(minX + width, minY),
                 new PointF(minX + width, minY + height),
                 new PointF(minX, minY + height),
diff --git a/SharpMap/Session.cs b/SharpMap/Session.cs
index 83b2d197..5dc1af09 100644
--- a/SharpMap/Session.cs
+++ b/SharpMap/Session.cs
@@ -1,6 +1,7 @@
-using System;
-using Common.Logging;
-using GeoAPI;
+using Common.Logging;
+using NetTopologySuite;
+using SharpMap.CoordinateSystems;
+using System;
 
 namespace SharpMap
 {
@@ -9,8 +10,8 @@ namespace SharpMap
     /// </summary>
     public class Session : ISession
     {
-        private static ICoordinateSystemRepository _repository;
-        private ICoordinateSystemServices _coordinateSystemServices;
+        private ICoordinateSystemRepository _repository;
+        private CoordinateSystemServices _coordinateSystemServices;
 
         /// <summary>
         /// Static constructor
@@ -28,12 +29,12 @@ static Session()
         /// <summary>
         /// The geometry services instance
         /// </summary>
-        public IGeometryServices GeometryServices { get; set; }
+        public NtsGeometryServices GeometryServices { get; set; }
 
         /// <summary>
         /// Gets the coordinate system services instance
         /// </summary>
-        public ICoordinateSystemServices CoordinateSystemServices
+        public CoordinateSystemServices CoordinateSystemServices
         {
             get
             {
@@ -60,7 +61,7 @@ public ICoordinateSystemRepository CoordinateSystemRepository
         /// </summary>
         /// <param name="geometryServices">The geometry services class</param>
         /// <returns>A reference to this session</returns>
-        public ISession SetGeometryServices(IGeometryServices geometryServices)
+        public ISession SetGeometryServices(NtsGeometryServices geometryServices)
         {
             GeometryServices = geometryServices;
             return this;
@@ -71,7 +72,7 @@ public ISession SetGeometryServices(IGeometryServices geometryServices)
         /// </summary>
         /// <param name="coordinateSystemServices">The coordinate system services class</param>
         /// <returns>A reference to this session</returns>
-        public ISession SetCoordinateSystemServices(ICoordinateSystemServices coordinateSystemServices)
+        public ISession SetCoordinateSystemServices(CoordinateSystemServices coordinateSystemServices)
         {
             CoordinateSystemServices = coordinateSystemServices;
             return this;
@@ -100,4 +101,4 @@ public ISession ReadConfiguration()
         }
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/SharpMap.csproj b/SharpMap/SharpMap.csproj
index 0cafd443..45f24081 100644
--- a/SharpMap/SharpMap.csproj
+++ b/SharpMap/SharpMap.csproj
@@ -24,12 +24,12 @@
     <ItemGroup>
         <PackageReference Include="Common.Logging" Version="3.4.1" />
         <PackageReference Include="Common.Logging.Core" Version="3.4.1" />
-        <PackageReference Include="GeoAPI.CoordinateSystems" Version="1.7.5" />
-        <PackageReference Include="NetTopologySuite.Core" Version="1.15.3" />
-        <PackageReference Include="System.Drawing.Common" Version="4.6.0" />
-        <PackageReference Include="System.Data.SqlClient" Version="4.7.0" />
+        <PackageReference Include="NetTopologySuite" Version="2.5.0" />
+        <PackageReference Include="ProjNet" Version="2.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+        <PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
         <PackageReference Include="System.Drawing.Primitives" Version="4.3.0" />
-        <PackageReference Include="System.Memory" Version="4.5.3" />
+        <PackageReference Include="System.Memory" Version="4.5.5" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(EnableApiCompat)' == 'true' ">
@@ -39,6 +39,10 @@
         <ResolvedMatchingContract Include="$(NugetPackageRoot)sharpmap\1.1.0\lib\net40-client\SharpMap.dll" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
+
 
     <!--
     <PropertyGroup>
diff --git a/SharpMap/Styles/GroupStyle.cs b/SharpMap/Styles/GroupStyle.cs
index 2fd2a234..539f547e 100644
--- a/SharpMap/Styles/GroupStyle.cs
+++ b/SharpMap/Styles/GroupStyle.cs
@@ -61,6 +61,6 @@ public void AddStyle(VectorStyle style)
         {
             _styles.Add(style);
         }
-    
+
     }
 }
diff --git a/SharpMap/Styles/LabelStyle.cs b/SharpMap/Styles/LabelStyle.cs
index cb501e82..4f9c1c10 100644
--- a/SharpMap/Styles/LabelStyle.cs
+++ b/SharpMap/Styles/LabelStyle.cs
@@ -15,13 +15,11 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using SharpMap.Rendering.Thematics;
 using System;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.Net.Mime;
 using System.Runtime.CompilerServices;
-using Common.Logging;
-using SharpMap.Rendering.Thematics;
 
 namespace SharpMap.Styles
 {
@@ -31,8 +29,8 @@ namespace SharpMap.Styles
     [Serializable]
     public class LabelStyle : Style, ICloneable
     {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (LabelStyle));
-        
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(LabelStyle));
+
         #region HorizontalAlignmentEnum enum
 
         /// <summary>
@@ -136,7 +134,7 @@ protected override void ReleaseManagedResources()
         /// <returns>A LabelStyle resembling this instance.</returns>
         public LabelStyle Clone()
         {
-            var res = (LabelStyle) MemberwiseClone();
+            var res = (LabelStyle)MemberwiseClone();
 
             lock (this)
             {
@@ -147,7 +145,7 @@ public LabelStyle Clone()
                     res._Halo = (Pen)_Halo.Clone();
 
                 if (_BackColor != null)
-                    res._BackColor = (Brush) _BackColor.Clone();
+                    res._BackColor = (Brush)_BackColor.Clone();
             }
 
             return res;
@@ -205,7 +203,7 @@ public Font Font
             set
             {
                 if (value.Unit != GraphicsUnit.Point)
-                    _logger.Error( fmh => fmh("Only assign fonts with size in Points"));
+                    _logger.Error(fmh => fmh("Only assign fonts with size in Points"));
                 _Font = value;
 
                 // we can't dispose the previous font 
@@ -215,7 +213,7 @@ public Font Font
             }
         }
 
-        [NonSerialized] 
+        [NonSerialized]
         private float _cachedDpiY = 0f;
         [NonSerialized]
         private Font _cachedFontForGraphics = null;
diff --git a/SharpMap/Styles/SldConverter.cs b/SharpMap/Styles/SldConverter.cs
index 8312fc6a..1ecbd7d5 100644
--- a/SharpMap/Styles/SldConverter.cs
+++ b/SharpMap/Styles/SldConverter.cs
@@ -15,13 +15,13 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.Drawing.Drawing2D;
-using System.IO;
-using System.Linq;
-using System.Xml;
+using System.Drawing.Drawing2D;
+using System.IO;
+using System.Linq;
+using System.Xml;
 
 namespace SharpMap.Styles
 {
@@ -77,10 +77,10 @@ public static IDictionary<string, VectorStyle> ParseFeatureStyle(XmlDocument doc
             var featureTypeStyleEls = sldConfig.SelectNodes("//sld:FeatureTypeStyle", nsm);
             if (featureTypeStyleEls == null)
                 return null;
-            
+
             foreach (XmlElement featTypeStyle in featureTypeStyleEls)
             {
-                var el = (XmlElement) featTypeStyle.SelectSingleNode("sld:FeatureTypeName", nsm);
+                var el = (XmlElement)featTypeStyle.SelectSingleNode("sld:FeatureTypeName", nsm);
                 var mainName = el != null ? el.InnerText : "";
                 var rules = featTypeStyle.SelectNodes("sld:Rule", nsm);
 
@@ -88,7 +88,7 @@ public static IDictionary<string, VectorStyle> ParseFeatureStyle(XmlDocument doc
                 {
                     foreach (XmlElement rule in rules)
                     {
-                        el = (XmlElement) rule.SelectSingleNode("sld:Name", nsm);
+                        el = (XmlElement)rule.SelectSingleNode("sld:Name", nsm);
                         var name = el != null ? el.InnerText : "";
                         var style = new VectorStyle();
                         SetSymbologyForRule(style, rule, nsm);
@@ -304,7 +304,7 @@ string pointSymbolPath
 
                 if (!String.IsNullOrEmpty(strokeOpacity))
                 {
-                    opacity = Convert.ToInt32(Math.Round(Convert.ToDouble(strokeOpacity)/0.0039215, 0));
+                    opacity = Convert.ToInt32(Math.Round(Convert.ToDouble(strokeOpacity) / 0.0039215, 0));
                     if (opacity > 255)
                         opacity = 255;
                 }
@@ -365,7 +365,7 @@ string pointSymbolPath
                     Func<string[], float[]> processor = strings =>
                     {
                         var res = new float[strings.Length];
-                        for(var i = 0; i < strings.Length; i++)
+                        for (var i = 0; i < strings.Length; i++)
                             res[i] = float.Parse(strings[i]);
                         return res.ToArray();
                     };
@@ -391,7 +391,7 @@ string pointSymbolPath
 
                 if (!String.IsNullOrEmpty(fillOpacity))
                 {
-                    opacity = Convert.ToInt32(Math.Round(Convert.ToDouble(fillOpacity)/0.0039215, 0));
+                    opacity = Convert.ToInt32(Math.Round(Convert.ToDouble(fillOpacity) / 0.0039215, 0));
                     if (opacity > 255)
                         opacity = 255;
                 }
diff --git a/SharpMap/Styles/Style.cs b/SharpMap/Styles/Style.cs
index 94971b4b..fa4a9033 100644
--- a/SharpMap/Styles/Style.cs
+++ b/SharpMap/Styles/Style.cs
@@ -15,8 +15,8 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
 using SharpMap.Base;
+using System;
 
 namespace SharpMap.Styles
 {
diff --git a/SharpMap/Styles/VectorStyle.cs b/SharpMap/Styles/VectorStyle.cs
index d382d2c2..801b881d 100644
--- a/SharpMap/Styles/VectorStyle.cs
+++ b/SharpMap/Styles/VectorStyle.cs
@@ -19,7 +19,6 @@
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Reflection;
-using GeoAPI.Geometries;
 using SharpMap.Rendering.Symbolizer;
 using Common.Logging;
 #if NETSTANDARD2_0
@@ -96,13 +95,13 @@ public VectorStyle Clone()
             }
             return vs;
         }
-        
+
         object ICloneable.Clone()
         {
             return Clone();
         }
 
-#region Privates
+        #region Privates
 
         private Brush _fillStyle;
         private Pen _lineStyle;
@@ -111,7 +110,7 @@ object ICloneable.Clone()
         private Image _symbol;
         private float _lineOffset;
 
-#endregion
+        #endregion
 
         /// <summary>
         /// Initializes a new VectorStyle and sets the default values
@@ -127,7 +126,7 @@ public VectorStyle()
         {
             Outline = new Pen(Color.Black, 1);
             Line = new Pen(Color.Black, 1);
-            Fill = new SolidBrush (Color.FromArgb(192, Color.Black));
+            Fill = new SolidBrush(Color.FromArgb(192, Color.Black));
             EnableOutline = false;
             SymbolScale = 1f;
             PointColor = new SolidBrush(Color.Red);
@@ -135,7 +134,7 @@ public VectorStyle()
             LineOffset = 0;
         }
 
-#region Properties
+        #region Properties
 
         private PointF _symbolOffset;
         private float _symbolRotation;
@@ -195,7 +194,7 @@ public Brush PointColor
         public float PointSize
         {
             get { return _pointSize; }
-            set { _pointSize= value; }
+            set { _pointSize = value; }
         }
 
         /// <summary>
@@ -256,22 +255,22 @@ public float LineOffset
         /// <summary>
         /// Gets or sets the symbolizer for puntal geometries
         /// </summary>
-        /// <remarks>Setting this property will lead to ignorance towards all <see cref="IPuntal"/> related style settings</remarks>
+        /// <remarks>Setting this property will lead to ignorance towards all <see cref="NetTopologySuite.Geometries.IPuntal"/> related style settings</remarks>
         public IPointSymbolizer PointSymbolizer { get; set; }
 
         /// <summary>
         /// Gets or sets the symbolizer for lineal geometries
         /// </summary>
-        /// <remarks>Setting this property will lead to ignorance towards all <see cref="ILineal"/> related style settings</remarks>
+        /// <remarks>Setting this property will lead to ignorance towards all <see cref="NetTopologySuite.Geometries.ILineal"/> related style settings</remarks>
         public ILineSymbolizer LineSymbolizer { get; set; }
 
         /// <summary>
         /// Gets or sets the symbolizer for polygonal geometries
         /// </summary>
-        /// <remarks>Setting this property will lead to ignorance towards all <see cref="IPolygonal"/> related style settings</remarks>
+        /// <remarks>Setting this property will lead to ignorance towards all <see cref="NetTopologySuite.Geometries.IPolygonal"/> related style settings</remarks>
         public IPolygonSymbolizer PolygonSymbolizer { get; set; }
 
-#endregion
+        #endregion
 
         /// <summary>
         /// Releases managed resources
@@ -465,8 +464,8 @@ private static void RandomizePolygonalStyle(VectorStyle res)
         public static Color CreateRandomKnownColor(int alpha = 255)
         {
             var kc = (KnownColor)_rnd.Next(28, 168);
-            return alpha == 255 
-                ? SmColor.FromKnownColor(kc) 
+            return alpha == 255
+                ? SmColor.FromKnownColor(kc)
                 : Color.FromArgb(alpha, SmColor.FromKnownColor(kc));
         }
     }
diff --git a/SharpMap/Utilities/GeoSpatialMath.cs b/SharpMap/Utilities/GeoSpatialMath.cs
index e658a6d4..0b59374c 100644
--- a/SharpMap/Utilities/GeoSpatialMath.cs
+++ b/SharpMap/Utilities/GeoSpatialMath.cs
@@ -1,5 +1,5 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
+using System;
 
 namespace SharpMap.Utilities
 {
@@ -11,7 +11,7 @@ public static class GeoSpatialMath
         /// <summary>
         /// Conversion factor degrees to radians
         /// </summary>
-        public const double DegToRad = Math.PI/180d; //0.01745329252; // Convert Degrees to Radians
+        public const double DegToRad = Math.PI / 180d; //0.01745329252; // Convert Degrees to Radians
 
         /// <summary>
         /// Meters per inch
@@ -37,18 +37,18 @@ public static class GeoSpatialMath
         /// Web Mercator SRID constant
         /// </summary>
         public const int WebMercatorSrid = 3857;
-        
+
         /// <summary>
         /// Web Mercator SRID constant
         /// </summary>
         public const double WebMercatorRadius = 6378137.0;
-        
+
         /// <summary>
         /// Web Mercator Domain as Envelope
         /// </summary>
-        public static readonly Envelope WebMercatorEnv = new Envelope(-20037508.34,20037508.34,-20000000,20000000);
+        public static readonly Envelope WebMercatorEnv = new Envelope(-20037508.34, 20037508.34, -20000000, 20000000);
+
 
-        
         /// <summary>
         /// Calculate the distance between 2 points on the great circle
         /// </summary>
@@ -60,10 +60,10 @@ public static class GeoSpatialMath
         public static double GreatCircleDistance(double lon1, double lat1, double lon2, double lat2)
         {
             var lonDistance = DiffLongitude(lon1, lon2);
-            var arg1 = Math.Sin(lat1*DegToRad)*Math.Sin(lat2*DegToRad);
-            var arg2 = Math.Cos(lat1*DegToRad)*Math.Cos(lat2*DegToRad)*Math.Cos(lonDistance*DegToRad);
+            var arg1 = Math.Sin(lat1 * DegToRad) * Math.Sin(lat2 * DegToRad);
+            var arg2 = Math.Cos(lat1 * DegToRad) * Math.Cos(lat2 * DegToRad) * Math.Cos(lonDistance * DegToRad);
 
-            return MetersPerDegreeAtEquator*Math.Acos(arg1 + arg2)/DegToRad;
+            return MetersPerDegreeAtEquator * Math.Acos(arg1 + arg2) / DegToRad;
         }
 
         /// <summary>
@@ -79,7 +79,7 @@ public static double GreatCircleDistance(double lon1, double lon2, double lat)
             lat = Math.Abs(lat);
             if (lat >= 90.0)
                 lat = 89.999;
-            var distance = Math.Cos(lat*DegToRad)*MetersPerDegreeAtEquator*lonDistance;
+            var distance = Math.Cos(lat * DegToRad) * MetersPerDegreeAtEquator * lonDistance;
             return distance;
         }
 
diff --git a/SharpMap/Utilities/Indexing/BinaryTree.cs b/SharpMap/Utilities/Indexing/BinaryTree.cs
index 8ef5d9ce..5e81d5ba 100644
--- a/SharpMap/Utilities/Indexing/BinaryTree.cs
+++ b/SharpMap/Utilities/Indexing/BinaryTree.cs
@@ -15,15 +15,14 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
-using Common.Logging;
 
 namespace SharpMap.Utilities.Indexing
 {
-// Binary Tree not working yet on Mono 
-// see bug: http://bugzilla.ximian.com/show_bug.cgi?id=78502
+    // Binary Tree not working yet on Mono 
+    // see bug: http://bugzilla.ximian.com/show_bug.cgi?id=78502
 #if !MONO
     [Serializable]
     internal class Node<T, U> where T : IComparable<T>
@@ -74,7 +73,7 @@ public Node(T item, U itemIndex, Node<T, U> right, Node<T, U> left)
     [Serializable]
     public class BinaryTree<T, U> where T : IComparable<T>
     {
-        static readonly ILog _logger = LogManager.GetLogger(typeof(BinaryTree<T,U>));
+        static readonly ILog _logger = LogManager.GetLogger(typeof(BinaryTree<T, U>));
 
         private readonly Node<T, U> _root;
 
@@ -221,10 +220,10 @@ private IEnumerable<ItemValue> ScanFind(T value, Node<T, U> root)
                 if (root.LeftNode != null)
                 {
                     //if (root.LeftNode.Item.Value.CompareTo(value) > 0)
-                        foreach (ItemValue item in ScanFind(value, root.LeftNode))
-                        {
-                            yield return item;
-                        }
+                    foreach (ItemValue item in ScanFind(value, root.LeftNode))
+                    {
+                        yield return item;
+                    }
                 }
             }
 
@@ -236,10 +235,10 @@ private IEnumerable<ItemValue> ScanFind(T value, Node<T, U> root)
                 if (root.RightNode != null)
                 {
                     //if (root.RightNode.Item.Value.CompareTo(value) > 0)
-                        foreach (ItemValue item in ScanFind(value, root.RightNode))
-                        {
-                            yield return item;
-                        }
+                    foreach (ItemValue item in ScanFind(value, root.RightNode))
+                    {
+                        yield return item;
+                    }
                 }
             }
         }
diff --git a/SharpMap/Utilities/Indexing/SpatialIndexing.cs b/SharpMap/Utilities/Indexing/SpatialIndexing.cs
index 646cac54..0f797118 100644
--- a/SharpMap/Utilities/Indexing/SpatialIndexing.cs
+++ b/SharpMap/Utilities/Indexing/SpatialIndexing.cs
@@ -15,16 +15,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using Common.Logging;
+using NetTopologySuite.Geometries;
+using SharpMap.Data.Providers;
+using SharpMap.Utilities.Indexing;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
-using Common.Logging;
-using GeoAPI.Geometries;
-using NetTopologySuite.Utilities;
-using SharpMap.Data.Providers;
-using SharpMap.Utilities.Indexing;
 
 namespace SharpMap.Utilities.Indexing
 {
@@ -252,9 +251,9 @@ public QuadTree(List<BoxObjects> objList, uint depth, Heuristic heurdata)
                 var geoavg = 0d; // geometric average - midpoint of ALL the objects
 
                 // go through all bbox and calculate the average of the midpoints
-                var frac = 1.0d/objList.Count;
+                var frac = 1.0d / objList.Count;
                 for (var i = 0; i < objList.Count; i++)
-                    geoavg += objList[i].Box.Centre[longaxis]*frac;
+                    geoavg += objList[i].Box.Centre[longaxis] * frac;
 
                 // bucket bbox based on their midpoint's side of the geo average in the longest axis
                 for (var i = 0; i < objList.Count; i++)
@@ -304,18 +303,18 @@ private static void SplitBoundingBox(Envelope input, out Envelope out1, out Enve
             /* -------------------------------------------------------------------- */
             if (input.Width > input.Height)
             {
-                range = input.Width*SplitRatio;
+                range = input.Width * SplitRatio;
 
                 out1 = new Envelope(input.BottomLeft(), new Coordinate(input.MinX + range, input.MaxY));
                 out2 = new Envelope(new Coordinate(input.MaxX - range, input.MinY), input.TopRight());
             }
 
-                /* -------------------------------------------------------------------- */
-                /*      Otherwise split in Y direction.                                 */
-                /* -------------------------------------------------------------------- */
+            /* -------------------------------------------------------------------- */
+            /*      Otherwise split in Y direction.                                 */
+            /* -------------------------------------------------------------------- */
             else
             {
-                range = input.Height*SplitRatio;
+                range = input.Height * SplitRatio;
 
                 out1 = new Envelope(input.BottomLeft(), new Coordinate(input.MaxX, input.MinY + range));
                 out2 = new Envelope(new Coordinate(input.MinX, input.MaxY - range), input.TopRight());
@@ -450,7 +449,7 @@ private static QuadTree ReadNode(uint depth, BinaryReader br)
                     var box = new BoxObjects();
                     box.Box = new Envelope(new Coordinate(br.ReadDouble(), br.ReadDouble()),
                         new Coordinate(br.ReadDouble(), br.ReadDouble()));
-                    box.ID = (uint) br.ReadInt32();
+                    box.ID = (uint)br.ReadInt32();
                     node._objList.Add(box);
                 }
             }
@@ -626,7 +625,7 @@ public void Dispose()
         public static double ErrorMetric(Envelope box)
         {
             var temp = new Coordinate(1, 1).Add(box.Max().Subtract(box.Min()));
-            return temp.X*temp.Y;
+            return temp.X * temp.Y;
         }
 
         /// <summary>
@@ -703,7 +702,7 @@ public struct BoxObjects : ISpatialIndexItem<uint>
     /// </summary>
     public class QuadTreeFactory : ISpatialIndexFactory<uint>
     {
-        private static readonly ILog _logger = LogManager.GetLogger(typeof (QuadTreeFactory));
+        private static readonly ILog _logger = LogManager.GetLogger(typeof(QuadTreeFactory));
 
         private static ShapeFile.SpatialIndexCreation _spatialIndexSpatialIndexCreationOption;
 
@@ -732,7 +731,7 @@ public static ShapeFile.SpatialIndexCreation SpatialIndexCreationOption
         /// <returns>A new spatial index item</returns>
         public ISpatialIndexItem<uint> Create(uint oid, Envelope box)
         {
-            return new QuadTree.BoxObjects {ID = oid, Box = box};
+            return new QuadTree.BoxObjects { ID = oid, Box = box };
         }
 
         /// <summary>
@@ -807,7 +806,7 @@ private static QuadTree CreateSpatialIndexLinear(Envelope extent, int expectedNu
             var root = QuadTree.CreateRootNode(extent);
             var h = new Heuristic
             {
-                maxdepth = (int) Math.Ceiling(Math.Log(expectedNumberOfEntries, 2)),
+                maxdepth = (int)Math.Ceiling(Math.Log(expectedNumberOfEntries, 2)),
                 // These are not used for this approach
                 minerror = 10,
                 tartricnt = 5,
@@ -851,7 +850,7 @@ private static QuadTree CreateSpatialIndexRecursive(Envelope extent, int expecte
             }
 
             Heuristic heur;
-            heur.maxdepth = (int) Math.Ceiling(Math.Log(objList.Count, 2));
+            heur.maxdepth = (int)Math.Ceiling(Math.Log(objList.Count, 2));
             heur.minerror = 10;
             heur.tartricnt = 5;
             heur.mintricnt = 2;
diff --git a/SharpMap/Utilities/LeastSquaresTransform.cs b/SharpMap/Utilities/LeastSquaresTransform.cs
index 976c4516..dd2c7834 100644
--- a/SharpMap/Utilities/LeastSquaresTransform.cs
+++ b/SharpMap/Utilities/LeastSquaresTransform.cs
@@ -15,9 +15,9 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Utilities
 {
@@ -131,10 +131,10 @@ public double[] GetAffineTransformation()
                 meanOutput.X += outputs[i].X;
                 meanOutput.Y += outputs[i].Y;
             }
-            meanInput.X = Math.Round(meanInput.X/inputs.Count);
-            meanInput.Y = Math.Round(meanInput.Y/inputs.Count);
-            meanOutput.X = Math.Round(meanOutput.X/inputs.Count);
-            meanOutput.Y = Math.Round(meanOutput.Y/inputs.Count);
+            meanInput.X = Math.Round(meanInput.X / inputs.Count);
+            meanInput.Y = Math.Round(meanInput.Y / inputs.Count);
+            meanOutput.X = Math.Round(meanOutput.X / inputs.Count);
+            meanOutput.Y = Math.Round(meanOutput.Y / inputs.Count);
 
             double[][] N = CreateMatrix(3, 3);
             //Create normal equation: transpose(B)*B
@@ -148,7 +148,7 @@ public double[] GetAffineTransformation()
                 outputs[i].Y -= meanOutput.Y;
                 //Calculate summed values
                 N[0][0] += Math.Pow(inputs[i].X, 2);
-                N[0][1] += inputs[i].X*inputs[i].Y;
+                N[0][1] += inputs[i].X * inputs[i].Y;
                 N[0][2] += -inputs[i].X;
                 N[1][1] += Math.Pow(inputs[i].Y, 2);
                 N[1][2] += -inputs[i].Y;
@@ -160,36 +160,36 @@ public double[] GetAffineTransformation()
 
             for (int i = 0; i < inputs.Count; i++)
             {
-                t1[0] += inputs[i].X*outputs[i].X;
-                t1[1] += inputs[i].Y*outputs[i].X;
+                t1[0] += inputs[i].X * outputs[i].X;
+                t1[1] += inputs[i].Y * outputs[i].X;
                 t1[2] += -outputs[i].X;
 
-                t2[0] += inputs[i].X*outputs[i].Y;
-                t2[1] += inputs[i].Y*outputs[i].Y;
+                t2[0] += inputs[i].X * outputs[i].Y;
+                t2[1] += inputs[i].Y * outputs[i].Y;
                 t2[2] += -outputs[i].Y;
             }
             double[] trans = new double[7];
             // Solve equation N = transpose(B)*t1
-            double frac = 1/
-                          (-N[0][0]*N[1][1]*N[2][2] + N[0][0]*Math.Pow(N[1][2], 2) + Math.Pow(N[0][1], 2)*N[2][2] -
-                           2*N[1][2]*N[0][1]*N[0][2] + N[1][1]*Math.Pow(N[0][2], 2));
-            trans[0] = (-N[0][1]*N[1][2]*t1[2] + N[0][1]*t1[1]*N[2][2] - N[0][2]*N[1][2]*t1[1] + N[0][2]*N[1][1]*t1[2] -
-                        t1[0]*N[1][1]*N[2][2] + t1[0]*Math.Pow(N[1][2], 2))*frac;
-            trans[1] = (-N[0][1]*N[0][2]*t1[2] + N[0][1]*t1[0]*N[2][2] + N[0][0]*N[1][2]*t1[2] - N[0][0]*t1[1]*N[2][2] -
-                        N[0][2]*N[1][2]*t1[0] + Math.Pow(N[0][2], 2)*t1[1])*frac;
+            double frac = 1 /
+                          (-N[0][0] * N[1][1] * N[2][2] + N[0][0] * Math.Pow(N[1][2], 2) + Math.Pow(N[0][1], 2) * N[2][2] -
+                           2 * N[1][2] * N[0][1] * N[0][2] + N[1][1] * Math.Pow(N[0][2], 2));
+            trans[0] = (-N[0][1] * N[1][2] * t1[2] + N[0][1] * t1[1] * N[2][2] - N[0][2] * N[1][2] * t1[1] + N[0][2] * N[1][1] * t1[2] -
+                        t1[0] * N[1][1] * N[2][2] + t1[0] * Math.Pow(N[1][2], 2)) * frac;
+            trans[1] = (-N[0][1] * N[0][2] * t1[2] + N[0][1] * t1[0] * N[2][2] + N[0][0] * N[1][2] * t1[2] - N[0][0] * t1[1] * N[2][2] -
+                        N[0][2] * N[1][2] * t1[0] + Math.Pow(N[0][2], 2) * t1[1]) * frac;
             trans[2] =
-                -(-N[1][2]*N[0][1]*t1[0] + Math.Pow(N[0][1], 2)*t1[2] + N[0][0]*N[1][2]*t1[1] - N[0][0]*N[1][1]*t1[2] -
-                  N[0][2]*N[0][1]*t1[1] + N[1][1]*N[0][2]*t1[0])*frac;
-            trans[2] += - meanOutput.X + meanInput.X;
+                -(-N[1][2] * N[0][1] * t1[0] + Math.Pow(N[0][1], 2) * t1[2] + N[0][0] * N[1][2] * t1[1] - N[0][0] * N[1][1] * t1[2] -
+                  N[0][2] * N[0][1] * t1[1] + N[1][1] * N[0][2] * t1[0]) * frac;
+            trans[2] += -meanOutput.X + meanInput.X;
             // Solve equation N = transpose(B)*t2
-            trans[3] = (-N[0][1]*N[1][2]*t2[2] + N[0][1]*t2[1]*N[2][2] - N[0][2]*N[1][2]*t2[1] + N[0][2]*N[1][1]*t2[2] -
-                        t2[0]*N[1][1]*N[2][2] + t2[0]*Math.Pow(N[1][2], 2))*frac;
-            trans[4] = (-N[0][1]*N[0][2]*t2[2] + N[0][1]*t2[0]*N[2][2] + N[0][0]*N[1][2]*t2[2] - N[0][0]*t2[1]*N[2][2] -
-                        N[0][2]*N[1][2]*t2[0] + Math.Pow(N[0][2], 2)*t2[1])*frac;
+            trans[3] = (-N[0][1] * N[1][2] * t2[2] + N[0][1] * t2[1] * N[2][2] - N[0][2] * N[1][2] * t2[1] + N[0][2] * N[1][1] * t2[2] -
+                        t2[0] * N[1][1] * N[2][2] + t2[0] * Math.Pow(N[1][2], 2)) * frac;
+            trans[4] = (-N[0][1] * N[0][2] * t2[2] + N[0][1] * t2[0] * N[2][2] + N[0][0] * N[1][2] * t2[2] - N[0][0] * t2[1] * N[2][2] -
+                        N[0][2] * N[1][2] * t2[0] + Math.Pow(N[0][2], 2) * t2[1]) * frac;
             trans[5] =
-                -(-N[1][2]*N[0][1]*t2[0] + Math.Pow(N[0][1], 2)*t2[2] + N[0][0]*N[1][2]*t2[1] - N[0][0]*N[1][1]*t2[2] -
-                  N[0][2]*N[0][1]*t2[1] + N[1][1]*N[0][2]*t2[0])*frac;
-            trans[5] += - meanOutput.Y + meanInput.Y;
+                -(-N[1][2] * N[0][1] * t2[0] + Math.Pow(N[0][1], 2) * t2[2] + N[0][0] * N[1][2] * t2[1] - N[0][0] * N[1][1] * t2[2] -
+                  N[0][2] * N[0][1] * t2[1] + N[1][1] * N[0][2] * t2[0]) * frac;
+            trans[5] += -meanOutput.Y + meanInput.Y;
 
             //Restore values
             for (int i = 0; i < inputs.Count; i++)
@@ -204,11 +204,11 @@ public double[] GetAffineTransformation()
             double s0 = 0;
             for (int i = 0; i < inputs.Count; i++)
             {
-                double x = inputs[i].X*trans[0] + inputs[i].Y*trans[1] + trans[2];
-                double y = inputs[i].X*trans[3] + inputs[i].Y*trans[4] + trans[5];
+                double x = inputs[i].X * trans[0] + inputs[i].Y * trans[1] + trans[2];
+                double y = inputs[i].X * trans[3] + inputs[i].Y * trans[4] + trans[5];
                 s0 += Math.Pow(x - outputs[i].X, 2) + Math.Pow(y - outputs[i].Y, 2);
             }
-            trans[6] = Math.Sqrt(s0)/(inputs.Count);
+            trans[6] = Math.Sqrt(s0) / (inputs.Count);
             return trans;
         }
 
@@ -243,10 +243,10 @@ public double[] GetHelmertTransformation()
                 meanOutput.X += outputs[i].X;
                 meanOutput.Y += outputs[i].Y;
             }
-            meanInput.X = Math.Round(meanInput.X/inputs.Count);
-            meanInput.Y = Math.Round(meanInput.Y/inputs.Count);
-            meanOutput.X = Math.Round(meanOutput.X/inputs.Count);
-            meanOutput.Y = Math.Round(meanOutput.Y/inputs.Count);
+            meanInput.X = Math.Round(meanInput.X / inputs.Count);
+            meanInput.Y = Math.Round(meanInput.Y / inputs.Count);
+            meanOutput.X = Math.Round(meanOutput.X / inputs.Count);
+            meanOutput.Y = Math.Round(meanOutput.Y / inputs.Count);
 
             double b00 = 0;
             double b02 = 0;
@@ -263,17 +263,17 @@ public double[] GetHelmertTransformation()
                 b00 += Math.Pow(inputs[i].X, 2) + Math.Pow(inputs[i].Y, 2);
                 b02 -= inputs[i].X;
                 b03 -= inputs[i].Y;
-                t[0] += -(inputs[i].X*outputs[i].X) - (inputs[i].Y*outputs[i].Y);
-                t[1] += -(inputs[i].Y*outputs[i].X) + (inputs[i].X*outputs[i].Y);
+                t[0] += -(inputs[i].X * outputs[i].X) - (inputs[i].Y * outputs[i].Y);
+                t[1] += -(inputs[i].Y * outputs[i].X) + (inputs[i].X * outputs[i].Y);
                 t[2] += outputs[i].X;
                 t[3] += outputs[i].Y;
             }
-            double frac = 1/(-inputs.Count*b00 + Math.Pow(b02, 2) + Math.Pow(b03, 2));
+            double frac = 1 / (-inputs.Count * b00 + Math.Pow(b02, 2) + Math.Pow(b03, 2));
             double[] result = new double[5];
-            result[0] = (-inputs.Count*t[0] + b02*t[2] + b03*t[3])*frac;
-            result[1] = (-inputs.Count*t[1] + b03*t[2] - b02*t[3])*frac;
-            result[2] = (b02*t[0] + b03*t[1] - t[2]*b00)*frac + meanOutput.X;
-            result[3] = (b03*t[0] - b02*t[1] - t[3]*b00)*frac + meanOutput.Y;
+            result[0] = (-inputs.Count * t[0] + b02 * t[2] + b03 * t[3]) * frac;
+            result[1] = (-inputs.Count * t[1] + b03 * t[2] - b02 * t[3]) * frac;
+            result[2] = (b02 * t[0] + b03 * t[1] - t[2] * b00) * frac + meanOutput.X;
+            result[3] = (b03 * t[0] - b02 * t[1] - t[3] * b00) * frac + meanOutput.Y;
 
             //Restore values
             for (int i = 0; i < inputs.Count; i++)
@@ -288,11 +288,11 @@ public double[] GetHelmertTransformation()
             double s0 = 0;
             for (int i = 0; i < inputs.Count; i++)
             {
-                double x = inputs[i].X*result[0] + inputs[i].Y*result[1] + result[2];
-                double y = -inputs[i].X*result[1] + inputs[i].Y*result[0] + result[3];
+                double x = inputs[i].X * result[0] + inputs[i].Y * result[1] + result[2];
+                double y = -inputs[i].X * result[1] + inputs[i].Y * result[0] + result[3];
                 s0 += Math.Pow(x - outputs[i].X, 2) + Math.Pow(y - outputs[i].Y, 2);
             }
-            result[4] = Math.Sqrt(s0)/(inputs.Count);
+            result[4] = Math.Sqrt(s0) / (inputs.Count);
             return result;
         }
 
diff --git a/SharpMap/Utilities/LineOffset.cs b/SharpMap/Utilities/LineOffset.cs
index 35ded68c..3a792810 100644
--- a/SharpMap/Utilities/LineOffset.cs
+++ b/SharpMap/Utilities/LineOffset.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Drawing;
 
 namespace SharpMap.Utilities
@@ -11,7 +9,7 @@ namespace SharpMap.Utilities
     /// </summary>
     public class LineOffset
     {
-        
+
         /// <summary>
         /// Offset a Linestring the given amount perpendicular to the line
         /// For example if a line should be drawn 10px to the right of its original position
diff --git a/SharpMap/Utilities/ScaleCalculations.cs b/SharpMap/Utilities/ScaleCalculations.cs
index c21a17f7..541897ab 100644
--- a/SharpMap/Utilities/ScaleCalculations.cs
+++ b/SharpMap/Utilities/ScaleCalculations.cs
@@ -24,8 +24,8 @@ public static double GetMapZoomFromScaleNonLatLong(double scale, double mapUnitF
 
             try
             {
-                double pageWidth = mapSizeWidth/nPxlPerInch*GeoSpatialMath.MetersPerInch;
-                zoom = Math.Abs(scale*pageWidth)/mapUnitFactor;
+                double pageWidth = mapSizeWidth / nPxlPerInch * GeoSpatialMath.MetersPerInch;
+                zoom = Math.Abs(scale * pageWidth) / mapUnitFactor;
             }
             catch
             {
diff --git a/SharpMap/Utilities/Surrogates.Brushes.cs b/SharpMap/Utilities/Surrogates.Brushes.cs
index e6403e12..2af1e48e 100644
--- a/SharpMap/Utilities/Surrogates.Brushes.cs
+++ b/SharpMap/Utilities/Surrogates.Brushes.cs
@@ -49,7 +49,7 @@ public class SolidBrushSurrogate : ISerializationSurrogate
             private class SolidBrushRef : IObjectReference, ISerializable
             {
                 private SolidBrush _brush;
-                
+
                 /// <summary>
                 /// Serialization constructor
                 /// </summary>
@@ -296,7 +296,7 @@ public class LinearGradientBrushSurrogate : ISerializationSurrogate
             public class LinearGradientBrushRef : IObjectReference, ISerializable
             {
                 private /*readonly*/ LinearGradientBrush _lgBrush;
-                
+
                 /// <summary>
                 /// Serialization constructor
                 /// </summary>
@@ -314,7 +314,7 @@ public LinearGradientBrushRef(SerializationInfo info, StreamingContext context)
                     if (hasIC)
                     {
                         lgBrush.InterpolationColors =
-                            (ColorBlend) info.GetValue("InterpolationColors", typeof (ColorBlend));
+                            (ColorBlend)info.GetValue("InterpolationColors", typeof(ColorBlend));
                     }
                     else
                     {
@@ -356,7 +356,7 @@ void ISerializationSurrogate.GetObjectData(Object obj, SerializationInfo info, S
                 info.AddValue("Transform", brush.Transform);
                 ColorBlend cb = null;
                 try { cb = brush.InterpolationColors; } catch { }
-                info.AddValue("HasIC", cb!= null);
+                info.AddValue("HasIC", cb != null);
                 if (cb != null)
                     info.AddValue("InterpolationColors", brush.InterpolationColors);
             }
diff --git a/SharpMap/Utilities/Surrogates.Helper.cs b/SharpMap/Utilities/Surrogates.Helper.cs
index f2e32203..dabc0063 100644
--- a/SharpMap/Utilities/Surrogates.Helper.cs
+++ b/SharpMap/Utilities/Surrogates.Helper.cs
@@ -226,10 +226,10 @@ void ISerializationSurrogate.GetObjectData(object obj, SerializationInfo info, S
             object ISerializationSurrogate.SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
             {
                 var colorMatrix = (ColorMatrix)obj;
-                var floatArray = (float[]) info.GetValue("cm", typeof (float[]));
+                var floatArray = (float[])info.GetValue("cm", typeof(float[]));
                 for (var i = 0; i < floatArray.Length; i++)
                 {
-                    colorMatrix[i/5, i%5] = floatArray[i];
+                    colorMatrix[i / 5, i % 5] = floatArray[i];
                 }
                 return null;
             }
diff --git a/SharpMap/Utilities/Surrogates.cs b/SharpMap/Utilities/Surrogates.cs
index 5967f116..b66b8df9 100644
--- a/SharpMap/Utilities/Surrogates.cs
+++ b/SharpMap/Utilities/Surrogates.cs
@@ -37,8 +37,8 @@ public static SurrogateSelector GetSurrogateSelectors()
         {
             var sc = new StreamingContext(StreamingContextStates.All);
             var ss = new SurrogateSelector();
-            ss.AddSurrogate(typeof (Pen), sc, new PenSurrogate());
-            ss.AddSurrogate(typeof (Brush), sc, new BrushSurrogate());
+            ss.AddSurrogate(typeof(Pen), sc, new PenSurrogate());
+            ss.AddSurrogate(typeof(Brush), sc, new BrushSurrogate());
             ss.AddSurrogate(typeof(SolidBrush), sc, new SolidBrushSurrogate());
             ss.AddSurrogate(typeof(TextureBrush), sc, new TextureBrushSurrogate());
             ss.AddSurrogate(typeof(HatchBrush), sc, new HatchBrushSurrogate());
@@ -71,7 +71,7 @@ public class ImageFormatRef : IObjectReference, ISerializable
                 private readonly ImageFormat _format;
                 public ImageFormatRef(SerializationInfo info, StreamingContext context)
                 {
-                    var guid = (Guid)info.GetValue("guid", typeof (Guid));
+                    var guid = (Guid)info.GetValue("guid", typeof(Guid));
                     _format = new ImageFormat(guid);
                 }
 
@@ -116,7 +116,7 @@ public object SetObjectData(object obj, SerializationInfo info, StreamingContext
         private class StringFormatSurrogate : ISerializationSurrogate
         {
             [Serializable]
-            public class StringFormatRef: IObjectReference, ISerializable
+            public class StringFormatRef : IObjectReference, ISerializable
             {
                 private readonly StringFormat _format;
                 public StringFormatRef(SerializationInfo info, StreamingContext context)
@@ -146,7 +146,7 @@ public void GetObjectData(SerializationInfo info, StreamingContext context)
                     throw new NotSupportedException();
                 }
             }
-            
+
             /// <summary>
             /// Populates the provided SerializationInfo with the data needed to serialize the object.
             /// </summary>
@@ -157,12 +157,12 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
             {
                 info.SetType(typeof(StringFormatRef));
 
-                var sf = (StringFormat) obj;
+                var sf = (StringFormat)obj;
                 info.AddValue("Alignment", (int)sf.Alignment);
                 info.AddValue("DigitSubstitutionLanguage", sf.DigitSubstitutionLanguage);
                 info.AddValue("DigitSubstitutionMethod", (int)sf.DigitSubstitutionMethod);
                 info.AddValue("FormatFlags", (int)sf.FormatFlags);
-                info.AddValue("HotkeyPrefix", (int) sf.HotkeyPrefix);
+                info.AddValue("HotkeyPrefix", (int)sf.HotkeyPrefix);
                 info.AddValue("LineAlignment", sf.LineAlignment);
                 info.AddValue("Trimming", sf.Trimming);
                 float firstTabStop;
@@ -173,8 +173,8 @@ public void GetObjectData(object obj, SerializationInfo info, StreamingContext c
 
             public object SetObjectData(object obj, SerializationInfo info, StreamingContext context, ISurrogateSelector selector)
             {
-                var sf = (StringFormat) obj;
-                
+                var sf = (StringFormat)obj;
+
                 return null;
             }
         }
@@ -202,7 +202,7 @@ public class PenRef : IObjectReference, ISerializable
                 /// <param name="context">The streaming context</param>
                 public PenRef(SerializationInfo info, StreamingContext context)
                 {
-                    var penType = (PenType) info.GetInt32("PenType");
+                    var penType = (PenType)info.GetInt32("PenType");
                     var width = info.GetSingle("Width");
                     switch (penType)
                     {
@@ -210,13 +210,13 @@ public PenRef(SerializationInfo info, StreamingContext context)
                             _pen = new Pen((Color)info.GetValue("Color", typeof(Color)), width);
                             break;
                         default:
-                            var brush = (Brush) info.GetValue("Brush", typeof (Brush));
+                            var brush = (Brush)info.GetValue("Brush", typeof(Brush));
                             _pen = new Pen(brush, width);
                             break;
                     }
                     _pen.Alignment = (PenAlignment)info.GetInt32("Alignment");
-                    var ca = (float[]) info.GetValue("CompoundArray", typeof (float[]));
-                    if (ca!= null && ca.Length > 0)
+                    var ca = (float[])info.GetValue("CompoundArray", typeof(float[]));
+                    if (ca != null && ca.Length > 0)
                         _pen.CompoundArray = ca;
 
                     LineCap lineCap;
@@ -269,7 +269,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
                     throw new NotSupportedException();
                 }
             }
-            
+
             #region ISerializationSurrogate Members
 
             /// <summary>
@@ -280,9 +280,9 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
             /// <param name="context">The destination for this serialization.</param>
             public void GetObjectData(Object obj, SerializationInfo info, StreamingContext context)
             {
-            
+
                 info.SetType(typeof(PenRef));
-                var pen = (Pen) obj;
+                var pen = (Pen)obj;
 
                 info.AddValue("PenType", pen.PenType);
                 info.AddValue("Width", pen.Width);
@@ -297,7 +297,7 @@ public void GetObjectData(Object obj, SerializationInfo info, StreamingContext c
                 var clp = pen.StartCap == LineCap.Custom ? pen.CustomStartCap : null;
                 SerializeLineCap(info, "Start", pen.StartCap, clp);
                 clp = pen.EndCap == LineCap.Custom ? pen.CustomEndCap : null;
-                SerializeLineCap(info, "End",pen.EndCap, clp);
+                SerializeLineCap(info, "End", pen.EndCap, clp);
 
                 info.AddValue("DashCap", (int)pen.DashCap);
                 info.AddValue("DashOffset", pen.DashOffset);
@@ -320,10 +320,10 @@ private static void SerializeLineCap(SerializationInfo info, string label, LineC
                         info.AddValue("Custom" + label + "Cap", customLineCap);
                     }
                     else
-                        info.AddValue(label+"Cap", (int)LineCap.Round);
+                        info.AddValue(label + "Cap", (int)LineCap.Round);
                 }
                 else
-                    info.AddValue(label+"Cap", (int)lineCap);
+                    info.AddValue(label + "Cap", (int)lineCap);
             }
 
             private static bool CustomEndCapSerializable(CustomLineCap clp)
@@ -398,7 +398,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
 
             void ISerializationSurrogate.GetObjectData(object obj, SerializationInfo info, StreamingContext context)
             {
-                var aac = (AdjustableArrowCap) obj;
+                var aac = (AdjustableArrowCap)obj;
                 info.SetType(typeof(AdjustableArrowCapRef));
                 info.AddValue("Width", aac.Width);
                 info.AddValue("Height", aac.Height);
@@ -435,7 +435,7 @@ public class CustomLineCapSurrogate : ISerializationSurrogate
             public class CustomLineCapRef : IObjectReference, ISerializable
             {
                 private readonly CustomLineCap _clp;
-                
+
                 /// <summary>
                 /// Serialization constructor
                 /// </summary>
@@ -443,15 +443,15 @@ public class CustomLineCapRef : IObjectReference, ISerializable
                 /// <param name="context"></param>
                 public CustomLineCapRef(SerializationInfo info, StreamingContext context)
                 {
-                    var baseCap = (LineCap) info.GetInt32("BaseCap");
+                    var baseCap = (LineCap)info.GetInt32("BaseCap");
                     var baseInset = info.GetSingle("BaseInset");
-                    var fillPath = (GraphicsPath) info.GetValue("FillPath", (typeof (GraphicsPath)));
+                    var fillPath = (GraphicsPath)info.GetValue("FillPath", (typeof(GraphicsPath)));
                     var strokePath = (GraphicsPath)info.GetValue("StrokePath", (typeof(GraphicsPath)));
 
                     var startCap = (LineCap)info.GetInt32("StartCap");
                     var endCap = (LineCap)info.GetInt32("StartCap");
                     _clp = new CustomLineCap(fillPath, strokePath, baseCap, baseInset);
-                    _clp.StrokeJoin = (LineJoin) info.GetInt32("StrokeJoin");
+                    _clp.StrokeJoin = (LineJoin)info.GetInt32("StrokeJoin");
                     _clp.WidthScale = info.GetSingle("WidthScale");
                     _clp.SetStrokeCaps(startCap, endCap);
                 }
@@ -469,7 +469,7 @@ void ISerializable.GetObjectData(SerializationInfo info, StreamingContext contex
 
             void ISerializationSurrogate.GetObjectData(object obj, SerializationInfo info, StreamingContext context)
             {
-                
+
                 var clp = (CustomLineCap)obj;
                 info.SetType(typeof(CustomLineCapRef));
                 info.AddValue("BaseCap", clp.BaseCap);
diff --git a/SharpMap/Utilities/Transform.cs b/SharpMap/Utilities/Transform.cs
index 9735120c..26cc5d91 100644
--- a/SharpMap/Utilities/Transform.cs
+++ b/SharpMap/Utilities/Transform.cs
@@ -15,10 +15,10 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries.Utilities;
 using System;
 using System.Drawing;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries.Utilities;
 
 namespace SharpMap.Utilities
 {
@@ -53,7 +53,7 @@ internal static PointF[] WorldToMap(Coordinate[] coordinates, double worldLeft,
                 {
                     double x = (coord.X - worldLeft) / pixelWidth;
                     double y = (worldTop - coord.Y) / pixelHeight;
-                    points[i] = new PointF((float) x, (float) y);
+                    points[i] = new PointF((float)x, (float)y);
                 }
             }
             return points;
@@ -90,7 +90,7 @@ public static PointF[] WorldToMap(Coordinate[] coordinates, AffineTransformation
         /// <param name="imageSize">Map Size when rendered</param>
         /// <param name="careAboutTransform">True for coordinate calculations, False if Graphics object will apply MapTransform</param>
         /// <returns>Affine Transformation</returns>
-        public static AffineTransformation WorldToMapMatrix(Coordinate worldCenter, 
+        public static AffineTransformation WorldToMapMatrix(Coordinate worldCenter,
             double pixelWidth, double pixelHeight, float mapTransformRotation, Size imageSize,
             bool careAboutTransform)
         {
@@ -141,11 +141,27 @@ internal static Coordinate[] MapToWorld(PointF[] points, Coordinate worldCenter,
                     coords[i] = new Coordinate(0, 0);
             else
             {
-                var ul = new Coordinate(worldCenter.X - mapZoom * .5,worldCenter.Y + mapHeight * .5);
+                var ulX = worldCenter.X - (mapZoom * .5);
+                var ulY = worldCenter.Y + (mapHeight * .5);
                 for (var i = 0; i < points.Length; i++)
-                    coords[i] = new Coordinate(ul.X + points[i].X * pixelWidth,ul.Y - points[i].Y * pixelHeight);
+                {
+                    /*
+                     * DGuidi: beware! unknown rounding issues here...
+                     * 'MapTest.ImageToWorld' fails (at least on my machine) 
+                     * and expose rounding issues (cx and cy are "XXX^10-15" instead of "0"),
+                     * but this happens ONLY if ALL tests are executed! 
+                     * Executing the single test, or even all "MapTest" tests, does not show the behaviour.
+                     * Assigning variables for ALL the computation steps seems to fix the problem...
+                     */
+                    var px = points[i].X;
+                    var py = points[i].Y;
+                    var wx = px * pixelWidth;
+                    var wy = py * pixelHeight;
+                    var cx = ulX + wx;                    
+                    var cy = ulY - wy;
+                    coords[i] = new Coordinate(cx, cy);
+                }
             }
-
             return coords;
         }
 
@@ -161,7 +177,7 @@ public static PointF WorldToMap(Coordinate p, Map map)
         {
             var left = map.Center.X - map.Zoom * 0.5;
             var top = map.Center.Y + map.MapHeight * 0.5;
-            var points = WorldToMap(new [] {p}, left, top, map.PixelWidth, map.PixelHeight);
+            var points = WorldToMap(new[] { p }, left, top, map.PixelWidth, map.PixelHeight);
             return points[0];
         }
 
@@ -175,10 +191,10 @@ public static PointF WorldToMap(Coordinate p, Map map)
         [Obsolete("Use MapToWorld(PointF[], Map)")]
         public static Coordinate MapToWorld(PointF p, Map map)
         {
-            var coords = MapToWorld(new [] {p}, map);
+            var coords = MapToWorld(new[] { p }, map);
             return coords[0];
         }
-        
+
         /// <summary>
         /// Transforms from image coordinates to world coordinate system (WCS).
         /// NOTE: This method is only applicable when MapTransformRotation = 0.
@@ -189,7 +205,7 @@ public static Coordinate MapToWorld(PointF p, Map map)
         [Obsolete("Use MapToWorld(PointF[], MapViewport)")]
         public static Coordinate MapToWorld(PointF p, MapViewport map)
         {
-            var coords = MapToWorld(new [] {p}, map.Center, map.Zoom, map.MapHeight, map.PixelWidth, map.PixelHeight);
+            var coords = MapToWorld(new[] { p }, map.Center, map.Zoom, map.MapHeight, map.PixelWidth, map.PixelHeight);
             return coords[0];
         }
     }
diff --git a/SharpMap/Utilities/Wfs/FeatureTypeInfo.cs b/SharpMap/Utilities/Wfs/FeatureTypeInfo.cs
index 667a2000..ec3ba3e8 100644
--- a/SharpMap/Utilities/Wfs/FeatureTypeInfo.cs
+++ b/SharpMap/Utilities/Wfs/FeatureTypeInfo.cs
@@ -3,8 +3,7 @@
 
 using System;
 using System.Collections.Generic;
-using GeoAPI;
-using GeoAPI.Geometries;
+using NtsGeometryFactory = NetTopologySuite.Geometries.GeometryFactory;
 
 namespace SharpMap.Utilities.Wfs
 {
@@ -67,7 +66,7 @@ public class WfsFeatureTypeInfo
     {
         #region Fields with Properties
 
-        internal IGeometryFactory Factory { get; private set; }
+        internal NtsGeometryFactory Factory { get; private set; }
 
         private BoundingBox _BoundingBox = new BoundingBox();
         private string _Cs = ",";
@@ -172,7 +171,7 @@ public string SRID
                     value = "4326";
                 if (string.Compare(_SRID, value, StringComparison.InvariantCultureIgnoreCase) != 0)
                 {
-                    Factory = GeometryServiceProvider.Instance.CreateGeometryFactory(int.Parse(value));
+                    Factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(int.Parse(value));
                     _SRID = value;
                 }
             }
@@ -240,7 +239,7 @@ public string Ts
         /// </param>
         public WfsFeatureTypeInfo(string serviceUri, string nsPrefix, string featureTypeNamespace, string featureType,
                                   string geometryName, GeometryTypeEnum geometryType)
-            :this()
+            : this()
         {
             _ServiceURI = serviceUri;
             _Prefix = nsPrefix;
@@ -369,7 +368,7 @@ public ElementInfo(string name, string dataType)
             /// Gets the type of the element
             /// </summary>
             public string DataType { get; private set; }
-        } 
+        }
         #endregion
 
         #endregion
diff --git a/SharpMap/Utilities/Wfs/GeometryFactories.cs b/SharpMap/Utilities/Wfs/GeometryFactories.cs
index 09c39b63..4ec76b1c 100644
--- a/SharpMap/Utilities/Wfs/GeometryFactories.cs
+++ b/SharpMap/Utilities/Wfs/GeometryFactories.cs
@@ -1,6 +1,8 @@
 // WFS provider by Peter Robineau (peter.robineau@gmx.at)
 // This file can be redistributed and/or modified under the terms of the GNU Lesser General Public License.
 
+using NetTopologySuite.Geometries;
+using SharpMap.Data;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,8 +10,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Xml;
-using SharpMap.Data;
-using GeoAPI.Geometries;
+using NtsGeometryFactory = NetTopologySuite.Geometries.GeometryFactory;
 
 namespace SharpMap.Utilities.Wfs
 {
@@ -33,7 +34,7 @@ internal abstract class GeometryFactory : IDisposable
         protected WfsFeatureTypeInfo _FeatureTypeInfo;
         protected XmlReader _GeomReader;
 
-        protected Collection<IGeometry> _Geoms = new Collection<IGeometry>();
+        protected Collection<Geometry> _Geoms = new Collection<Geometry>();
 
         protected FeatureDataTable _LabelInfo;
         protected IPathNode _LabelNode;
@@ -97,7 +98,7 @@ protected GeometryFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureTypeInf
 
         #endregion
 
-        internal IGeometryFactory Factory { get; set; }
+        internal NtsGeometryFactory Factory { get; set; }
 
         /// <summary>
         /// Gets or sets the axis order
@@ -114,9 +115,9 @@ internal int[] AxisOrder
 
         /// <summary>
         /// Abstract method - overwritten by derived classes for producing instances
-        /// derived from <see cref="GeoAPI.Geometries.IGeometry"/>.
+        /// derived from <see cref="NetTopologySuite.Geometries.Geometry"/>.
         /// </summary>
-        internal abstract Collection<IGeometry> createGeometries();
+        internal abstract Collection<Geometry> createGeometries();
 
         /// <summary>
         /// This method parses quickly without paying attention to
@@ -127,7 +128,7 @@ internal int[] AxisOrder
         /// <param name="geometryType">The geometry type (Point, LineString, Polygon, MultiPoint, MultiCurve, 
         /// MultiLineString (deprecated), MultiSurface, MultiPolygon (deprecated)</param>
         /// <returns>The created geometries</returns>
-        internal virtual Collection<IGeometry> createQuickGeometries(string geometryType)
+        internal virtual Collection<Geometry> createQuickGeometries(string geometryType)
         {
             // Ignore multi-geometries
             if (geometryType.Equals("MultiPointPropertyType")) geometryType = "PointPropertyType";
@@ -210,11 +211,11 @@ protected Coordinate[] ParseCoordinates(XmlReader reader)
             {
                 // we assume there are only x,y pairs
                 var coords = coordinateString.Split(' ');
-                var odds = coords.Where((s, idx) => idx%2 == 0);
-                var evens = coords.Where((s, idx) => idx%2 != 0);
+                var odds = coords.Where((s, idx) => idx % 2 == 0);
+                var evens = coords.Where((s, idx) => idx % 2 != 0);
                 coordinateValues = (from o in odds
-                    from e in evens
-                    select new [] {o, e}).ToArray();
+                                    from e in evens
+                                    select new[] { o, e }).ToArray();
             }
             length = coordinateValues.Length;
 
@@ -226,9 +227,9 @@ from e in evens
                 c[_axisOrder[1]] = Convert.ToDouble(values[1], _formatInfo);
 
                 var coordinate = values.Length > 2
-                    ? new Coordinate(c[0], c[1], Convert.ToDouble(values[2]))
+                    ? new CoordinateZ(c[0], c[1], Convert.ToDouble(values[2]))
                     : new Coordinate(c[0], c[1]);
-                    
+
                 vertices.Add(coordinate);
             }
 
@@ -305,7 +306,7 @@ protected XmlReader GetSubReaderOf(XmlReader reader, Dictionary<string, string>
         /// <summary>
         /// This method adds labels to the collection.
         /// </summary>
-        protected void AddLabel(Dictionary<string, string> labelValues, IGeometry geom)
+        protected void AddLabel(Dictionary<string, string> labelValues, Geometry geom)
         {
             if (_LabelInfo == null || geom == null || labelValues == null) return;
 
@@ -319,7 +320,7 @@ protected void AddLabel(Dictionary<string, string> labelValues, IGeometry geom)
 
                     row[labelName] = labelValue;
                 }
-                
+
                 row.Geometry = geom;
                 _LabelInfo.AddRow(row);
 
@@ -357,22 +358,22 @@ private void createReader(HttpClientUtil httpClientUtil)
         private void initializePathNodes()
         {
             IPathNode coordinatesNode = new PathNode("http://www.opengis.net/gml", "coordinates",
-                                                     (NameTable) _XmlReader.NameTable);
+                                                     (NameTable)_XmlReader.NameTable);
             IPathNode posListNode = new PathNode("http://www.opengis.net/gml", "posList",
-                                                 (NameTable) _XmlReader.NameTable);
+                                                 (NameTable)_XmlReader.NameTable);
             IPathNode posNode = new PathNode("http://www.opengis.net/gml", "pos",
                                                  (NameTable)_XmlReader.NameTable);
             IPathNode ogcServiceExceptionNode = new PathNode("http://www.opengis.net/ogc", "ServiceException",
-                                                             (NameTable) _XmlReader.NameTable);
-            IPathNode serviceExceptionNode = new PathNode("", "ServiceException", (NameTable) _XmlReader.NameTable);
-                //ServiceExceptions without ogc prefix are returned by deegree. PDD.
+                                                             (NameTable)_XmlReader.NameTable);
+            IPathNode serviceExceptionNode = new PathNode("", "ServiceException", (NameTable)_XmlReader.NameTable);
+            //ServiceExceptions without ogc prefix are returned by deegree. PDD.
             IPathNode exceptionTextNode = new PathNode("http://www.opengis.net/ows", "ExceptionText",
-                                                       (NameTable) _XmlReader.NameTable);
+                                                       (NameTable)_XmlReader.NameTable);
             _CoordinatesNode = new AlternativePathNodesCollection(coordinatesNode, posListNode, posNode);
             _ServiceExceptionNode = new AlternativePathNodesCollection(ogcServiceExceptionNode, exceptionTextNode,
                                                                        serviceExceptionNode);
             _FeatureNode = new PathNode(_FeatureTypeInfo.FeatureTypeNamespace, _FeatureTypeInfo.Name,
-                                        (NameTable) _XmlReader.NameTable);
+                                        (NameTable)_XmlReader.NameTable);
         }
 
         /// <summary>
@@ -410,7 +411,7 @@ public void Dispose()
     }
 
     /// <summary>
-    /// This class produces instances of type <see cref="GeoAPI.Geometries.IPoint"/>.
+    /// This class produces instances of type <see cref="NetTopologySuite.Geometries.Point"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class PointFactory : GeometryFactory
@@ -423,7 +424,7 @@ internal class PointFactory : GeometryFactory
         /// <param name="httpClientUtil">A configured <see cref="HttpClientUtil"/> instance for performing web requests</param>
         /// <param name="featureTypeInfo">A <see cref="WfsFeatureTypeInfo"/> instance providing metadata of the featuretype to query</param>
         /// <param name="labelInfo">A FeatureDataTable for labels</param>
-        internal PointFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo) 
+        internal PointFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo)
             : base(httpClientUtil, featureTypeInfo, labelInfo)
         {
         }
@@ -445,12 +446,12 @@ internal PointFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureTypeInfo)
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.IPoint"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.Point"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
-            IPathNode pointNode = new PathNode(_GMLNS, "Point", (NameTable) _XmlReader.NameTable);
+            IPathNode pointNode = new PathNode(_GMLNS, "Point", (NameTable)_XmlReader.NameTable);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
 
@@ -482,7 +483,7 @@ internal override Collection<IGeometry> createGeometries()
     }
 
     /// <summary>
-    /// This class produces instances of type <see cref="GeoAPI.Geometries.ILineString"/>.
+    /// This class produces instances of type <see cref="NetTopologySuite.Geometries.LineString"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class LineStringFactory : GeometryFactory
@@ -517,12 +518,12 @@ internal LineStringFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureTypeIn
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.ILineString"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.LineString"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
-            IPathNode lineStringNode = new PathNode(_GMLNS, "LineString", (NameTable) _XmlReader.NameTable);
+            IPathNode lineStringNode = new PathNode(_GMLNS, "LineString", (NameTable)_XmlReader.NameTable);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
 
@@ -555,7 +556,7 @@ internal override Collection<IGeometry> createGeometries()
     }
 
     /// <summary>
-    /// This class produces instances of type <see cref="GeoAPI.Geometries.IPolygon"/>.
+    /// This class produces instances of type <see cref="NetTopologySuite.Geometries.Polygon"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class PolygonFactory : GeometryFactory
@@ -590,22 +591,22 @@ internal PolygonFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureTypeInfo)
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.IPolygon"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.Polygon"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
             XmlReader outerBoundaryReader = null;
             XmlReader innerBoundariesReader = null;
 
-            IPathNode polygonNode = new PathNode(_GMLNS, "Polygon", (NameTable) _XmlReader.NameTable);
-            IPathNode outerBoundaryNode = new PathNode(_GMLNS, "outerBoundaryIs", (NameTable) _XmlReader.NameTable);
-            IPathNode exteriorNode = new PathNode(_GMLNS, "exterior", (NameTable) _XmlReader.NameTable);
+            IPathNode polygonNode = new PathNode(_GMLNS, "Polygon", (NameTable)_XmlReader.NameTable);
+            IPathNode outerBoundaryNode = new PathNode(_GMLNS, "outerBoundaryIs", (NameTable)_XmlReader.NameTable);
+            IPathNode exteriorNode = new PathNode(_GMLNS, "exterior", (NameTable)_XmlReader.NameTable);
             IPathNode outerBoundaryNodeAlt = new AlternativePathNodesCollection(outerBoundaryNode, exteriorNode);
-            IPathNode innerBoundaryNode = new PathNode(_GMLNS, "innerBoundaryIs", (NameTable) _XmlReader.NameTable);
-            IPathNode interiorNode = new PathNode(_GMLNS, "interior", (NameTable) _XmlReader.NameTable);
+            IPathNode innerBoundaryNode = new PathNode(_GMLNS, "innerBoundaryIs", (NameTable)_XmlReader.NameTable);
+            IPathNode interiorNode = new PathNode(_GMLNS, "interior", (NameTable)_XmlReader.NameTable);
             IPathNode innerBoundaryNodeAlt = new AlternativePathNodesCollection(innerBoundaryNode, interiorNode);
-            IPathNode linearRingNode = new PathNode(_GMLNS, "LinearRing", (NameTable) _XmlReader.NameTable);
+            IPathNode linearRingNode = new PathNode(_GMLNS, "LinearRing", (NameTable)_XmlReader.NameTable);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
 
@@ -614,8 +615,8 @@ internal override Collection<IGeometry> createGeometries()
                 // Reading the entire feature's node makes it possible to collect label values that may appear before or after the geometry property
                 while ((_FeatureReader = GetSubReaderOf(_XmlReader, null, _FeatureNode)) != null)
                 {
-                    ILinearRing shell = null;
-                    var holes = new List<ILinearRing>();
+                    LinearRing shell = null;
+                    var holes = new List<LinearRing>();
                     while ((_GeomReader = GetSubReaderOf(_FeatureReader, labelValues, polygonNode)) != null)
                     {
                         //polygon = new Polygon();
@@ -652,7 +653,7 @@ internal override Collection<IGeometry> createGeometries()
     }
 
     /// <summary>
-    /// This class produces instances of type <see cref="GeoAPI.Geometries.IMultiPoint"/>.
+    /// This class produces instances of type <see cref="NetTopologySuite.Geometries.MultiPoint"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class MultiPointFactory : GeometryFactory
@@ -665,7 +666,7 @@ internal class MultiPointFactory : GeometryFactory
         /// <param name="httpClientUtil">A configured <see cref="HttpClientUtil"/> instance for performing web requests</param>
         /// <param name="featureTypeInfo">A <see cref="WfsFeatureTypeInfo"/> instance providing metadata of the featuretype to query</param>
         /// <param name="labelInfo">A FeatureDataTable for labels</param>
-        internal MultiPointFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo) 
+        internal MultiPointFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo)
             : base(httpClientUtil, featureTypeInfo, labelInfo)
         {
         }
@@ -685,13 +686,13 @@ internal MultiPointFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureTypeIn
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.IMultiPoint"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.MultiPoint"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
-            IPathNode multiPointNode = new PathNode(_GMLNS, "MultiPoint", (NameTable) _XmlReader.NameTable);
-            IPathNode pointMemberNode = new PathNode(_GMLNS, "pointMember", (NameTable) _XmlReader.NameTable);
+            IPathNode multiPointNode = new PathNode(_GMLNS, "MultiPoint", (NameTable)_XmlReader.NameTable);
+            IPathNode pointMemberNode = new PathNode(_GMLNS, "pointMember", (NameTable)_XmlReader.NameTable);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
 
@@ -704,12 +705,12 @@ internal override Collection<IGeometry> createGeometries()
                         (_GeomReader = GetSubReaderOf(_FeatureReader, labelValues, multiPointNode, pointMemberNode)) !=
                         null)
                     {
-                        GeometryFactory geomFactory = new PointFactory(_GeomReader, _FeatureTypeInfo) { AxisOrder = AxisOrder};
+                        GeometryFactory geomFactory = new PointFactory(_GeomReader, _FeatureTypeInfo) { AxisOrder = AxisOrder };
                         var points = geomFactory.createGeometries();
 
-                        var pointArray = new IPoint[points.Count];
+                        var pointArray = new Point[points.Count];
                         var i = 0;
-                        foreach (IPoint point in points)
+                        foreach (Point point in points)
                             pointArray[i] = point;
 
                         _Geoms.Add(Factory.CreateMultiPoint(pointArray));
@@ -732,7 +733,7 @@ internal override Collection<IGeometry> createGeometries()
     }
 
     /// <summary>
-    /// This class produces objects of type <see cref="GeoAPI.Geometries.IMultiLineString"/>.
+    /// This class produces objects of type <see cref="NetTopologySuite.Geometries.MultiLineString"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class MultiLineStringFactory : GeometryFactory
@@ -746,7 +747,7 @@ internal class MultiLineStringFactory : GeometryFactory
         /// <param name="featureTypeInfo">A <see cref="WfsFeatureTypeInfo"/> instance providing metadata of the featuretype to query</param>
         /// <param name="labelInfo">A FeatureDataTable for labels</param>
         internal MultiLineStringFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo,
-                                        FeatureDataTable labelInfo) 
+                                        FeatureDataTable labelInfo)
             : base(httpClientUtil, featureTypeInfo, labelInfo)
         {
         }
@@ -766,16 +767,16 @@ internal MultiLineStringFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureT
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.IMultiLineString"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.MultiLineString"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
-            IPathNode multiLineStringNode = new PathNode(_GMLNS, "MultiLineString", (NameTable) _XmlReader.NameTable);
-            IPathNode multiCurveNode = new PathNode(_GMLNS, "MultiCurve", (NameTable) _XmlReader.NameTable);
+            IPathNode multiLineStringNode = new PathNode(_GMLNS, "MultiLineString", (NameTable)_XmlReader.NameTable);
+            IPathNode multiCurveNode = new PathNode(_GMLNS, "MultiCurve", (NameTable)_XmlReader.NameTable);
             IPathNode multiLineStringNodeAlt = new AlternativePathNodesCollection(multiLineStringNode, multiCurveNode);
-            IPathNode lineStringMemberNode = new PathNode(_GMLNS, "lineStringMember", (NameTable) _XmlReader.NameTable);
-            IPathNode curveMemberNode = new PathNode(_GMLNS, "curveMember", (NameTable) _XmlReader.NameTable);
+            IPathNode lineStringMemberNode = new PathNode(_GMLNS, "lineStringMember", (NameTable)_XmlReader.NameTable);
+            IPathNode curveMemberNode = new PathNode(_GMLNS, "curveMember", (NameTable)_XmlReader.NameTable);
             IPathNode lineStringMemberNodeAlt = new AlternativePathNodesCollection(lineStringMemberNode, curveMemberNode);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
@@ -791,11 +792,11 @@ internal override Collection<IGeometry> createGeometries()
                         null)
                     {
                         GeometryFactory geomFactory = new LineStringFactory(_GeomReader, _FeatureTypeInfo) { AxisOrder = AxisOrder };
-                        Collection<IGeometry> lineStrings = geomFactory.createGeometries();
+                        Collection<Geometry> lineStrings = geomFactory.createGeometries();
 
-                        var lineStringArray = new ILineString[lineStrings.Count];
+                        var lineStringArray = new LineString[lineStrings.Count];
                         var i = 0;
-                        foreach (ILineString lineString in lineStrings)
+                        foreach (LineString lineString in lineStrings)
                             lineStringArray[i++] = lineString;
 
                         _Geoms.Add(Factory.CreateMultiLineString(lineStringArray));
@@ -818,7 +819,7 @@ internal override Collection<IGeometry> createGeometries()
     }
 
     /// <summary>
-    /// This class produces instances of type <see cref="GeoAPI.Geometries.IMultiPolygon"/>.
+    /// This class produces instances of type <see cref="NetTopologySuite.Geometries.MultiPolygon"/>.
     /// The base class is <see cref="GeometryFactory"/>.
     /// </summary>
     internal class MultiPolygonFactory : GeometryFactory
@@ -831,7 +832,7 @@ internal class MultiPolygonFactory : GeometryFactory
         /// <param name="httpClientUtil">A configured <see cref="HttpClientUtil"/> instance for performing web requests</param>
         /// <param name="featureTypeInfo">A <see cref="WfsFeatureTypeInfo"/> instance providing metadata of the featuretype to query</param>
         /// <param name="labelInfo">A FeatureDataTable for labels</param>
-        internal MultiPolygonFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo) 
+        internal MultiPolygonFactory(HttpClientUtil httpClientUtil, WfsFeatureTypeInfo featureTypeInfo, FeatureDataTable labelInfo)
             : base(httpClientUtil, featureTypeInfo, labelInfo)
         {
         }
@@ -851,20 +852,20 @@ internal MultiPolygonFactory(XmlReader xmlReader, WfsFeatureTypeInfo featureType
         #region Internal Member
 
         /// <summary>
-        /// This method produces instances of type <see cref="GeoAPI.Geometries.IMultiPolygon"/>.
+        /// This method produces instances of type <see cref="NetTopologySuite.Geometries.MultiPolygon"/>.
         /// </summary>
         /// <returns>The created geometries</returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
-            //IMultiPolygon multiPolygon = null;
+            //MultiPolygon multiPolygon = null;
 
-            IPathNode multiPolygonNode = new PathNode(_GMLNS, "MultiPolygon", (NameTable) _XmlReader.NameTable);
-            IPathNode multiSurfaceNode = new PathNode(_GMLNS, "MultiSurface", (NameTable) _XmlReader.NameTable);
+            IPathNode multiPolygonNode = new PathNode(_GMLNS, "MultiPolygon", (NameTable)_XmlReader.NameTable);
+            IPathNode multiSurfaceNode = new PathNode(_GMLNS, "MultiSurface", (NameTable)_XmlReader.NameTable);
             IPathNode multiPolygonNodeAlt = new AlternativePathNodesCollection(multiPolygonNode, multiSurfaceNode);
-            IPathNode polygonMemberNode = new PathNode(_GMLNS, "polygonMember", (NameTable) _XmlReader.NameTable);
-            IPathNode surfaceMemberNode = new PathNode(_GMLNS, "surfaceMember", (NameTable) _XmlReader.NameTable);
+            IPathNode polygonMemberNode = new PathNode(_GMLNS, "polygonMember", (NameTable)_XmlReader.NameTable);
+            IPathNode surfaceMemberNode = new PathNode(_GMLNS, "surfaceMember", (NameTable)_XmlReader.NameTable);
             IPathNode polygonMemberNodeAlt = new AlternativePathNodesCollection(polygonMemberNode, surfaceMemberNode);
-            IPathNode linearRingNode = new PathNode(_GMLNS, "LinearRing", (NameTable) _XmlReader.NameTable);
+            IPathNode linearRingNode = new PathNode(_GMLNS, "LinearRing", (NameTable)_XmlReader.NameTable);
             var labelValues = new Dictionary<string, string>();
             bool geomFound = false;
 
@@ -878,12 +879,12 @@ internal override Collection<IGeometry> createGeometries()
                          GetSubReaderOf(_FeatureReader, labelValues, multiPolygonNodeAlt)) != null)
                     {
                         XmlReader memberReader;
-                        var polygons = new List<IGeometry>();
+                        var polygons = new List<Geometry>();
                         while ((memberReader = GetSubReaderOf(_GeomReader, labelValues, polygonMemberNodeAlt)) != null)
                         {
                             GeometryFactory geomFactory = new PolygonFactory(memberReader, _FeatureTypeInfo) { AxisOrder = AxisOrder };
                             var polygon = geomFactory.createGeometries()[0]; // polygon element has a maxOccurs=1
-                            
+
                             polygons.Add(polygon);
 
                             geomFound = true;
@@ -891,14 +892,14 @@ internal override Collection<IGeometry> createGeometries()
 
                         if (geomFound)
                         {
-                            var polygonArray = new IPolygon[polygons.Count];
+                            var polygonArray = new Polygon[polygons.Count];
                             var i = 0;
-                            foreach (IPolygon polygon in polygons)
+                            foreach (Polygon polygon in polygons)
                                 polygonArray[i++] = polygon;
 
                             _Geoms.Add(Factory.CreateMultiPolygon(polygonArray));
                         }
-                        
+
                     }
                     if (geomFound) AddLabel(labelValues, _Geoms[_Geoms.Count - 1]);
                     geomFound = false;
@@ -960,7 +961,7 @@ internal UnspecifiedGeometryFactory_WFS1_0_0_GML2(HttpClientUtil httpClientUtil,
         /// appropriate geometries.
         /// </summary>
         /// <returns></returns>
-        internal override Collection<IGeometry> createGeometries()
+        internal override Collection<Geometry> createGeometries()
         {
             GeometryFactory geomFactory = null;
 
@@ -969,15 +970,15 @@ internal override Collection<IGeometry> createGeometries()
 
             if (_QuickGeometries) _MultiGeometries = false;
 
-            IPathNode pointNode = new PathNode(_GMLNS, "Point", (NameTable) _XmlReader.NameTable);
-            IPathNode lineStringNode = new PathNode(_GMLNS, "LineString", (NameTable) _XmlReader.NameTable);
-            IPathNode polygonNode = new PathNode(_GMLNS, "Polygon", (NameTable) _XmlReader.NameTable);
-            IPathNode multiPointNode = new PathNode(_GMLNS, "MultiPoint", (NameTable) _XmlReader.NameTable);
-            IPathNode multiLineStringNode = new PathNode(_GMLNS, "MultiLineString", (NameTable) _XmlReader.NameTable);
-            IPathNode multiCurveNode = new PathNode(_GMLNS, "MultiCurve", (NameTable) _XmlReader.NameTable);
+            IPathNode pointNode = new PathNode(_GMLNS, "Point", (NameTable)_XmlReader.NameTable);
+            IPathNode lineStringNode = new PathNode(_GMLNS, "LineString", (NameTable)_XmlReader.NameTable);
+            IPathNode polygonNode = new PathNode(_GMLNS, "Polygon", (NameTable)_XmlReader.NameTable);
+            IPathNode multiPointNode = new PathNode(_GMLNS, "MultiPoint", (NameTable)_XmlReader.NameTable);
+            IPathNode multiLineStringNode = new PathNode(_GMLNS, "MultiLineString", (NameTable)_XmlReader.NameTable);
+            IPathNode multiCurveNode = new PathNode(_GMLNS, "MultiCurve", (NameTable)_XmlReader.NameTable);
             IPathNode multiLineStringNodeAlt = new AlternativePathNodesCollection(multiLineStringNode, multiCurveNode);
-            IPathNode multiPolygonNode = new PathNode(_GMLNS, "MultiPolygon", (NameTable) _XmlReader.NameTable);
-            IPathNode multiSurfaceNode = new PathNode(_GMLNS, "MultiSurface", (NameTable) _XmlReader.NameTable);
+            IPathNode multiPolygonNode = new PathNode(_GMLNS, "MultiPolygon", (NameTable)_XmlReader.NameTable);
+            IPathNode multiSurfaceNode = new PathNode(_GMLNS, "MultiSurface", (NameTable)_XmlReader.NameTable);
             IPathNode multiPolygonNodeAlt = new AlternativePathNodesCollection(multiPolygonNode, multiSurfaceNode);
 
             while (_XmlReader.Read())
@@ -1041,7 +1042,7 @@ internal override Collection<IGeometry> createGeometries()
                 var res = _QuickGeometries
                     ? geomFactory.createQuickGeometries(geometryTypeString)
                     : geomFactory.createGeometries();
-                
+
                 geomFactory.Dispose();
                 return res;
             }
@@ -1052,4 +1053,4 @@ internal override Collection<IGeometry> createGeometries()
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Utilities/Wfs/HttpClientUtil.cs b/SharpMap/Utilities/Wfs/HttpClientUtil.cs
index fa687293..29230a3b 100644
--- a/SharpMap/Utilities/Wfs/HttpClientUtil.cs
+++ b/SharpMap/Utilities/Wfs/HttpClientUtil.cs
@@ -95,7 +95,7 @@ public Stream GetDataStream()
 
             try
             {
-                _webRequest = (HttpWebRequest) WebRequest.Create(_url);
+                _webRequest = (HttpWebRequest)WebRequest.Create(_url);
             }
             catch (SecurityException ex)
             {
@@ -134,11 +134,11 @@ public Stream GetDataStream()
                         requestStream.Write(_postData, 0, _postData.Length);
                     }
                 }
-                    /* HTTP GET */
+                /* HTTP GET */
                 else
                     _webRequest.Method = WebRequestMethods.Http.Get;
 
-                _webResponse = (HttpWebResponse) _webRequest.GetResponse();
+                _webResponse = (HttpWebResponse)_webRequest.GetResponse();
                 return _webResponse.GetResponseStream();
             }
             catch (Exception ex)
diff --git a/SharpMap/Utilities/Wfs/IWFS_TextResources.cs b/SharpMap/Utilities/Wfs/IWFS_TextResources.cs
index 335d8379..cbd2f9df 100644
--- a/SharpMap/Utilities/Wfs/IWFS_TextResources.cs
+++ b/SharpMap/Utilities/Wfs/IWFS_TextResources.cs
@@ -1,7 +1,7 @@
 // WFS provider by Peter Robineau (peter.robineau@gmx.at)
 // This file can be redistributed and/or modified under the terms of the GNU Lesser General Public License.
 
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 
 namespace SharpMap.Utilities.Wfs
 {
diff --git a/SharpMap/Utilities/Wfs/IXPathQueryManager.cs b/SharpMap/Utilities/Wfs/IXPathQueryManager.cs
index 55158b05..45b18992 100644
--- a/SharpMap/Utilities/Wfs/IXPathQueryManager.cs
+++ b/SharpMap/Utilities/Wfs/IXPathQueryManager.cs
@@ -19,14 +19,14 @@ public interface IXPathQueryManager
         /// <param name="prefix">The prefix used to identify the namespace</param>
         /// <param name="ns">The full namespace qualifier</param>
         void AddNamespace(string prefix, string ns);
-        
+
         /// <summary>
         /// Method to compile a <paramref name="xPath"/> to a <see cref="XPathExpression"/>
         /// </summary>
         /// <param name="xPath">The xpath to compile</param>
         /// <returns>The compiled <see cref="XPathExpression"/></returns>
         XPathExpression Compile(string xPath);
-        
+
         /// <summary>
         /// Function to create a deep-copy clone of this <see cref="IXPathQueryManager"/>
         /// </summary>
@@ -112,7 +112,7 @@ public interface IXPathQueryManager
         /// Method to reset/delete the current namespace context
         /// </summary>
         void ResetNamespaces();
-        
+
         /// <summary>
         /// Method to reset the inherent <see cref="XPathNavigator"/>.
         /// </summary>
diff --git a/SharpMap/Utilities/Wfs/OGCFilter_FE1_1_0.cs b/SharpMap/Utilities/Wfs/OGCFilter_FE1_1_0.cs
index 2e01ad1c..5902fbc2 100644
--- a/SharpMap/Utilities/Wfs/OGCFilter_FE1_1_0.cs
+++ b/SharpMap/Utilities/Wfs/OGCFilter_FE1_1_0.cs
@@ -39,7 +39,7 @@ public enum JunctorEnum
             /// Or junctor
             /// </summary>
             Or
-        } ;
+        };
 
         #endregion
 
@@ -162,7 +162,7 @@ public class PropertyIsEqualToFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsEqualToFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsEqualToFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -199,7 +199,7 @@ public class PropertyIsNotEqualToFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsNotEqualToFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsNotEqualToFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -236,7 +236,7 @@ public class PropertyIsLessThanFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsLessThanFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsLessThanFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -273,7 +273,7 @@ public class PropertyIsGreaterThanFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsGreaterThanFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsGreaterThanFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -310,7 +310,7 @@ public class PropertyIsLessThanOrEqualToFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsLessThanOrEqualToFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsLessThanOrEqualToFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -347,7 +347,7 @@ public class PropertyIsGreaterThanOrEqualToFilter_FE1_1_0 : OGCFilterBase, IFilt
         /// Initializes a new instance of the <see cref="PropertyIsGreaterThanOrEqualToFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsGreaterThanOrEqualToFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -384,7 +384,7 @@ public class PropertyIsBetweenFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsBetweenFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsBetweenFilter_FE1_1_0(string propertyName, string lowerBoundary, string upperBoundary)
-            : base(new[] {propertyName, lowerBoundary, upperBoundary})
+            : base(new[] { propertyName, lowerBoundary, upperBoundary })
         {
         }
 
@@ -423,7 +423,7 @@ public class PropertyIsLikeFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="PropertyIsLikeFilter_FE1_1_0"/> class.
         /// </summary>
         public PropertyIsLikeFilter_FE1_1_0(string propertyName, string arg)
-            : base(new[] {propertyName, arg})
+            : base(new[] { propertyName, arg })
         {
         }
 
@@ -461,7 +461,7 @@ public class FeatureIdFilter_FE1_1_0 : OGCFilterBase, IFilter
         /// Initializes a new instance of the <see cref="FeatureIdFilter_FE1_1_0 "/> class.
         /// </summary>
         public FeatureIdFilter_FE1_1_0(string id)
-            : base(new[] {id})
+            : base(new[] { id })
         {
         }
 
diff --git a/SharpMap/Utilities/Wfs/WFS_1_0_0_TextResources.cs b/SharpMap/Utilities/Wfs/WFS_1_0_0_TextResources.cs
index 250b7193..2d041987 100644
--- a/SharpMap/Utilities/Wfs/WFS_1_0_0_TextResources.cs
+++ b/SharpMap/Utilities/Wfs/WFS_1_0_0_TextResources.cs
@@ -1,11 +1,11 @@
 // WFS provider by Peter Robineau (peter.robineau@gmx.at)
 // This file can be redistributed and/or modified under the terms of the GNU Lesser General Public License.
 
+using NetTopologySuite.Geometries;
 using System;
 using System.IO;
 using System.Text;
 using System.Xml;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Utilities.Wfs
 {
diff --git a/SharpMap/Utilities/Wfs/WFS_1_1_0_TextResources.cs b/SharpMap/Utilities/Wfs/WFS_1_1_0_TextResources.cs
index b0d554c6..f00215e0 100644
--- a/SharpMap/Utilities/Wfs/WFS_1_1_0_TextResources.cs
+++ b/SharpMap/Utilities/Wfs/WFS_1_1_0_TextResources.cs
@@ -1,12 +1,11 @@
 // WFS provider by Peter Robineau (peter.robineau@gmx.at)
 // This file can be redistributed and/or modified under the terms of the GNU Lesser General Public License.
 
+using NetTopologySuite.Geometries;
 using System;
 using System.IO;
 using System.Text;
 using System.Xml;
-using SharpMap.Data.Providers;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Utilities.Wfs
 {
@@ -76,7 +75,7 @@ public string GetFeatureGETRequest(WfsFeatureTypeInfo featureTypeInfo, Envelope
             {
                 filterBuilder.Append("%20xmlns:" + featureTypeInfo.Prefix + "=%22" +
                                      Uri.EscapeDataString(featureTypeInfo.FeatureTypeNamespace) + "%22");
-                    //added by PDD to get it to work for deegree default sample
+                //added by PDD to get it to work for deegree default sample
             }
             filterBuilder.Append("%3E");
             if (filter != null)
@@ -148,7 +147,7 @@ public byte[] GetFeaturePOSTRequest(WfsFeatureTypeInfo featureTypeInfo, string l
                         !string.IsNullOrEmpty(featureTypeInfo.FeatureTypeNamespace))
                         xWriter.WriteAttributeString("xmlns:" + featureTypeInfo.Prefix,
                                                      featureTypeInfo.FeatureTypeNamespace);
-                            //added by PDD to get it to work for deegree default sample
+                    //added by PDD to get it to work for deegree default sample
                     xWriter.WriteStartElement("Query", NSWFS);
                     xWriter.WriteAttributeString("typeName", qualification + featureTypeInfo.Name);
                     if (!loadAllElements)
@@ -167,7 +166,7 @@ public byte[] GetFeaturePOSTRequest(WfsFeatureTypeInfo featureTypeInfo, string l
                             !string.IsNullOrEmpty(featureTypeInfo.FeatureTypeNamespace))
                             xWriter.WriteElementString("PropertyName",
                                 qualification + featureTypeInfo.Geometry._GeometryName);
-                            //added qualification to get it to work for deegree default sample
+                        //added qualification to get it to work for deegree default sample
                         else
                             xWriter.WriteElementString("PropertyName", featureTypeInfo.Geometry._GeometryName);
                     }
diff --git a/SharpMap/Utilities/Wfs/XPathQueryManager.cs b/SharpMap/Utilities/Wfs/XPathQueryManager.cs
index d0596352..c6619359 100644
--- a/SharpMap/Utilities/Wfs/XPathQueryManager.cs
+++ b/SharpMap/Utilities/Wfs/XPathQueryManager.cs
@@ -247,7 +247,7 @@ public IXPathQueryManager GetXPathQueryManagerInContext(XPathExpression xPath, D
         /// </summary>
         public bool GetContextOfNextNode()
         {
-            return GetContextOfNode((uint) _NavDiff + 1);
+            return GetContextOfNode((uint)_NavDiff + 1);
         }
 
         /// <summary>
@@ -404,7 +404,7 @@ private void findXPath(XPathExpression xPath)
         private void InitializeCustomContext(CustomQueryContext paramContext)
         {
             IDictionary<string, string> namespaces = paramContext.GetNamespacesInScope(XmlNamespaceScope.ExcludeXml);
-            _ParamContext = new CustomQueryContext((NameTable) paramContext.NameTable);
+            _ParamContext = new CustomQueryContext((NameTable)paramContext.NameTable);
             _ParamContext.AddNamespace(namespaces);
         }
 
@@ -697,8 +697,8 @@ protected string ResolveArgument(object arg)
                 if (arg is string)
                     return arg.ToString();
                 else if (arg is XPathNodeIterator)
-                    if (((XPathNodeIterator) arg).MoveNext() == true)
-                        return ((XPathNodeIterator) arg).Current.Value;
+                    if (((XPathNodeIterator)arg).MoveNext() == true)
+                        return ((XPathNodeIterator)arg).Current.Value;
                 return string.Empty;
             }
 
@@ -774,8 +774,8 @@ public ParamCompareWithTargetNs(XPathResultType[] argTypes, int minArgs, int max
             /// <returns>A boolean value indicating whether the argument strings are identical</returns>
             public override object Invoke(XsltContext xsltContext, object[] args, XPathNavigator docContext)
             {
-                return ((string) ((string) args[1] + ResolveArgument(args[2]))).Equals(
-                    ResolveNsPrefix(ResolveArgument(args[0]), (string) args[1], docContext), StringComparison.Ordinal);
+                return ((string)((string)args[1] + ResolveArgument(args[2]))).Equals(
+                    ResolveNsPrefix(ResolveArgument(args[0]), (string)args[1], docContext), StringComparison.Ordinal);
             }
 
             #endregion
diff --git a/SharpMap/Utilities/Wfs/XPathQueryManager_DecoratorBase.cs b/SharpMap/Utilities/Wfs/XPathQueryManager_DecoratorBase.cs
index 2b4d7d86..bed9dcfd 100644
--- a/SharpMap/Utilities/Wfs/XPathQueryManager_DecoratorBase.cs
+++ b/SharpMap/Utilities/Wfs/XPathQueryManager_DecoratorBase.cs
@@ -15,7 +15,7 @@ namespace SharpMap.Utilities.Wfs
     public abstract class XPathQueryManager_Decorator
     {
         #region Fields
-        
+
         /// <summary>
         /// The <see cref="IXPathQueryManager"/> that is decorated
         /// </summary>
diff --git a/SharpMap/Web/IClient.cs b/SharpMap/Web/IClient.cs
index 4f774652..e0536c7e 100644
--- a/SharpMap/Web/IClient.cs
+++ b/SharpMap/Web/IClient.cs
@@ -28,7 +28,7 @@ public interface IClient
         /// Gets or set a value indicating the <see cref="ICredentials"/> to use for accessing the <see cref="Proxy"/>.
         /// </summary>
         ICredentials Credentials { get; set; }
-        
+
         /// <summary>
         /// Gets or sets a value indicating the base uniform resource locator of the web service.
         /// </summary>
@@ -58,7 +58,7 @@ public interface IClient
         /// 
         /// </summary>
         string[] ExceptionFormats { get; }
-        
+
         /// <summary>
         /// Gets a value indicating the web-servers result as an <see cref="XmlDocument"/>
         /// </summary>
diff --git a/SharpMap/Web/OgcException.cs b/SharpMap/Web/OgcException.cs
index b262173e..b4d23d04 100644
--- a/SharpMap/Web/OgcException.cs
+++ b/SharpMap/Web/OgcException.cs
@@ -28,9 +28,9 @@ public ServiceExceptionReport(string version)
         /// <summary>
         /// Gets the version number
         /// </summary>
-        public string Version { get ; private set; }
+        public string Version { get; private set; }
     }
-    
+
     /// <summary>
     /// The ServiceExceptionType type defines the ServiceException
     /// element.  The content of the element is an exception message
diff --git a/SharpMap/Web/Wcs/Capabilities.cs b/SharpMap/Web/Wcs/Capabilities.cs
index bee943ee..674c42a4 100644
--- a/SharpMap/Web/Wcs/Capabilities.cs
+++ b/SharpMap/Web/Wcs/Capabilities.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace SharpMap.Web.Wcs
 {
     class Capabilities
diff --git a/SharpMap/Web/Wcs/Client.cs b/SharpMap/Web/Wcs/Client.cs
index bead43a3..7f16da7c 100644
--- a/SharpMap/Web/Wcs/Client.cs
+++ b/SharpMap/Web/Wcs/Client.cs
@@ -37,7 +37,7 @@ public class Client : IClient
         /// </summary>
         public XmlNode VendorSpecificCapabilities
         {
-            get 
+            get
             {
                 return null;// _vendorSpecificCapabilities; 
             }
@@ -364,7 +364,7 @@ public XmlDocument GetRemoteXml()
         /// </summary>
         public void ParseVersion()
         {
-            
+
             if (XmlDoc.DocumentElement.Attributes["version"] != null)
             {
                 _version = XmlDoc.DocumentElement.Attributes["version"].Value;
diff --git a/SharpMap/Web/WebUtilities.cs b/SharpMap/Web/WebUtilities.cs
index 7ce3ec3d..823be731 100644
--- a/SharpMap/Web/WebUtilities.cs
+++ b/SharpMap/Web/WebUtilities.cs
@@ -37,14 +37,14 @@ private static void TestSystemWeb()
 
                     try
                     {
-                        var httpContextType = 
+                        var httpContextType =
                             assembly.GetType("System.Web.HttpContext");
-                         var httpContextPropertyInfo = 
-                            httpContextType.GetProperty("Current",
-                                                        BindingFlags.Public | BindingFlags.Static);
+                        var httpContextPropertyInfo =
+                           httpContextType.GetProperty("Current",
+                                                       BindingFlags.Public | BindingFlags.Static);
                         _context = httpContextPropertyInfo.GetValue(null, null);
 
-                        var cachePropertyInfo = 
+                        var cachePropertyInfo =
                             httpContextType.GetProperty("Cache",
                                                         BindingFlags.Public | BindingFlags.Instance);
                         if (_context != null)
@@ -99,9 +99,9 @@ private static object GetCurrentCache()
         {
             if (!_systemWebTested)
             {
-                lock(LockContext)
+                lock (LockContext)
                 {
-                    if (!_systemWebTested) 
+                    if (!_systemWebTested)
                         TestSystemWeb();
                 }
             }
@@ -114,7 +114,7 @@ private static object GetCurrentCache()
 
         [MethodImpl(MethodImplOptions.Synchronized)]
         internal static bool TryGetValue<T>(string key, out T instance)
-            where T: class
+            where T : class
         {
             var cache = GetCurrentCache();
             if (cache == null)
@@ -123,7 +123,7 @@ internal static bool TryGetValue<T>(string key, out T instance)
                 return false;
             }
 
-            instance = (T)_getMethodInfo.Invoke(cache, new object[] {key});
+            instance = (T)_getMethodInfo.Invoke(cache, new object[] { key });
             return instance != null;
         }
 
@@ -140,7 +140,7 @@ internal static bool TryGetValue<T>(string key, out T instance)
         /// <param name="instance"></param>
         /// <returns></returns>
         internal static bool TryAddValue<T>(string key, T instance)
-            where T: class
+            where T : class
         {
             return TryAddValue(key, instance, TimeSpan.FromDays(1));
         }
@@ -157,7 +157,7 @@ internal static bool TryAddValue<T>(string key, T instance, TimeSpan timeSpan)
             return true;
         }
     }
-    
+
     class WebUtilities
     {
         #region Reusable XML Parsing
diff --git a/SharpMap/Web/Wfs/Capabilities.cs b/SharpMap/Web/Wfs/Capabilities.cs
index 8048ff28..cb4fe4c0 100644
--- a/SharpMap/Web/Wfs/Capabilities.cs
+++ b/SharpMap/Web/Wfs/Capabilities.cs
@@ -129,7 +129,7 @@ public struct ServiceContact
                 public string Role;
 
                 #region Nested type: ContactInfo
-                
+
                 /// <summary>
                 /// Contact info structure
                 /// </summary>
@@ -139,22 +139,22 @@ public struct ContactInfo
                     /// Telephone
                     /// </summary>
                     public Phone Telephone;
-                    
+
                     /// <summary>
                     /// Address
                     /// </summary>
                     public Address AddressDetails;
-                    
+
                     /// <summary>
                     /// Online resource
                     /// </summary>
                     public string OnlineResource;
-                    
+
                     /// <summary>
                     /// Hours of service
                     /// </summary>
                     public string HoursOfService;
-                    
+
                     /// <summary>
                     /// Contact instructions
                     /// </summary>
@@ -173,7 +173,7 @@ public struct Phone
                         /// <summary>
                         /// Facsimile number
                         /// </summary>
-                        public string Facsimile;  
+                        public string Facsimile;
                     }
                     #endregion
 
@@ -226,7 +226,7 @@ public struct Address
 
         #endregion
 
-        
+
 
 
     }
diff --git a/SharpMap/Web/Wfs/Client.cs b/SharpMap/Web/Wfs/Client.cs
index 433845dd..71d9c4f3 100644
--- a/SharpMap/Web/Wfs/Client.cs
+++ b/SharpMap/Web/Wfs/Client.cs
@@ -60,8 +60,8 @@ public ICredentials Credentials
         /// </summary>
         public IWebProxy Proxy
         {
-            get{return _proxy;}
-            set{_proxy = value;}
+            get { return _proxy; }
+            set { _proxy = value; }
         }
 
         /// <summary>
@@ -325,7 +325,7 @@ public XmlDocument GetRemoteXml()
                 }
 
                 if (stream == null)
-                        throw new ApplicationException("No response stream");
+                    throw new ApplicationException("No response stream");
             }
             catch (Exception ex)
             {
@@ -362,7 +362,7 @@ public void ParseVersion()
             var doc = XmlDoc.DocumentElement;
             if (doc == null)
                 throw new InvalidOperationException("Could not get DocumentElement");
-            
+
             if (doc.Attributes["version"] != null)
             {
                 _version = doc.Attributes["version"].Value;
@@ -379,9 +379,9 @@ public void ParseVersion()
         /// </summary>
         public void ParseCapabilities()
         {
-            if(_xmlDoc == null)
+            if (_xmlDoc == null)
             {
-                throw (new ApplicationException("A valid WFS capabilities XML file was not loaded!"));   
+                throw (new ApplicationException("A valid WFS capabilities XML file was not loaded!"));
             }
 
             var documentElement = _xmlDoc.DocumentElement;
@@ -586,8 +586,8 @@ private void ParseServiceProvider(XmlNode xnlServiceProvider)
             node = xnlServiceProvider.SelectSingleNode("ows:ProviderSite", _nsmgr);
             _serviceProvider.ProviderSite = (node != null ? node.InnerText : null);
             XmlNode nodeServiceContact = xnlServiceProvider.SelectSingleNode("ows:ServiceContact", _nsmgr);
-            
-            if(nodeServiceContact != null)
+
+            if (nodeServiceContact != null)
             {
                 XmlNode node2 = nodeServiceContact.SelectSingleNode("ows:IndividualName", _nsmgr);
                 _serviceProvider.ServiceContactDetail.IndividualName = (node2 != null ? node2.InnerText : null);
@@ -596,12 +596,12 @@ private void ParseServiceProvider(XmlNode xnlServiceProvider)
 
                 XmlNode nodeContactInfo = xnlServiceProvider.SelectSingleNode("ows:ContactInfo", _nsmgr);
 
-                if(nodeContactInfo != null)
+                if (nodeContactInfo != null)
                 {
                     XmlNode nodePhone = nodeContactInfo.SelectSingleNode("ows:Phone", _nsmgr);
                     XmlNode nodeAddress = nodeContactInfo.SelectSingleNode("ows:Address", _nsmgr);
 
-                    if(nodePhone != null)
+                    if (nodePhone != null)
                     {
                         XmlNode node4 = nodePhone.SelectSingleNode("ows:Voice", _nsmgr);
                         _serviceProvider.ServiceContactDetail.ContactInformation.Telephone.Voice = (node4 != null ? node4.InnerText : null);
@@ -609,7 +609,7 @@ private void ParseServiceProvider(XmlNode xnlServiceProvider)
                         _serviceProvider.ServiceContactDetail.ContactInformation.Telephone.Facsimile = (node4 != null ? node4.InnerText : null);
                     }
 
-                    if(nodeAddress != null)
+                    if (nodeAddress != null)
                     {
                         XmlNode node5 = nodeAddress.SelectSingleNode("ows:DeliveryPoint", _nsmgr);
                         _serviceProvider.ServiceContactDetail.ContactInformation.AddressDetails.DeliveryPoint = (node5 != null ? node5.InnerText : null);
@@ -620,7 +620,7 @@ private void ParseServiceProvider(XmlNode xnlServiceProvider)
                         node5 = nodeAddress.SelectSingleNode("ows:PostalCode", _nsmgr);
                         _serviceProvider.ServiceContactDetail.ContactInformation.AddressDetails.PostalCode = (node5 != null ? node5.InnerText : null);
                         node5 = nodeAddress.SelectSingleNode("ows:Country", _nsmgr);
-                        _serviceProvider.ServiceContactDetail.ContactInformation.AddressDetails.Country= (node5 != null ? node5.InnerText : null);
+                        _serviceProvider.ServiceContactDetail.ContactInformation.AddressDetails.Country = (node5 != null ? node5.InnerText : null);
                         node5 = nodeAddress.SelectSingleNode("ows:ElectronicMailAddress", _nsmgr);
                         _serviceProvider.ServiceContactDetail.ContactInformation.AddressDetails.ElectronicMailAddress = (node5 != null ? node5.InnerText : null);
                     }
diff --git a/SharpMap/Web/Wms/Client.cs b/SharpMap/Web/Wms/Client.cs
index 3c28b7fb..44049ba0 100644
--- a/SharpMap/Web/Wms/Client.cs
+++ b/SharpMap/Web/Wms/Client.cs
@@ -1,15 +1,14 @@
+using Common.Logging;
+using NetTopologySuite.Geometries;
 using System;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Drawing;
-using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Text;
 using System.Xml;
 using System.Xml.Schema;
-using GeoAPI.Geometries;
-using Common.Logging;
 
 namespace SharpMap.Web.Wms
 {
@@ -235,7 +234,7 @@ public string Version
 
         ///<summary>
         ///</summary>
-        [Obsolete("Deprecated, use Version property instead.")]  
+        [Obsolete("Deprecated, use Version property instead.")]
         public string WmsVersion
         {
             get { return _version; }
@@ -383,8 +382,8 @@ public WmsServerLayer Layer
         /// </summary>
         public IWebProxy Proxy
         {
-            get { return _proxy;}
-            set {_proxy = value;}
+            get { return _proxy; }
+            set { _proxy = value; }
         }
 
         /// <summary>
@@ -392,7 +391,7 @@ public IWebProxy Proxy
         /// </summary>
         public string BaseUrl
         {
-            get{return _baseUrl;}
+            get { return _baseUrl; }
             set
             {
                 _capabilitiesUrl = CreateCapabilitiesUrl(_baseUrl);
@@ -413,7 +412,7 @@ public string CapabilitiesUrl
         /// </summary>
         public string GetXmlAsText
         {
-            get 
+            get
             {
                 StringWriter sw = new StringWriter();
                 XmlTextWriter xw = new XmlTextWriter(sw);
@@ -451,13 +450,13 @@ public XmlDocument XmlDoc
         /// <summary>
         /// Just instantiate, no parameters
         /// </summary>
-        public Client() {}
+        public Client() { }
 
         /// <summary>
         /// Initializes WMS server and parses the Capabilities request
         /// </summary>
         /// <param name="url">URL of wms server</param>
-        public Client(string url) 
+        public Client(string url)
             : this(url, null, 10000, null, "") { }
 
         /// <summary>
@@ -576,7 +575,7 @@ public XmlDocument GetRemoteXml()
                 myRequest.Credentials = _credentials ?? CredentialCache.DefaultCredentials;
                 myRequest.Timeout = _timeOut;
                 if (_proxy != null) myRequest.Proxy = _proxy;
-                
+
                 var myResponse = myRequest.GetResponse();
 
                 if (myResponse.ContentLength == 0)
@@ -785,7 +784,7 @@ private void ParseRequest(XmlNode xmlRequestNode)
         /// <summary>
         /// Parses GetMap request nodes
         /// </summary>
-        private void ParseRequestTypeBlock(XmlNode requestNodes, ref WmsOnlineResource[] requestResources, ref Collection<string> outputFormats )
+        private void ParseRequestTypeBlock(XmlNode requestNodes, ref WmsOnlineResource[] requestResources, ref Collection<string> outputFormats)
         {
             if (requestNodes != null)
             {
@@ -851,7 +850,7 @@ private WmsServerLayer ParseLayer(XmlNode xmlLayer)
             }
 
             XmlNodeList xnlCrs = null;
-            if(_version == "1.1.0" || _version == "1.1.1")
+            if (_version == "1.1.0" || _version == "1.1.1")
                 xnlCrs = xmlLayer.SelectNodes("sm:SRS", _nsmgr); // <--I think this needs to be version specific
             else
                 xnlCrs = xmlLayer.SelectNodes("sm:CRS", _nsmgr);
@@ -949,8 +948,8 @@ private WmsServerLayer ParseLayer(XmlNode xmlLayer)
                 if (!WebUtilities.TryParseNodeAsDouble(bbox.Attributes["miny"], out miny)) continue;
                 if (!WebUtilities.TryParseNodeAsDouble(bbox.Attributes["maxx"], out maxx)) continue;
                 if (!WebUtilities.TryParseNodeAsDouble(bbox.Attributes["maxy"], out maxy)) continue;
-                if (!WebUtilities.TryParseNodeAsEpsg(WebUtilities.FindEpsgNode(bbox), out epsg)) continue; 
-           
+                if (!WebUtilities.TryParseNodeAsEpsg(WebUtilities.FindEpsgNode(bbox), out epsg)) continue;
+
                 layer.SRIDBoundingBoxes.Add(new SpatialReferencedBoundingBox(minx, miny, maxx, maxy, epsg));
             }
             return layer;
@@ -963,7 +962,7 @@ public void ValidateXml()
         {
             try
             {
-                  // Now create StringWriter object to get data from xml document.
+                // Now create StringWriter object to get data from xml document.
                 var sw = new StringWriter();
                 var xw = new XmlTextWriter(sw);
                 _xmlDoc.WriteTo(xw);
@@ -993,22 +992,22 @@ public void ValidateXml()
                 }
 
                 settings.ValidationFlags = XmlSchemaValidationFlags.ReportValidationWarnings;
-                settings.ValidationEventHandler += new ValidationEventHandler(delegate(object sender, ValidationEventArgs args)
+                settings.ValidationEventHandler += new ValidationEventHandler(delegate (object sender, ValidationEventArgs args)
                        {
                            throw new ApplicationException("Could not validate the WMS capabilities file completely. Here is the validation error message..." + args.Message);
                        });
 
-				//TextReader, XMLReader, URL, Stream
+                //TextReader, XMLReader, URL, Stream
                 var xmlStream = (TextReader)new StringReader(sw.ToString());
                 var reader = XmlReader.Create(xmlStream, settings);
-                while (reader.Read());
+                while (reader.Read()) ;
             }
             catch (Exception ex)
             {
                 throw new ApplicationException("Could not validate the WMS capabilities file for this version of the capabilities file. Here is the validation error message..." + ex.Message, ex);
             }
         }
-        
+
         /// <summary>
         /// 
         /// </summary>
@@ -1026,8 +1025,8 @@ public string CreateCapabilitiesUrl(string url)
             if (!url.ToLower().Contains("request=getcapabilities"))
                 strReq.AppendFormat("REQUEST=GetCapabilities&");
 
-			//If version is NOT set at this point then add to query string
-            if(_version != "")
+            //If version is NOT set at this point then add to query string
+            if (_version != "")
                 strReq.AppendFormat("VERSION=" + _version + "&");
 
 
@@ -1042,14 +1041,14 @@ public void ParseVersion()
         {
             if (_xmlDoc.DocumentElement != null)
             {
-            if (_xmlDoc.DocumentElement.Attributes["version"] != null)
-            {
-                _version = _xmlDoc.DocumentElement.Attributes["version"].Value;
-                if (_version != "1.0.0" && _version != "1.1.0" && _version != "1.1.1" && _version != "1.3.0")
-                    throw new ApplicationException("WMS Version " + _version + " is not currently supported");
-            }
-            else
-                throw (new ApplicationException("No service version number was found in the capabilities XML file!"));
+                if (_xmlDoc.DocumentElement.Attributes["version"] != null)
+                {
+                    _version = _xmlDoc.DocumentElement.Attributes["version"].Value;
+                    if (_version != "1.0.0" && _version != "1.1.0" && _version != "1.1.1" && _version != "1.3.0")
+                        throw new ApplicationException("WMS Version " + _version + " is not currently supported");
+                }
+                else
+                    throw (new ApplicationException("No service version number was found in the capabilities XML file!"));
             }
         }
 
diff --git a/SharpMap/Web/Wms/SpatialReferencedBoundingBox.cs b/SharpMap/Web/Wms/SpatialReferencedBoundingBox.cs
index 0f4fa89f..ffef7f93 100644
--- a/SharpMap/Web/Wms/SpatialReferencedBoundingBox.cs
+++ b/SharpMap/Web/Wms/SpatialReferencedBoundingBox.cs
@@ -1,4 +1,4 @@
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 
 namespace SharpMap.Web.Wms
 {
@@ -20,7 +20,7 @@ public class SpatialReferencedBoundingBox : Envelope
         /// <param name="minY">The minimum y-ordinate value</param>
         /// <param name="maxY">The maximum y-ordinate value</param>
         /// <param name="srid">Spatial Reference ID</param>
-        public SpatialReferencedBoundingBox(double minX, double minY, double maxX, double maxY, int srid) 
+        public SpatialReferencedBoundingBox(double minX, double minY, double maxX, double maxY, int srid)
             : base(minX, maxX, minY, maxY)
         {
             SRID = srid;
diff --git a/SharpMap/Web/Wms/Tiling/ITileCache.cs b/SharpMap/Web/Wms/Tiling/ITileCache.cs
index 898fe30a..a341a2ce 100644
--- a/SharpMap/Web/Wms/Tiling/ITileCache.cs
+++ b/SharpMap/Web/Wms/Tiling/ITileCache.cs
@@ -15,8 +15,8 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System.Drawing;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Web.Wms.Tiling
 {
@@ -31,7 +31,7 @@ public interface ITileCache
         /// <param name="box">The bounding <paramref name="box"/> of the area covered by the <paramref name="tile"/>.</param>
         /// <param name="tile">The tile image</param>
         void AddTile(Envelope box, Bitmap tile);
-        
+
         /// <summary>
         /// Function to retrieve a tile from the cache that covers the provided <paramref name="box"/>.
         /// </summary>
diff --git a/SharpMap/Web/Wms/Tiling/TileCacheFileStorage.cs b/SharpMap/Web/Wms/Tiling/TileCacheFileStorage.cs
index b4fd4402..f9fc8750 100644
--- a/SharpMap/Web/Wms/Tiling/TileCacheFileStorage.cs
+++ b/SharpMap/Web/Wms/Tiling/TileCacheFileStorage.cs
@@ -15,13 +15,13 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Reflection;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Web.Wms.Tiling
 {
@@ -104,4 +104,4 @@ private string GetFileName(Envelope boundingBox)
                                  "png");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Web/Wms/Tiling/TileExtents.cs b/SharpMap/Web/Wms/Tiling/TileExtents.cs
index f14ece56..7eec4196 100644
--- a/SharpMap/Web/Wms/Tiling/TileExtents.cs
+++ b/SharpMap/Web/Wms/Tiling/TileExtents.cs
@@ -15,9 +15,9 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Web.Wms.Tiling
 {
@@ -41,23 +41,23 @@ public static List<Envelope> GetTileExtents(TileSet tileSet, Envelope extent, do
             double xOrigin = tileSet.BoundingBox.MinX;
             double yOrigin = tileSet.BoundingBox.MinY;
 
-            double tileWorldUnits = tileResolution*tileSet.Width;
+            double tileWorldUnits = tileResolution * tileSet.Width;
 
             var tileBbox = new Envelope(
-                Math.Floor((extent.MinX - xOrigin)/tileWorldUnits)*tileWorldUnits + xOrigin,
-                Math.Floor((extent.MinY - yOrigin)/tileWorldUnits)*tileWorldUnits + yOrigin,
-                Math.Ceiling((extent.MaxX - xOrigin)/tileWorldUnits)*tileWorldUnits + xOrigin,
-                Math.Ceiling((extent.MaxY - yOrigin)/tileWorldUnits)*tileWorldUnits + yOrigin);
+                Math.Floor((extent.MinX - xOrigin) / tileWorldUnits) * tileWorldUnits + xOrigin,
+                Math.Floor((extent.MinY - yOrigin) / tileWorldUnits) * tileWorldUnits + yOrigin,
+                Math.Ceiling((extent.MaxX - xOrigin) / tileWorldUnits) * tileWorldUnits + xOrigin,
+                Math.Ceiling((extent.MaxY - yOrigin) / tileWorldUnits) * tileWorldUnits + yOrigin);
 
-            int tileCountX = (int) Math.Round((tileBbox.MaxX - tileBbox.MinX)/tileWorldUnits);
-            int tileCountY = (int) Math.Round((tileBbox.MaxY - tileBbox.MinY)/tileWorldUnits);
+            int tileCountX = (int)Math.Round((tileBbox.MaxX - tileBbox.MinX) / tileWorldUnits);
+            int tileCountY = (int)Math.Round((tileBbox.MaxY - tileBbox.MinY) / tileWorldUnits);
 
             for (int x = 0; x < tileCountX; x++)
             {
                 for (int y = 0; y < tileCountY; y++)
                 {
-                    double x1 = tileBbox.MinX    + x*tileWorldUnits;
-                    double y1 = tileBbox.MinY + y*tileWorldUnits;
+                    double x1 = tileBbox.MinX + x * tileWorldUnits;
+                    double y1 = tileBbox.MinY + y * tileWorldUnits;
                     double x2 = x1 + tileWorldUnits;
                     double y2 = y1 + tileWorldUnits;
 
@@ -126,4 +126,4 @@ private static double GetTileResolution(List<double> resolutions, double resolut
             return resolutions[result];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/SharpMap/Web/Wms/Tiling/TileSet.cs b/SharpMap/Web/Wms/Tiling/TileSet.cs
index faf6daef..8f790030 100644
--- a/SharpMap/Web/Wms/Tiling/TileSet.cs
+++ b/SharpMap/Web/Wms/Tiling/TileSet.cs
@@ -15,12 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Xml;
-using GeoAPI.Geometries;
 
 namespace SharpMap.Web.Wms.Tiling
 {
@@ -137,7 +137,7 @@ private static TileSet ParseTileSetNode(XmlNode xnlTileSet, XmlNamespaceManager
 
             var xnLayers = xnlTileSet.SelectSingleNode("sm:Layers", nsmgr);
             if (xnLayers != null)
-                tileSet.Layers.AddRange(xnLayers.InnerText.Split(new[] {','}));
+                tileSet.Layers.AddRange(xnLayers.InnerText.Split(new[] { ',' }));
 
             tileSet.Name = CreateDefaultName(tileSet._layers);
 
@@ -169,7 +169,7 @@ private static TileSet ParseTileSetNode(XmlNode xnlTileSet, XmlNamespaceManager
 
             var xnStyles = xnlTileSet.SelectSingleNode("sm:Styles", nsmgr);
             if (xnStyles != null)
-                tileSet.Styles.AddRange(xnStyles.InnerText.Split(new[] {','}));
+                tileSet.Styles.AddRange(xnStyles.InnerText.Split(new[] { ',' }));
 
             var xnBoundingBox = xnlTileSet.SelectSingleNode("sm:BoundingBox", nsmgr);
             if (xnBoundingBox != null)
@@ -190,7 +190,7 @@ private static TileSet ParseTileSetNode(XmlNode xnlTileSet, XmlNamespaceManager
             var xnResolutions = xnlTileSet.SelectSingleNode("sm:Resolutions", nsmgr);
             if (xnResolutions != null)
             {
-                var resolutions = xnResolutions.InnerText.TrimEnd(' ').Split(new[] {' '});
+                var resolutions = xnResolutions.InnerText.TrimEnd(' ').Split(new[] { ' ' });
                 foreach (string resolutionStr in resolutions)
                 {
                     if (resolutionStr != "")
diff --git a/UnitTests/Converters/SqlServer2008.cs b/UnitTests/Converters/SqlServer2008.cs
index 3bcba9f1..51a53dbd 100644
--- a/UnitTests/Converters/SqlServer2008.cs
+++ b/UnitTests/Converters/SqlServer2008.cs
@@ -1,11 +1,15 @@
-using System;
-using GeoAPI.Geometries;
-using NUnit.Framework;
 using Microsoft.SqlServer.Types;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using ProjNet.CoordinateSystems;
+using ProjNet.CoordinateSystems.Transformations;
 using SharpMap.Converters.SqlServer2008SpatialObjects;
 using SharpMap.Converters.WellKnownText;
-using SharpMap.Geometries;
+using SharpMap.CoordinateSystems;
 using SharpMap.Data.Providers;
+using SharpMap.Geometries;
+using System;
 
 namespace UnitTests.Converters
 {
@@ -28,12 +32,20 @@ public class SqlServer2008
         [OneTimeSetUp]
         public void SetupFixture()
         {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
             //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+            var gss = NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
+                new CoordinateSystemFactory(),
+                new CoordinateTransformationFactory(),
+                SpatialReference.GetAllReferenceSystems());
+            SharpMap.Session.Instance
+                .SetGeometryServices(gss)
+                .SetCoordinateSystemServices(css)
+                .SetCoordinateSystemRepository(css);
         }
 
 
-        private IGeometry ToSqlServerAndBack(IGeometry gIn, SqlServerSpatialObjectType spatialType)
+        private Geometry ToSqlServerAndBack(Geometry gIn, SqlServerSpatialObjectType spatialType)
         {
             Assert.That(gIn, Is.Not.Null);
             //Assert.That(gIn.SRID, Is.EqualTo(-1));
@@ -78,7 +90,7 @@ public void ConvertAndBack(SqlServerSpatialObjectType spatialType)
             gPl.SRID = srid;
             gMPol.SRID = srid;
 
-            var comparison = new Comparison<IGeometry>((u, v) => u.EqualsExact(v) ? 0 : 1);
+            var comparison = new Comparison<Geometry>((u, v) => u.EqualsExact(v) ? 0 : 1);
 
             Assert.That(ToSqlServerAndBack(gPn, spatialType), Is.EqualTo(gPn).Using(comparison));
             Assert.That(ToSqlServerAndBack(gMp, spatialType), Is.EqualTo(gMp).Using(comparison));
diff --git a/UnitTests/Converters/WKB/WKBTests.cs b/UnitTests/Converters/WKB/WKBTests.cs
index ed51448c..c611b610 100644
--- a/UnitTests/Converters/WKB/WKBTests.cs
+++ b/UnitTests/Converters/WKB/WKBTests.cs
@@ -1,19 +1,17 @@
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using GeoAPI.Geometries;
-using NUnit.Framework;
 using NetTopologySuite.Geometries;
+using NUnit.Framework;
 using SharpMap.Converters.WellKnownBinary;
 using SharpMap.Converters.WellKnownText;
+using System.IO;
+using System.Text;
 
 namespace UnitTests.Converters.WKB
 {
     [TestFixture]
     public class WKBTests
     {
-        private static readonly IGeometryFactory Factory = new GeometryFactory();
-        
+        private static readonly GeometryFactory Factory = new GeometryFactory();
+
         private string point = "POINT (20.564 346.3493254)";
         private string multipoint = "MULTIPOINT (20.564 346.3493254, 45 32, 23 54)";
         private string linestring = "LINESTRING (20 20, 20 30, 30 30, 30 20, 40 20)";
@@ -23,7 +21,7 @@ public class WKBTests
 
         private string polygon = "POLYGON ((20 20, 20 30, 30 30, 30 20, 20 20), (21 21, 21 29, 29 29, 29 21, 21 21))";
 
-        private IGeometry ToBinaryAndBack(IGeometry gIn, WkbByteOrder byteOrder)
+        private Geometry ToBinaryAndBack(Geometry gIn, WkbByteOrder byteOrder)
         {
             MemoryStream stream = new MemoryStream();
             BinaryWriter writer = new BinaryWriter(stream);
@@ -84,7 +82,7 @@ public void Convert()
         [Test]
         public void TestHugeGeometryCollection()
         {
-            IGeometry geom = null;
+            Geometry geom = null;
             string filePath = TestUtility.GetPathToTestFile("Base 64.txt");
 
             if (!File.Exists(filePath))
@@ -98,7 +96,7 @@ public void TestHugeGeometryCollection()
                     sb.AppendLine(sr.ReadLine());
                 }
                 var wkb = System.Convert.FromBase64String(sb.ToString());
-                Assert.DoesNotThrow( () => geom = GeometryFromWKB.Parse(wkb, new GeometryFactory()));
+                Assert.DoesNotThrow(() => geom = GeometryFromWKB.Parse(wkb, new GeometryFactory()));
             }
             Assert.IsTrue(geom.OgcGeometryType == OgcGeometryType.GeometryCollection);
         }
diff --git a/UnitTests/Converters/WKT/SpatialReferenceTests.cs b/UnitTests/Converters/WKT/SpatialReferenceTests.cs
index d62a6832..c3ba87fa 100644
--- a/UnitTests/Converters/WKT/SpatialReferenceTests.cs
+++ b/UnitTests/Converters/WKT/SpatialReferenceTests.cs
@@ -1,5 +1,4 @@
-using System;
-using NUnit.Framework;
+using NUnit.Framework;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
 
@@ -34,7 +33,7 @@ public void WebMercatorCanBeTranformed(int srid)
 
             var csf = new CoordinateSystemFactory();
             var cs = csf.CreateFromWkt(wkt);
-            
+
             var ctf = new CoordinateTransformationFactory();
             Assert.DoesNotThrow(() => ctf.CreateFromCoordinateSystems(cs, GeographicCoordinateSystem.WGS84),
                 "Could not reproject SRID:" + srid);
diff --git a/UnitTests/Converters/WKT/WktGeometryTests.cs b/UnitTests/Converters/WKT/WktGeometryTests.cs
index 5cc291b6..120c975f 100644
--- a/UnitTests/Converters/WKT/WktGeometryTests.cs
+++ b/UnitTests/Converters/WKT/WktGeometryTests.cs
@@ -1,19 +1,16 @@
-using System;
-using System.ComponentModel;
-using GeoAPI.Geometries;
-using NUnit.Framework;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
+using NUnit.Framework;
 
 namespace UnitTests.Converters.WKT
 {
     [TestFixture]
     public class WktGeometryTests
     {
-        private static readonly IGeometryFactory Factory = new GeometryFactory();
+        private static readonly GeometryFactory Factory = new GeometryFactory();
         private static readonly WKTReader WktReader = new WKTReader(Factory);
 
-        public static IGeometry GeomFromText(string wkt)
+        public static Geometry GeomFromText(string wkt)
         {
             return WktReader.Read(wkt);
         }
@@ -22,7 +19,7 @@ public static IGeometry GeomFromText(string wkt)
         public void ParseGeometryCollection()
         {
             string geomCollection = "GEOMETRYCOLLECTION (POINT (10 10), POINT (30 30), LINESTRING (15 15, 20 20))";
-            var geom = GeomFromText(geomCollection) as IGeometryCollection;
+            var geom = GeomFromText(geomCollection) as GeometryCollection;
             Assert.IsNotNull(geom);
             Assert.AreEqual(3, geom.NumGeometries);
             Assert.IsTrue(geom[0] is Point);
@@ -45,12 +42,12 @@ public void ParseGeometryCollection()
         public void ParseLineString()
         {
             string linestring = "LINESTRING (20 20, 20 30, 30 30, 30 20, 40 20)";
-            var geom = GeomFromText(linestring) as ILineString;
+            var geom = GeomFromText(linestring) as LineString;
             Assert.IsNotNull(geom);
             Assert.AreEqual(40, geom.Length);
             Assert.IsFalse(geom.IsRing);
             Assert.AreEqual(linestring, geom.AsText());
-            Assert.IsTrue((GeomFromText("LINESTRING EMPTY") as ILineString).IsEmpty);
+            Assert.IsTrue((GeomFromText("LINESTRING EMPTY") as LineString).IsEmpty);
             Assert.AreEqual("LINESTRING EMPTY", Factory.CreateLineString((Coordinate[])null).AsText());
             linestring = "LINESTRING (-3.32348670085011 56.3658879665301, 5.72037855874896E-05 53.5353372259589)";
             geom = GeomFromText(linestring) as LineString;
@@ -61,21 +58,21 @@ public void ParseLineString()
         public void ParseMultiLineString()
         {
             string multiLinestring = "MULTILINESTRING ((10 10, 40 50), (20 20, 30 20), (20 20, 50 20, 50 60, 20 20))";
-            var geom = GeomFromText(multiLinestring) as IMultiLineString;
+            var geom = GeomFromText(multiLinestring) as MultiLineString;
             Assert.IsNotNull(geom);
             Assert.AreEqual(3, geom.NumGeometries);
             Assert.AreEqual(180, geom.Length);
             Assert.AreEqual(120, geom[2].Length);
-            Assert.IsFalse(((ILineString)geom[0]).IsClosed, "[0].IsClosed");
-            Assert.IsFalse(((ILineString)geom[1]).IsClosed, "[1].IsClosed");
-            Assert.IsTrue(((ILineString)geom[2]).IsClosed, "[2].IsClosed");
+            Assert.IsFalse(((LineString)geom[0]).IsClosed, "[0].IsClosed");
+            Assert.IsFalse(((LineString)geom[1]).IsClosed, "[1].IsClosed");
+            Assert.IsTrue(((LineString)geom[2]).IsClosed, "[2].IsClosed");
             Assert.IsTrue(geom[0].IsSimple, "[0].IsSimple");
             Assert.IsTrue(geom[1].IsSimple, "[1].IsSimple");
             Assert.IsTrue(geom[2].IsSimple, "[2].IsSimple");
-            Assert.IsTrue(((ILineString)geom[2]).IsRing, "Third line is a ring");
+            Assert.IsTrue(((LineString)geom[2]).IsRing, "Third line is a ring");
             Assert.AreEqual(multiLinestring, geom.AsText());
             Assert.IsTrue(GeomFromText("MULTILINESTRING EMPTY").IsEmpty);
-            geom = GeomFromText("MULTILINESTRING ((10 10, 40 50), (20 20, 30 20), EMPTY, (20 20, 50 20, 50 60, 20 20))") as IMultiLineString;
+            geom = GeomFromText("MULTILINESTRING ((10 10, 40 50), (20 20, 30 20), EMPTY, (20 20, 50 20, 50 60, 20 20))") as MultiLineString;
             Assert.IsNotNull(geom);
             Assert.IsTrue(geom[2].IsEmpty);
             Assert.AreEqual(4, geom.NumGeometries);
@@ -86,10 +83,10 @@ public void ParseMultiLineString()
         public void ParseMultiPoint()
         {
             string multipoint = "MULTIPOINT ((20.564 346.3493254), (45 32), (23 54))";
-            var geom = GeomFromText(multipoint) as IMultiPoint;
+            var geom = GeomFromText(multipoint) as MultiPoint;
             Assert.IsNotNull(geom);
-            Assert.AreEqual(20.564, ((IPoint)geom[0]).X);
-            Assert.AreEqual(54, ((IPoint)geom[2]).Y);
+            Assert.AreEqual(20.564, ((Point)geom[0]).X);
+            Assert.AreEqual(54, ((Point)geom[2]).Y);
             Assert.AreEqual(multipoint, geom.AsText());
             Assert.IsTrue(GeomFromText("MULTIPOINT EMPTY").IsEmpty);
             Assert.AreEqual("MULTIPOINT EMPTY", Factory.CreateMultiPointFromCoords((Coordinate[])null).AsText());
@@ -99,19 +96,19 @@ public void ParseMultiPoint()
         public void ParseMultipolygon()
         {
             string multipolygon = "MULTIPOLYGON (((0 0, 10 0, 10 10, 0 10, 0 0)), ((5 5, 7 5, 7 7, 5 7, 5 5)))";
-            var geom = GeomFromText(multipolygon) as IMultiPolygon;
+            var geom = GeomFromText(multipolygon) as MultiPolygon;
             Assert.IsNotNull(geom);
             Assert.AreEqual(2, geom.NumGeometries);
             Assert.AreEqual(new Point(5, 5), geom[0].Centroid);
             Assert.AreEqual(multipolygon, geom.AsText());
             Assert.IsNotNull(GeomFromText("MULTIPOLYGON EMPTY"));
             Assert.IsTrue(GeomFromText("MULTIPOLYGON EMPTY").IsEmpty);
-            geom = GeomFromText("MULTIPOLYGON (((0 0, 10 0, 10 10, 0 10, 0 0)), EMPTY, ((5 5, 7 5, 7 7, 5 7, 5 5)))") as IMultiPolygon;
+            geom = GeomFromText("MULTIPOLYGON (((0 0, 10 0, 10 10, 0 10, 0 0)), EMPTY, ((5 5, 7 5, 7 7, 5 7, 5 5)))") as MultiPolygon;
             Assert.IsNotNull(geom);
             Assert.IsTrue(geom[1].IsEmpty);
-            Assert.AreEqual(new Point(5, 5), ((IPolygon)geom[2]).ExteriorRing.EndPoint);
-            Assert.AreEqual(new Point(5, 5), ((IPolygon)geom[2]).ExteriorRing.StartPoint);
-            Assert.AreEqual(((IPolygon)geom[2]).ExteriorRing.StartPoint, ((IPolygon)geom[2]).ExteriorRing.EndPoint);
+            Assert.AreEqual(new Point(5, 5), ((Polygon)geom[2]).ExteriorRing.EndPoint);
+            Assert.AreEqual(new Point(5, 5), ((Polygon)geom[2]).ExteriorRing.StartPoint);
+            Assert.AreEqual(((Polygon)geom[2]).ExteriorRing.StartPoint, ((Polygon)geom[2]).ExteriorRing.EndPoint);
             Assert.AreEqual(3, geom.NumGeometries);
             Assert.AreEqual("MULTIPOLYGON EMPTY", Factory.CreateMultiPolygon(null).AsText());
         }
@@ -120,7 +117,7 @@ public void ParseMultipolygon()
         public void ParsePoint()
         {
             string point = "POINT (20.564 346.3493254)";
-            var geom = GeomFromText(point) as IPoint;
+            var geom = GeomFromText(point) as Point;
             Assert.IsNotNull(geom);
             Assert.AreEqual(20.564, geom.X);
             Assert.AreEqual(346.3493254, geom.Y);
@@ -133,37 +130,37 @@ public void ParsePoint()
         public void ParsePolygon()
         {
             string polygon = "POLYGON ((20 20, 20 30, 30 30, 30 20, 20 20))";
-            var geom = GeomFromText(polygon) as IPolygon;
+            var geom = GeomFromText(polygon) as Polygon;
             Assert.IsNotNull(geom);
             Assert.AreEqual(40, geom.ExteriorRing.Length);
             Assert.AreEqual(100, geom.Area);
             Assert.AreEqual(polygon, geom.AsText());
             //Test interior rings
             polygon = "POLYGON ((20 20, 20 30, 30 30, 30 20, 20 20), (21 21, 29 21, 29 29, 21 29, 21 21), (23 23, 23 27, 27 27, 27 23, 23 23))";
-            geom = GeomFromText(polygon) as IPolygon;
+            geom = GeomFromText(polygon) as Polygon;
             Assert.IsNotNull(geom);
-            Assert.AreEqual(88, geom.Length);            
-            Assert.AreEqual(20, geom.Area);            
-            ILinearRing exteriorRing = geom.ExteriorRing as ILinearRing;
+            Assert.AreEqual(88, geom.Length);
+            Assert.AreEqual(20, geom.Area);
+            LinearRing exteriorRing = geom.ExteriorRing as LinearRing;
             Assert.IsNotNull(exteriorRing);
             Assert.AreEqual(40, exteriorRing.Length);
             Assert.AreEqual(0, exteriorRing.Area);
-            IPolygon exteriorPoly = exteriorRing.Factory.CreatePolygon(exteriorRing, null);
+            Polygon exteriorPoly = exteriorRing.Factory.CreatePolygon(exteriorRing, null);
             Assert.IsNotNull(exteriorPoly);
             Assert.AreEqual(100, exteriorPoly.Area);
             Assert.AreEqual(2, geom.NumInteriorRings);
-            ILinearRing interiorRingOne = geom.InteriorRings[0] as ILinearRing;
+            LinearRing interiorRingOne = geom.InteriorRings[0] as LinearRing;
             Assert.IsNotNull(interiorRingOne);
             Assert.AreEqual(32, interiorRingOne.Length);
             Assert.AreEqual(0, interiorRingOne.Area);
-            IPolygon interiorPolyOne = interiorRingOne.Factory.CreatePolygon(interiorRingOne, null);
+            Polygon interiorPolyOne = interiorRingOne.Factory.CreatePolygon(interiorRingOne, null);
             Assert.IsNotNull(interiorPolyOne);
             Assert.AreEqual(64, interiorPolyOne.Area);
-            ILinearRing interiorRingTwo = geom.InteriorRings[1] as ILinearRing;
+            LinearRing interiorRingTwo = geom.InteriorRings[1] as LinearRing;
             Assert.IsNotNull(interiorRingTwo);
             Assert.AreEqual(16, interiorRingTwo.Length);
             Assert.AreEqual(0, interiorRingTwo.Area);
-            IPolygon interiorPolyTwo = interiorRingTwo.Factory.CreatePolygon(interiorRingTwo, null);
+            Polygon interiorPolyTwo = interiorRingTwo.Factory.CreatePolygon(interiorRingTwo, null);
             Assert.IsNotNull(interiorPolyTwo);
             Assert.AreEqual(16, interiorPolyTwo.Area);
             Assert.AreEqual(exteriorPoly.Area - interiorPolyOne.Area - interiorPolyTwo.Area, geom.Area);
@@ -173,6 +170,6 @@ public void ParsePolygon()
             Assert.AreEqual("POLYGON EMPTY", Factory.CreatePolygon(null, null).AsText());
         }
 
-        
+
     }
 }
diff --git a/UnitTests/CoordinateSystems/CoordinateSystemExtensionsTest.cs b/UnitTests/CoordinateSystems/CoordinateSystemExtensionsTest.cs
index c040e4ad..2ecceae4 100644
--- a/UnitTests/CoordinateSystems/CoordinateSystemExtensionsTest.cs
+++ b/UnitTests/CoordinateSystems/CoordinateSystemExtensionsTest.cs
@@ -1,9 +1,5 @@
-using System.Drawing;
-using System.Globalization;
-using System.Text;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.Geometries;
-using NetTopologySuite;
+using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
@@ -12,6 +8,7 @@
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
+using System.Drawing;
 
 namespace UnitTests.CoordinateSystems
 {
@@ -21,19 +18,17 @@ public class CoordinateSystemExtensionsTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            var gss = new NtsGeometryServices();
+            var gss = NtsGeometryServices.Instance;
             var css = new CoordinateSystemServices(
                 new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
-
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
         }
-        
+
         [TestCase(4326)]
         [TestCase(25832)]
         [TestCase(31467)]
@@ -41,8 +36,8 @@ public void OneTimeSetUp()
         public void TestCoordinateSystemForMap(int srid)
         {
             var map = new Map(new Size(200, 150)) { SRID = srid };
-            ICoordinateSystem cs = null;
-            Assert.DoesNotThrow( () => cs = map.GetCoordinateSystem());
+            CoordinateSystem cs = null;
+            Assert.DoesNotThrow(() => cs = map.GetCoordinateSystem());
             Assert.NotNull(cs);
             Assert.AreEqual("EPSG", cs.Authority);
             Assert.AreEqual((long)srid, cs.AuthorityCode);
@@ -54,9 +49,9 @@ public void TestCoordinateSystemForMap(int srid)
         [TestCase(3758)]
         public void TestCoordinateSystemForLayer(int srid)
         {
-            var map = new VectorLayer("LayerName", new GeometryFeatureProvider(new FeatureDataTable())) {SRID = srid};
-            ICoordinateSystem cs = null;
-            Assert.DoesNotThrow( () => cs = map.GetCoordinateSystem());
+            var map = new VectorLayer("LayerName", new GeometryFeatureProvider(new FeatureDataTable())) { SRID = srid };
+            CoordinateSystem cs = null;
+            Assert.DoesNotThrow(() => cs = map.GetCoordinateSystem());
             Assert.NotNull(cs);
             Assert.AreEqual("EPSG", cs.Authority);
             Assert.AreEqual((long)srid, cs.AuthorityCode);
@@ -69,7 +64,7 @@ public void TestCoordinateSystemForLayer(int srid)
         public void TestCoordinateSystemForProvider(int srid)
         {
             var map = new GeometryFeatureProvider(new FeatureDataTable()) { SRID = srid };
-            ICoordinateSystem cs = null;
+            CoordinateSystem cs = null;
             Assert.DoesNotThrow(() => cs = map.GetCoordinateSystem());
             Assert.NotNull(cs);
             Assert.AreEqual("EPSG", cs.Authority);
@@ -82,9 +77,9 @@ public void TestCoordinateSystemForProvider(int srid)
         [TestCase(3758)]
         public void TestCoordinateSystemForGeometry(int srid)
         {
-            var map = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(srid);
+            var map = NtsGeometryServices.Instance.CreateGeometryFactory(srid);
             var g = map.CreatePoint(new Coordinate(10, 10));
-            ICoordinateSystem cs = null;
+            CoordinateSystem cs = null;
             Assert.DoesNotThrow(() => cs = g.GetCoordinateSystem());
             Assert.NotNull(cs);
             Assert.AreEqual("EPSG", cs.Authority);
diff --git a/UnitTests/CoordinateSystems/Transformations/GeometryTransformTest.cs b/UnitTests/CoordinateSystems/Transformations/GeometryTransformTest.cs
index a6f95083..726a9230 100644
--- a/UnitTests/CoordinateSystems/Transformations/GeometryTransformTest.cs
+++ b/UnitTests/CoordinateSystems/Transformations/GeometryTransformTest.cs
@@ -2,6 +2,6 @@
 {
     public class GeometryTransformTest
     {
-         
+
     }
 }
\ No newline at end of file
diff --git a/UnitTests/Data/FeatureDataSetTests.cs b/UnitTests/Data/FeatureDataSetTests.cs
index e0c885e9..2ac48cea 100644
--- a/UnitTests/Data/FeatureDataSetTests.cs
+++ b/UnitTests/Data/FeatureDataSetTests.cs
@@ -1,8 +1,8 @@
-using System;
+using NUnit.Framework;
+using SharpMap.Data;
+using System;
 using System.Data;
 using System.Linq;
-using NUnit.Framework;
-using SharpMap.Data;
 
 namespace UnitTests.Data
 {
@@ -11,8 +11,8 @@ public class FeatureDataSetTests : Serialization.BaseSerializationTest
         [Test]
         public void TestCreateJoin()
         {
-            var fds = new FeatureDataSet {DataSetName = "Join"};
-            var ds = (DataSet) fds;
+            var fds = new FeatureDataSet { DataSetName = "Join" };
+            var ds = (DataSet)fds;
 
             var t1 = CreateFeatureDataTable("T1");
             fds.Tables.Add(t1);
@@ -23,7 +23,7 @@ public void TestCreateJoin()
             Assert.AreEqual(2, ds.Tables.Count);
             Assert.AreEqual(1, fds.Tables.Count);
 
-            Assert.DoesNotThrow( () => fds.Relations.Add(t1.Columns[0], t2.Columns[0]));
+            Assert.DoesNotThrow(() => fds.Relations.Add(t1.Columns[0], t2.Columns[0]));
 
         }
 
@@ -43,7 +43,7 @@ private static DataTable CreateDataTable(string name, bool pk = false)
             var t2 = new DataTable(name);
             t2.Columns.Add("oid", typeof(uint));
             t2.Columns.Add("P1", typeof(string));
-            if (pk) t2.PrimaryKey = new [] { t2.Columns[0] };
+            if (pk) t2.PrimaryKey = new[] { t2.Columns[0] };
             return t2;
         }
 
@@ -54,12 +54,12 @@ public void TestIndexing()
             var ds = (DataSet)fds;
 
             for (var i = 0; i < 10; i++)
-                ds.Tables.Add(i%2 == 0 ? CreateFeatureDataTable("T" + i) : CreateDataTable("T" + i, true));
+                ds.Tables.Add(i % 2 == 0 ? CreateFeatureDataTable("T" + i) : CreateDataTable("T" + i, true));
 
             Assert.AreEqual(10, ds.Tables.Count);
             Assert.AreEqual(5, fds.Tables.Count);
             for (var i = 0; i < 5; i++)
-                Assert.IsTrue(ReferenceEquals(ds.Tables[2*i], fds.Tables[i]));
+                Assert.IsTrue(ReferenceEquals(ds.Tables[2 * i], fds.Tables[i]));
         }
 
         [Test]
@@ -83,9 +83,9 @@ public void TestSerializationOfDataset()
             var l3 = CreateFeatureDataTable("layer 3");
 
             fds.Tables.Add(l3);
-            
+
             fds.Relations.Add(l2.Columns["oid"], l3.Columns["oid"]);
-            
+
             FeatureDataSet deserializedFds = null;
 
             Assert.DoesNotThrow(() => deserializedFds = SandD(fds, GetFormatter()));
@@ -117,7 +117,7 @@ public void TestSerializationOfDataset()
         [Test]
         public void TestSerialization()
         {
-            var fds = new FeatureDataSet { DataSetName = "Serialization", Namespace = "ns"};
+            var fds = new FeatureDataSet { DataSetName = "Serialization", Namespace = "ns" };
             using (var p = Serialization.ProviderTest.CreateProvider("managedspatialite"))
             {
                 p.Open();
@@ -126,7 +126,7 @@ public void TestSerialization()
             }
 
             FeatureDataTable deserializedFds = null;
-            Assert.DoesNotThrow( () => deserializedFds = SandD(fds.Tables[0], GetFormatter()));
+            Assert.DoesNotThrow(() => deserializedFds = SandD(fds.Tables[0], GetFormatter()));
 
             //Assert.IsNotNull(deserializedFds);
             //Assert.AreEqual(fds.DataSetName, deserializedFds.DataSetName);
diff --git a/UnitTests/Data/Providers/DataTablePointTests.cs b/UnitTests/Data/Providers/DataTablePointTests.cs
index cad7595b..b44f3825 100644
--- a/UnitTests/Data/Providers/DataTablePointTests.cs
+++ b/UnitTests/Data/Providers/DataTablePointTests.cs
@@ -15,13 +15,12 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
-using System;
-using System.Data;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
+using System;
+using System.Data;
 
 namespace UnitTests.Data.Providers
 {
@@ -45,11 +44,11 @@ internal static DataTable CreateDataTableSource()
                 DataRow row = source.NewRow();
                 row["oid"] = i;
                 row["name"] = "Feature #" + i;
-                row["x"] = rnd.NextDouble()*1000;
-                row["y"] = rnd.NextDouble()*1000;
+                row["x"] = rnd.NextDouble() * 1000;
+                row["y"] = rnd.NextDouble() * 1000;
                 source.Rows.Add(row);
             }
-            source.PrimaryKey = new[] {pk};
+            source.PrimaryKey = new[] { pk };
 
             return source;
         }
@@ -84,7 +83,7 @@ public void ExecuteIntersectionQueryReturnsExpectedFeatures()
 
             foreach (DataRowView rowView in source.DefaultView)
             {
-                if (query.Contains(new Coordinate((double) rowView["x"], (double) rowView["y"])))
+                if (query.Contains(new Coordinate((double)rowView["x"], (double)rowView["y"])))
                 {
                     expected.ImportRow(rowView.Row);
                 }
@@ -123,10 +122,10 @@ public void GetExtentsComputation()
 
             foreach (DataRowView rowView in source.DefaultView)
             {
-                if (minX > (double) rowView["x"]) minX = (double) rowView["x"];
-                if (minY > (double) rowView["y"]) minY = (double) rowView["y"];
-                if (maxX < (double) rowView["x"]) maxX = (double) rowView["x"];
-                if (maxY < (double) rowView["y"]) maxY = (double) rowView["y"];
+                if (minX > (double)rowView["x"]) minX = (double)rowView["x"];
+                if (minY > (double)rowView["y"]) minY = (double)rowView["y"];
+                if (maxX < (double)rowView["x"]) maxX = (double)rowView["x"];
+                if (maxY < (double)rowView["y"]) maxY = (double)rowView["y"];
             }
 
             Envelope expectedBounds = new Envelope(minX, maxX, minY, maxY);
@@ -142,9 +141,9 @@ public void GetGeometryByIDReturnsExpectedGeometry()
             DataTablePoint provider = new DataTablePoint(source, "oid", "x", "y");
 
             DataRow row = source.Select("oid = 43")[0];
-            Point expected = new Point((double) row["x"], (double) row["y"]);
+            Point expected = new Point((double)row["x"], (double)row["y"]);
 
-            IGeometry actual = provider.GetGeometryByID(43);
+            Geometry actual = provider.GetGeometryByID(43);
 
             Assert.IsNotNull(actual);
             Assert.IsTrue(actual is Point);
diff --git a/UnitTests/Data/Providers/DbPointProviderTest.cs b/UnitTests/Data/Providers/DbPointProviderTest.cs
index a7f90929..1084b565 100644
--- a/UnitTests/Data/Providers/DbPointProviderTest.cs
+++ b/UnitTests/Data/Providers/DbPointProviderTest.cs
@@ -1,8 +1,8 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
+using System;
 
 namespace UnitTests.Data.Providers
 {
@@ -11,9 +11,8 @@ public class DbPointProviderTest : ProviderTest
     {
         private System.Data.Common.DbConnection _connection; // Keep connection active; when closed, the in-memory database is dropped
 
-        public override void OneTimeSetUp()
+        public DbPointProviderTest()
         {
-            base.OneTimeSetUp();
             _connection = WriteSqlLite();
         }
 
@@ -105,7 +104,7 @@ public void TestGetGeometryById()
         {
             using (var p = CreateProvider())
             {
-                IGeometry feature = null;
+                Geometry feature = null;
                 Assert.DoesNotThrow(() => feature = p.GetGeometryByID(3));
                 Assert.IsNotNull(feature);
                 Assert.AreEqual(feature.Centroid.Coordinate,
@@ -131,7 +130,7 @@ public void TestExecuteIntersectionQueryAgainstEnvelopeEqualsGetOidsInView()
         {
             using (var p = CreateProvider())
             {
-                var ext =p.GetExtents();
+                var ext = p.GetExtents();
                 var fds = new FeatureDataSet();
                 Assert.DoesNotThrow(() => p.ExecuteIntersectionQuery(ext, fds));
                 Assert.AreEqual(1, fds.Tables.Count);
diff --git a/UnitTests/Data/Providers/DbTests.cs b/UnitTests/Data/Providers/DbTests.cs
index bb5d397e..81e7b859 100644
--- a/UnitTests/Data/Providers/DbTests.cs
+++ b/UnitTests/Data/Providers/DbTests.cs
@@ -18,7 +18,7 @@ public void OneTimeSetUp()
                 throw new NUnit.Framework.IgnoreException("Provider cound not be instantiated!");
             }
         }
-        
+
         protected abstract System.Data.Common.DbConnection GetOpenConnection();
         protected TProvider GetProvider()
         {
@@ -107,8 +107,8 @@ public void Test07GetGeometryByID()
         {
             using (var provider = GetProvider())
             {
-                GeoAPI.Geometries.IGeometry result = null;
-                NUnit.Framework.Assert.DoesNotThrow( () => result = provider.GetGeometryByID(1));
+                NetTopologySuite.Geometries.Geometry result = null;
+                NUnit.Framework.Assert.DoesNotThrow(() => result = provider.GetGeometryByID(1));
                 NUnit.Framework.Assert.IsNotNull(result);
             }
         }
@@ -119,7 +119,7 @@ public void Test09ExecuteIntersectionQuery()
             using (var provider = GetProvider())
             {
                 var ext = provider.GetExtents();
-                ext.ExpandBy(-0.25*ext.Width, -0.25*ext.Height);
+                ext.ExpandBy(-0.25 * ext.Width, -0.25 * ext.Height);
 
                 var fds = new SharpMap.Data.FeatureDataSet();
                 NUnit.Framework.Assert.DoesNotThrow(() => provider.ExecuteIntersectionQuery(ext, fds));
@@ -144,14 +144,14 @@ public void Test10ExecuteIntersectionQuery()
                 NUnit.Framework.Assert.Less(fds.Tables[0].Count, provider.GetFeatureCount());
             }
         }
-    
+
         [NUnit.Framework.Test]
         public void Test11GetFeature()
         {
             using (var provider = GetProvider())
             {
                 SharpMap.Data.FeatureDataRow feature = null;
-                NUnit.Framework.Assert.DoesNotThrow(()=>  feature = provider.GetFeature(5));
+                NUnit.Framework.Assert.DoesNotThrow(() => feature = provider.GetFeature(5));
                 NUnit.Framework.Assert.NotNull(feature);
                 NUnit.Framework.Assert.AreEqual(5, feature[provider.ObjectIdColumn]);
             }
diff --git a/UnitTests/Data/Providers/DbTwoPointLineProviderTest.cs b/UnitTests/Data/Providers/DbTwoPointLineProviderTest.cs
index 9cc5887d..e7781137 100644
--- a/UnitTests/Data/Providers/DbTwoPointLineProviderTest.cs
+++ b/UnitTests/Data/Providers/DbTwoPointLineProviderTest.cs
@@ -1,8 +1,8 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
+using System;
 
 namespace UnitTests.Data.Providers
 {
@@ -11,9 +11,8 @@ public class DbTwoPointLineProviderTest : ProviderTest
     {
         private System.Data.Common.DbConnection _connection; // Keep connection active; when closed, the in-memory database is dropped
 
-        public override void OneTimeSetUp()
+        public DbTwoPointLineProviderTest()
         {
-            base.OneTimeSetUp();
             _connection = WriteSqlLite();
         }
 
@@ -114,7 +113,7 @@ public void TestGetGeometryById()
         {
             using (var p = CreateProvider())
             {
-                IGeometry feature = null;
+                Geometry feature = null;
                 Assert.DoesNotThrow(() => feature = p.GetGeometryByID(3));
                 Assert.IsNotNull(feature);
                 Assert.AreEqual(feature.Centroid.Coordinate,
@@ -140,7 +139,7 @@ public void TestExecuteIntersectionQueryAgainstEnvelopeEqualsGetOidsInView()
         {
             using (var p = CreateProvider())
             {
-                var ext =p.GetExtents();
+                var ext = p.GetExtents();
                 var fds = new FeatureDataSet();
                 Assert.DoesNotThrow(() => p.ExecuteIntersectionQuery(ext, fds));
                 Assert.AreEqual(1, fds.Tables.Count);
diff --git a/UnitTests/Data/Providers/DbaseReaderTests.cs b/UnitTests/Data/Providers/DbaseReaderTests.cs
index 7b8d51a6..011f0d25 100644
--- a/UnitTests/Data/Providers/DbaseReaderTests.cs
+++ b/UnitTests/Data/Providers/DbaseReaderTests.cs
@@ -1,22 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Text;
-using NUnit.Framework;
+using NUnit.Framework;
 using SharpMap.Data.Providers;
+using System.Linq;
 
 namespace UnitTests.Data.Providers
 {
     [NUnit.Framework.TestFixture]
     public class DbaseReaderTests
     {
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-        }
-
         private int GetNumberOfRecords(DbaseReader reader)
         {
             var numberOfRecordsField = typeof(DbaseReader).GetField("_numberOfRecords", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
diff --git a/UnitTests/Data/Providers/GeoPackageTest.cs b/UnitTests/Data/Providers/GeoPackageTest.cs
index eb0d212b..c2193ae9 100644
--- a/UnitTests/Data/Providers/GeoPackageTest.cs
+++ b/UnitTests/Data/Providers/GeoPackageTest.cs
@@ -1,23 +1,15 @@
-using System;
-using System.Collections.ObjectModel;
-using System.IO;
-using GeoAPI.Geometries;
-using NetTopologySuite;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
+using System.Collections.ObjectModel;
+using System.IO;
 
 namespace UnitTests.Data.Providers
 {
     public class GeoPackageTest
     {
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NtsGeometryServices();
-        }
-
         [TestCase(@"geonames_belgium.gpkg")]
         [TestCase(@"gdal_sample.gpkg")]
         [TestCase(@"haiti-vectors-split.gpkg")]
@@ -30,7 +22,7 @@ public void TestGeoPackage(string filePath)
 
             if (!File.Exists(filePath))
                 throw new IgnoreException(string.Format("Test data not present: '{0}'!", filePath));
-            
+
             GeoPackage gpkg = null;
             Assert.DoesNotThrow(() => gpkg = GeoPackage.Open(filePath), "Opened did not prove to be a valid geo package");
 
@@ -42,7 +34,7 @@ public void TestGeoPackage(string filePath)
                 Assert.DoesNotThrow(() => p = gpkg.GetFeatureProvider(feature));
 
                 TestProvider(p, feature);
-                
+
                 ILayer l = null;
                 Assert.DoesNotThrow(() => l = gpkg.GetFeatureLayer(feature));
 
@@ -71,7 +63,7 @@ private static void TestProvider(IProvider provider, GpkgContent content)
             {
                 if (tmpFeatures > 50) break;
 
-                IGeometry geom = null;
+                Geometry geom = null;
                 Assert.DoesNotThrow(() => geom = provider.GetGeometryByID(oid),
                     "GetGeometryByID threw exception:\n\tConnection{0}\n\t{1}",
                     provider.ConnectionID, content.TableName);
@@ -86,7 +78,7 @@ private static void TestProvider(IProvider provider, GpkgContent content)
                 tmpFeatures++;
             }
 
-            Collection<IGeometry> geoms = null;
+            Collection<Geometry> geoms = null;
             Assert.DoesNotThrow(() => geoms = provider.GetGeometriesInView(extent),
                 "GetGeometriesInView threw exception:\n\tConnection{0}\n\t{1}",
                 provider.ConnectionID, content.TableName);
@@ -97,7 +89,7 @@ private static void TestProvider(IProvider provider, GpkgContent content)
                     "GetGeometriesInView with full extent did not return 90% of the geometries:\n\tConnection{0}\n\t{1}",
                     provider.ConnectionID, content.TableName);
             }
-        
+
 
             var fds = new FeatureDataSet();
             Assert.DoesNotThrow(() => provider.ExecuteIntersectionQuery(extent, fds),
diff --git a/UnitTests/Data/Providers/GeometryFeatureProviderTest.cs b/UnitTests/Data/Providers/GeometryFeatureProviderTest.cs
index 97a8e951..b4d97f17 100644
--- a/UnitTests/Data/Providers/GeometryFeatureProviderTest.cs
+++ b/UnitTests/Data/Providers/GeometryFeatureProviderTest.cs
@@ -1,4 +1,5 @@
-using System;
+using NetTopologySuite;
+using System;
 using System.Data;
 using System.Threading;
 using System.Threading.Tasks;
@@ -39,24 +40,24 @@ public void TestConcurrentExecuteIntersectionQuerysDontThrowException()
         private void DoExecuteIntersectionQuery(int obj)
         {
             var ext = _provider.GetExtents();
-            
+
             var minX = _rnd.Next((int)ext.MinX, (int)ext.MaxX);
             var maxX = _rnd.Next((int)minX, (int)ext.MaxX);
             var minY = _rnd.Next((int)ext.MinY, (int)ext.MaxY);
             var maxY = _rnd.Next((int)minY, (int)ext.MaxY);
-            var box = new GeoAPI.Geometries.Envelope(minX, maxX, minY, maxY);
+            var box = new NetTopologySuite.Geometries.Envelope(minX, maxX, minY, maxY);
 
             System.Diagnostics.Trace.WriteLine(string.Format(
-                @"{0:000}/{2:00}: Executing intersection query agains {1}", 
+                @"{0:000}/{2:00}: Executing intersection query agains {1}",
                 obj, box, Thread.CurrentThread.ManagedThreadId));
             var fds = new SharpMap.Data.FeatureDataSet();
             _provider.ExecuteIntersectionQuery(box, fds);
             var table = fds.Tables[0];
             var count = table != null ? table.Rows.Count : 0;
             System.Diagnostics.Trace.WriteLine(string.Format(
-                @"{0:000}/{3:00}: Executed intersection query agains {1} returned {2} features", 
+                @"{0:000}/{3:00}: Executed intersection query agains {1} returned {2} features",
                 obj, box, count, Thread.CurrentThread.ManagedThreadId));
-            
+
         }
 
         [NUnit.Framework.Test]
@@ -65,13 +66,13 @@ public void GetItemByID()
             var fdt = new SharpMap.Data.FeatureDataTable();
             fdt.Columns.Add(new DataColumn("ID", typeof(uint)));
 
-            var gf = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory();
+            var gf = NtsGeometryServices.Instance.CreateGeometryFactory();
 
             for (var i = 0; i < 5; i++)
             {
                 var row = fdt.NewRow();
                 row[0] = (uint)i;
-                row.Geometry = gf.CreatePoint(new GeoAPI.Geometries.Coordinate(i, i));
+                row.Geometry = gf.CreatePoint(new NetTopologySuite.Geometries.Coordinate(i, i));
                 fdt.AddRow(row);
             }
             var layer = new SharpMap.Layers.VectorLayer("TMP", new SharpMap.Data.Providers.GeometryFeatureProvider(fdt));
@@ -86,51 +87,51 @@ public void TestFindGeoNearPoint()
             var fdt = new SharpMap.Data.FeatureDataTable();
             fdt.Columns.Add(new DataColumn("ID", typeof(uint)));
 
-            var gf = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory();
+            var gf = NtsGeometryServices.Instance.CreateGeometryFactory();
 
             for (var i = 0; i < 5; i++)
             {
                 var row = fdt.NewRow();
                 row[0] = (uint)i;
-                row.Geometry = gf.CreatePoint(new GeoAPI.Geometries.Coordinate(i, i));
+                row.Geometry = gf.CreatePoint(new NetTopologySuite.Geometries.Coordinate(i, i));
                 fdt.AddRow(row);
             }
             var layer = new SharpMap.Layers.VectorLayer("TMP", new SharpMap.Data.Providers.GeometryFeatureProvider(fdt));
 
-            var res = FindGeoNearPoint(gf.CreatePoint(new GeoAPI.Geometries.Coordinate(0.1, 0.1)), layer, 0.2d);
+            var res = FindGeoNearPoint(gf.CreatePoint(new NetTopologySuite.Geometries.Coordinate(0.1, 0.1)), layer, 0.2d);
             NUnit.Framework.Assert.IsNotNull(res);
             NUnit.Framework.Assert.AreEqual(0, (uint)res[0]);
         }
 
-public static SharpMap.Data.FeatureDataRow FindGeoNearPoint(
-    GeoAPI.Geometries.IPoint point, SharpMap.Layers.VectorLayer layer, double amountGrow)
-{
-    var box = new GeoAPI.Geometries.Envelope(point.Coordinate);
-    box.ExpandBy(amountGrow);
+        public static SharpMap.Data.FeatureDataRow FindGeoNearPoint(
+            NetTopologySuite.Geometries.Point point, SharpMap.Layers.VectorLayer layer, double amountGrow)
+        {
+            var box = new NetTopologySuite.Geometries.Envelope(point.Coordinate);
+            box.ExpandBy(amountGrow);
 
-    var fds = new SharpMap.Data.FeatureDataSet();
-    layer.DataSource.ExecuteIntersectionQuery(box, fds);
+            var fds = new SharpMap.Data.FeatureDataSet();
+            layer.DataSource.ExecuteIntersectionQuery(box, fds);
 
-    SharpMap.Data.FeatureDataRow result = null;
-    var minDistance = double.MaxValue;
+            SharpMap.Data.FeatureDataRow result = null;
+            var minDistance = double.MaxValue;
 
-    foreach (SharpMap.Data.FeatureDataTable fdt in fds.Tables)
-    {
-        foreach (SharpMap.Data.FeatureDataRow fdr in fdt.Rows)
-        {
-            if (fdr.Geometry != null)
+            foreach (SharpMap.Data.FeatureDataTable fdt in fds.Tables)
             {
-                var distance = point.Distance(fdr.Geometry);
-                if (distance < minDistance)
+                foreach (SharpMap.Data.FeatureDataRow fdr in fdt.Rows)
                 {
-                    result = fdr;
-                    minDistance = distance;
+                    if (fdr.Geometry != null)
+                    {
+                        var distance = point.Distance(fdr.Geometry);
+                        if (distance < minDistance)
+                        {
+                            result = fdr;
+                            minDistance = distance;
+                        }
+                    }
                 }
             }
+            return result;
         }
-    }
-    return result;
-}
 
     }
 }
diff --git a/UnitTests/Data/Providers/KmlProviderTests.cs b/UnitTests/Data/Providers/KmlProviderTests.cs
index 30261404..1abfeb39 100644
--- a/UnitTests/Data/Providers/KmlProviderTests.cs
+++ b/UnitTests/Data/Providers/KmlProviderTests.cs
@@ -1,25 +1,19 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Net;
-using NUnit.Framework;
+using NUnit.Framework;
 using SharpKml.Dom;
 using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Net;
 
 namespace UnitTests.Data.Providers
 {
     [TestFixture]
     public class KmlProviderTests
     {
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = NetTopologySuite.NtsGeometryServices.Instance;
-        }
-
         [Test]
         public void TestConstruction()
         {
@@ -39,7 +33,7 @@ public void TestGetMap()
             var p = KmlProvider.FromKml(TestUtility.GetPathToTestFile("KML_Samples.kml"));
             var l = new VectorLayer(p.ConnectionID, p);
             l.Theme = p.GetKmlTheme();
-            
+
             m.Layers.Add(l);
             m.ZoomToExtents();
             m.Zoom *= 1.1;
@@ -47,42 +41,42 @@ public void TestGetMap()
             using (var img = m.GetMap())
                 img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "KmlProviderImage.png"), ImageFormat.Png);
         }
-        
-//        [Test]
-//        public void TestKmlInternalStyle()
-//        {
-//            var m = new Map(new Size(500, 300));
-//            m.BackColor = Color.White;
-//
-//            var p = KmlProvider.FromKml(TestUtility.GetPathToTestFile("KML_Samples.kml"));
-//            var l = new VectorLayer(p.ConnectionID, p);
-//            l.Theme = p.GetKmlTheme();
-//            
-//            m.Layers.Add(l);
-//            m.ZoomToExtents();
-//            m.Zoom *= 1.1;
-//
-//            using (var img = m.GetMap())
-//                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "KmlProviderImage.png"), ImageFormat.Png);
-//        }
-//
-//        [Test]
-//        public void TestKmzInternalStyle()
-//        {
-//            var m = new Map(new Size(500, 300));
-//            m.BackColor = Color.White;
-//
-//            var p = KmlProvider.FromKml(TestUtility.GetPathToTestFile("KML_Samples.kml"));
-//            var l = new VectorLayer(p.ConnectionID, p);
-//            l.Theme = p.GetKmlTheme();
-//            
-//            m.Layers.Add(l);
-//            m.ZoomToExtents();
-//            m.Zoom *= 1.1;
-//
-//            using (var img = m.GetMap())
-//                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "KmlProviderImage.png"), ImageFormat.Png);
-//        }
+
+        //        [Test]
+        //        public void TestKmlInternalStyle()
+        //        {
+        //            var m = new Map(new Size(500, 300));
+        //            m.BackColor = Color.White;
+        //
+        //            var p = KmlProvider.FromKml(TestUtility.GetPathToTestFile("KML_Samples.kml"));
+        //            var l = new VectorLayer(p.ConnectionID, p);
+        //            l.Theme = p.GetKmlTheme();
+        //            
+        //            m.Layers.Add(l);
+        //            m.ZoomToExtents();
+        //            m.Zoom *= 1.1;
+        //
+        //            using (var img = m.GetMap())
+        //                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "KmlProviderImage.png"), ImageFormat.Png);
+        //        }
+        //
+        //        [Test]
+        //        public void TestKmzInternalStyle()
+        //        {
+        //            var m = new Map(new Size(500, 300));
+        //            m.BackColor = Color.White;
+        //
+        //            var p = KmlProvider.FromKml(TestUtility.GetPathToTestFile("KML_Samples.kml"));
+        //            var l = new VectorLayer(p.ConnectionID, p);
+        //            l.Theme = p.GetKmlTheme();
+        //            
+        //            m.Layers.Add(l);
+        //            m.ZoomToExtents();
+        //            m.Zoom *= 1.1;
+        //
+        //            using (var img = m.GetMap())
+        //                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "KmlProviderImage.png"), ImageFormat.Png);
+        //        }
 
         [TestCase("KML_geom_internal_styleurl.kml", "KML file with styles defined internally (see also KMZ equivalent)")]
         [TestCase("KML_geom_external_styleurl_file.kml", "KML file with styles defined in KML_styles.kml (see also KMZ equivalent)")]
@@ -101,15 +95,15 @@ public void TestKmlStyles(string testDataFile, string description)
                 p = KmlProvider.FromKml(TestUtility.GetPathToTestFile(testDataFile));
             else
                 p = KmlProvider.FromKmz(TestUtility.GetPathToTestFile(testDataFile));
-            
+
             var l = new VectorLayer(p.ConnectionID, p);
             l.Theme = p.GetKmlTheme();
-            
+
             m.Layers.Add(l);
-            
+
             var labelLayer = new LabelLayer("Labels");
             labelLayer.DataSource = p;
-            labelLayer.LabelStringDelegate = (fdr) => ((Placemark) fdr["Object"]).Name;
+            labelLayer.LabelStringDelegate = (fdr) => ((Placemark)fdr["Object"]).Name;
             labelLayer.Style.Font = new Font(labelLayer.Style.Font.FontFamily, 8f);
             m.Layers.Add(labelLayer);
 
@@ -119,7 +113,7 @@ public void TestKmlStyles(string testDataFile, string description)
             disclaimer.Text = $"{description} \nOpen **{testDataFile}** in GoogleEarth for comparison";
             disclaimer.Anchor = MapDecorationAnchor.LeftTop;
             m.Decorations.Add(disclaimer);
-            
+
             using (var img = m.GetMap())
                 img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), testDataFile + ".png"), ImageFormat.Png);
         }
@@ -132,7 +126,7 @@ public void TestHttp(string kmlWebResource, string description)
             m.BackColor = Color.White;
 
             KmlProvider p = null;
-            
+
             var request = WebRequest.Create(kmlWebResource);
             try
             {
@@ -148,7 +142,7 @@ public void TestHttp(string kmlWebResource, string description)
                         p = KmlProvider.FromKmz(response.GetResponseStream(), "doc.kml");
                 }
             }
-            catch (WebException ex) 
+            catch (WebException ex)
             {
                 Assert.Ignore(ex.Message);
             }
@@ -156,24 +150,24 @@ public void TestHttp(string kmlWebResource, string description)
             {
                 Assert.Fail(ex.Message);
             }
-            
+
             var l = new VectorLayer(p.ConnectionID, p);
             l.Theme = p.GetKmlTheme();
             m.Layers.Add(l);
 
             // Takes ages to render
-//            var labelLayer = new LabelLayer("Labels");
-//            labelLayer.DataSource = p;
-//            labelLayer.LabelColumn = "Name";
-//            m.Layers.Add(labelLayer);
-         
+            //            var labelLayer = new LabelLayer("Labels");
+            //            labelLayer.DataSource = p;
+            //            labelLayer.LabelColumn = "Name";
+            //            m.Layers.Add(labelLayer);
+
             ZoomToExtentsWithMargin(m);
 
             var disclaimer = new Disclaimer();
             disclaimer.Text = kmlWebResource;
             disclaimer.Anchor = MapDecorationAnchor.LeftTop;
             m.Decorations.Add(disclaimer);
-            
+
             using (var img = m.GetMap())
                 img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), description + ".png"), ImageFormat.Png);
         }
@@ -190,7 +184,7 @@ private void ZoomToExtentsWithMargin(Map m)
             m.Zoom *= 1.1;
 
         }
-        
-        
+
+
     }
 }
diff --git a/UnitTests/Data/Providers/ManagedSQLiteTests.cs b/UnitTests/Data/Providers/ManagedSQLiteTests.cs
index 3fab6ae0..bf5ed88d 100644
--- a/UnitTests/Data/Providers/ManagedSQLiteTests.cs
+++ b/UnitTests/Data/Providers/ManagedSQLiteTests.cs
@@ -1,28 +1,27 @@
 //#if !LINUX
-using System;
-using System.IO;
-using GeoAPI.Geometries;
-using NetTopologySuite.Operation.Distance;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data.Providers;
+using System;
+using System.IO;
 
 namespace UnitTests.Data.Providers
 {
     [NUnit.Framework.TestFixture, NUnit.Framework.Category("KnownToFailOnTeamCityAtCodebetter")]
     public class ManagedSQLiteTests : ProviderTest
-    {
-//#if LINUX
-//        [NUnit.Framework.OneTimeSetUp]
-//        public void OneTimeSetUp()
-//        {
-//            if (Environment.OSVersion.Platform == PlatformID.Unix)
-//            {
-//                if (!File.Exists("libSQLite.Interop.so"))
-//                    throw new IgnoreException($"'libSQLite.Interop.so' not present");
-//            }
-//        }
-//#endif
-
+    {
+        //#if LINUX
+        //        [NUnit.Framework.OneTimeSetUp]
+        //        public void OneTimeSetUp()
+        //        {
+        //            if (Environment.OSVersion.Platform == PlatformID.Unix)
+        //            {
+        //                if (!File.Exists("libSQLite.Interop.so"))
+        //                    throw new IgnoreException($"'libSQLite.Interop.so' not present");
+        //            }
+        //        }
+        //#endif
+
         private string GetTestDBPath()
         {
             return $"Data Source={TestUtility.GetPathToTestFile("test-2.3.sqlite")};";
@@ -90,7 +89,7 @@ public void TestReadLines()
                 sq.ExecuteIntersectionQuery(ext, ds);
                 NUnit.Framework.Assert.AreEqual(775, ds.Tables[0].Count);
 
-                var env = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(sq.SRID).ToGeometry(ext);
+                var env = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(sq.SRID).ToGeometry(ext);
                 var dsEnv = new SharpMap.Data.FeatureDataSet();
                 sq.ExecuteIntersectionQuery(env, dsEnv);
                 NUnit.Framework.Assert.AreEqual(775, dsEnv.Tables[0].Count);
@@ -100,7 +99,7 @@ public void TestReadLines()
         [NUnit.Framework.Test]
         public void TestReadPolys()
         {
-            using (var sq = 
+            using (var sq =
                 new SharpMap.Data.Providers.ManagedSpatiaLite(GetTestDBPath(), "regions", "Geometry", "ROWID"))
             {
                 var ext = sq.GetExtents();
diff --git a/UnitTests/Data/Providers/NtsProviderTests.cs b/UnitTests/Data/Providers/NtsProviderTests.cs
index a7930921..e477e5bc 100644
--- a/UnitTests/Data/Providers/NtsProviderTests.cs
+++ b/UnitTests/Data/Providers/NtsProviderTests.cs
@@ -1,9 +1,9 @@
-using System.Data;
-using GeoAPI.Geometries;
-using NetTopologySuite;
+using NetTopologySuite;
 using NetTopologySuite.Features;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data.Providers;
+using System.Data;
 
 namespace UnitTests.Data.Providers
 {
@@ -20,7 +20,7 @@ public void FeatureWithNullDataThrowsException()
             var ds = DataTablePointTests.CreateDataTableSource();
             // add row with null value
             ds.BeginLoadData();
-            
+
             var row = ds.LoadDataRow(new object[] { 1001, null, 1, 1 }, LoadOption.OverwriteChanges);
             ds.EndLoadData();
             Assert.That(ds.Rows.Count, Is.EqualTo(101));
@@ -34,7 +34,7 @@ public void FeatureWithNullDataThrowsException()
             // Create provider
             NtsProvider p = null;
             Assert.DoesNotThrow(() => p = new NtsProvider(dsp));
-            
+
             /*
              * assert
              */
@@ -63,7 +63,7 @@ public void FeatureWithNullDataThrowsException2()
             // act
             IProvider p = null;
             Assert.DoesNotThrow(() => p = new NtsProvider(features));
-            
+
             // assert
             Assert.That(p, Is.Not.Null);
             Assert.That(p.GetFeatureCount(), Is.EqualTo(5));
diff --git a/UnitTests/Data/Providers/OgrProviderTest.cs b/UnitTests/Data/Providers/OgrProviderTest.cs
index bf904a3f..bc4e7b03 100644
--- a/UnitTests/Data/Providers/OgrProviderTest.cs
+++ b/UnitTests/Data/Providers/OgrProviderTest.cs
@@ -1,9 +1,8 @@
-using System;
-using System.IO;
-using NUnit.Framework;
+using NUnit.Framework;
 using SharpMap;
 using SharpMap.Data;
-using SharpMap.Data.Providers;
+using System;
+using System.IO;
 using OgrProvider = SharpMap.Data.Providers.Ogr;
 
 namespace UnitTests.Data.Providers
@@ -56,8 +55,8 @@ public void TestCreateFromFeatureDataTable(string filePath, int srid, string dri
                 throw new IgnoreException("Getting data failed", ex);
             }
 
-            Assert.DoesNotThrow(() => OgrProvider.CreateFromFeatureDataTable(fdt, 
-                ((FeatureDataRow)fdt.Rows[0]).Geometry.OgcGeometryType, srid, 
+            Assert.DoesNotThrow(() => OgrProvider.CreateFromFeatureDataTable(fdt,
+                ((FeatureDataRow)fdt.Rows[0]).Geometry.OgcGeometryType, srid,
                 driver, connection));
         }
     }
diff --git a/UnitTests/Data/Providers/OleDbPointProviderTest.cs b/UnitTests/Data/Providers/OleDbPointProviderTest.cs
index 695796a6..4e3ef46e 100644
--- a/UnitTests/Data/Providers/OleDbPointProviderTest.cs
+++ b/UnitTests/Data/Providers/OleDbPointProviderTest.cs
@@ -1,4 +1,4 @@
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
@@ -9,11 +9,10 @@ public class OleDbPointProviderTest : ProviderTest
     {
         private string _tableName;
 
-        public override void OneTimeSetUp()
+        public OleDbPointProviderTest()
         {
             if (System.IntPtr.Size == 8)
                 Assert.Ignore("Only run in 32bit mode, because most Excel installations are 32bit.");
-            base.OneTimeSetUp();
 
             try
             {
@@ -117,7 +116,7 @@ public void TestGetGeometryById()
         {
             using (var p = CreateProvider())
             {
-                IGeometry feature = null;
+                Geometry feature = null;
                 Assert.DoesNotThrow(() => feature = p.GetGeometryByID(3));
                 Assert.IsNotNull(feature);
                 Assert.AreEqual(feature.Centroid.Coordinate,
diff --git a/UnitTests/Data/Providers/PostGisGeographyTests.cs b/UnitTests/Data/Providers/PostGisGeographyTests.cs
index 536818d5..26c9ebce 100644
--- a/UnitTests/Data/Providers/PostGisGeographyTests.cs
+++ b/UnitTests/Data/Providers/PostGisGeographyTests.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using GeoAPI.Geometries;
-using NUnit.Framework;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 using Npgsql;
 using NpgsqlTypes;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace UnitTests.Data.Providers
 {
@@ -20,8 +19,6 @@ public void OneTimeSetUp()
         {
             try
             {
-                GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-
                 var connStrBuilder = new NpgsqlConnectionStringBuilder(Properties.Settings.Default.PostGis);
                 if (string.IsNullOrEmpty(connStrBuilder.Host) || string.IsNullOrEmpty(connStrBuilder.Database))
                 {
@@ -144,7 +141,7 @@ public void TestGetExtents()
         {
             foreach (var sq in GetTestProvider())
             {
-                GeoAPI.Geometries.Envelope extents = sq.GetExtents();
+                NetTopologySuite.Geometries.Envelope extents = sq.GetExtents();
                 Assert.IsNotNull(extents);
             }
         }
diff --git a/UnitTests/Data/Providers/PostGisTests.cs b/UnitTests/Data/Providers/PostGisTests.cs
index 4ae1ecbc..399f460f 100644
--- a/UnitTests/Data/Providers/PostGisTests.cs
+++ b/UnitTests/Data/Providers/PostGisTests.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using NUnit.Framework;
-using NetTopologySuite.IO;
+using NetTopologySuite.IO;
 using Npgsql;
 using NpgsqlTypes;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace UnitTests.Data.Providers
 {
@@ -18,8 +18,6 @@ public void OneTimeSetUp()
         {
             try
             {
-                GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-
                 var connStrBuilder = new NpgsqlConnectionStringBuilder(Properties.Settings.Default.PostGis);
                 if (string.IsNullOrEmpty(connStrBuilder.Host) || string.IsNullOrEmpty(connStrBuilder.Database))
                 {
@@ -80,7 +78,7 @@ public void OneTimeSetUp()
                             {
                                 var feature = shapeFile.GetFeature(idx);
 
-                                @params["PId"].NpgsqlValue = (int) idx;
+                                @params["PId"].NpgsqlValue = (int)idx;
                                 @params["PName"].NpgsqlValue = feature["NAME"];
                                 @params["PGeom"].NpgsqlValue = writer.Write(feature.Geometry);
                                 cmd.ExecuteNonQuery();
@@ -133,7 +131,7 @@ private static SharpMap.Data.Providers.PostGIS GetTestProvider()
         /// <summary>
         /// Get the envelope of the entire roads_ugl file
         /// </summary>
-        private static GeoAPI.Geometries.Envelope GetTestEnvelope()
+        private static NetTopologySuite.Geometries.Envelope GetTestEnvelope()
         {
             return SharpMap.Converters.WellKnownText.GeometryFromWKT.Parse("POLYGON ((-97.23724071609665 41.698023105763589, -82.424263624596563 41.698023105763589, -82.424263624596563 49.000629000758515, -97.23724071609665 49.000629000758515, -97.23724071609665 41.698023105763589))").EnvelopeInternal;
         }
@@ -143,7 +141,7 @@ public void TestGetExtents()
         {
             using (var sq = GetTestProvider())
             {
-                GeoAPI.Geometries.Envelope extents = sq.GetExtents();
+                NetTopologySuite.Geometries.Envelope extents = sq.GetExtents();
                 Assert.IsNotNull(extents);
             }
         }
diff --git a/UnitTests/Data/Providers/ProviderTest.cs b/UnitTests/Data/Providers/ProviderTest.cs
index b765184b..91712c8e 100644
--- a/UnitTests/Data/Providers/ProviderTest.cs
+++ b/UnitTests/Data/Providers/ProviderTest.cs
@@ -3,11 +3,6 @@
     [NUnit.Framework.TestFixture]
     public abstract class ProviderTest
     {
-        [NUnit.Framework.OneTimeSetUp]
-        public virtual void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance =
-                NetTopologySuite.NtsGeometryServices.Instance;
-        }
+
     }
 }
diff --git a/UnitTests/Data/Providers/SQLServer2008Tests.cs b/UnitTests/Data/Providers/SQLServer2008Tests.cs
index 15e11758..963d067a 100644
--- a/UnitTests/Data/Providers/SQLServer2008Tests.cs
+++ b/UnitTests/Data/Providers/SQLServer2008Tests.cs
@@ -1,26 +1,20 @@
-using System.Collections.Generic;
-using System.Linq;
+using SharpMap.Data.Providers;
+using System.Collections.Generic;
 using System.Data.SqlClient;
-using SharpMap.Data.Providers;
+using System.Linq;
 
 namespace UnitTests.Data.Providers
 {
     [NUnit.Framework.TestFixture]
     public class SQLServer2008Tests
     {
-        [NUnit.Framework.OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-        }
-
         [NUnit.Framework.TestCase("[sde].[gisadmin.di]", "sde", "gisadmin.di")]
         [NUnit.Framework.TestCase("[sde.gisadmin].[di]", "sde.gisadmin", "di")]
         [NUnit.Framework.TestCase("sde.gisadmin.di", "sde.gisadmin", "di")]
         public void VerifySchemaDetection(string schemaTable, string tableSchema, string table)
         {
-            SharpMap.Data.Providers.SqlServer2008 sq = new SharpMap.Data.Providers.SqlServer2008("", 
-                schemaTable, "geom", "oidcolumn", 
+            SharpMap.Data.Providers.SqlServer2008 sq = new SharpMap.Data.Providers.SqlServer2008("",
+                schemaTable, "geom", "oidcolumn",
                 SqlServerSpatialObjectType.Geometry, 4326, SqlServer2008ExtentsMode.SpatialIndex);
             NUnit.Framework.Assert.AreEqual(tableSchema, sq.TableSchema);
             NUnit.Framework.Assert.AreEqual(table, sq.Table);
@@ -71,7 +65,6 @@ public void OneTimeSetUp()
                 NUnit.Framework.Assert.Ignore("Requires SQL Server connectionstring");
             }
 
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
             //SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
 
             // Set up sample tables (Geometry + Geography)
@@ -284,7 +277,7 @@ private SharpMap.Data.Providers.SqlServer2008 GetTestProvider(SqlServerProviderM
         /// <summary>
         /// Get the envelope of the entire roads_ugl file
         /// </summary>
-        private GeoAPI.Geometries.Envelope GetTestEnvelope(SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
+        private NetTopologySuite.Geometries.Envelope GetTestEnvelope(SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
         {
             var env = SharpMap.Converters.WellKnownText.GeometryFromWKT.Parse("POLYGON ((-97.23724071609665 41.698023105763589, -82.424263624596563 41.698023105763589, -82.424263624596563 49.000629000758515, -97.23724071609665 49.000629000758515, -97.23724071609665 41.698023105763589))").EnvelopeInternal;
             if (spatialType == SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)
@@ -300,7 +293,7 @@ public void TestGetExtentsQueryIndividualFeatures(SharpMap.Data.Providers.SqlSer
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(spatialType);
 
             sq.ExtentsMode = SharpMap.Data.Providers.SqlServer2008ExtentsMode.QueryIndividualFeatures;
-            GeoAPI.Geometries.Envelope extents = sq.GetExtents();
+            NetTopologySuite.Geometries.Envelope extents = sq.GetExtents();
 
             NUnit.Framework.Assert.IsNotNull(extents);
         }
@@ -321,7 +314,7 @@ public void TestGetExtentsSpatialIndex(SharpMap.Data.Providers.SqlServerSpatialO
             else
             {
                 sq.ExtentsMode = SharpMap.Data.Providers.SqlServer2008ExtentsMode.SpatialIndex;
-                GeoAPI.Geometries.Envelope extents = sq.GetExtents();
+                NetTopologySuite.Geometries.Envelope extents = sq.GetExtents();
 
                 NUnit.Framework.Assert.IsNotNull(extents);
             }
@@ -359,7 +352,7 @@ public void TestGetExtentsEnvelopeAggregate(SharpMap.Data.Providers.SqlServerSpa
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(spatialType);
 
             sq.ExtentsMode = SharpMap.Data.Providers.SqlServer2008ExtentsMode.EnvelopeAggregate;
-            GeoAPI.Geometries.Envelope extents = sq.GetExtents();
+            NetTopologySuite.Geometries.Envelope extents = sq.GetExtents();
 
             NUnit.Framework.Assert.IsNotNull(extents);
         }
@@ -443,19 +436,19 @@ public void TestGetGeometriesInViewFORCESEEK(SqlServerProviderMode providerMode,
             NUnit.Framework.Assert.AreEqual(_numValidGeoms, geometries.Count);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
-        public void TestGetGeometriesInViewFORCEINDEX(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        public void TestGetGeometriesInViewFORCEINDEX(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
-            sq.ForceIndex = spatialType ==  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex;
+            sq.ForceIndex = spatialType == SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex;
             sq.ValidateGeometries = validateGeometries;
 
             var geometries = sq.GetGeometriesInView(GetTestEnvelope(spatialType));
@@ -465,21 +458,21 @@ public void TestGetGeometriesInViewFORCEINDEX(SqlServerProviderMode providerMode
             NUnit.Framework.Assert.AreEqual(_numValidGeoms, geometries.Count);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
-        public void TestGetGeometriesInViewAllHints(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        public void TestGetGeometriesInViewAllHints(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
             sq.NoLockHint = true;
             sq.ForceSeekHint = true;
-            sq.ForceIndex = spatialType ==  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex;
+            sq.ForceIndex = spatialType == SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex;
 
             sq.ValidateGeometries = validateGeometries;
             var geometries = sq.GetGeometriesInView(GetTestEnvelope(spatialType));
@@ -497,7 +490,7 @@ public void TestPerformanceSqlServer2008ExProvider()
             // Microsoft.SqlServer.Types assembly being available (e.g. SQL 2008 and 2012).
             // This can be solved with a <bindingRedirect> in the .config file.
 
-            var spatialType =  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry;
+            var spatialType = SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry;
 
             // testing with both providers using ExtentsMode = QueryIndividualFeatures (ie the "heaviest" lifting)
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(SqlServerProviderMode.WellKnownBinary, spatialType);
@@ -508,8 +501,8 @@ public void TestPerformanceSqlServer2008ExProvider()
             // From my testing, SqlServer2008 performance is slightly faster when using ValidateGeometries = true, 
             // as the SQL where clause is simpler (does not require explicitly excluding invalid geometries)
             sq.ValidateGeometries = true;
-            
-            GeoAPI.Geometries.Envelope envelope = GetTestEnvelope(spatialType);
+
+            NetTopologySuite.Geometries.Envelope envelope = GetTestEnvelope(spatialType);
             List<System.TimeSpan> measurements = new List<System.TimeSpan>(200);
             List<System.TimeSpan> measurementsex = new List<System.TimeSpan>(200);
             System.Diagnostics.Stopwatch timer;
@@ -561,15 +554,15 @@ public void TestGetObjectIDsInView(SharpMap.Data.Providers.SqlServerSpatialObjec
             NUnit.Framework.Assert.AreEqual(sq.ValidateGeometries ? _numValidatedGeoms : _numValidGeoms, objectIds.Count);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
-        public void TestExecuteIntersectionQuery(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        public void TestExecuteIntersectionQuery(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
@@ -582,11 +575,11 @@ public void TestExecuteIntersectionQuery(SqlServerProviderMode providerMode,  Sh
             NUnit.Framework.Assert.AreEqual(sq.ValidateGeometries ? _numValidatedGeoms : _numValidGeoms, ds.Tables[0].Rows.Count);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -179, 179, -89.4, 89.4)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -180, 180, -90, 90)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -179, 179, -89.4, 89.4)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -180, 180, -90, 90)]
-        public void TestExecuteIntersectionQueryExceedGeogMaxExtents(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, 
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -179, 179, -89.4, 89.4)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -180, 180, -90, 90)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -179, 179, -89.4, 89.4)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, -180, 180, -90, 90)]
+        public void TestExecuteIntersectionQueryExceedGeogMaxExtents(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType,
             double x1, double x2, double y1, double y2)
         {
             // occurs when user zooms out beyond map extents. For Geog, when latitude approaches 90 N or S can result in  
@@ -596,26 +589,26 @@ public void TestExecuteIntersectionQueryExceedGeogMaxExtents(SqlServerProviderMo
 
             SharpMap.Data.FeatureDataSet ds = new SharpMap.Data.FeatureDataSet();
 
-            sq.ExecuteIntersectionQuery(new GeoAPI.Geometries.Envelope(x1, x2, y1, y2), ds);
+            sq.ExecuteIntersectionQuery(new NetTopologySuite.Geometries.Envelope(x1, x2, y1, y2), ds);
 
             NUnit.Framework.Assert.AreEqual(sq.ValidateGeometries ? _numValidatedGeoms : _numValidGeoms, ds.Tables[0].Rows.Count);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
-        public void TestExecuteIntersectionQueryAllHints(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        public void TestExecuteIntersectionQueryAllHints(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
             sq.NoLockHint = true;
             sq.ForceSeekHint = true;
-            sq.ForceIndex = spatialType ==  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex; ;
+            sq.ForceIndex = spatialType == SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry ? GeometrySpatialIndex : GeographySpatialIndex; ;
             sq.ValidateGeometries = validateGeometries;
 
             SharpMap.Data.FeatureDataSet ds = new SharpMap.Data.FeatureDataSet();
@@ -650,11 +643,11 @@ public void TestGetFeatureCountWithDefinitionQuery(SharpMap.Data.Providers.SqlSe
             NUnit.Framework.Assert.LessOrEqual(count, _numValidGeoms);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        public void TestGetFeature(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        public void TestGetFeature(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
@@ -664,11 +657,11 @@ public void TestGetFeature(SqlServerProviderMode providerMode,  SharpMap.Data.Pr
             NUnit.Framework.Assert.IsNotNull(feature.Geometry);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        public void TestGetFeatureNonExisting(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        public void TestGetFeatureNonExisting(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
@@ -677,11 +670,11 @@ public void TestGetFeatureNonExisting(SqlServerProviderMode providerMode,  Sharp
             NUnit.Framework.Assert.IsNull(feature);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        public void TestGetFeatureNullGeometry(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        public void TestGetFeatureNullGeometry(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
@@ -691,11 +684,11 @@ public void TestGetFeatureNullGeometry(SqlServerProviderMode providerMode,  Shar
             NUnit.Framework.Assert.IsNull(feature.Geometry);
         }
 
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
-        public void TestGetFeatureEmptyGeometry(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography)]
+        public void TestGetFeatureEmptyGeometry(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
 
@@ -708,13 +701,13 @@ public void TestGetFeatureEmptyGeometry(SqlServerProviderMode providerMode,  Sha
         // NetTopologySuite.IO.WKBReader can make sense of SqlServer invalid Geoms!
         //[NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.WellKnownBinary, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, false)]
         //[NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, false)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
-        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes,  SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
-        public void TestGetFeatureInvalidGeometry(SqlServerProviderMode providerMode,  SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geometry, true)]
+        [NUnit.Framework.TestCase(SqlServerProviderMode.NativeSqlBytes, SharpMap.Data.Providers.SqlServerSpatialObjectType.Geography, true)]
+        public void TestGetFeatureInvalidGeometry(SqlServerProviderMode providerMode, SharpMap.Data.Providers.SqlServerSpatialObjectType spatialType, bool validateGeometries)
         {
             SharpMap.Data.Providers.SqlServer2008 sq = GetTestProvider(providerMode, spatialType);
             sq.ValidateGeometries = validateGeometries;
@@ -722,7 +715,7 @@ public void TestGetFeatureInvalidGeometry(SqlServerProviderMode providerMode,  S
             var feature = sq.GetFeature(_idInvalidGeom);
 
             NUnit.Framework.Assert.IsNotNull(feature);
-            if (providerMode== SqlServerProviderMode.NativeSqlBytes)
+            if (providerMode == SqlServerProviderMode.NativeSqlBytes)
                 // client side conversion always attempts validation
                 NUnit.Framework.Assert.IsTrue(!feature.Geometry.IsEmpty && feature.Geometry.IsValid);
             else
@@ -733,6 +726,6 @@ public void TestGetFeatureInvalidGeometry(SqlServerProviderMode providerMode,  S
                     NUnit.Framework.Assert.IsTrue(feature.Geometry.IsEmpty);
             }
         }
-        
+
     }
 }
diff --git a/UnitTests/Data/Providers/ShapeFileProviderTests.cs b/UnitTests/Data/Providers/ShapeFileProviderTests.cs
index 91d646e1..9e90516a 100644
--- a/UnitTests/Data/Providers/ShapeFileProviderTests.cs
+++ b/UnitTests/Data/Providers/ShapeFileProviderTests.cs
@@ -5,7 +5,7 @@ namespace UnitTests.Data.Providers
     [NUnit.Framework.TestFixture]
     public class ShapeFileProviderTests : ProviderTest
     {
-        
+
         private long _msLineal;
         private long _msVector;
         private const int NumberOfRenderCycles = 1;
@@ -28,11 +28,12 @@ public void TestReadValueZFromPointZShapeFile()
             int fc = sh.GetFeatureCount();
             NUnit.Framework.Assert.AreEqual(1149, fc);
             NUnit.Framework.Assert.AreEqual(0, sh.GetObjectIDsInView(sh.GetExtents())[0]);
-            var featsInView = sh.GetGeometriesInView(new GeoAPI.Geometries.Envelope(sh.GetExtents()));
+            var featsInView = sh.GetGeometriesInView(new NetTopologySuite.Geometries.Envelope(sh.GetExtents()));
             NUnit.Framework.Assert.AreEqual(1149, featsInView.Count);
             foreach (var item in featsInView)
             {
                 NUnit.Framework.Assert.IsNotNull(item.Coordinate.Z);
+                NUnit.Framework.Assert.IsFalse(double.IsNaN(item.Coordinate.Z));
             }
             NUnit.Framework.Assert.AreEqual(featsInView[0].Coordinate.Z, 146.473);
             NUnit.Framework.Assert.AreEqual(featsInView[1].Coordinate.Z, 181.374);
@@ -53,21 +54,22 @@ public void TestReadValueZFromLineStringZShapeFile()
             int fc = sh.GetFeatureCount();
             NUnit.Framework.Assert.AreEqual(1221, fc);
             NUnit.Framework.Assert.AreEqual(0, sh.GetObjectIDsInView(sh.GetExtents())[0]);
-            var featsInView = sh.GetGeometriesInView(new GeoAPI.Geometries.Envelope(sh.GetExtents()));
+            var featsInView = sh.GetGeometriesInView(new NetTopologySuite.Geometries.Envelope(sh.GetExtents()));
             NUnit.Framework.Assert.AreEqual(1221, featsInView.Count);
             foreach (var item in featsInView)
             {
                 NUnit.Framework.Assert.IsNotNull(item.Coordinate.Z);
+                NUnit.Framework.Assert.IsFalse(double.IsNaN(item.Coordinate.Z));
             }
             NUnit.Framework.Assert.AreEqual(featsInView[0].Coordinates[0].Z, 35.865);
             NUnit.Framework.Assert.AreEqual(featsInView[0].Coordinates[1].Z, 35.743);
-            
+
             NUnit.Framework.Assert.AreEqual(featsInView[1].Coordinates[0].Z, 35.518);
             NUnit.Framework.Assert.AreEqual(featsInView[1].Coordinates[1].Z, 35.518);
-            
+
             NUnit.Framework.Assert.AreEqual(featsInView[2].Coordinates[0].Z, 37.438);
             NUnit.Framework.Assert.AreEqual(featsInView[2].Coordinates[1].Z, 37.441);
-            
+
             NUnit.Framework.Assert.AreEqual(featsInView[3].Coordinates[0].Z, 37.441);
             NUnit.Framework.Assert.AreEqual(featsInView[3].Coordinates[1].Z, 37.441);
 
@@ -84,12 +86,12 @@ public void UsingTest()
                     System.Diagnostics.Trace.WriteLine(reader.ReadInt32());
                 }
                 NUnit.Framework.Assert.Throws<System.ObjectDisposedException>(() => System.Diagnostics.Trace.WriteLine(s.Position));
-            } 
+            }
         }
 
         private static void CopyShapeFile(string path, out string tmp)
         {
-            tmp = System.IO.Path.ChangeExtension(System.IO.Path.GetTempFileName(),".shp");
+            tmp = System.IO.Path.ChangeExtension(System.IO.Path.GetTempFileName(), ".shp");
             if (!System.IO.File.Exists(path)) throw new NUnit.Framework.IgnoreException("File not found");
             foreach (var file in System.IO.Directory.GetFiles(System.IO.Path.GetDirectoryName(path), System.IO.Path.GetFileNameWithoutExtension(path) + ".*"))
             {
@@ -133,7 +135,7 @@ public void TestReadPointZShapeFile()
             int fc = sh.GetFeatureCount();
             NUnit.Framework.Assert.AreEqual(4342, fc);
             NUnit.Framework.Assert.AreEqual(0, sh.GetObjectIDsInView(sh.GetExtents())[0]);
-            var featsInView = sh.GetGeometriesInView(new GeoAPI.Geometries.Envelope(sh.GetExtents()));
+            var featsInView = sh.GetGeometriesInView(new NetTopologySuite.Geometries.Envelope(sh.GetExtents()));
             NUnit.Framework.Assert.AreEqual(4342, featsInView.Count);
             sh.Close();
         }
@@ -171,17 +173,17 @@ public void TestPerformanceLinealLayer()
 
             var shp = new SharpMap.Data.Providers.ShapeFile(TestUtility.GetPathToTestFile("roads_ugl.shp"), false, false);
             var lyr = new SharpMap.Layers.Symbolizer.LinealVectorLayer("Roads", shp)
-                          {
-                              Symbolizer =
+            {
+                Symbolizer =
                                   new SharpMap.Rendering.Symbolizer.BasicLineSymbolizer
-                                      {Line = new System.Drawing.Pen(System.Drawing.Color.Black)}
-                          };
+                                  { Line = new System.Drawing.Pen(System.Drawing.Color.Black) }
+            };
             map.Layers.Add(lyr);
             map.ZoomToExtents();
 
             RepeatedRendering(map, shp.GetFeatureCount(), NumberOfRenderCycles, out _msLineal);
             System.Diagnostics.Trace.WriteLine("\nWith testing if record is deleted ");
-            
+
             shp.CheckIfRecordIsDeleted = true;
             long tmp;
             RepeatedRendering(map, shp.GetFeatureCount(), 1, out tmp);
@@ -211,7 +213,7 @@ private static void RepeatedRendering(SharpMap.Map map, int numberOfFeatures, in
                 sw.Reset();
             }
 
-            avgRenderTime = totalRenderTime/numberOfTimes;
+            avgRenderTime = totalRenderTime / numberOfTimes;
             System.Diagnostics.Trace.WriteLine("\n Average rendering time:" + avgRenderTime.ToString(
                                          System.Globalization.NumberFormatInfo.CurrentInfo) + "ms.");
         }
@@ -241,7 +243,7 @@ public void TestExecuteIntersectionQuery()
             var fds = new SharpMap.Data.FeatureDataSet();
             var bbox = shp.GetExtents();
             //narrow it down
-            bbox.ExpandBy(-0.425*bbox.Width, -0.425*bbox.Height);
+            bbox.ExpandBy(-0.425 * bbox.Width, -0.425 * bbox.Height);
 
             //Just to avoid that initial query does not impose performance penalty
             shp.DoTrueIntersectionQuery = false;
@@ -256,7 +258,7 @@ public void TestExecuteIntersectionQuery()
             System.Diagnostics.Trace.WriteLine("Queried using just envelopes:\n" + fds.Tables[0].Rows.Count + " in " +
                                      sw.ElapsedMilliseconds + "ms.");
             fds.Tables.RemoveAt(0);
-            
+
             shp.DoTrueIntersectionQuery = true;
             sw.Reset();
             sw.Start();
@@ -278,7 +280,7 @@ public void TestExecuteIntersectionQueryWithFilterDelegate()
             var fds = new SharpMap.Data.FeatureDataSet();
             var bbox = shp.GetExtents();
             //narrow it down
-            bbox.ExpandBy(-0.425*bbox.Width, -0.425*bbox.Height);
+            bbox.ExpandBy(-0.425 * bbox.Width, -0.425 * bbox.Height);
 
             //Just to avoid that initial query does not impose performance penalty
             shp.DoTrueIntersectionQuery = false;
@@ -295,7 +297,7 @@ public void TestExecuteIntersectionQueryWithFilterDelegate()
             System.Diagnostics.Trace.WriteLine("Queried using just envelopes:\n" + fds.Tables[0].Rows.Count + " in " +
                                      sw.ElapsedMilliseconds + "ms.");
             fds.Tables.RemoveAt(0);
-            
+
             shp.DoTrueIntersectionQuery = true;
             sw.Reset();
             sw.Start();
diff --git a/UnitTests/Data/Providers/ThreadingTest.cs b/UnitTests/Data/Providers/ThreadingTest.cs
index 8e9ab8f2..b0d5c4d1 100644
--- a/UnitTests/Data/Providers/ThreadingTest.cs
+++ b/UnitTests/Data/Providers/ThreadingTest.cs
@@ -1,19 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
-using NetTopologySuite.Geometries;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Utilities.Indexing;
+using System;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace UnitTests.Data.Providers
 {
     public class ShapeFileWithMemoryCacheThreadingTest : ThreadingTest
     {
-        private static string TestDataPath 
+        private static string TestDataPath
         {
             get => TestUtility.GetPathToTestFile("roads_ugl.shp");
         }
@@ -130,12 +128,6 @@ public SqlSever2008ThreadingTest()
     public abstract class ThreadingTest
     {
         //private static readonly ILog Logger = LogManager.GetLogger(typeof(ThreadingTest));
-        
-        static ThreadingTest ()
-        {
-            GeoAPI.GeometryServiceProvider.Instance =
-                NetTopologySuite.NtsGeometryServices.Instance;
-        }
 
         private const int NumberOfTests = 200;
         private readonly IProvider _provider;
@@ -171,7 +163,7 @@ protected Envelope GetRandomEnvelope()
         private double NextRandom(double min, double max, double start, double amount)
         {
             var d = max - min;
-            return start + min * amount + d*amount*_rnd.NextDouble();
+            return start + min * amount + d * amount * _rnd.NextDouble();
         }
 
         [Test]
@@ -304,7 +296,7 @@ private void ExecuteGetGeometriesInView(object arguments)
                     "Thread {0}: {1}. failed:\n{2}", Thread.CurrentThread.ManagedThreadId, arguments, ex.Message));
                 _testsFailed[(int)arguments] = ex;
             }
-            
+
             SignalRun((int)arguments);
         }
         private void ExecuteExecuteFeatureQueryEnvelope(object arguments)
diff --git a/UnitTests/Data/Providers/WFSProviderTest.cs b/UnitTests/Data/Providers/WFSProviderTest.cs
index 00de6c06..620c8a2b 100644
--- a/UnitTests/Data/Providers/WFSProviderTest.cs
+++ b/UnitTests/Data/Providers/WFSProviderTest.cs
@@ -16,8 +16,8 @@ public void TestAxisOrder()
                 new SharpMap.Data.Providers.WFS("http://geo.vliz.be/geoserver/wfs?service=WFS&request=GetCapabilities",
                     "nsTmp", "elevation_10m", SharpMap.Data.Providers.WFS.WFSVersionEnum.WFS1_1_0);
             Assert.That(p.SRID == 4326);
-            Assert.That(p.AxisOrder[0] == 1 && p.AxisOrder[1]==0);
-            p.AxisOrder = new[] {0, 1};
+            Assert.That(p.AxisOrder[0] == 1 && p.AxisOrder[1] == 0);
+            p.AxisOrder = new[] { 0, 1 };
             Assert.That(p.AxisOrder[0] == 0 && p.AxisOrder[1] == 1);
 
             Assert.Throws<System.ArgumentException>(() => p.AxisOrder = new[] { 0, 1, 4 });
@@ -35,8 +35,8 @@ public void TestQuery()
             //p.FeatureTypeInfo.Geometry._GeometryType = 
 
             var ext = p.GetExtents();
-            
-            var g = p.GetGeometriesInView(new GeoAPI.Geometries.Envelope(-90, 90, -180, 180));
+
+            var g = p.GetGeometriesInView(new NetTopologySuite.Geometries.Envelope(-90, 90, -180, 180));
             Assert.That(g.Count > 0);
 
             var fds = new FeatureDataSet();
diff --git a/UnitTests/DictionaryExtender.cs b/UnitTests/DictionaryExtender.cs
index e25fb750..7062b0ba 100644
--- a/UnitTests/DictionaryExtender.cs
+++ b/UnitTests/DictionaryExtender.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using System.Dynamic;
 
@@ -10,7 +9,7 @@ public static class DictionaryExtender
         public static ExpandoObject ToExpando(this IDictionary<string, object> dictionary)
         {
             var expando = new ExpandoObject();
-            var expandoDic = (IDictionary<string, object>) expando;
+            var expandoDic = (IDictionary<string, object>)expando;
 
             foreach (var kvp in dictionary)
             {
diff --git a/UnitTests/EventListener.cs b/UnitTests/EventListener.cs
index ec1edea1..05d35866 100644
--- a/UnitTests/EventListener.cs
+++ b/UnitTests/EventListener.cs
@@ -3,7 +3,6 @@
 using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.Linq;
-using System.Reactive;
 using System.Reactive.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -19,7 +18,7 @@ internal class EventListener
         private static readonly MethodInfo _dictionarySetItemMethod =
             typeof(Dictionary<string, object>).GetProperty("Item").GetSetMethod();
 
-        private static readonly MethodInfo _listAddMethod = typeof(ObservableCollection<Dictionary<string, object>>).GetMethod("Add"); 
+        private static readonly MethodInfo _listAddMethod = typeof(ObservableCollection<Dictionary<string, object>>).GetMethod("Add");
         #endregion
 
         private readonly ObservableCollection<Dictionary<string, object>> _savedArgs = new ObservableCollection<Dictionary<string, object>>();
@@ -47,17 +46,17 @@ private Delegate CreateCompatibleListener(EventInfo eventInfo)
 
             var delegateParameters = invokeMethod.GetParameters();
 
-            var args = new List<Type> {typeof (EventListener)};
-            args.AddRange(delegateParameters.Select(p=>p.ParameterType));
+            var args = new List<Type> { typeof(EventListener) };
+            args.AddRange(delegateParameters.Select(p => p.ParameterType));
 
             var dm = new DynamicMethod(methodName,
-                typeof (void),
+                typeof(void),
                 args.ToArray(),
                 typeof(EventListener));
 
             var generator = dm.GetILGenerator(256);
-            generator.DeclareLocal(typeof (Dictionary<string, object>));
-            
+            generator.DeclareLocal(typeof(Dictionary<string, object>));
+
             generator.Emit(OpCodes.Newobj, _dictionaryCto);
             generator.Emit(OpCodes.Stloc_0);
 
@@ -87,7 +86,7 @@ private Delegate CreateCompatibleListener(EventInfo eventInfo)
             generator.Emit(OpCodes.Ldfld, savedArgsField);
             generator.Emit(OpCodes.Ldloc_0);
             generator.Emit(OpCodes.Callvirt, _listAddMethod);
-            
+
             generator.Emit(OpCodes.Ret);
 
             return dm.CreateDelegate(delegateType, this);
@@ -106,7 +105,7 @@ public IList<dynamic> DynamicSavedArgs
             get
             {
                 return _dynamicSavedArgs ??
-                       (_dynamicSavedArgs = _savedArgs.Select(dict => (dynamic) dict.ToExpando()).ToList());
+                       (_dynamicSavedArgs = _savedArgs.Select(dict => (dynamic)dict.ToExpando()).ToList());
             }
         }
     }
diff --git a/UnitTests/Extenders.cs b/UnitTests/Extenders.cs
index abf34c93..ecd92fd4 100644
--- a/UnitTests/Extenders.cs
+++ b/UnitTests/Extenders.cs
@@ -13,15 +13,15 @@
 // along with SharpMap; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using SharpMap;
+using SharpMap.Layers;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
 using System.Reactive.Linq;
-using GeoAPI.Geometries;
-using NUnit.Framework;
-using SharpMap;
-using SharpMap.Layers;
 
 namespace UnitTests
 {
@@ -52,7 +52,7 @@ public MapNewTileAvailableEventArgs(TileLayer sender, Envelope bbox, Bitmap bm,
             public int SourceHeight { get; private set; }
 
             public ImageAttributes ImageAttributes { get; private set; }
-        } 
+        }
         #endregion
 
         #region DownloadProgressEventArgs class
@@ -64,7 +64,7 @@ public DownloadProgressEventArgs(int tilesRemaining)
             }
 
             public int TilesRemaining { get; private set; }
-        } 
+        }
         #endregion
 
         #region Map extenders
@@ -75,28 +75,28 @@ public static LayerCollection GetCollection(this Map map, LayerCollectionType co
             {
                 case LayerCollectionType.Background:
                     return map.BackgroundLayer;
-                    
+
                 case LayerCollectionType.Static:
                     return map.Layers;
-                
+
                 case LayerCollectionType.Variable:
-                    return  map.VariableLayers;
+                    return map.VariableLayers;
                 default:
                     throw new Exception();
             }
         }
-        
+
         public static IObservable<MapNewTileAvailableEventArgs> GetMapNewTileAvailableAsObservable(this Map map)
         {
             var listener = new EventListener(map, "MapNewTileAvaliable");
             return listener.SavedArgs.ToObservable()
                 .Select(dict => new MapNewTileAvailableEventArgs(
-                    (TileLayer) dict["sender"],
-                    (Envelope) dict["bbox"],
-                    (Bitmap) dict["bm"],
-                    (int) dict["sourceWidth"],
-                    (int) dict["sourceHeight"],
-                    (ImageAttributes) dict["imageAttributes"]));
+                    (TileLayer)dict["sender"],
+                    (Envelope)dict["bbox"],
+                    (Bitmap)dict["bm"],
+                    (int)dict["sourceWidth"],
+                    (int)dict["sourceHeight"],
+                    (ImageAttributes)dict["imageAttributes"]));
         }
 
         #endregion
diff --git a/UnitTests/Issues/GitHub.cs b/UnitTests/Issues/GitHub.cs
index e00285f1..73e3dff3 100644
--- a/UnitTests/Issues/GitHub.cs
+++ b/UnitTests/Issues/GitHub.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Net;
-using GeoAPI.Geometries;
-using NetTopologySuite.Features;
+using NetTopologySuite.Features;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
+using System;
+using System.Net;
 
 namespace UnitTests.Issues
 {
@@ -74,7 +74,7 @@ public void TestIssue116()
                 var rasterLyr = new SharpMap.Layers.GdalRasterLayer("Raster", rasterFile);
                 map.Layers.Add(rasterLyr);
 
-                var linePoints = new[] { new GeoAPI.Geometries.Coordinate(0, 0), new GeoAPI.Geometries.Coordinate(10, 10) };
+                var linePoints = new[] { new NetTopologySuite.Geometries.Coordinate(0, 0), new NetTopologySuite.Geometries.Coordinate(10, 10) };
                 var line = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4326).CreateLineString(linePoints);
                 var linealDs = new SharpMap.Data.Providers.GeometryProvider(line);
                 var linealLyr = new SharpMap.Layers.VectorLayer("Lineal", linealDs) { SRID = 4326 };
@@ -106,7 +106,7 @@ public void TestIssue156(string url, SecurityProtocolType sptFail, SecurityProto
 
             SharpMap.Layers.WmsLayer wmsLayer = null;
             ServicePointManager.SecurityProtocol = sptFail;
-            Assert.That(() => wmsLayer = new SharpMap.Layers.WmsLayer("WMSFAIL", url), Throws.InstanceOf<System.ApplicationException>() );
+            Assert.That(() => wmsLayer = new SharpMap.Layers.WmsLayer("WMSFAIL", url), Throws.InstanceOf<System.ApplicationException>());
             ServicePointManager.SecurityProtocol = sptSucceed;
             Assert.That(() => wmsLayer = new SharpMap.Layers.WmsLayer("WMSSUCCED", url), Throws.Nothing);
             Assert.That(wmsLayer, Is.Not.Null, "wmsLayer null");
diff --git a/UnitTests/Layers/CoordinateTransformationTest.cs b/UnitTests/Layers/CoordinateTransformationTest.cs
index bfc4a209..d9515b9b 100644
--- a/UnitTests/Layers/CoordinateTransformationTest.cs
+++ b/UnitTests/Layers/CoordinateTransformationTest.cs
@@ -1,5 +1,4 @@
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap;
 using SharpMap.Data;
diff --git a/UnitTests/Layers/GdiImageLayerTest.cs b/UnitTests/Layers/GdiImageLayerTest.cs
index 59e55225..a814e285 100644
--- a/UnitTests/Layers/GdiImageLayerTest.cs
+++ b/UnitTests/Layers/GdiImageLayerTest.cs
@@ -1,12 +1,13 @@
-using System;
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using SharpMap;
+using SharpMap.Layers;
+using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
-using GeoAPI.Geometries;
-using NUnit.Framework;
-using SharpMap;
-using SharpMap.Layers;
+using Point = System.Drawing.Point;
 
 namespace UnitTests.Layers
 {
@@ -32,7 +33,7 @@ internal static string CreateImage(Size size, PointF? origin = null)
         private static void CreateWorldFile(string imageFile, Size size, PointF? origin)
         {
             if (origin == null) return;
-            
+
             var ext = Path.GetExtension(imageFile);
             if (ext == null)
                 throw new ArgumentException("imageFile");
@@ -54,7 +55,7 @@ internal static void DeleteTmpFiles(string imageFile)
         {
             if (File.Exists(imageFile))
             {
-                foreach (var file in Directory.GetFiles(Path.GetTempPath(), 
+                foreach (var file in Directory.GetFiles(Path.GetTempPath(),
                     Path.GetFileNameWithoutExtension(imageFile) + ".*"))
                 {
                     try
@@ -76,8 +77,8 @@ public void TestGdiImageLayer1()
         {
             var imageFile = CreateImage(new Size(512, 256));
             GdiImageLayer l = null;
-            
-            Assert.DoesNotThrow( () => l = new GdiImageLayer(imageFile));
+
+            Assert.DoesNotThrow(() => l = new GdiImageLayer(imageFile));
 
             Assert.NotNull(l);
             Assert.AreEqual(Path.GetFileName(imageFile), l.LayerName);
@@ -113,7 +114,7 @@ public class GdiImageLayerProxyTest
         public void TestTransparency()
         {
             var tmpFile = GdiImageLayerTest.CreateImage(new Size(300, 300), new PointF(10, 10));
-            using(var l = new GdiImageLayer(tmpFile))
+            using (var l = new GdiImageLayer(tmpFile))
             using (var pl = new GdiImageLayerProxy<GdiImageLayer>(l, 0.3f))
             using (var m = new Map(new Size(450, 450)))
             {
@@ -122,7 +123,7 @@ public void TestTransparency()
                 using (var img = (Bitmap)m.GetMap())
                 {
                     var color = img.GetPixel(225, 225);
-                    Assert.LessOrEqual(Math.Abs((int)Math.Round(0.3f*255, MidpointRounding.AwayFromZero) - color.A),1);
+                    Assert.LessOrEqual(Math.Abs((int)Math.Round(0.3f * 255, MidpointRounding.AwayFromZero) - color.A), 1);
                 }
             }
             GdiImageLayerTest.DeleteTmpFiles(tmpFile);
@@ -152,7 +153,7 @@ public void TestColorMap()
         {
             var tmpFile = GdiImageLayerTest.CreateImage(new Size(300, 300), new PointF(10, 10));
             using (var l = new GdiImageLayer(tmpFile))
-            using (var pl = new GdiImageLayerProxy<GdiImageLayer>(l, new ColorMap{OldColor = Color.Red, NewColor = Color.MistyRose}))
+            using (var pl = new GdiImageLayerProxy<GdiImageLayer>(l, new ColorMap { OldColor = Color.Red, NewColor = Color.MistyRose }))
             using (var m = new Map(new Size(450, 450)))
             {
                 m.Layers.Add(pl);
diff --git a/UnitTests/Layers/LabelLayerTest.cs b/UnitTests/Layers/LabelLayerTest.cs
index 249d4d3d..60f26a9a 100644
--- a/UnitTests/Layers/LabelLayerTest.cs
+++ b/UnitTests/Layers/LabelLayerTest.cs
@@ -1,14 +1,13 @@
-using System.Data;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Runtime.InteropServices;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace UnitTests.Layers
 {
@@ -20,22 +19,22 @@ public class LabelLayerTest
         public void OneTimeSetUp()
         {
             var fdt = new FeatureDataTable();
-            fdt.Columns.Add(new DataColumn("ID", typeof (int)));
-            fdt.Columns.Add(new DataColumn("LABEL", typeof (string)));
-            fdt.Columns.Add(new DataColumn("HALIGN", typeof (int)));
-            fdt.Columns.Add(new DataColumn("VALIGN", typeof (int)));
+            fdt.Columns.Add(new DataColumn("ID", typeof(int)));
+            fdt.Columns.Add(new DataColumn("LABEL", typeof(string)));
+            fdt.Columns.Add(new DataColumn("HALIGN", typeof(int)));
+            fdt.Columns.Add(new DataColumn("VALIGN", typeof(int)));
 
-            var factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4236);
+            var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4236);
             for (var i = 0; i < 3; i++)
             {
                 for (var j = 0; j < 3; j++)
                 {
                     var fdr = fdt.NewRow();
-                    fdr[0] = i*3 + j;
-                    fdr[1] = string.Format("Point({0}, {1})\nID {2}", i, j, i*3 + j);
+                    fdr[0] = i * 3 + j;
+                    fdr[1] = string.Format("Point({0}, {1})\nID {2}", i, j, i * 3 + j);
                     fdr[2] = j;
                     fdr[3] = i;
-                    fdr.Geometry = factory.CreatePoint(new Coordinate(j*100, i*100));
+                    fdr.Geometry = factory.CreatePoint(new Coordinate(j * 100, i * 100));
                     fdt.AddRow(fdr);
                 }
             }
@@ -51,8 +50,8 @@ private static IStyle StyleBasedOnAlignment(FeatureDataRow dr)
         {
             var style = new LabelStyle
             {
-                HorizontalAlignment = (LabelStyle.HorizontalAlignmentEnum)(int) dr[2],
-                VerticalAlignment = (LabelStyle.VerticalAlignmentEnum)(int) dr[3],
+                HorizontalAlignment = (LabelStyle.HorizontalAlignmentEnum)(int)dr[2],
+                VerticalAlignment = (LabelStyle.VerticalAlignmentEnum)(int)dr[3],
                 Rotation = -20,
                 BackColor = Brushes.Pink,
                 Halo = new Pen(Brushes.LightBlue, 2)
@@ -69,7 +68,7 @@ public void MultiLineCenterAlignedTest()
                 //_featureDataTable.Clear();
                 var gfp = new GeometryFeatureProvider(_featureDataTable);
                 var vl = new VectorLayer("VL", gfp);
-                var ll = new LabelLayer("MultiLineCenterAligned") {DataSource = gfp};
+                var ll = new LabelLayer("MultiLineCenterAligned") { DataSource = gfp };
                 ll.Theme = CreateTheme();
                 ll.LabelColumn = "LABEL";
                 m.Layers.Add(vl);
diff --git a/UnitTests/Layers/LayerGroupTest.cs b/UnitTests/Layers/LayerGroupTest.cs
index 03ba2e83..3a4489aa 100644
--- a/UnitTests/Layers/LayerGroupTest.cs
+++ b/UnitTests/Layers/LayerGroupTest.cs
@@ -1,5 +1,4 @@
-using System;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Layers;
 using SharpMap.Styles;
@@ -16,7 +15,7 @@ public override Envelope Envelope
             {
                 get { return null; }
             }
-        } 
+        }
         #endregion
 
         #region FooLayer class
@@ -26,10 +25,10 @@ public override Envelope Envelope
             {
                 get { return new Envelope(5, 10, 5, 10); }
             }
-        } 
+        }
         #endregion
 
-        private GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation CreateTransformation()
+        private ProjNet.CoordinateSystems.Transformations.ICoordinateTransformation CreateTransformation()
         {
             var ctf = new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
             return ctf.CreateFromCoordinateSystems(
@@ -37,7 +36,7 @@ private GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation Creat
                 ProjNet.CoordinateSystems.GeographicCoordinateSystem.WGS84);
         }
 
-        private GeoAPI.CoordinateSystems.Transformations.ICoordinateTransformation CreateReverseTransformation()
+        private ProjNet.CoordinateSystems.Transformations.ICoordinateTransformation CreateReverseTransformation()
         {
             var ctf = new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory();
             return ctf.CreateFromCoordinateSystems(
@@ -147,7 +146,7 @@ public void LayerGroup_CloneProp()
             //group.TargetSRID = 4318; // different to CoordinateTransformation above!!!
             group.Proj4Projection = "dummy";
             group.Style = new LabelStyle();
-            
+
             var clonedGroup = (LayerGroup)group.Clone();
 
             Assert.That(clonedGroup.CoordinateTransformation.SourceCS.WKT, Is.EqualTo(group.CoordinateTransformation.SourceCS.WKT), "CoordinateTransformation mismatch");
diff --git a/UnitTests/Layers/LayerTest.cs b/UnitTests/Layers/LayerTest.cs
index 909d3783..74e54807 100644
--- a/UnitTests/Layers/LayerTest.cs
+++ b/UnitTests/Layers/LayerTest.cs
@@ -1,8 +1,8 @@
-using System;
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using System;
 using System.ComponentModel;
 using System.Windows.Forms;
-using GeoAPI.Geometries;
-using NUnit.Framework;
 
 namespace UnitTests.Layers
 {
@@ -16,7 +16,7 @@ public override Envelope Envelope
             {
                 get { throw new NotImplementedException(); }
             }
-        } 
+        }
         #endregion
 
         #region BindableComponent class
@@ -42,7 +42,7 @@ public void Dispose()
             public BindingContext BindingContext { get; set; }
 
             public int IntProperty { get; set; }
-        } 
+        }
         #endregion
 
 
@@ -55,7 +55,7 @@ public void SRID_Winform_ShouldBeBindable()
             layer.SRID = 0;
 
             var binding = new Binding("IntProperty", layer, "SRID");
-            
+
             var targetComponent = new BindableComponent();
             targetComponent.Disposed += (sender, args) => _bcDisposed = true;
             targetComponent.DataBindings.Add(binding);
diff --git a/UnitTests/Layers/Layer_AffectedAreaTest.cs b/UnitTests/Layers/Layer_AffectedAreaTest.cs
index a4ca130b..dfd2bed1 100644
--- a/UnitTests/Layers/Layer_AffectedAreaTest.cs
+++ b/UnitTests/Layers/Layer_AffectedAreaTest.cs
@@ -1,21 +1,18 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using GeoAPI.Geometries;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.Geometries.Utilities;
 using NUnit.Framework;
-using ProjNet.CoordinateSystems.Transformations;
 using SharpMap;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
-using SharpMap.Drawing;
 using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
 using Color = System.Drawing.Color;
 using LabelStyle = SharpMap.Styles.LabelStyle;
 using PointF = System.Drawing.PointF;
@@ -95,7 +92,7 @@ public void LabelLayer_AffectedArea(LabelLayerMode mode, bool testRotations)
                     SetMapTransform(map, rot);
                     map.ZoomToBox(extents, true);
 
-                    var affectedArea = GetAffectedArea(map, (Layer) map.Layers[1]);
+                    var affectedArea = GetAffectedArea(map, (Layer)map.Layers[1]);
                     AddAffectedAreaLayer(map, affectedArea);
 
                     using (var img = map.GetMap())
@@ -142,7 +139,7 @@ private Polygon GetAffectedArea(Map map, Layer layer)
             using (var img = new Bitmap(map.Size.Width, map.Size.Height))
             using (var g = Graphics.FromImage(img))
             {
-                var rect = ((ILayerEx) layer).Render(g, (MapViewport) map);
+                var rect = ((ILayerEx)layer).Render(g, (MapViewport)map);
                 var pts = new PointF[]
                 {
                     new PointF(rect.X, rect.Y),
@@ -151,7 +148,7 @@ private Polygon GetAffectedArea(Map map, Layer layer)
                     new PointF(rect.X, rect.Y + rect.Height),
                     new PointF(rect.X, rect.Y),
                 };
-                
+
                 var coords = map.ImageToWorld(pts);
                 return new Polygon(new LinearRing(coords));
             }
@@ -159,14 +156,14 @@ private Polygon GetAffectedArea(Map map, Layer layer)
 
         private void AddAffectedAreaLayer(Map map, Polygon affectedArea)
         {
-            var geoms = new List<IGeometry>(){affectedArea};
+            var geoms = new List<Geometry>() { affectedArea };
             if (!map.MapTransform.IsIdentity)
             {
                 // affectedArea is aligned with Graphics Canvas (not with north arrow)
                 // The following steps are simply to show this geom in world units  
                 var centreX = affectedArea.EnvelopeInternal.Centre.X;
                 var centreY = affectedArea.EnvelopeInternal.Centre.Y;
-                
+
                 // apply negative rotation about center of polygon
                 var rad = NetTopologySuite.Utilities.Degrees.ToRadians(map.MapTransformRotation);
                 var trans = new AffineTransformation();
@@ -189,12 +186,12 @@ private void AddAffectedAreaLayer(Map map, Polygon affectedArea)
                     new Coordinate(minX , minY ),
                     new Coordinate(minX , maxY ),
                 };
-               
+
                 // rotate enclosing envelope back to world units
                 trans = new AffineTransformation();
                 trans.Compose(AffineTransformation.RotationInstance(rad));
                 trans.Compose(AffineTransformation.TranslationInstance(centreX, centreY));
-                
+
                 // construct geom to show on screen
                 var enclosing = trans.Transform(new Polygon(new LinearRing(coords)));
                 geoms.Add(enclosing);
@@ -218,7 +215,7 @@ private void AddBasicLabelLayers(Map map, LabelLayerMode mode)
             fdt.Columns.Add(new DataColumn("ID", typeof(int)));
             fdt.Columns.Add(new DataColumn("LABEL", typeof(string)));
 
-            var factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4236);
+            var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4236);
             var fdr = fdt.NewRow();
             fdr[0] = 1;
             fdr[1] = "Test Label";
@@ -297,7 +294,7 @@ private void AddPathOnLabelLayers(Map map)
             fdt.Columns.Add(new DataColumn("ID", typeof(int)));
             fdt.Columns.Add(new DataColumn("LABEL", typeof(string)));
 
-            var factory = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory(4236);
+            var factory = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory(4236);
             var fdr = fdt.NewRow();
             fdr[0] = 1;
             fdr[1] = "Test Label";
@@ -343,7 +340,7 @@ public void PathLabel_AffectedArea(LabelLayerMode mode, bool testRotations, bool
 
             var vtAlgins = new[]
             {
-                LabelStyle.VerticalAlignmentEnum.Top, 
+                LabelStyle.VerticalAlignmentEnum.Top,
                 LabelStyle.VerticalAlignmentEnum.Middle,
                 LabelStyle.VerticalAlignmentEnum.Bottom
             };
@@ -376,8 +373,8 @@ public void PathLabel_AffectedArea(LabelLayerMode mode, bool testRotations, bool
                                     map.Zoom *= 1.25;
                                     break;
                                 case LabelLayerMode.SineCurveClipped:
-//                            map.ZoomToExtents();
-//                            map.Zoom *= 0.6;
+                                    //                            map.ZoomToExtents();
+                                    //                            map.Zoom *= 0.6;
                                     break;
                                 case LabelLayerMode.SineCurveExtended:
                                     map.ZoomToExtents();
@@ -385,10 +382,10 @@ public void PathLabel_AffectedArea(LabelLayerMode mode, bool testRotations, bool
                                     break;
                             }
 
-                            var affectedArea = GetAffectedArea(map, (Layer) map.Layers[1]);
+                            var affectedArea = GetAffectedArea(map, (Layer)map.Layers[1]);
                             if (affectedArea == null)
                                 continue;
-                            
+
                             AddAffectedAreaLayer(map, affectedArea);
 
                             using (var img = map.GetMap())
@@ -408,8 +405,8 @@ public void PathLabel_AffectedArea(LabelLayerMode mode, bool testRotations, bool
             }
         }
 
-        private void AddSineCurveLayers(Map map, LabelLayerMode mode,  
-            LabelStyle.HorizontalAlignmentEnum hzAlign, 
+        private void AddSineCurveLayers(Map map, LabelLayerMode mode,
+            LabelStyle.HorizontalAlignmentEnum hzAlign,
             LabelStyle.VerticalAlignmentEnum vtAlign)
         {
             string text;
@@ -428,11 +425,11 @@ private void AddSineCurveLayers(Map map, LabelLayerMode mode,
             fdt.BeginInit();
             fdt.Columns.Add(new System.Data.DataColumn("ID", typeof(int)));
             fdt.Columns.Add(new System.Data.DataColumn("LABEL", typeof(string)));
-            fdt.PrimaryKey = new[] {fdt.Columns[0]};
+            fdt.PrimaryKey = new[] { fdt.Columns[0] };
             fdt.EndInit();
             fdt.BeginLoadData();
-            var fdr = (SharpMap.Data.FeatureDataRow) fdt.LoadDataRow(new object[] {1, text}, true);
-            fdr.Geometry = CreateSineLine(new GeoAPI.Geometries.Coordinate(10, 10));
+            var fdr = (SharpMap.Data.FeatureDataRow)fdt.LoadDataRow(new object[] { 1, text }, true);
+            fdr.Geometry = CreateSineLine(new NetTopologySuite.Geometries.Coordinate(10, 10));
             fdt.EndLoadData();
 
             var vLyr = new SharpMap.Layers.VectorLayer("Geometry", new GeometryFeatureProvider(fdt));
@@ -441,29 +438,29 @@ private void AddSineCurveLayers(Map map, LabelLayerMode mode,
             vLyr.SRID = map.SRID;
             map.Layers.Add(vLyr);
 
-            var lLyr = new SharpMap.Layers.LabelLayer("Label") {DataSource = vLyr.DataSource, LabelColumn = "LABEL"};
+            var lLyr = new SharpMap.Layers.LabelLayer("Label") { DataSource = vLyr.DataSource, LabelColumn = "LABEL" };
             lLyr.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
             lLyr.Style.ForeColor = System.Drawing.Color.Cyan;
-            lLyr.Style.BackColor = new SolidBrush(Color.FromArgb(128,Color.LightSlateGray));
+            lLyr.Style.BackColor = new SolidBrush(Color.FromArgb(128, Color.LightSlateGray));
             //lLyr.Style.Halo = new Pen(Color.Yellow, 4);
-            lLyr.Style.IgnoreLength = mode==LabelLayerMode.SineCurveExtended;
+            lLyr.Style.IgnoreLength = mode == LabelLayerMode.SineCurveExtended;
             lLyr.Style.HorizontalAlignment = hzAlign;
             lLyr.Style.VerticalAlignment = vtAlign;
             //ll.Style.IsTextOnPath = textOnPath;
             map.Layers.Add(lLyr);
         }
 
-        private static GeoAPI.Geometries.ILineString CreateSineLine(GeoAPI.Geometries.Coordinate offset,
+        private static NetTopologySuite.Geometries.LineString CreateSineLine(NetTopologySuite.Geometries.Coordinate offset,
             double scaleY = 100)
         {
             var factory = new NetTopologySuite.Geometries.GeometryFactory();
             var cs = factory.CoordinateSequenceFactory.Create(181, 2);
             for (int i = 0; i <= 180; i++)
             {
-                cs.SetOrdinate(i, GeoAPI.Geometries.Ordinate.X, offset.X + 2 * i);
-                cs.SetOrdinate(i, GeoAPI.Geometries.Ordinate.Y, offset.Y + scaleY * System.Math.Sin(2d * i * System.Math.PI/180d));
+                cs.SetOrdinate(i, NetTopologySuite.Geometries.Ordinate.X, offset.X + 2 * i);
+                cs.SetOrdinate(i, NetTopologySuite.Geometries.Ordinate.Y, offset.Y + scaleY * System.Math.Sin(2d * i * System.Math.PI / 180d));
             }
-            return factory.CreateLineString(cs);        
+            return factory.CreateLineString(cs);
         }
 
         [NUnit.Framework.TestCase(SymbolizerMode.Rps, PointAlignment.Horizontal, true)]
@@ -474,11 +471,11 @@ private static GeoAPI.Geometries.ILineString CreateSineLine(GeoAPI.Geometries.Co
         [NUnit.Framework.TestCase(SymbolizerMode.Cps, PointAlignment.Diagonal, false)]
         [NUnit.Framework.TestCase(SymbolizerMode.Pps, PointAlignment.Horizontal, true)]
         [NUnit.Framework.TestCase(SymbolizerMode.Pps, PointAlignment.Vertical, false)]
-        [NUnit.Framework.TestCase(SymbolizerMode.Pps, PointAlignment.Diagonal, false)]       
+        [NUnit.Framework.TestCase(SymbolizerMode.Pps, PointAlignment.Diagonal, false)]
         [NUnit.Framework.TestCase(SymbolizerMode.Lps, PointAlignment.Horizontal, true)]
         [NUnit.Framework.TestCase(SymbolizerMode.Lps, PointAlignment.Vertical, false)]
-        [NUnit.Framework.TestCase(SymbolizerMode.Lps, PointAlignment.Diagonal, false)]       
-        public void PointSymbolizer_AffectedArea(SymbolizerMode symMode,  PointAlignment alignMode, bool testRotations)
+        [NUnit.Framework.TestCase(SymbolizerMode.Lps, PointAlignment.Diagonal, false)]
+        public void PointSymbolizer_AffectedArea(SymbolizerMode symMode, PointAlignment alignMode, bool testRotations)
         {
             using (var map = new Map())
             {
@@ -508,7 +505,7 @@ public void PointSymbolizer_AffectedArea(SymbolizerMode symMode,  PointAlignment
                     SetMapTransform(map, rot);
                     map.ZoomToBox(extents, true);
 
-                    var affectedArea = GetAffectedArea(map, (Layer) map.Layers[0]);
+                    var affectedArea = GetAffectedArea(map, (Layer)map.Layers[0]);
                     AddAffectedAreaLayer(map, affectedArea);
 
                     using (var img = map.GetMap())
@@ -530,31 +527,31 @@ public void PointSymbolizer_AffectedArea(SymbolizerMode symMode,  PointAlignment
             switch (mode)
             {
                 case PointAlignment.Horizontal:
-                    pts.Add(new NetTopologySuite.Geometries.Point(99,7));
-                    pts.Add(new NetTopologySuite.Geometries.Point(100,7));
-                    pts.Add(new NetTopologySuite.Geometries.Point(101,7));
+                    pts.Add(new NetTopologySuite.Geometries.Point(99, 7));
+                    pts.Add(new NetTopologySuite.Geometries.Point(100, 7));
+                    pts.Add(new NetTopologySuite.Geometries.Point(101, 7));
                     break;
                 case PointAlignment.Vertical:
-                    pts.Add(new NetTopologySuite.Geometries.Point(99,7));
-                    pts.Add(new NetTopologySuite.Geometries.Point(99,8));
-                    pts.Add(new NetTopologySuite.Geometries.Point(99,9));
+                    pts.Add(new NetTopologySuite.Geometries.Point(99, 7));
+                    pts.Add(new NetTopologySuite.Geometries.Point(99, 8));
+                    pts.Add(new NetTopologySuite.Geometries.Point(99, 9));
                     break;
                 case PointAlignment.Diagonal:
-                    pts.Add(new NetTopologySuite.Geometries.Point(99,7));
-                    pts.Add(new NetTopologySuite.Geometries.Point(100,8));
-                    pts.Add(new NetTopologySuite.Geometries.Point(101,9));
+                    pts.Add(new NetTopologySuite.Geometries.Point(99, 7));
+                    pts.Add(new NetTopologySuite.Geometries.Point(100, 8));
+                    pts.Add(new NetTopologySuite.Geometries.Point(101, 9));
                     break;
             }
             return pts;
-        }           
-        
+        }
+
         private void AddRasterPointSymbolizerLayers(Map map, PointAlignment mode)
         {
             var pts = GetSymbolizerPoints(mode);
-            
+
             var vLyr = new VectorLayer("RasterPoint", new GeometryFeatureProvider(pts.AsEnumerable()));
             var rps = new SharpMap.Rendering.Symbolizer.RasterPointSymbolizer();
-            rps.Symbol = GetRasterSymbol(); 
+            rps.Symbol = GetRasterSymbol();
             rps.Rotation = 30f;
             vLyr.Style.PointSymbolizer = rps;
             map.Layers.Add(vLyr);
@@ -578,9 +575,9 @@ private System.Drawing.Image GetRasterSymbol()
         private void AddCharacterPointSymbolizerLayers(Map map, PointAlignment mode)
         {
             var pts = GetSymbolizerPoints(mode);
-            
+
             var vLyr = new VectorLayer("CharPoint", new GeometryFeatureProvider(pts.AsEnumerable()));
-            var cps  = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
+            var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
             {
                 Halo = 1,
                 HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
@@ -594,13 +591,13 @@ private void AddCharacterPointSymbolizerLayers(Map map, PointAlignment mode)
             vLyr.Style.PointSize = 4f;
             map.Layers.Add(vLyr);
         }
-        
+
         private void AddLinePointSymbolizerLayers(Map map, PointAlignment mode)
         {
             var pts = GetSymbolizerPoints(mode);
-            
+
             var vLyr = new VectorLayer("LinePoint", new GeometryFeatureProvider(pts.AsEnumerable()));
-            var cps  = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
+            var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
             {
                 Halo = 1,
                 HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
@@ -615,13 +612,13 @@ private void AddLinePointSymbolizerLayers(Map map, PointAlignment mode)
         }
 
         private void AddPathPointSymbolizerLayers(Map map, PointAlignment mode)
-        { 
+        {
             var pts = GetSymbolizerPoints(mode);
-            
+
             var vLyr = new VectorLayer("PathPoint with 2 parts", new GeometryFeatureProvider(pts.AsEnumerable()));
 
             var gpTriangle1 = new System.Drawing.Drawing2D.GraphicsPath();
-            gpTriangle1.AddPolygon(new [] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
+            gpTriangle1.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
             var gpTriangle2 = new System.Drawing.Drawing2D.GraphicsPath();
             gpTriangle2.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(-5, -10), new System.Drawing.Point(-10, 0), new System.Drawing.Point(0, 0), });
             var pps = new
@@ -662,7 +659,7 @@ private void AddPathPointSymbolizerLayers(Map map, PointAlignment mode)
         private void AddListPointSymbolizerLayers(Map map, PointAlignment mode)
         {
             var pts = GetSymbolizerPoints(mode);
-            
+
             var vLyr = new VectorLayer("ListPoint with Pps and Cps", new GeometryFeatureProvider(pts.AsEnumerable()));
             var pps =
                 SharpMap.Rendering.Symbolizer.PathPointSymbolizer.CreateSquare(new System.Drawing.Pen(System.Drawing.Color.Red, 2),
@@ -701,7 +698,7 @@ public void Line_AffectedArea(float width, float offset, PointAlignment alignMod
                 ConfigureMap(map);
 
                 AddLineLayers(map, alignMode, width, offset);
-                
+
                 var extents = map.GetExtents();
                 extents.ExpandBy(0.2);
 
@@ -710,7 +707,7 @@ public void Line_AffectedArea(float width, float offset, PointAlignment alignMod
                     SetMapTransform(map, rot);
                     map.ZoomToBox(extents, true);
 
-                    var affectedArea = GetAffectedArea(map, (Layer) map.Layers[0]);
+                    var affectedArea = GetAffectedArea(map, (Layer)map.Layers[0]);
                     AddAffectedAreaLayer(map, affectedArea);
 
                     using (var img = map.GetMap())
@@ -730,7 +727,7 @@ private void AddLineLayers(Map map, PointAlignment mode, float width, float offs
         {
             var pts = GetSymbolizerPoints(mode);
             var line = new LineString(GetSymbolizerPoints(mode).Select(p => new Coordinate(p.X, p.Y)).ToArray());
-            
+
             var vLyr = new VectorLayer("Line", new GeometryFeatureProvider(line));
             vLyr.Style.Line = new Pen(Color.Green, width);
             vLyr.Style.LineOffset = offset;
diff --git a/UnitTests/Layers/TileLayerIssues.cs b/UnitTests/Layers/TileLayerIssues.cs
index d1c9a24c..7c08fbb1 100644
--- a/UnitTests/Layers/TileLayerIssues.cs
+++ b/UnitTests/Layers/TileLayerIssues.cs
@@ -1,10 +1,9 @@
-using System.Drawing;
-using System.Drawing.Imaging;
-using BruTile.Web;
-using GeoAPI.Geometries;
+using BruTile.Predefined;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Layers;
-using BruTile.Predefined;
+using System.Drawing;
+using System.Drawing.Imaging;
 
 namespace UnitTests.Layers
 {
@@ -25,12 +24,12 @@ public void TestIncompleteImage()
             using (var map = new SharpMap.Map(new Size(2500, 2500)))
             {
                 map.BackColor = Color.Magenta;
-                var fc = new BruTile.Cache.FileCache(System.IO.Path.Combine(_fileCacheRoot, "BingStaging"), "png"); 
+                var fc = new BruTile.Cache.FileCache(System.IO.Path.Combine(_fileCacheRoot, "BingStaging"), "png");
                 var bts = KnownTileSources.Create(KnownTileSource.BingHybridStaging, null, fc);
                 var tl = new TileLayer(bts, "TileLayer - " + KnownTileSource.BingHybridStaging, Color.Transparent, true);
-                                       
+
                 map.Layers.Add(tl);
-                
+
                 map.ZoomToBox(new Envelope(829384.331338522, 837200.785470394, 7068020.31417922, 7072526.73926545)
                             /*new Envelope(-239839.49199841652, 78451.759683380573, -37033.0152981899, 106723.52879865949)*/);
                 using (var image = map.GetMap())
diff --git a/UnitTests/Layers/WmsLayerTest.cs b/UnitTests/Layers/WmsLayerTest.cs
index 11755d59..4b22d6a4 100644
--- a/UnitTests/Layers/WmsLayerTest.cs
+++ b/UnitTests/Layers/WmsLayerTest.cs
@@ -1,11 +1,11 @@
-using System;
-using System.Drawing;
-using System.Linq;
-using System.Web;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Layers;
 using SharpMap.Web.Wms;
+using System;
+using System.Drawing;
+using System.Linq;
+using System.Web;
 
 namespace UnitTests.Layers
 {
@@ -17,12 +17,12 @@ public void BgColor_NamedColor_SetUrlPropertyCorrectly()
         {
             var client = CreateClientFromXmlResult("wms.atlantedesertificazione.xml");
 
-            var layer = new WmsLayer("wms", client) {BgColor = Color.Red, SRID = 0, Transparent = false};
+            var layer = new WmsLayer("wms", client) { BgColor = Color.Red, SRID = 0, Transparent = false };
 
             var url = layer.GetRequestUrl(new Envelope(1, 1, 1, 1), new Size(1, 1));
             var queryString = HttpUtility.ParseQueryString(url);
 
-            Assert.That(queryString["BGCOLOR"], Is.EqualTo("FF0000"), 
+            Assert.That(queryString["BGCOLOR"], Is.EqualTo("FF0000"),
                 "Layer.BgColor does not produce a valid Url");
         }
 
@@ -54,7 +54,7 @@ public void ContactInfo_ContactOrganization_IsParsedCorrectly()
 
         private Client CreateClientFromXmlResult(string xmlFilename)
         {
-            var resourceName = typeof (WmsLayerTest).Namespace + "." + xmlFilename;
+            var resourceName = typeof(WmsLayerTest).Namespace + "." + xmlFilename;
             var resourceStream = typeof(WmsLayerTest).Assembly.GetManifestResourceStream(resourceName);
             Assert.That(resourceStream, Is.Not.Null, "Wrong test: Invalid resource name");
 
diff --git a/UnitTests/MapDecorationTest.cs b/UnitTests/MapDecorationTest.cs
index 9a5e2729..37740165 100644
--- a/UnitTests/MapDecorationTest.cs
+++ b/UnitTests/MapDecorationTest.cs
@@ -1,14 +1,15 @@
-using System.Collections.Generic;
-using System.Drawing;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap;
 using SharpMap.Data.Providers;
+using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
 //using SharpMap.Geometries;
 using SharpMap.Rendering.Decoration.ScaleBar;
-using SharpMap.Layers;
-using GeoPoint = GeoAPI.Geometries.Coordinate;
+using System.Collections.Generic;
+using System.Drawing;
+using GeoPoint = NetTopologySuite.Geometries.Coordinate;
+using Point = System.Drawing.Point;
 
 namespace UnitTests
 {
@@ -30,25 +31,25 @@ public class MapDecorationTest
         [Test]
         public void TestMapDecorationTest()
         {
-            var m = new Map(new Size(780, 540)) {BackColor = Color.White};
-            var p = new GeometryProvider(new List<IGeometry>());
-            var pts = new [] {new GeoPoint(0, 0), new GeoPoint(779, 539)};
+            var m = new Map(new Size(780, 540)) { BackColor = Color.White };
+            var p = new GeometryProvider(new List<Geometry>());
+            var pts = new[] { new GeoPoint(0, 0), new GeoPoint(779, 539) };
             var ls = m.Factory.CreateLineString(pts);
             p.Geometries.Add(ls);
-            m.Layers.Add(new VectorLayer("t",p));
+            m.Layers.Add(new VectorLayer("t", p));
             m.ZoomToExtents();
 
             m.Decorations.Add(new TestDecoration
-                                  {
-                                      Anchor = MapDecorationAnchor.LeftTop,
-                                      BorderColor = Color.Green,
-                                      BackgroundColor = Color.LightGreen,
-                                      BorderWidth = 2,
-                                      Location = new Point(10, 10),
-                                      BorderMargin = new Size(5, 5),
-                                      RoundedEdges = true,
-                                      Opacity = 0.6f
-                                  });
+            {
+                Anchor = MapDecorationAnchor.LeftTop,
+                BorderColor = Color.Green,
+                BackgroundColor = Color.LightGreen,
+                BorderWidth = 2,
+                Location = new Point(10, 10),
+                BorderMargin = new Size(5, 5),
+                RoundedEdges = true,
+                Opacity = 0.6f
+            });
 
             m.Decorations.Add(new TestDecoration
             {
@@ -72,7 +73,7 @@ public void TestMapDecorationTest()
                 BorderMargin = new Size(5, 5),
                 RoundedEdges = true,
                 BarWidth = 4,
-                ScaleText =ScaleBarLabelText.RepresentativeFraction,
+                ScaleText = ScaleBarLabelText.RepresentativeFraction,
                 NumTicks = 2,
                 Opacity = 1f
             });
diff --git a/UnitTests/MapTest.cs b/UnitTests/MapTest.cs
index 80e91c07..cfa13fed 100644
--- a/UnitTests/MapTest.cs
+++ b/UnitTests/MapTest.cs
@@ -1,37 +1,41 @@
-using System;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.Linq;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using GeoAPI.Geometries;
 using Moq;
-using NUnit.Framework;
+using NetTopologySuite;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.Geometries.Utilities;
 using NetTopologySuite.IO;
+using NUnit.Framework;
 using SharpMap;
 using SharpMap.Data.Providers;
-using Geometry = GeoAPI.Geometries.IGeometry;
 using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
 using SharpMap.Rendering.Decoration.ScaleBar;
-using Point = GeoAPI.Geometries.Coordinate;
-using BoundingBox = GeoAPI.Geometries.Envelope;
+using System;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using BoundingBox = NetTopologySuite.Geometries.Envelope;
+using Geometry = NetTopologySuite.Geometries.Geometry;
 
 namespace UnitTests
 {
     [TestFixture]
     public class MapTest
     {
-        private static readonly IGeometryFactory Factory = new GeometryFactory();
-        private static readonly WKTReader WktReader = new WKTReader(Factory);
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            var gss = NtsGeometryServices.Instance;
+            Session.Instance.SetGeometryServices(gss);
+        }
 
-        public static IGeometry GeomFromText(string wkt)
+        public static Geometry GeomFromText(string wkt)
         {
-            return WktReader.Read(wkt);
+
+            return new WKTReader(Session.Instance.GeometryServices).Read(wkt);
         }
 
         private static IProvider CreateDatasource()
@@ -106,7 +110,7 @@ public void TestClone()
         public void GetExtents_EmptyMap_ThrowInvalidOperationException()
         {
             Map map = new Map(new Size(2, 1));
-            Assert.Throws<InvalidOperationException>( () => map.ZoomToExtents() );
+            Assert.Throws<InvalidOperationException>(() => map.ZoomToExtents());
         }
 
         [Test]
@@ -232,7 +236,7 @@ public void GetMap_GeometryProvider_ReturnImage()
         public void GetMap_RenderEmptyMap_ThrowInvalidOperationException()
         {
             Map map = new Map(new Size(2, 1));
-            Assert.Throws<InvalidOperationException>(() => map.GetMap() );
+            Assert.Throws<InvalidOperationException>(() => map.GetMap());
         }
 
         [Test]
@@ -265,29 +269,29 @@ public void ImageToWorld()
         {
             Map map = new Map(new Size(1000, 500));
             map.Zoom = 360;
-            map.Center = new Point(0, 0);
-            Assert.AreEqual(new Point(0, 0), map.ImageToWorld(new PointF(500, 250)));
-            Assert.AreEqual(new Point(-180, 90), map.ImageToWorld(new PointF(0, 0)));
-            Assert.AreEqual(new Point(-180, -90), map.ImageToWorld(new PointF(0, 500)));
-            Assert.AreEqual(new Point(180, 90), map.ImageToWorld(new PointF(1000, 0)));
-            Assert.AreEqual(new Point(180, -90), map.ImageToWorld(new PointF(1000, 500)));
+            map.Center = new Coordinate(0, 0);
+            Assert.AreEqual(new Coordinate(0, 0), map.ImageToWorld(new PointF(500, 250)));
+            Assert.AreEqual(new Coordinate(-180, 90), map.ImageToWorld(new PointF(0, 0)));
+            Assert.AreEqual(new Coordinate(-180, -90), map.ImageToWorld(new PointF(0, 500)));
+            Assert.AreEqual(new Coordinate(180, 90), map.ImageToWorld(new PointF(1000, 0)));
+            Assert.AreEqual(new Coordinate(180, -90), map.ImageToWorld(new PointF(1000, 500)));
         }
 
         [Test]
         public void ImageToWorld_DefaultMap_ReturnValue()
         {
             Map map = new Map(new Size(500, 200));
-            map.Center = new Point(23, 34);
+            map.Center = new Coordinate(23, 34);
             map.Zoom = 1000;
-            Point p = map.ImageToWorld(new PointF(242.5f, 92));
-            Assert.AreEqual(new Point(8, 50), p);
+            Coordinate p = map.ImageToWorld(new PointF(242.5f, 92));
+            Assert.AreEqual(new Coordinate(8, 50), p);
         }
 
         [Ignore("Benchmarking MapTransform in Map and MapViewport with(new) and without(old) Coordinate arrays")]
-        [TestCase("roads_ugl.shp", 0)] 
-        [TestCase("roads_ugl.shp", 45)] 
-        [TestCase("SPATIAL_F_SKARVMUFF.shp", 0)] 
-        [TestCase("SPATIAL_F_SKARVMUFF.shp", 45)] 
+        [TestCase("roads_ugl.shp", 0)]
+        [TestCase("roads_ugl.shp", 45)]
+        [TestCase("SPATIAL_F_SKARVMUFF.shp", 0)]
+        [TestCase("SPATIAL_F_SKARVMUFF.shp", 45)]
         public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTransformRotation)
         {
             // previous World >> Image transform calculations were for each individual coordinate in an array 
@@ -295,7 +299,7 @@ public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTrans
             // When there is no map rotation, a simplified calculation is used. When map is rotated, an affine transformation is used
             // (one affine transformation object instantiated per array, previously one affine transformation per coordinate). 
 
-            // Hypothesis: There should be minimal change for point layers, but significant improvements for geometries with ILineString and IMultiPoint
+            // Hypothesis: There should be minimal change for point layers, but significant improvements for geometries with MultiLineString and MultiPoint
 
             // New methods typically much faster as shown below from several tests:
             // roads_ugl: 3361 polylines (avg 52 vertices per feature)
@@ -311,8 +315,8 @@ public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTrans
             //    0deg    mVp     6         2            3x faster
             //    45deg   mAp    25        10            2.5x faster
             //    45deg   mVp    45         2            20x faster
-            
-            var map = new Map(new Size(1024, 1024)) {BackColor = System.Drawing.Color.LightSkyBlue};
+
+            var map = new Map(new Size(1024, 1024)) { BackColor = System.Drawing.Color.LightSkyBlue };
 
             if (!mapTransformRotation.Equals(0f))
             {
@@ -338,7 +342,7 @@ public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTrans
             var newTimesMvp = new System.Collections.Generic.List<long>();
 
             var numTests = 20;
-            
+
             // MAP tests
             for (var i = 0; i < numTests; i++)
             {
@@ -354,7 +358,7 @@ public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTrans
                         {
                             using (var transform = map.MapTransform)
                             {
-                                var pts = new[] {pt};
+                                var pts = new[] { pt };
                                 transform.TransformPoints(pts);
                                 pt = pts[0];
                             }
@@ -381,75 +385,75 @@ public void WorldToImageTransform_Benchmark(string shapeFileName, float mapTrans
                 sw.Stop();
                 newTimesMap.Add(sw.ElapsedMilliseconds);
             }
-            
+
             // drop slowest 2 / fastest 2
             oldTimesMap.Sort();
             newTimesMap.Sort();
 
             var oldTimesAvgMap = oldTimesMap.Skip(2).Take(16).Average();
             var newTimesAvgMap = newTimesMap.Skip(2).Take(16).Average();
-            
+
             Trace.WriteLine($"WorldToImageTransform_Benchmark {shapeFileName} {mapTransformRotation:000}deg MAP old: {oldTimesAvgMap}  MAP new: {newTimesAvgMap}");
             // allow a little bit of leeway
-            Assert.LessOrEqual(newTimesAvgMap / oldTimesAvgMap,1.2,$"{shapeFileName}_{mapTransformRotation}deg_MAP" );
-
-// NOTE: MapViewport Tests no longer relevant  due to redundant method WorldToImageOld being removed
-// Section commented out AFTER confirming test results
-//            // MapViewport Tests
-//            var mvp = (MapViewport) map;
-//            for (var i = 0; i < numTests; i++)
-//            {
-//                // old
-//                sw.Reset();
-//                sw.Start();
-//                foreach (var geom in geoms)
-//                {
-//                    foreach (var p in geom.Coordinates)
-//                    {
-//                        var pt = mvp.WorldToImageOld(p, true);
-//                        if (!mvp.MapTransformRotation.Equals(0f))
-//                        {
-//                            using (var transform = mvp.MapTransform)
-//                            {
-//                                var pts = new[] {pt};
-//                                transform.TransformPoints(pts);
-//                                pt = pts[0];
-//                            }
-//                        }
-//                    }
-//                }
-//                sw.Stop();
-//                oldTimesMvp.Add(sw.ElapsedMilliseconds);
-//                
-//                // new
-//                sw.Reset();
-//                sw.Start();
-//                foreach (var geom in geoms)
-//                {
-//                    if (geom.Coordinates.Length == 0)
-//                    {
-//                        var pt = mvp.WorldToImage(geom.Coordinates[0], true);
-//                    }
-//                    else
-//                    {
-//                        var pts = mvp.WorldToImage(geom.Coordinates, true);
-//                    }
-//                }
-//
-//                sw.Stop();
-//                newTimesMvp.Add(sw.ElapsedMilliseconds);
-//            }
-//            
-//            oldTimesMvp.Sort();
-//            newTimesMvp.Sort();
-//            
-//            var oldTimesAvgMvp = oldTimesMvp.Skip(2).Take(16).Average();
-//            var newTimesAvgMvp = newTimesMvp.Skip(2).Take(16).Average();
-//
-//            
-//            Trace.WriteLine($"WorldToImageTransform_Benchmark {shapeFileName} {mapTransformRotation:000}deg  MVP old: {oldTimesAvgMvp}  MVP new: {newTimesAvgMvp}");
-//            // allow a little bit of leeway
-//            Assert.LessOrEqual(newTimesAvgMvp/ oldTimesAvgMvp,1.2, $"{shapeFileName}_{mapTransformRotation}deg_MVP" );
+            Assert.LessOrEqual(newTimesAvgMap / oldTimesAvgMap, 1.2, $"{shapeFileName}_{mapTransformRotation}deg_MAP");
+
+            // NOTE: MapViewport Tests no longer relevant  due to redundant method WorldToImageOld being removed
+            // Section commented out AFTER confirming test results
+            //            // MapViewport Tests
+            //            var mvp = (MapViewport) map;
+            //            for (var i = 0; i < numTests; i++)
+            //            {
+            //                // old
+            //                sw.Reset();
+            //                sw.Start();
+            //                foreach (var geom in geoms)
+            //                {
+            //                    foreach (var p in geom.Coordinates)
+            //                    {
+            //                        var pt = mvp.WorldToImageOld(p, true);
+            //                        if (!mvp.MapTransformRotation.Equals(0f))
+            //                        {
+            //                            using (var transform = mvp.MapTransform)
+            //                            {
+            //                                var pts = new[] {pt};
+            //                                transform.TransformPoints(pts);
+            //                                pt = pts[0];
+            //                            }
+            //                        }
+            //                    }
+            //                }
+            //                sw.Stop();
+            //                oldTimesMvp.Add(sw.ElapsedMilliseconds);
+            //                
+            //                // new
+            //                sw.Reset();
+            //                sw.Start();
+            //                foreach (var geom in geoms)
+            //                {
+            //                    if (geom.Coordinates.Length == 0)
+            //                    {
+            //                        var pt = mvp.WorldToImage(geom.Coordinates[0], true);
+            //                    }
+            //                    else
+            //                    {
+            //                        var pts = mvp.WorldToImage(geom.Coordinates, true);
+            //                    }
+            //                }
+            //
+            //                sw.Stop();
+            //                newTimesMvp.Add(sw.ElapsedMilliseconds);
+            //            }
+            //            
+            //            oldTimesMvp.Sort();
+            //            newTimesMvp.Sort();
+            //            
+            //            var oldTimesAvgMvp = oldTimesMvp.Skip(2).Take(16).Average();
+            //            var newTimesAvgMvp = newTimesMvp.Skip(2).Take(16).Average();
+            //
+            //            
+            //            Trace.WriteLine($"WorldToImageTransform_Benchmark {shapeFileName} {mapTransformRotation:000}deg  MVP old: {oldTimesAvgMvp}  MVP new: {newTimesAvgMvp}");
+            //            // allow a little bit of leeway
+            //            Assert.LessOrEqual(newTimesAvgMvp/ oldTimesAvgMvp,1.2, $"{shapeFileName}_{mapTransformRotation}deg_MVP" );
 
             map.Dispose();
         }
@@ -495,12 +499,12 @@ public void ImageToWorld_AndBack_MapViewport_WithRotation(float rotationDeg)
             // Similar to ImageToWorld_AndBack_Map_WithRotation but testing MapViewport and generating test images
             var map = ConfigureTransformMap(rotationDeg);
             map.Decorations.Add(new ScaleBar());
-            map.Decorations.Add(new NorthArrow(){ForeColor = Color.Red});
-            map.Decorations.Add(new EyeOfSight(){Anchor = MapDecorationAnchor.RightTop, ForeColor = Color.DarkBlue});
+            map.Decorations.Add(new NorthArrow() { ForeColor = Color.Red });
+            map.Decorations.Add(new EyeOfSight() { Anchor = MapDecorationAnchor.RightTop, ForeColor = Color.DarkBlue });
             var imagePts = GetImageCoordinates(map);
             var worldPts = GetWorldCoordinates(map, imagePts);
             ValidateTransformScenarios(true, map, imagePts, worldPts.Coordinates);
-  
+
             // visual checks
             var vl = new VectorLayer("Test Viewport Outline");
             var gp = new GeometryProvider(worldPts);
@@ -511,26 +515,26 @@ public void ImageToWorld_AndBack_MapViewport_WithRotation(float rotationDeg)
 
             // Polygon should always appear aligned with borders, with red dot should always be in lower left corner.
             // note buffer giving small margin around borders to be sure polygon isn't grossly larger than mapviewport. 
-            var polygon = GetMapExtentPolygon(map.Center, map.Zoom,map.MapHeight,map.MapTransformRotation).Buffer(-50);
+            var polygon = GetMapExtentPolygon(map.Center, map.Zoom, map.MapHeight, map.MapTransformRotation).Buffer(-50);
             vl = new VectorLayer("Test Viewport Inset");
             gp = new GeometryProvider(polygon);
             gp.Geometries.Add(new NetTopologySuite.Geometries.Point(map.Center));
             gp.Geometries.Add(new NetTopologySuite.Geometries.Point(polygon.Coordinates[0]));
             vl.DataSource = gp;
             map.Layers.Add(vl);
-            
+
             string fn = $"MapRotation_{rotationDeg:000}.png";
             using (var img = map.GetMap(96))
-                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), fn),System.Drawing.Imaging.ImageFormat.Png);
+                img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), fn), System.Drawing.Imaging.ImageFormat.Png);
 
             map.Dispose();
         }
-        
+
         private Map ConfigureTransformMap(float rotationDeg)
         {
-            var map = new Map(new Size(600, 300)) {BackColor = System.Drawing.Color.LightSkyBlue};
+            var map = new Map(new Size(600, 300)) { BackColor = System.Drawing.Color.LightSkyBlue };
             map.Zoom = 1000;
-            map.Center = new Point(25000, 75000);
+            map.Center = new Coordinate(25000, 75000);
             var mapScale = map.MapScale;
 
             System.Drawing.Drawing2D.Matrix mapTransform = new System.Drawing.Drawing2D.Matrix();
@@ -549,38 +553,38 @@ private PointF[] GetImageCoordinates(Map map)
                 new PointF(map.Size.Width, 0), // UR
                 new PointF(map.Size.Width, map.Size.Height), // LR
                 new PointF(0, map.Size.Height) // LL
-            };   
+            };
         }
 
         private LineString GetWorldCoordinates(Map map, PointF[] imagePts)
         {
             var affineTrans = GetIndependentTransform(map);
             // LineString equivalent of imagePts
-            var geom = new LineString((Coordinate[])Array.ConvertAll(imagePts , p => new Coordinate(p.X, p.Y)));
+            var geom = new LineString((Coordinate[])Array.ConvertAll(imagePts, p => new Coordinate(p.X, p.Y)));
             // independent transform to World coordinates            
-//            NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform.TransformLineString(
-//                new GeometryFactory(new PrecisionModel()), geom, affineTrans);
+            //            NetTopologySuite.CoordinateSystems.Transformations.GeometryTransform.TransformLineString(
+            //                new GeometryFactory(new PrecisionModel()), geom, affineTrans);
             geom = (LineString)affineTrans.Transform(geom);
             geom.GeometryChangedAction();
             return geom;
         }
-        
+
         //private ProjNet.CoordinateSystems.Transformations.AffineTransform GetIndependentTransform(Map map)
         private AffineTransformation GetIndependentTransform(Map map)
         {
             double scaleX = map.Zoom / map.Size.Width;
             double scaleY = map.MapHeight / map.Size.Height;
-            
+
             // Affine Transformation: 
             // 1: Translate to mapViewPort centre
             // 2: Reflect in X-Axis
             // 3: Rotation about mapViewPort centre
             // 4: Scale to map units
             // 5: Translate to map centre
-            
+
             //CLOCKWISE ProjNet affine transform (negate degrees)
             //double rad = -1 * deg * Math.PI / 180.0;
-            //GeoAPI.CoordinateSystems.Transformations.IMathTransform trans =
+            //NetTopologySuite.CoordinateSystems.Transformations.MathTransform trans =
             //    new ProjNet.CoordinateSystems.Transformations.AffineTransform(
             //        scaleX * Math.Cos(rad),
             //        -scaleX * Math.Sin(rad),
@@ -591,16 +595,16 @@ private AffineTransformation GetIndependentTransform(Map map)
 
             //ANTICLCOCKWISE ProjNet affine transform 
             double rad = map.MapTransformRotation * Math.PI / 180.0;
-//            var trans =
-//                new ProjNet.CoordinateSystems.Transformations.AffineTransform(
-//                    scaleX * Math.Cos(rad),
-//                    scaleX * Math.Sin(rad),
-//                    -scaleX * Math.Cos(rad) * map.Size.Width * 0.5 - scaleX * Math.Sin(rad) * map.Size.Height * 0.5 + map.Center.X,
-//                    scaleY * Math.Sin(rad),
-//                    -scaleY * Math.Cos(rad),
-//                    -scaleY * Math.Sin(rad) * map.Size.Width * 0.5 + scaleY * Math.Cos(rad) * map.Size.Height * 0.5 + map.Center.Y);
-//
-//            return trans;
+            //            var trans =
+            //                new ProjNet.CoordinateSystems.Transformations.AffineTransform(
+            //                    scaleX * Math.Cos(rad),
+            //                    scaleX * Math.Sin(rad),
+            //                    -scaleX * Math.Cos(rad) * map.Size.Width * 0.5 - scaleX * Math.Sin(rad) * map.Size.Height * 0.5 + map.Center.X,
+            //                    scaleY * Math.Sin(rad),
+            //                    -scaleY * Math.Cos(rad),
+            //                    -scaleY * Math.Sin(rad) * map.Size.Width * 0.5 + scaleY * Math.Cos(rad) * map.Size.Height * 0.5 + map.Center.Y);
+            //
+            //            return trans;
 
             var trans = new AffineTransformation();
             trans.Compose(AffineTransformation.TranslationInstance(-map.Size.Width * 0.5, -map.Size.Height * 0.5));
@@ -623,9 +627,9 @@ private AffineTransformation GetIndependentTransform(Map map)
         private Polygon GetMapExtentPolygon(Coordinate mapCenter, double zoom, double mapHeight, float rotationDeg)
         {
             // height has been adjusted for pixelRatio
-//            var height = map.MapHeight;
-//            if (double.IsNaN(height) || double.IsInfinity(height) || map.Size.Width == 0 || map.Size.Height == 0)
-//                return null;
+            //            var height = map.MapHeight;
+            //            if (double.IsNaN(height) || double.IsInfinity(height) || map.Size.Width == 0 || map.Size.Height == 0)
+            //                return null;
 
             var poly = new Polygon(new LinearRing(new Coordinate[]
                 {
@@ -645,7 +649,7 @@ private Polygon GetMapExtentPolygon(Coordinate mapCenter, double zoom, double ma
             return (Polygon)at.Transform(poly);
         }
 
-        private void ValidateTransformScenarios( bool useMapViewport, Map map, PointF[] ptsImage, Coordinate[] controlGeom)
+        private void ValidateTransformScenarios(bool useMapViewport, Map map, PointF[] ptsImage, Coordinate[] controlGeom)
         {
             Coordinate[] ptsWorld;
             Envelope worldEnv;
@@ -654,27 +658,27 @@ private void ValidateTransformScenarios( bool useMapViewport, Map map, PointF[]
             string mode;
 
             var controlEnv = new Envelope(
-                controlGeom.Min(c => c.X), 
+                controlGeom.Min(c => c.X),
                 controlGeom.Max(c => c.X),
                 controlGeom.Min(c => c.Y),
                 controlGeom.Max(c => c.Y));
 
-            var mvp = (MapViewport) map;
-            
+            var mvp = (MapViewport)map;
+
             if (!useMapViewport)
             {
                 mode = "map";
-                ptsWorld = map.ImageToWorld((PointF[]) ptsImage.Clone(), true);
+                ptsWorld = map.ImageToWorld((PointF[])ptsImage.Clone(), true);
                 worldEnv = map.Envelope;
-                worldPolygon = GetMapExtentPolygon(map.Center, map.Zoom,map.MapHeight,map.MapTransformRotation);
+                worldPolygon = GetMapExtentPolygon(map.Center, map.Zoom, map.MapHeight, map.MapTransformRotation);
                 andBack = map.WorldToImage(ptsWorld, true);
             }
             else
             {
                 mode = "mvp";
-                ptsWorld= mvp.ImageToWorld((PointF[]) ptsImage.Clone(), true);
+                ptsWorld = mvp.ImageToWorld((PointF[])ptsImage.Clone(), true);
                 worldEnv = mvp.Envelope;
-                worldPolygon = GetMapExtentPolygon(mvp.Center, mvp.Zoom,mvp.MapHeight,mvp.MapTransformRotation);;
+                worldPolygon = GetMapExtentPolygon(mvp.Center, mvp.Zoom, mvp.MapHeight, mvp.MapTransformRotation); ;
                 andBack = mvp.WorldToImage(ptsWorld, true);
             }
 
@@ -697,32 +701,32 @@ private void ValidateTransformScenarios( bool useMapViewport, Map map, PointF[]
             Assert.IsTrue(worldPolygon.EnvelopeInternal.TopLeft().Equals2D(controlEnv.TopLeft(), 0.1), $"{mode}Polygon BottomLeft");
             Assert.IsTrue(worldPolygon.EnvelopeInternal.TopRight().Equals2D(controlEnv.TopRight(), 0.1), $"{mode}Polygon BottomLeft");
             Assert.IsTrue(worldPolygon.EnvelopeInternal.BottomRight().Equals2D(controlEnv.BottomRight(), 0.1), $"{mode}Polygon BottomLeft");
-            
+
             // validate zoom
             map.Zoom = 1000;
             Assert.AreEqual(map.Zoom, mvp.Zoom, 0.001, $"{mode}MapZoom");
-            
+
             Assert.AreEqual(map.Zoom, worldPolygon.Coordinates[1].Distance(worldPolygon.Coordinates[2]), 0.1, $"{mode}PolygonWidth");
 
             // validate MapScale
             Assert.AreEqual(map.MapScale, mvp.GetMapScale(96), 0.1, $"{mode}MapScale");
-            
+
             // now convert WORLD >> IMAGE
             //var andBack = map.WorldToImage(ptsWorld, true);
 
-            Assert.AreEqual(ptsImage[0].X,andBack[0].X, 0.02, $"{mode}World2Image Centre X");
-            Assert.AreEqual(ptsImage[0].Y,andBack[0].Y, 0.02, $"{mode}World2Image Centre Y");
-            Assert.AreEqual(ptsImage[1].X,andBack[1].X, 0.02, $"{mode}World2Image TopLeft X");
-            Assert.AreEqual(ptsImage[1].Y,andBack[1].Y, 0.02, $"{mode}World2Image TopLeft Y");
-            Assert.AreEqual(ptsImage[2].X,andBack[2].X, 0.02, $"{mode}World2Image TopRight X");
-            Assert.AreEqual(ptsImage[2].Y,andBack[2].Y, 0.02, $"{mode}World2Image TopRight Y");
-            Assert.AreEqual(ptsImage[3].X,andBack[3].X, 0.02, $"{mode}World2Image BottomRight X");
-            Assert.AreEqual(ptsImage[3].Y,andBack[3].Y, 0.02, $"{mode}World2Image BottomRight Y");
-            Assert.AreEqual(ptsImage[4].X,andBack[4].X, 0.02, $"{mode}World2Image BottomLeft X");
-            Assert.AreEqual(ptsImage[4].Y,andBack[4].Y, 0.02, $"{mode}World2Image BottomLeft Y");
+            Assert.AreEqual(ptsImage[0].X, andBack[0].X, 0.02, $"{mode}World2Image Centre X");
+            Assert.AreEqual(ptsImage[0].Y, andBack[0].Y, 0.02, $"{mode}World2Image Centre Y");
+            Assert.AreEqual(ptsImage[1].X, andBack[1].X, 0.02, $"{mode}World2Image TopLeft X");
+            Assert.AreEqual(ptsImage[1].Y, andBack[1].Y, 0.02, $"{mode}World2Image TopLeft Y");
+            Assert.AreEqual(ptsImage[2].X, andBack[2].X, 0.02, $"{mode}World2Image TopRight X");
+            Assert.AreEqual(ptsImage[2].Y, andBack[2].Y, 0.02, $"{mode}World2Image TopRight Y");
+            Assert.AreEqual(ptsImage[3].X, andBack[3].X, 0.02, $"{mode}World2Image BottomRight X");
+            Assert.AreEqual(ptsImage[3].Y, andBack[3].Y, 0.02, $"{mode}World2Image BottomRight Y");
+            Assert.AreEqual(ptsImage[4].X, andBack[4].X, 0.02, $"{mode}World2Image BottomLeft X");
+            Assert.AreEqual(ptsImage[4].Y, andBack[4].Y, 0.02, $"{mode}World2Image BottomLeft Y");
 
         }
-        
+
         [Test]
         public void Initalize_MapInstance()
         {
@@ -734,7 +738,7 @@ public void Initalize_MapInstance()
             Assert.AreEqual(Color.Transparent, map.BackColor);
             Assert.AreEqual(double.MaxValue, map.MaximumZoom);
             Assert.IsTrue(map.MinimumZoom > 0);
-            Assert.AreEqual(new Point(0, 0), map.Center, "map.Center should be initialized to (0,0)");
+            Assert.AreEqual(new Coordinate(0, 0), map.Center, "map.Center should be initialized to (0,0)");
             Assert.AreEqual(1, map.Zoom, "Map zoom should be initialized to 1.0");
         }
 
@@ -826,21 +830,21 @@ public void WorldToImage()
         {
             Map map = new Map(new Size(1000, 500));
             map.Zoom = 360;
-            map.Center = new Point(0, 0);
-            Assert.AreEqual(new PointF(500, 250), map.WorldToImage(new Point(0, 0)));
-            Assert.AreEqual(new PointF(0, 0), map.WorldToImage(new Point(-180, 90)));
-            Assert.AreEqual(new PointF(0, 500), map.WorldToImage(new Point(-180, -90)));
-            Assert.AreEqual(new PointF(1000, 0), map.WorldToImage(new Point(180, 90)));
-            Assert.AreEqual(new PointF(1000, 500), map.WorldToImage(new Point(180, -90)));
+            map.Center = new Coordinate(0, 0);
+            Assert.AreEqual(new PointF(500, 250), map.WorldToImage(new Coordinate(0, 0)));
+            Assert.AreEqual(new PointF(0, 0), map.WorldToImage(new Coordinate(-180, 90)));
+            Assert.AreEqual(new PointF(0, 500), map.WorldToImage(new Coordinate(-180, -90)));
+            Assert.AreEqual(new PointF(1000, 0), map.WorldToImage(new Coordinate(180, 90)));
+            Assert.AreEqual(new PointF(1000, 500), map.WorldToImage(new Coordinate(180, -90)));
         }
 
         [Test]
         public void WorldToMap_DefaultMap_ReturnValue()
         {
             Map map = new Map(new Size(500, 200));
-            map.Center = new Point(23, 34);
+            map.Center = new Coordinate(23, 34);
             map.Zoom = 1000;
-            PointF p = map.WorldToImage(new Point(8, 50));
+            PointF p = map.WorldToImage(new Coordinate(8, 50));
             Assert.AreEqual(new PointF(242.5f, 92), p);
         }
 
@@ -849,7 +853,7 @@ public void ZoomToBox_NoAspectCorrection()
         {
             Map map = new Map(new Size(400, 200));
             map.ZoomToBox(new BoundingBox(20, 100, 50, 80));
-            Assert.AreEqual(new Point(60, 65), map.Center);
+            Assert.AreEqual(new Coordinate(60, 65), map.Center);
             Assert.AreEqual(80, map.Zoom);
         }
 
@@ -858,23 +862,23 @@ public void ZoomToBox_WithAspectCorrection()
         {
             Map map = new Map(new Size(400, 200));
             map.ZoomToBox(new BoundingBox(20, 100, 10, 180));
-            Assert.AreEqual(new Point(60, 95), map.Center);
+            Assert.AreEqual(new Coordinate(60, 95), map.Center);
             Assert.AreEqual(340, map.Zoom);
         }
 
-        [TestCase(600, 300, 10000,10000)]
-        [TestCase(600, 300, 5000,15000)]
-        [TestCase(600, 300, 15000,5000)]
-        [TestCase(300, 600, 10000,10000)]
-        [TestCase(300, 600, 5000,15000)]
-        [TestCase(300, 600, 15000,5000)]
+        [TestCase(600, 300, 10000, 10000)]
+        [TestCase(600, 300, 5000, 15000)]
+        [TestCase(600, 300, 15000, 5000)]
+        [TestCase(300, 600, 10000, 10000)]
+        [TestCase(300, 600, 5000, 15000)]
+        [TestCase(300, 600, 15000, 5000)]
         public void ZoomToBox_WithRotatedViewport(int mapSizeWidth, int mapSizeHeight, double dataWidthMetres, double dataHeightMetres)
         {
             // Tests to ensure ZoomToExtents shows map extents at maximum possible scale without clipping
             // Each test will work through series of MapTransform from 0-360 deg at 30deg increments/
             // The old/new image outputs demonstrate how the updates have fixed problems when viewport is rotated.
             var map = new Map(new Size(mapSizeWidth, mapSizeHeight));
-            map.BackColor= Color.Azure;
+            map.BackColor = Color.Azure;
 
             // create layer with single polygon centred on 700,000mE, 1,000,000mN
             var env = new Envelope(0, dataWidthMetres, 0, dataHeightMetres);
@@ -887,7 +891,7 @@ public void ZoomToBox_WithRotatedViewport(int mapSizeWidth, int mapSizeHeight, d
                 new Coordinate(env.MaxX, env.MinY),
                 new Coordinate(env.MinX, env.MinY)
             }));
-            
+
             var vl = new VectorLayer("Test Points");
             var gp = new GeometryProvider(extentsPoly);
             gp.Geometries.Add(new NetTopologySuite.Geometries.Point(env.Centre));
@@ -911,7 +915,7 @@ public void ZoomToBox_WithRotatedViewport(int mapSizeWidth, int mapSizeHeight, d
                 // reset view
                 map.Center = new Coordinate(0, 0);
                 map.Zoom = 1000;
-                
+
                 // OLD: zoom to box, ignoring map rotation: layer extents will overlap borders or have significant margins  
                 map.ZoomToBox(ext);
                 var fn = $"ZoomToBox_{mapSizeWidth}x{mapSizeHeight}_bbox_{env.Width}x{env.Height}_OLD_{degrees:000}deg.png";
@@ -928,7 +932,7 @@ public void ZoomToBox_WithRotatedViewport(int mapSizeWidth, int mapSizeHeight, d
                 // allow small margin by buffering true outline of MapViewport in world coordinates
                 Assert.IsTrue(polygon.Buffer(1).Contains(extentsPoly), $"{degrees:000}_contains");
                 Assert.IsTrue(polygon.Buffer(-1).Intersects(extentsPoly), $"{degrees:000}_intersects");
-                
+
                 fn = $"ZoomToBox_{mapSizeWidth}x{mapSizeHeight}_bbox_{env.Width}x{env.Height}_NEW_{degrees:000}deg.png";
                 using (var img = map.GetMap(96))
                     img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), fn), System.Drawing.Imaging.ImageFormat.Bmp);
diff --git a/UnitTests/GeoApiExTests.cs b/UnitTests/NtsExtensionsTests.cs
similarity index 67%
rename from UnitTests/GeoApiExTests.cs
rename to UnitTests/NtsExtensionsTests.cs
index 19ac70ed..d025bee8 100644
--- a/UnitTests/GeoApiExTests.cs
+++ b/UnitTests/NtsExtensionsTests.cs
@@ -1,44 +1,41 @@
-using GeoAPI.Geometries;
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace UnitTests
-{
-    [TestFixture]
-    public class GeoApiExTests
-    {
-        [Test]
-        public void TestCloseRing()
-        {
-            var coords = new List<Coordinate>(new Coordinate[] {
-                new Coordinate(0,0,5),
-                new Coordinate(0,100,10),
-                new Coordinate(100,100,20),
-                new Coordinate(100,0,30)
-            });
-
-            coords.EnsureValidRing();
-            Assert.AreEqual(5,coords.Count);
-
-            Assert.AreEqual(5, coords[4].Z);
-
-        }
-
-        [Test]
-        public void TestCloseRing2()
-        {
-            var coords = new List<Coordinate>(new Coordinate[] {
-                new Coordinate(0,0),
-                new Coordinate(0,100),
-                new Coordinate(100,100),
-                new Coordinate(100,0)
-            });
-
-            coords.EnsureValidRing();
-            Assert.AreEqual(5, coords.Count);
-        }
-    }
-}
+using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using System.Collections.Generic;
+
+namespace UnitTests
+{
+    [TestFixture]
+    public class NtsExtensionsTests
+    {
+        [Test]
+        public void TestCloseRing()
+        {
+            var coords = new List<Coordinate>(new Coordinate[] {
+                new CoordinateZ(0,0,5),
+                new CoordinateZ(0,100,10),
+                new CoordinateZ(100,100,20),
+                new CoordinateZ(100,0,30)
+            });
+
+            coords.EnsureValidRing();
+            Assert.AreEqual(5, coords.Count);
+
+            Assert.AreEqual(5, coords[4].Z);
+
+        }
+
+        [Test]
+        public void TestCloseRing2()
+        {
+            var coords = new List<Coordinate>(new Coordinate[] {
+                new Coordinate(0,0),
+                new Coordinate(0,100),
+                new Coordinate(100,100),
+                new Coordinate(100,0)
+            });
+
+            coords.EnsureValidRing();
+            Assert.AreEqual(5, coords.Count);
+        }
+    }
+}
diff --git a/UnitTests/Rendering/Decoration/Graticule/GraticuleTest.cs b/UnitTests/Rendering/Decoration/Graticule/GraticuleTest.cs
index 739a08db..62dd6aae 100644
--- a/UnitTests/Rendering/Decoration/Graticule/GraticuleTest.cs
+++ b/UnitTests/Rendering/Decoration/Graticule/GraticuleTest.cs
@@ -1,18 +1,17 @@
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using GeoAPI.CoordinateSystems;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
+using ProjNet.CoordinateSystems;
 using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
 using SharpMap.Rendering.Decoration.Graticule;
 using SharpMap.Utilities;
+using System;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Reflection;
 using Point = NetTopologySuite.Geometries.Point;
 
 namespace UnitTests.Rendering.Decoration.Graticule
@@ -24,63 +23,63 @@ public class GraticuleTest
         private readonly Envelope _gcsDomain = new Envelope(-180, 180, -90, 90);
         private readonly Envelope _gcsWebMercDomain = new Envelope(-180, 180, -85, 85);
 
-        [TestCase(2500,0)]
-        [TestCase(2500,60)]
-        [TestCase(2500,120)]
-        [TestCase(2500,180)]
-        [TestCase(2500,240)]
-        [TestCase(1000,0)]
-        [TestCase(500,0)]
-        [TestCase(100,0)]
-        [TestCase(50,0)]
-        [TestCase(20,0)]
-        [TestCase(10,0)]
-        [TestCase(5,0)]
-        [TestCase(2,0)]
-        [TestCase(1,0)]
-        [TestCase(0.5,0)]
-        [TestCase(0.25,0)]
-        [TestCase(0.1,0)]
-        [TestCase(0.05,0)]
-        [TestCase(0.01,0)]
+        [TestCase(2500, 0)]
+        [TestCase(2500, 60)]
+        [TestCase(2500, 120)]
+        [TestCase(2500, 180)]
+        [TestCase(2500, 240)]
+        [TestCase(1000, 0)]
+        [TestCase(500, 0)]
+        [TestCase(100, 0)]
+        [TestCase(50, 0)]
+        [TestCase(20, 0)]
+        [TestCase(10, 0)]
+        [TestCase(5, 0)]
+        [TestCase(2, 0)]
+        [TestCase(1, 0)]
+        [TestCase(0.5, 0)]
+        [TestCase(0.25, 0)]
+        [TestCase(0.1, 0)]
+        [TestCase(0.05, 0)]
+        [TestCase(0.01, 0)]
         public void TestGraticuleWgs84(double scale, float mapRotationDeg)
         {
-            using (var map = GetMap(4326, new Coordinate(0.5,-0.5),mapRotationDeg))
+            using (var map = GetMap(4326, new Coordinate(0.5, -0.5), mapRotationDeg))
             {
                 map.MapScale = scale;
-            
+
                 var graticule = map.Decorations[0] as SharpMap.Rendering.Decoration.Graticule.Graticule;
 
                 CalculateGraticule(map, graticule);
 
                 var gcsStyle = graticule.GcsGraticuleStyle;
                 if (gcsStyle.SecondaryLineStyle != GraticuleLineStyle.None)
-                    map.Layers.Add(CreateLayer("Gcs Secondary", 4326, 4326, 
-                        map.Envelope,_gcsDomain, Brushes.Orange, 6, gcsStyle.Subdivision));
-            
-                map.Layers.Add(CreateLayer("Gcs Primary", 4326,4326, 
-                    map.Envelope, _gcsDomain,Brushes.Red, 10, gcsStyle.Division));
+                    map.Layers.Add(CreateLayer("Gcs Secondary", 4326, 4326,
+                        map.Envelope, _gcsDomain, Brushes.Orange, 6, gcsStyle.Subdivision));
+
+                map.Layers.Add(CreateLayer("Gcs Primary", 4326, 4326,
+                    map.Envelope, _gcsDomain, Brushes.Red, 10, gcsStyle.Division));
 
                 SaveMap(map, true);
-                
+
             }
         }
 
-        [TestCase(500000,0)]
-        [TestCase(2500,0)]
-        [TestCase(2500,60)]
-        [TestCase(2500,120)]
-        [TestCase(2500,180)]
-        [TestCase(2500,240)]
-        [TestCase(1000,0)]
-        [TestCase(500,0)]
-        [TestCase(100,0)]
+        [TestCase(500000, 0)]
+        [TestCase(2500, 0)]
+        [TestCase(2500, 60)]
+        [TestCase(2500, 120)]
+        [TestCase(2500, 180)]
+        [TestCase(2500, 240)]
+        [TestCase(1000, 0)]
+        [TestCase(500, 0)]
+        [TestCase(100, 0)]
         public void TestGraticuleWebMercator(double scale, float mapRotationDeg)
         {
-            using (var map = GetMap(3857, new Coordinate(19300000,-5010000),mapRotationDeg))
+            using (var map = GetMap(3857, new Coordinate(19300000, -5010000), mapRotationDeg))
             {
                 map.MapScale = scale;
-            
+
                 var graticule = map.Decorations[0] as SharpMap.Rendering.Decoration.Graticule.Graticule;
                 CalculateGraticule(map, graticule);
 
@@ -104,36 +103,36 @@ public void TestGraticuleWebMercator(double scale, float mapRotationDeg)
                     unProjectedEnv, _gcsWebMercDomain, Brushes.Red, 10, gcsStyle.Division));
 
                 map.BackgroundLayer.Add(GetBruTileLayer());
-                
+
                 SaveMap(map, false);
-            } 
+            }
         }
 
-        [TestCase(500000,0)]
-        [TestCase(2500,0)]
-        [TestCase(2500,60)]
-        [TestCase(2500,120)]
-        [TestCase(2500,180)]
-        [TestCase(2500,240)]
-        [TestCase(1000,0)]
-        [TestCase(500,0)]
-        [TestCase(100,0)]
+        [TestCase(500000, 0)]
+        [TestCase(2500, 0)]
+        [TestCase(2500, 60)]
+        [TestCase(2500, 120)]
+        [TestCase(2500, 180)]
+        [TestCase(2500, 240)]
+        [TestCase(1000, 0)]
+        [TestCase(500, 0)]
+        [TestCase(100, 0)]
         public void TestGraticuleInd75Utm47N(double scale, float mapRotationDeg)
         {
             // PCS = 24047 and GCS = 4240
-            using (var map = GetMap(24047, new Coordinate(700000,1000000),mapRotationDeg))
+            using (var map = GetMap(24047, new Coordinate(700000, 1000000), mapRotationDeg))
             {
                 map.MapScale = scale;
-            
+
                 var graticule = map.Decorations[0] as SharpMap.Rendering.Decoration.Graticule.Graticule;
                 CalculateGraticule(map, graticule);
 
                 // Projected
                 var pcsStyle = graticule.PcsGraticuleStyle;
-                var pcsDomain = new Envelope(166021.44, 534994.66,0.00 ,9329005.18);
+                var pcsDomain = new Envelope(166021.44, 534994.66, 0.00, 9329005.18);
                 if (pcsStyle.SecondaryLineStyle != GraticuleLineStyle.None)
                     map.Layers.Add(CreateLayer("Pcs Secondary", map.SRID, map.SRID,
-                        map.Envelope, pcsDomain , Brushes.CadetBlue, 8, pcsStyle.Subdivision));
+                        map.Envelope, pcsDomain, Brushes.CadetBlue, 8, pcsStyle.Subdivision));
 
                 map.Layers.Add(CreateLayer("Pcs Primary", map.SRID, map.SRID,
                     map.Envelope, pcsDomain, Brushes.DodgerBlue, 12, pcsStyle.Division));
@@ -150,9 +149,9 @@ public void TestGraticuleInd75Utm47N(double scale, float mapRotationDeg)
 
                 // can't do this - it's 3857 and doesn't project to any other Map.SRID
                 //map.BackgroundLayer.Add(GetBruTileLayer());
-                
+
                 SaveMap(map, false);
-            } 
+            }
         }
 
         private void SaveMap(Map map, bool isGeographic)
@@ -162,39 +161,39 @@ private void SaveMap(Map map, bool isGeographic)
             var s = map.MapScale.ToString("00000.###").Replace(".", "-");
             var fn = $"Graticule SRID {map.SRID} Scale {s} Center {x} {y} Rotn {map.MapTransformRotation:N0}.png";
             using (var img = map.GetMap(96))
-                img.Save(Path.Combine(UnitTestsFixture.GetImageDirectory(this), fn),ImageFormat.Png);
+                img.Save(Path.Combine(UnitTestsFixture.GetImageDirectory(this), fn), ImageFormat.Png);
         }
 
         private void CalculateGraticule(MapViewport map, SharpMap.Rendering.Decoration.Graticule.Graticule graticule)
         {
             using (var img = new Bitmap(map.Size.Width, map.Size.Height, PixelFormat.Format32bppArgb))
-                using (var g = Graphics.FromImage(img))
-                    graticule.Render(g, map);
+            using (var g = Graphics.FromImage(img))
+                graticule.Render(g, map);
         }
 
         private Map GetMap(int srid, Coordinate center, float mapRotationDeg)
         {
-            var map = new Map(new Size(800,640));
-            map.SRID= srid;
+            var map = new Map(new Size(800, 640));
+            map.SRID = srid;
             map.Center = center;
             map.BackColor = Color.BlanchedAlmond;
 
             if (!mapRotationDeg.Equals(0f))
             {
                 var matrix = new System.Drawing.Drawing2D.Matrix();
-                matrix.RotateAt(mapRotationDeg, new PointF(map.Size.Width * 0.5f, map.Size.Height* 0.5f));
+                matrix.RotateAt(mapRotationDeg, new PointF(map.Size.Width * 0.5f, map.Size.Height * 0.5f));
                 map.MapTransform = matrix;
             }
-            
+
             map.Decorations.Add(new SharpMap.Rendering.Decoration.Graticule.Graticule
             {
-                GcsGraticuleStyle = {PrimaryLineStyle = GraticuleLineStyle.SolidTick}
+                GcsGraticuleStyle = { PrimaryLineStyle = GraticuleLineStyle.SolidTick }
             });
-            
+
             map.Decorations.Add(new EyeOfSight());
-            
+
             map.Disclaimer = "FEATURE LAYER DOTS SHOULD COINCIDE WITH GRATICULE TICKS";
-            
+
             return map;
         }
 
@@ -204,8 +203,8 @@ private Envelope TransformBox(Envelope env, int sourceSrid, int targetSrid)
 
             var ll = transform.MathTransform.Transform(env.BottomLeft().ToDoubleArray());
             var ur = transform.MathTransform.Transform(env.TopRight().ToDoubleArray());
-            
-            return new Envelope(new Coordinate(ll[0], ll[1]), 
+
+            return new Envelope(new Coordinate(ll[0], ll[1]),
                                 new Coordinate(ur[0], ur[1]));
         }
 
@@ -236,9 +235,9 @@ private ILayer CreateLayer(string layerName, int sourceSrid, int targetSrid, Env
 
             var vl = new VectorLayer(layerName)
             {
-                DataSource = gp, 
-                TargetSRID = targetSrid, 
-                Style = {PointColor = symColour, PointSize = symSize}
+                DataSource = gp,
+                TargetSRID = targetSrid,
+                Style = { PointColor = symColour, PointSize = symSize }
             };
             return vl;
         }
@@ -258,28 +257,28 @@ private ILayer GetBruTileLayer()
 
         }
 
-        [Ignore ("Time consuming test that has already been validated")]
-        [TestCase(7.0, 8.0, 0.00000001, AxisOrientationEnum.North )]
-        public void TestDmsLabel(  double fromVal, double toVal, double increment, AxisOrientationEnum axis)
+        [Ignore("Time consuming test that has already been validated")]
+        [TestCase(7.0, 8.0, 0.00000001, AxisOrientationEnum.North)]
+        public void TestDmsLabel(double fromVal, double toVal, double increment, AxisOrientationEnum axis)
         {
             // ok ok - testing private method suggests this method should be public and somewhere else
             // I think NTS would be good place, but at time of writing NTS was going through major version
             // upgrade, so have left this as is for next significant release of SharpMap
-            
+
             var tolerance = 1.1E-8;
 
-            char[] split = {'°', '\'', '"', 'N', 'S', 'E', 'W'};
+            char[] split = { '°', '\'', '"', 'N', 'S', 'E', 'W' };
 
-            Type type = typeof (SharpMap.Rendering.Decoration.Graticule.Graticule);
+            Type type = typeof(SharpMap.Rendering.Decoration.Graticule.Graticule);
             BindingFlags bindingAttr = BindingFlags.NonPublic | BindingFlags.Instance;
             MethodInfo method = type.GetMethod("GetFormattedLabel", bindingAttr);
-            
+
             var gratitule = Activator.CreateInstance(type);
 
             var thisVal = fromVal;
             do
             {
-                var dms = (string)method.Invoke(gratitule, new object [] {true, thisVal, axis});
+                var dms = (string)method.Invoke(gratitule, new object[] { true, thisVal, axis });
                 //var dms = GetFormattedLabel(true, degree, axis);
                 var tokens = dms.Split(split, StringSplitOptions.RemoveEmptyEntries);
                 var dec = double.Parse(tokens[0]);
@@ -288,8 +287,8 @@ public void TestDmsLabel(  double fromVal, double toVal, double increment, AxisO
                 if (tokens.Length >= 2)
                     dec += double.Parse(tokens[1]) / 60;
 
-                Assert.AreEqual(Math.Round(thisVal,8), Math.Round(dec, 8), tolerance, $"{thisVal:N8} {dms} {dec:N8}");
-                
+                Assert.AreEqual(Math.Round(thisVal, 8), Math.Round(dec, 8), tolerance, $"{thisVal:N8} {dms} {dec:N8}");
+
                 thisVal += increment;
             } while (thisVal < toVal);
         }
diff --git a/UnitTests/Rendering/Decoration/ScaleBar/ScaleBarTests.cs b/UnitTests/Rendering/Decoration/ScaleBar/ScaleBarTests.cs
index a050a971..88a12354 100644
--- a/UnitTests/Rendering/Decoration/ScaleBar/ScaleBarTests.cs
+++ b/UnitTests/Rendering/Decoration/ScaleBar/ScaleBarTests.cs
@@ -1,19 +1,20 @@
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.IO;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
 using NetTopologySuite;
+using NetTopologySuite.CoordinateSystems.Transformations;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using ProjNet.CoordinateSystems;
 using ProjNet.CoordinateSystems.Transformations;
 using SharpMap;
+using SharpMap.CoordinateSystems;
 using SharpMap.Data;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Rendering.Decoration;
 using SharpMap.Rendering.Decoration.ScaleBar;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.IO;
 using Unit = SharpMap.Rendering.Decoration.ScaleBar.Unit;
 
 namespace UnitTests.Rendering.Decoration.ScaleBar
@@ -24,33 +25,31 @@ public class ScaleBarTests
         private Map _map;
 
         //private readonly List<int> _testLatitudes = new List<int> {0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85};
-        private readonly List<int> _testLatitudes = new List<int> {0, 10, 20, 30, 40, 50, 60, 70, 80};
+        private readonly List<int> _testLatitudes = new List<int> { 0, 10, 20, 30, 40, 50, 60, 70, 80 };
 
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
             //System.IO.Directory.CreateDirectory(Path.Combine(Path.GetTempPath(), "BruTileCache", "Osm"));
 
-//            var files = System.IO.Directory.GetFiles(Path.Combine(Path.GetTempPath(), "SharpMap"));
-//            foreach (var file in files)
-//                System.IO.File.Delete(file);
+            //            var files = System.IO.Directory.GetFiles(Path.Combine(Path.GetTempPath(), "SharpMap"));
+            //            foreach (var file in files)
+            //                System.IO.File.Delete(file);
 
-            var gss = new NtsGeometryServices();
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
+            var gss = NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
                 new CoordinateSystemFactory(),
                 new CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
 
             // plug-in WebMercator so that correct spherical definition is directly available to Layer Transformations using SRID
-            var pcs = (ProjectedCoordinateSystem) ProjectedCoordinateSystem.WebMercator;
-            css.AddCoordinateSystem((int) pcs.AuthorityCode, pcs);
+            var pcs = (ProjectedCoordinateSystem)ProjectedCoordinateSystem.WebMercator;
+            ((ICoordinateSystemRepository)css).AddCoordinateSystem((int)pcs.AuthorityCode, pcs);
 
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
-            GeoAPI.GeometryServiceProvider.Instance = NetTopologySuite.NtsGeometryServices.Instance;
 
             _map = new Map
             {
@@ -69,21 +68,21 @@ public void OneTimeSetUp()
             _map.Layers.Add(lyr);
 
             // Add bru-tile map background 
-//            var cacheFolder = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "BruTileCache", "Osm");
-//            var lyrBruTile = new TileLayer(
-//                BruTile.Predefined.KnownTileSources.Create(BruTile.Predefined.KnownTileSource.OpenStreetMap),
-//                "Tiles", Color.Transparent, true, cacheFolder)
-//            {
-//                SRID = 3857,
-//                TargetSRID = _map.SRID
-//            };
-//            _map.BackgroundLayer.Add(lyrBruTile);
+            //            var cacheFolder = System.IO.Path.Combine(System.IO.Path.GetTempPath(), "BruTileCache", "Osm");
+            //            var lyrBruTile = new TileLayer(
+            //                BruTile.Predefined.KnownTileSources.Create(BruTile.Predefined.KnownTileSource.OpenStreetMap),
+            //                "Tiles", Color.Transparent, true, cacheFolder)
+            //            {
+            //                SRID = 3857,
+            //                TargetSRID = _map.SRID
+            //            };
+            //            _map.BackgroundLayer.Add(lyrBruTile);
 
             var scaleBar = new SharpMap.Rendering.Decoration.ScaleBar.ScaleBar()
             {
-                MapUnit = (int) Unit.Meter,
-                BarUnitLargeScale = (int) Unit.Kilometer,
-                BarUnitSmallScale = (int) Unit.Meter,
+                MapUnit = (int)Unit.Meter,
+                BarUnitLargeScale = (int)Unit.Kilometer,
+                BarUnitSmallScale = (int)Unit.Meter,
                 Anchor = MapDecorationAnchor.Center,
                 BarStyle = ScaleBarStyle.Meridian,
                 BarColor1 = Color.Transparent,
@@ -97,14 +96,14 @@ public void OneTimeSetUp()
 
         private GeometryFeatureProvider CreateScaleBarDataSource()
         {
-            var fdt = new FeatureDataTable {TableName = "ScaleBarTests"};
+            var fdt = new FeatureDataTable { TableName = "ScaleBarTests" };
             fdt.Columns.Add(new DataColumn("oid", typeof(uint)));
             fdt.Columns[0].AutoIncrement = true;
 
             fdt.Columns.Add(new DataColumn("Latitude", typeof(int))); // start latitude for filtering
             fdt.Columns.Add(new DataColumn("Interval", typeof(int))); // distance interval for filtering
 
-            fdt.PrimaryKey = new[] {fdt.Columns[0]};
+            fdt.PrimaryKey = new[] { fdt.Columns[0] };
 
             LoadData(fdt);
 
@@ -1181,8 +1180,8 @@ public void TestWebMercator(int interval)
             foreach (var lyr in _map.BackgroundLayer)
                 lyr.Enabled = true;
 
-            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar) _map.Decorations[0];
-            scaleBar.MapUnit = (int) Unit.Meter;
+            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar)_map.Decorations[0];
+            scaleBar.MapUnit = (int)Unit.Meter;
 
             GenerateScaleBarImages("WebMerc", null, interval);
 
@@ -1199,13 +1198,13 @@ public void TestPcs(int interval)
 
             foreach (var lyr in _map.Layers)
                 if (lyr is VectorLayer)
-                    ((VectorLayer) lyr).TargetSRID = _map.SRID;
+                    ((VectorLayer)lyr).TargetSRID = _map.SRID;
 
             foreach (var lyr in _map.BackgroundLayer)
                 lyr.Enabled = false;
 
-            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar) _map.Decorations[0];
-            scaleBar.MapUnit = (int) Unit.Meter;
+            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar)_map.Decorations[0];
+            scaleBar.MapUnit = (int)Unit.Meter;
 
             //GenerateScaleBarImages("Utm47N", null, interval);
 
@@ -1222,13 +1221,13 @@ public void TestWgs84(int interval)
 
             foreach (var lyr in _map.Layers)
                 if (lyr is VectorLayer)
-                    ((VectorLayer) lyr).TargetSRID = _map.SRID;
+                    ((VectorLayer)lyr).TargetSRID = _map.SRID;
 
             foreach (var lyr in _map.BackgroundLayer)
                 lyr.Enabled = false;
 
-            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar) _map.Decorations[0];
-            scaleBar.MapUnit = (int) Unit.Degree;
+            var scaleBar = (SharpMap.Rendering.Decoration.ScaleBar.ScaleBar)_map.Decorations[0];
+            scaleBar.MapUnit = (int)Unit.Degree;
 
             GenerateScaleBarImages("Wgs84", null, interval);
 
@@ -1239,16 +1238,16 @@ public void TestWgs84(int interval)
 
         private void GenerateScaleBarImages(string srDescr, int? centerLat, int interval)
         {
-            var vectorLyr = (VectorLayer) _map.Layers[0];
+            var vectorLyr = (VectorLayer)_map.Layers[0];
 
             // apply Filter Delegate and zoom to resulting extents
             // interval = distance in metres between points stepping out from common meridian
-            var gfp = (GeometryFeatureProvider) vectorLyr.DataSource;
+            var gfp = (GeometryFeatureProvider)vectorLyr.DataSource;
             if (!centerLat.HasValue)
-                gfp.FilterDelegate = row => ((int) row["Interval"] == interval || (int) row["Interval"] == 0);
+                gfp.FilterDelegate = row => ((int)row["Interval"] == interval || (int)row["Interval"] == 0);
             else
-                gfp.FilterDelegate = row => (((int) row["Latitude"]) == (int) centerLat.Value &&
-                                             ((int) row["Interval"] == interval || (int) row["Interval"] == 0));
+                gfp.FilterDelegate = row => (((int)row["Latitude"]) == (int)centerLat.Value &&
+                                             ((int)row["Interval"] == interval || (int)row["Interval"] == 0));
 
             var geometries = vectorLyr.DataSource.GetGeometriesInView(new Envelope(-180, 180, -90, 90));
             var box = new Envelope();
diff --git a/UnitTests/Rendering/GroupStyle/GroupStyleTests.cs b/UnitTests/Rendering/GroupStyle/GroupStyleTests.cs
index 584be22e..317e5041 100644
--- a/UnitTests/Rendering/GroupStyle/GroupStyleTests.cs
+++ b/UnitTests/Rendering/GroupStyle/GroupStyleTests.cs
@@ -1,8 +1,8 @@
 using NUnit.Framework;
+using SharpMap;
+using SharpMap.Layers;
 using System.Drawing;
 using System.Drawing.Imaging;
-using SharpMap.Layers;
-using SharpMap;
 
 namespace UnitTests.Rendering.GroupStyle
 {
@@ -67,7 +67,7 @@ public void TestRender()
 
             Map m = new Map(new Size(11, 11));
             m.BackColor = Color.White;
-            m.ZoomToBox(new GeoAPI.Geometries.Envelope(-5, 5, -5, 5));
+            m.ZoomToBox(new NetTopologySuite.Geometries.Envelope(-5, 5, -5, 5));
             m.Layers.Add(vLay);
             var img = m.GetMap();
 
diff --git a/UnitTests/Rendering/Symbolizer/CohenSutherlandLineClippingTest.cs b/UnitTests/Rendering/Symbolizer/CohenSutherlandLineClippingTest.cs
index 0591fa40..91c18c92 100644
--- a/UnitTests/Rendering/Symbolizer/CohenSutherlandLineClippingTest.cs
+++ b/UnitTests/Rendering/Symbolizer/CohenSutherlandLineClippingTest.cs
@@ -1,16 +1,12 @@
-using System.Collections.Concurrent;
-using System.Data;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
-using SharpMap.Data.Providers;
 
 namespace UnitTests.Rendering.Symbolizer
 {
     [TestFixture]
     public class CohenSutherlandLineClippingTest
     {
-        private static readonly IGeometryFactory Factory = new GeometryFactory();
+        private static readonly GeometryFactory Factory = new GeometryFactory();
 
         [Test]
         public void SimpleTest()
@@ -42,7 +38,7 @@ public void InOutInTest()
             var l = Factory.CreateLineString(new[] { new Coordinate(-5, 4), new Coordinate(15, 4), new Coordinate(15, 6), new Coordinate(-5, 6), });
             var res = lc.ClipLineString(l);
             Assert.IsNotNull(res);
-            Assert.IsTrue(res is  MultiLineString);
+            Assert.IsTrue(res is MultiLineString);
             Assert.AreEqual("MULTILINESTRING ((0 4, 10 4), (10 6, 0 6))", res.ToString());
         }
 
diff --git a/UnitTests/Rendering/Symbolizer/LineSymbolizerTest.cs b/UnitTests/Rendering/Symbolizer/LineSymbolizerTest.cs
index f6d913f7..5fbafa24 100644
--- a/UnitTests/Rendering/Symbolizer/LineSymbolizerTest.cs
+++ b/UnitTests/Rendering/Symbolizer/LineSymbolizerTest.cs
@@ -4,12 +4,7 @@ namespace UnitTests.Rendering.Symbolizer
 {
     public class LineSymbolizerTest
     {
-        static LineSymbolizerTest()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-        }
-
-        [NUnit.Framework.Test] 
+        [NUnit.Framework.Test]
         public void TestBasicLineSymbolizer()
         {
             var p = new SharpMap.Data.Providers.ShapeFile(TestUtility.GetPathToTestFile("roads_aur.shp"), false);
@@ -17,7 +12,7 @@ public void TestBasicLineSymbolizer()
             //l.Style.Outline = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 5);
             l.Style.Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 1);
             l.Style.EnableOutline = false;
-            var m = new SharpMap.Map(new System.Drawing.Size(1440,1080)) {BackColor = System.Drawing.Color.Cornsilk};
+            var m = new SharpMap.Map(new System.Drawing.Size(1440, 1080)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
 
             m.ZoomToExtents();
@@ -55,23 +50,24 @@ public void TestWarpedLineSymbolizer()
             var p = new SharpMap.Data.Providers.ShapeFile(TestUtility.GetPathToTestFile("roads_aur.shp"), false);
 
             var l = new SharpMap.Layers.VectorLayer("roads", p);
-            
+
             var cls = new SharpMap.Rendering.Symbolizer.CachedLineSymbolizer();
             cls.LineSymbolizeHandlers.Add(new SharpMap.Rendering.Symbolizer.PlainLineSymbolizeHandler
-                                              {Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 2)});
+            { Line = new System.Drawing.Pen(System.Drawing.Color.Gold, 2) });
 
             var wls = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                          {
-                              Pattern =
+            {
+                Pattern =
                                   SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.
                                   GetGreaterSeries(3, 3),
-                              Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
-                              , Interval = 20
-                          };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
+                              ,
+                Interval = 20
+            };
             cls.LineSymbolizeHandlers.Add(wls);
             l.Style.LineSymbolizer = cls;
 
-            var m = new SharpMap.Map(new System.Drawing.Size(720, 540)) {BackColor = System.Drawing.Color.Cornsilk};
+            var m = new SharpMap.Map(new System.Drawing.Size(720, 540)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
 
             m.ZoomToExtents();
@@ -85,14 +81,15 @@ public void TestWarpedLineSymbolizer()
             bmp.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "AurichRoads2.bmp"));
 
             cls.LineSymbolizeHandlers[1] = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                                               {
-                                                   Pattern =
+            {
+                Pattern =
                                                        SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.
                                                        GetTriangle(4, 0),
-                                                   Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
-                                                   Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
-                                                   ,Interval = 10
-                                               };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
+                Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
+                                                   ,
+                Interval = 10
+            };
             sw.Reset(); sw.Start();
             bmp = m.GetMap();
             sw.Stop();
@@ -113,7 +110,7 @@ public void TestWarpedLineSymbolizer()
             bmp = m.GetMap();
             sw.Stop();
             System.Diagnostics.Trace.WriteLine(string.Format("Rendering new method: {0}ms", sw.ElapsedMilliseconds));
-            bmp.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this),"AurichRoads2-1.bmp"));
+            bmp.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "AurichRoads2-1.bmp"));
             cls.LineSymbolizeHandlers[1] = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
             {
                 Pattern =
@@ -149,12 +146,12 @@ public void TestWarpedLineSymbolizer()
 
             //cls.LineSymbolizeHandlers[0] = cls.LineSymbolizeHandlers[1];
             cls.LineSymbolizeHandlers[1] = new SharpMap.Rendering.Symbolizer.WarpedLineSymbolizeHander
-                                               {
-                                                   Pattern =
+            {
+                Pattern =
                                                        SharpMap.Rendering.Symbolizer.WarpedLineSymbolizer.GetZigZag(4, 4),
-                                                   Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
-                                                   //Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
-                                               };
+                Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1),
+                //Fill = new System.Drawing.SolidBrush(System.Drawing.Color.Firebrick)
+            };
             sw.Reset(); sw.Start();
             bmp = m.GetMap();
             sw.Stop();
@@ -216,7 +213,7 @@ public SharpMap.Styles.IStyle GetStyle(SharpMap.Data.FeatureDataRow attribute)
                     Line = new System.Drawing.Pen(System.Drawing.Color.Firebrick, 1)
                     ,
                     Interval = 20
-                    
+
                 };
                 cls.LineSymbolizeHandlers.Add(wls);
                 cls.ImmediateMode = true;
diff --git a/UnitTests/Rendering/Symbolizer/PointSymbolizerTest.cs b/UnitTests/Rendering/Symbolizer/PointSymbolizerTest.cs
index 9bc1f762..9a6d6c84 100644
--- a/UnitTests/Rendering/Symbolizer/PointSymbolizerTest.cs
+++ b/UnitTests/Rendering/Symbolizer/PointSymbolizerTest.cs
@@ -12,16 +12,16 @@ public void TestCharacterPointSymbolizer()
                 TestData.CreatingData.GetRandomOrdinates(50, -180, 180), TestData.CreatingData.GetRandomOrdinates(50, -90, 90), null);
             var geometryFeatureProvider = new SharpMap.Data.Providers.GeometryFeatureProvider(fdt);
             var layer = new SharpMap.Layers.VectorLayer("randompoints", geometryFeatureProvider);
-            var cps  = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
-                                              {
-                                                  Halo = 1,
-                                                  HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
-                                                  //Font = new System.Drawing.Font("Arial", 12),
-                                                  CharacterIndex = 0xcc,
-                                              };
+            var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
+            {
+                Halo = 1,
+                HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.Wheat),
+                //Font = new System.Drawing.Font("Arial", 12),
+                CharacterIndex = 0xcc,
+            };
             layer.Style.PointSymbolizer = cps;
             var map = new SharpMap.Map(new System.Drawing.Size(720, 360));
-            
+
             map.Layers.Add(layer);
             map.ZoomToExtents();
             map.GetMap().Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "CharacterPointSymbolizer1.bmp"));
@@ -63,7 +63,7 @@ public void TestPathPointSymbolizer()
             map.GetMap().Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "PathPointSymbolizer3.bmp"));
 
             var gpTriangle1 = new System.Drawing.Drawing2D.GraphicsPath();
-            gpTriangle1.AddPolygon(new [] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
+            gpTriangle1.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(5, 10), new System.Drawing.Point(10, 0), new System.Drawing.Point(0, 0), });
             var gpTriangle2 = new System.Drawing.Drawing2D.GraphicsPath();
             gpTriangle2.AddPolygon(new[] { new System.Drawing.Point(0, 0), new System.Drawing.Point(-5, -10), new System.Drawing.Point(-10, 0), new System.Drawing.Point(0, 0), });
             pps = new
@@ -90,7 +90,8 @@ public void TestPathPointSymbolizer()
                                                                         System.Drawing.Color.Red)
                                                                 }
 
-                                                        }){ Rotation = 45 };
+                                                        })
+            { Rotation = 45 };
 
             layer.Style.PointSymbolizer = pps;
             map.GetMap().Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "PathPointSymbolizer4.bmp"));
@@ -107,12 +108,12 @@ public void TestRasterPointSymbolizer()
             var geometryFeatureProvider = new SharpMap.Data.Providers.GeometryFeatureProvider(fdt);
             var layer = new SharpMap.Layers.VectorLayer("randompoints", geometryFeatureProvider);
 
-            
+
             var wmnStream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("UnitTests.Resources.Women.png");
             var wmnBmp = new System.Drawing.Bitmap(wmnStream);
 
             var rps =
-                new SharpMap.Rendering.Symbolizer.RasterPointSymbolizer {Symbol = wmnBmp};
+                new SharpMap.Rendering.Symbolizer.RasterPointSymbolizer { Symbol = wmnBmp };
 
             layer.Style.PointSymbolizer = rps;
             var map = new SharpMap.Map(new System.Drawing.Size(720, 360));
@@ -125,14 +126,14 @@ public void TestRasterPointSymbolizer()
             rps.Rotation = 0;
 
             var cps = new SharpMap.Rendering.Symbolizer.CharacterPointSymbolizer
-                          {
-                              Halo = 1,
-                              HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.WhiteSmoke),
-                              Foreground = new System.Drawing.SolidBrush(System.Drawing.Color.Black),
-                              Font = new System.Drawing.Font("Arial", 12),
-                              Text = "Anne",
-                              Offset = new System.Drawing.PointF(0, rps.Size.Height*0.5f)
-                
+            {
+                Halo = 1,
+                HaloBrush = new System.Drawing.SolidBrush(System.Drawing.Color.WhiteSmoke),
+                Foreground = new System.Drawing.SolidBrush(System.Drawing.Color.Black),
+                Font = new System.Drawing.Font("Arial", 12),
+                Text = "Anne",
+                Offset = new System.Drawing.PointF(0, rps.Size.Height * 0.5f)
+
             };
 
             var lps = new SharpMap.Rendering.Symbolizer.ListPointSymbolizer { rps, cps };
diff --git a/UnitTests/Rendering/Symbolizer/PolygonSymbolizerTest.cs b/UnitTests/Rendering/Symbolizer/PolygonSymbolizerTest.cs
index bb48653c..8938195a 100644
--- a/UnitTests/Rendering/Symbolizer/PolygonSymbolizerTest.cs
+++ b/UnitTests/Rendering/Symbolizer/PolygonSymbolizerTest.cs
@@ -11,10 +11,10 @@ public override void Begin(System.Drawing.Graphics g, SharpMap.MapViewport map,
                 base.Begin(g, map, aproximateNumberOfGeometries);
                 _oldRenderOrigin = g.RenderingOrigin;
             }
-            protected override void OnRenderInternal(SharpMap.MapViewport map, GeoAPI.Geometries.IPolygon polygon, System.Drawing.Graphics g)
+            protected override void OnRenderInternal(SharpMap.MapViewport map, NetTopologySuite.Geometries.Polygon polygon, System.Drawing.Graphics g)
             {
                 var pt = polygon.Centroid;
-                g.RenderingOrigin = 
+                g.RenderingOrigin =
                     System.Drawing.Point.Truncate(map.WorldToImage(pt.Coordinate));
                 base.OnRenderInternal(map, polygon, g);
             }
@@ -35,14 +35,14 @@ public void TestPlainPolygonSymbolizer(string filePath)
             var provider = new SharpMap.Data.Providers.ShapeFile(filePath, true);
             var l = new SharpMap.Layers.Symbolizer.PolygonalVectorLayer("Countries", provider);
             l.Symbolizer = new ModifiedBasicPolygonSymbolizer
-                {
-                    Fill = new System.Drawing.Drawing2D.HatchBrush(
-                            System.Drawing.Drawing2D.HatchStyle.WideDownwardDiagonal, 
+            {
+                Fill = new System.Drawing.Drawing2D.HatchBrush(
+                            System.Drawing.Drawing2D.HatchStyle.WideDownwardDiagonal,
                             System.Drawing.Color.Red /*,
                             System.Drawing.Color.LightPink*/),
-                    UseClipping = false,
-                    //Outline = System.Drawing.Pens.AliceBlue
-                };
+                UseClipping = false,
+                //Outline = System.Drawing.Pens.AliceBlue
+            };
 
             var m = new SharpMap.Map(new System.Drawing.Size(1440, 1080)) { BackColor = System.Drawing.Color.Cornsilk };
             m.Layers.Add(l);
@@ -51,7 +51,7 @@ public void TestPlainPolygonSymbolizer(string filePath)
 
             var sw = new System.Diagnostics.Stopwatch();
             var img = m.GetMap();
-            
+
             sw.Start();
             img = m.GetMap();
             img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "PolygonSymbolizer-1.bmp"), System.Drawing.Imaging.ImageFormat.Bmp);
@@ -70,10 +70,10 @@ public void TestPlainPolygonSymbolizer(string filePath)
 
             sw.Reset(); sw.Start();
             img = m.GetMap();
-            img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this),"PolygonSymbolizer-2.bmp"), System.Drawing.Imaging.ImageFormat.Bmp);
+            img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "PolygonSymbolizer-2.bmp"), System.Drawing.Imaging.ImageFormat.Bmp);
             sw.Stop();
             System.Diagnostics.Trace.WriteLine(string.Format("Rendering new method:{0}ms", sw.ElapsedMilliseconds));
-        
+
         }
     }
 
diff --git a/UnitTests/Rendering/Symbolizer/RasterPointSymbolizerTest.cs b/UnitTests/Rendering/Symbolizer/RasterPointSymbolizerTest.cs
index d3ebd4fc..dd8f6eca 100644
--- a/UnitTests/Rendering/Symbolizer/RasterPointSymbolizerTest.cs
+++ b/UnitTests/Rendering/Symbolizer/RasterPointSymbolizerTest.cs
@@ -1,10 +1,6 @@
-using GeoAPI.Geometries;
-using NetTopologySuite.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace UnitTests.Rendering.Symbolizer
 {
@@ -21,7 +17,7 @@ public void TestRasterPointSymbolizerScaleRotn()
             var m = CreateMap();
             m.ZoomToExtents();
             var img = m.GetMap();
-            img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this),"RasterPointSymbolizer.png"), System.Drawing.Imaging.ImageFormat.Png);
+            img.Save(System.IO.Path.Combine(UnitTestsFixture.GetImageDirectory(this), "RasterPointSymbolizer.png"), System.Drawing.Imaging.ImageFormat.Png);
         }
 
         private SharpMap.Map CreateMap()
diff --git a/UnitTests/Rendering/Thematics/ColorBlendTest.cs b/UnitTests/Rendering/Thematics/ColorBlendTest.cs
index fffd3459..bcf7bb1e 100644
--- a/UnitTests/Rendering/Thematics/ColorBlendTest.cs
+++ b/UnitTests/Rendering/Thematics/ColorBlendTest.cs
@@ -1,6 +1,6 @@
-using System.Drawing;
-using SharpMap.Rendering.Thematics;
 using NUnit.Framework;
+using SharpMap.Rendering.Thematics;
+using System.Drawing;
 namespace UnitTests.Rendering.Thematics
 {
     [TestFixture]
@@ -9,7 +9,7 @@ public class ColorBlendTest
         [Test]
         public void ToBrushTest()
         {
-            ColorBlend colorBlend = new ColorBlend(new Color[] {Color.Blue, Color.GreenYellow, Color.Red}, new float[] {0f, 500f, 1000f} );
+            ColorBlend colorBlend = new ColorBlend(new Color[] { Color.Blue, Color.GreenYellow, Color.Red }, new float[] { 0f, 500f, 1000f });
             Assert.IsNotNull(colorBlend);
             System.Drawing.Drawing2D.LinearGradientBrush lgb = colorBlend.ToBrush(new Rectangle(0, 0, 100, 100), 0.5f);
             Assert.IsNotNull(lgb);
diff --git a/UnitTests/Serialization/BaseSerializationTest.cs b/UnitTests/Serialization/BaseSerializationTest.cs
index a7c6876a..a591831d 100644
--- a/UnitTests/Serialization/BaseSerializationTest.cs
+++ b/UnitTests/Serialization/BaseSerializationTest.cs
@@ -1,7 +1,7 @@
-using System.IO;
+using SharpMap.Utilities;
+using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
-using SharpMap.Utilities;
 
 namespace UnitTests.Serialization
 {
diff --git a/UnitTests/Serialization/DecorationsTest.cs b/UnitTests/Serialization/DecorationsTest.cs
index 81128e18..fe58ca61 100644
--- a/UnitTests/Serialization/DecorationsTest.cs
+++ b/UnitTests/Serialization/DecorationsTest.cs
@@ -1,8 +1,7 @@
-using System;
+using NUnit.Framework;
+using SharpMap.Rendering.Decoration;
 using System.Collections.Generic;
 using System.Drawing;
-using NUnit.Framework;
-using SharpMap.Rendering.Decoration;
 
 namespace UnitTests.Serialization
 {
@@ -13,7 +12,7 @@ public void NorthArrowTest()
         {
             var northArrowS = new NorthArrow();
             NorthArrow northArrowD = null;
-            
+
             Assert.DoesNotThrow(() => northArrowD = SandD(northArrowS, GetFormatter()));
             Assert.IsNotNull(northArrowD);
 
@@ -50,10 +49,10 @@ public void EyeOfSightTest()
 
         }
 
-        private class DecorationEqualityComparer<T> : EqualityComparer<T> 
-            where T:MapDecoration
+        private class DecorationEqualityComparer<T> : EqualityComparer<T>
+            where T : MapDecoration
         {
-            
+
             protected readonly List<string> DifferAt = new List<string>();
 
             public override bool Equals(T lhs, T rhs)
@@ -140,7 +139,7 @@ public override string ToString()
             }
         }
 
-        private class NorthArrowEqualityComparer : DecorationEqualityComparer<NorthArrow> 
+        private class NorthArrowEqualityComparer : DecorationEqualityComparer<NorthArrow>
         {
             public override bool Equals(NorthArrow x, NorthArrow y)
             {
@@ -160,7 +159,7 @@ public override bool Equals(NorthArrow x, NorthArrow y)
                 if (x.NorthArrowImage != null && x.GetHashCode() != y.GetHashCode())
                 {
                     if (x.GetHashCode() != y.GetHashCode())
-                    DifferAt.Add("NorthArrowImage (GetHashCode)");
+                        DifferAt.Add("NorthArrowImage (GetHashCode)");
                     result = false;
                 }
 
@@ -179,9 +178,9 @@ private class DisclaimerEqualityComparer : DecorationEqualityComparer<Disclaimer
             public override bool Equals(Disclaimer lhs, Disclaimer rhs)
             {
                 var result = base.Equals(lhs, rhs);
-                
+
                 var feq = new FontEqualityComparer();
-                if (!feq.Equals(lhs.Font,rhs.Font))
+                if (!feq.Equals(lhs.Font, rhs.Font))
                 {
                     DifferAt.Add("Font");
                     result = false;
@@ -226,7 +225,7 @@ private static bool StringFormatsEqual(StringFormat lhs, StringFormat rhs)
                 if (lhs.DigitSubstitutionLanguage != rhs.DigitSubstitutionLanguage) return false;
                 if (lhs.DigitSubstitutionMethod != rhs.DigitSubstitutionMethod) return false;
                 if (lhs.FormatFlags != rhs.FormatFlags) return false;
-                if (lhs.HotkeyPrefix!= rhs.HotkeyPrefix) return false;
+                if (lhs.HotkeyPrefix != rhs.HotkeyPrefix) return false;
                 if (lhs.LineAlignment != rhs.LineAlignment) return false;
                 if (lhs.Trimming != rhs.Trimming) return false;
 
diff --git a/UnitTests/Serialization/FakePersistentCache.cs b/UnitTests/Serialization/FakePersistentCache.cs
index ddb32ee4..4d6e9a30 100644
--- a/UnitTests/Serialization/FakePersistentCache.cs
+++ b/UnitTests/Serialization/FakePersistentCache.cs
@@ -1,6 +1,6 @@
-using System;
-using BruTile;
+using BruTile;
 using BruTile.Cache;
+using System;
 
 namespace UnitTests.Serialization
 {
diff --git a/UnitTests/Serialization/LayerTest.cs b/UnitTests/Serialization/LayerTest.cs
index d77f242a..cd2c470b 100644
--- a/UnitTests/Serialization/LayerTest.cs
+++ b/UnitTests/Serialization/LayerTest.cs
@@ -1,12 +1,10 @@
-using System.Collections.Generic;
-using System.Drawing.Imaging;
-using System.IO;
+using BruTile.Predefined;
 using NUnit.Framework;
-using NetTopologySuite;
 using SharpMap.Layers;
 using SharpMap.Rendering.Symbolizer;
-using UnitTests.Properties;
-using BruTile.Predefined;
+using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.IO;
 using Assembly = System.Reflection.Assembly;
 
 namespace UnitTests.Serialization
@@ -14,8 +12,8 @@ namespace UnitTests.Serialization
     [TestFixture]
     public class LayerTest : BaseSerializationTest
     {
-       
-        [Test] 
+
+        [Test]
         public void TestVectorLayer()
         {
             var vlayerS = new VectorLayer("Test", ProviderTest.CreateProvider());
@@ -23,7 +21,7 @@ public void TestVectorLayer()
 
             Assert.DoesNotThrow(() => vlayerD = SandD(vlayerS, GetFormatter()), "Exception");
             Assert.IsNotNull(vlayerD, "Deserialized VectorLayer is null");
-            
+
             var vlec = new VectorLayerEqualityComparer();
             Assert.IsTrue(vlec.Equals(vlayerS, vlayerD), vlec.ToString());
         }
@@ -31,7 +29,7 @@ public void TestVectorLayer()
         [Test]
         public void TestLabelLayer()
         {
-            var vlayerS = new LabelLayer("Test") {DataSource = ProviderTest.CreateProvider() };
+            var vlayerS = new LabelLayer("Test") { DataSource = ProviderTest.CreateProvider() };
 
             LabelLayer vlayerD = null;
 
@@ -70,15 +68,15 @@ public void TestLayerCollection()
             var lcS = new LayerCollection();
             LayerCollection lcD = null;
             Assert.DoesNotThrow(() => lcD = SandD(lcS, GetFormatter()));
-            
-            TestLayerCollections(lcS,lcD);
+
+            TestLayerCollections(lcS, lcD);
         }
 
         [Test]
         public void TestPuntalLayer()
         {
             var lS = new SharpMap.Layers.Symbolizer.PuntalVectorLayer("PuntalTest", ProviderTest.CreateProvider());
-            var rsS = (RasterPointSymbolizer) lS.Symbolizer;
+            var rsS = (RasterPointSymbolizer)lS.Symbolizer;
             rsS.Transparency = 0.2f;
 
             SharpMap.Layers.Symbolizer.PuntalVectorLayer lD = null;
@@ -95,7 +93,7 @@ public void TestPuntalLayer()
         public void TestTileLayer()
         {
             var tlS =
-                new TileLayer(KnownTileSources.Create(KnownTileSource.BingHybridStaging, string.Empty), 
+                new TileLayer(KnownTileSources.Create(KnownTileSource.BingHybridStaging, string.Empty),
                     "Name", System.Drawing.Color.MediumTurquoise, true, Path.Combine(Path.GetTempPath(), "Bing", "Hybrid"));
 
             TileLayer tlD = null;
@@ -183,7 +181,7 @@ public override string ToString()
             }
         }
 
-        internal class LayerEqualityComparer<T> : ILayerEqualityComparer<T> where T:Layer
+        internal class LayerEqualityComparer<T> : ILayerEqualityComparer<T> where T : Layer
         {
             public override bool Equals(T lhs, T rhs)
             {
@@ -220,7 +218,7 @@ internal class VectorLayerEqualityComparer : LayerEqualityComparer<VectorLayer>
             public override bool Equals(VectorLayer lhs, VectorLayer rhs)
             {
                 var result = base.Equals(lhs, rhs);
-                
+
                 if (lhs.ClippingEnabled != rhs.ClippingEnabled)
                 {
                     DifferAt.Add("ClippingEnabled");
diff --git a/UnitTests/Serialization/MapDocSerializationTests.cs b/UnitTests/Serialization/MapDocSerializationTests.cs
index 19e1ae4e..7082a8c4 100644
--- a/UnitTests/Serialization/MapDocSerializationTests.cs
+++ b/UnitTests/Serialization/MapDocSerializationTests.cs
@@ -1,15 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using NUnit.Framework;
-using System.Drawing;
-using System.Xml.Serialization;
-using SharpMap.Serialization;
+using NUnit.Framework;
+using System;
 using System.IO;
 using System.Net;
-using System.Resources;
-using SharpMap.Layers;
+using System.Text;
 
 namespace UnitTests.Serialization
 {
@@ -153,7 +146,7 @@ public void TestDeSerializeWmsLayerWithCredentials()
             Assert.AreEqual("http://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer?SERVICE=WMS&REQUEST=GetCapabilities&", (m.Layers[0] as SharpMap.Layers.WmsLayer).CapabilitiesUrl, "m.Layers[0].CapabilitiesUrl");
             Assert.IsNotNull((m.Layers[0] as SharpMap.Layers.WmsLayer).Credentials, "m.Layers[0].Credentials != null");
             ICredentials c = null;
-            Assert.DoesNotThrow(() => c = ((SharpMap.Layers.WmsLayer) m.Layers[0]).Credentials);
+            Assert.DoesNotThrow(() => c = ((SharpMap.Layers.WmsLayer)m.Layers[0]).Credentials);
             Assert.IsTrue(c is NetworkCredential);
             var nc = (NetworkCredential)c;
             Assert.AreEqual("test", nc.UserName, "nc.UserName");
@@ -169,7 +162,7 @@ public void TestDeSerializeWmsLayerWithCredentials()
         public void TestSerializeWmsLayerWithCredentials()
         {
             SharpMap.Map m = new SharpMap.Map();
-            SharpMap.Layers.WmsLayer l = new SharpMap.Layers.WmsLayer("testwms", "http://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer", TimeSpan.MaxValue, 
+            SharpMap.Layers.WmsLayer l = new SharpMap.Layers.WmsLayer("testwms", "http://sampleserver1.arcgisonline.com/ArcGIS/services/Specialty/ESRI_StatesCitiesRivers_USA/MapServer/WMSServer", TimeSpan.MaxValue,
                 System.Net.WebRequest.DefaultWebProxy, new NetworkCredential("test", "pw"));
             l.AddChildLayers(l.RootLayer, false);
             m.Layers.Add(l);
diff --git a/UnitTests/Serialization/MapTest.cs b/UnitTests/Serialization/MapTest.cs
index 24a4bc93..ea82abe2 100644
--- a/UnitTests/Serialization/MapTest.cs
+++ b/UnitTests/Serialization/MapTest.cs
@@ -1,17 +1,14 @@
 #if !LINUX
-using System;
-using System.Drawing;
-using System.IO;
 using BruTile.Predefined;
-using BruTile.Web;
-using GeoAPI.CoordinateSystems.Transformations;
-using GeoAPI.Geometries;
-using NUnit.Framework;
+using NetTopologySuite.CoordinateSystems.Transformations;
 using NetTopologySuite.Geometries;
+using NUnit.Framework;
+using ProjNet.CoordinateSystems.Transformations;
 using SharpMap;
 using SharpMap.Data.Providers;
 using SharpMap.Layers;
 using SharpMap.Styles;
+using System.Drawing;
 
 namespace UnitTests.Serialization
 {
@@ -19,18 +16,18 @@ public class MapTest : BaseSerializationTest
     {
         private readonly Size _mapSize = new Size(1200, 800);
 
-        [Test, Description("Just a line")] 
+        [Test, Description("Just a line")]
         public void TestMap1()
         {
             var m = new Map(_mapSize);
             m.Layers.Add(new VectorLayer("tmp", new GeometryProvider(
-                new LineString(new [] {new Coordinate(0, 0), new Coordinate(10, 10), }))));
+                new LineString(new[] { new Coordinate(0, 0), new Coordinate(10, 10), }))));
 
             m.ZoomToExtents();
 
             Map mD = null;
-            Assert.DoesNotThrow(()=>mD=SandD(m, GetFormatter()));
-            
+            Assert.DoesNotThrow(() => mD = SandD(m, GetFormatter()));
+
             TestMaps("Test1", m, mD);
         }
 
@@ -43,8 +40,8 @@ private static void TestMaps(string name, Map m, Map mD)
             var c = new LayerTest.VectorLayerEqualityComparer();
             for (var i = 0; i < m.Layers.Count; i++)
             {
-                Assert.IsTrue(c.Equals((VectorLayer)m.Layers[i], 
-                                       (VectorLayer)mD.Layers[i]), 
+                Assert.IsTrue(c.Equals((VectorLayer)m.Layers[i],
+                                       (VectorLayer)mD.Layers[i]),
                                        "Layer {0}, '{1}' Differs at {2}",
                                        i, m.Layers[i].LayerName, string.Join(", ", c.DifferAt));
             }
@@ -74,9 +71,9 @@ public void TestMap2()
         {
             var m = new Map(_mapSize);
             m.BackgroundLayer.Add(new TileLayer(KnownTileSources.Create(KnownTileSource.BingHybridStaging), "BingHybridStaging"));
-            
+
             string cn = $"Data Source={TestUtility.GetPathToTestFile("osm_aurich.sqlite")};";
-            
+
             var ct = Wgs84ToWebMercator;
             //Env[7,45731445821406 : 7,53454260528903, 53,4342695512313 : 53,478793942147]
             var box = new Envelope(7.45731445821406, 7.53454260528903, 53.4342695512313, 53.478793942147);
diff --git a/UnitTests/Serialization/ProviderTest.cs b/UnitTests/Serialization/ProviderTest.cs
index 1ff6055b..aa4388a6 100644
--- a/UnitTests/Serialization/ProviderTest.cs
+++ b/UnitTests/Serialization/ProviderTest.cs
@@ -1,26 +1,20 @@
-using System;
-using System.IO;
-using GeoAPI.Geometries;
+using NetTopologySuite.Geometries;
 using NUnit.Framework;
 using SharpMap.Data.Providers;
+using System;
+using System.IO;
 
 namespace UnitTests.Serialization
 {
     public class ProviderTest : BaseSerializationTest
     {
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-        }
-
-        internal static IProvider CreateProvider(string name=null)
+        internal static IProvider CreateProvider(string name = null)
         {
             name = name ?? "geometryprovider";
             switch (name.ToLower())
             {
                 default:
-                //case "geometryprovider":
+                    //case "geometryprovider":
                     return CreateProvider<GeometryProvider>();
                 case "shapefile":
                     return CreateProvider<ShapeFile>();
@@ -34,20 +28,20 @@ internal static IProvider CreateProvider(string name=null)
         }
 
         internal static T CreateProvider<T>()
-        where T: IProvider
+        where T : IProvider
         {
             try
             {
-                var gf = GeoAPI.GeometryServiceProvider.Instance.CreateGeometryFactory();
+                var gf = NetTopologySuite.NtsGeometryServices.Instance.CreateGeometryFactory();
 
                 if (typeof(T) == typeof(GeometryProvider))
-                    return (T) (IProvider) new GeometryProvider(gf.CreatePoint(new Coordinate(1, 1)));
+                    return (T)(IProvider)new GeometryProvider(gf.CreatePoint(new Coordinate(1, 1)));
 
                 if (typeof(T) == typeof(ShapeFile))
-                    return (T) (IProvider) new ShapeFile(TestUtility.GetPathToTestFile("roads_ugl.shp"));
+                    return (T)(IProvider)new ShapeFile(TestUtility.GetPathToTestFile("roads_ugl.shp"));
 
                 if (typeof(T) == typeof(PostGIS))
-                    return (T) (IProvider) new PostGIS(
+                    return (T)(IProvider)new PostGIS(
                         "Host=ivv-t3s.ivv-aachen.de;Port=5432;integrated security=true;database=postgis_sample;",
                         "rivers", "wkb_geometry", "ogc_fid");
 
@@ -60,9 +54,9 @@ internal static T CreateProvider<T>()
                         "HighWays", "Geometry", "PK_UID");
 
 #if !LINUX
-            if (typeof(T) == typeof(SqlServer2008))
-                return (T)(IProvider)new SqlServer2008("Data Source=IVV-SQLD; Database=OBE;Integrated Security=SSPI;",
-                                                       "Roads", "wkb_geometry", "ogc_fid", SqlServerSpatialObjectType.Geometry);
+                if (typeof(T) == typeof(SqlServer2008))
+                    return (T)(IProvider)new SqlServer2008("Data Source=IVV-SQLD; Database=OBE;Integrated Security=SSPI;",
+                                                           "Roads", "wkb_geometry", "ogc_fid", SqlServerSpatialObjectType.Geometry);
 #endif
                 throw new NotSupportedException();
             }
@@ -128,8 +122,8 @@ public void TestSqlServer2008(SqlServerSpatialObjectType spatialType)
         {
             var sql2008S = new SqlServer2008("Data Source=IVV-SQLD; Database=OBE;Integrated Security=SSPI;",
                                              "roads", "spatialCol", "idCol",
-                                             spatialType, 
-                                             4326, 
+                                             spatialType,
+                                             4326,
                                              SqlServer2008ExtentsMode.EnvelopeAggregate);
 
             var sql2008D = SandD(sql2008S, GetFormatter());
diff --git a/UnitTests/Serialization/ReflectionTests.cs b/UnitTests/Serialization/ReflectionTests.cs
index 40ce6a65..eb2d1957 100644
--- a/UnitTests/Serialization/ReflectionTests.cs
+++ b/UnitTests/Serialization/ReflectionTests.cs
@@ -1,6 +1,6 @@
-using System;
+using NUnit.Framework;
+using System;
 using System.Reflection;
-using NUnit.Framework;
 
 namespace UnitTests.Serialization
 {
@@ -31,55 +31,55 @@ protected String MyProperty3
             }
         }
 
-        [Test]    
+        [Test]
         public void Main()
-            {
-                Type myType = (typeof(MyTypeClass));
-                // Get the public properties.
-                PropertyInfo[] myPropertyInfo = myType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                System.Diagnostics.Trace.WriteLine($"The number of public properties is {myPropertyInfo.Length}.");
-                // Display the public properties.
-                DisplayPropertyInfo(myPropertyInfo);
-                // Get the nonpublic properties.
-                PropertyInfo[] myPropertyInfo1 = myType.GetProperties(BindingFlags.NonPublic | BindingFlags.Instance);
-                System.Diagnostics.Trace.WriteLine($"The number of protected properties is {myPropertyInfo1.Length}.");
-                // Display all the nonpublic properties.
-                DisplayPropertyInfo(myPropertyInfo1);
-
-                try
-                {
-                    // Get Type object of MyClass.
-                    myType = typeof(MyTypeClass);
-                    // Get the PropertyInfo by passing the property name and specifying the BindingFlags.
-                    PropertyInfo myPropInfo = myType.GetProperty("MyProperty1", BindingFlags.Public | BindingFlags.Instance);
-                    // Display Name propety to System.Diagnostics.Trace.
-                    System.Diagnostics.Trace.WriteLine("{0} is a property of MyClass.", myPropInfo.Name);
-                }
-                catch (NullReferenceException e)
-                {
-                    System.Diagnostics.Trace.WriteLine("MyProperty does not exist in MyClass." + e.Message);
-                }
+        {
+            Type myType = (typeof(MyTypeClass));
+            // Get the public properties.
+            PropertyInfo[] myPropertyInfo = myType.GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            System.Diagnostics.Trace.WriteLine($"The number of public properties is {myPropertyInfo.Length}.");
+            // Display the public properties.
+            DisplayPropertyInfo(myPropertyInfo);
+            // Get the nonpublic properties.
+            PropertyInfo[] myPropertyInfo1 = myType.GetProperties(BindingFlags.NonPublic | BindingFlags.Instance);
+            System.Diagnostics.Trace.WriteLine($"The number of protected properties is {myPropertyInfo1.Length}.");
+            // Display all the nonpublic properties.
+            DisplayPropertyInfo(myPropertyInfo1);
 
+            try
+            {
+                // Get Type object of MyClass.
+                myType = typeof(MyTypeClass);
+                // Get the PropertyInfo by passing the property name and specifying the BindingFlags.
+                PropertyInfo myPropInfo = myType.GetProperty("MyProperty1", BindingFlags.Public | BindingFlags.Instance);
+                // Display Name propety to System.Diagnostics.Trace.
+                System.Diagnostics.Trace.WriteLine("{0} is a property of MyClass.", myPropInfo.Name);
             }
-            public static void DisplayPropertyInfo(PropertyInfo[] myPropertyInfo)
+            catch (NullReferenceException e)
             {
-                // Display information for all properties. 
-                for (int i = 0; i < myPropertyInfo.Length; i++)
-                {
-                    PropertyInfo myPropInfo = (PropertyInfo)myPropertyInfo[i];
-                    System.Diagnostics.Trace.WriteLine($"The property name is {myPropInfo.Name}." );
-                    System.Diagnostics.Trace.WriteLine($"The property type is {myPropInfo.PropertyType}.");
-                }
+                System.Diagnostics.Trace.WriteLine("MyProperty does not exist in MyClass." + e.Message);
+            }
+
+        }
+        public static void DisplayPropertyInfo(PropertyInfo[] myPropertyInfo)
+        {
+            // Display information for all properties. 
+            for (int i = 0; i < myPropertyInfo.Length; i++)
+            {
+                PropertyInfo myPropInfo = (PropertyInfo)myPropertyInfo[i];
+                System.Diagnostics.Trace.WriteLine($"The property name is {myPropInfo.Name}.");
+                System.Diagnostics.Trace.WriteLine($"The property type is {myPropInfo.PropertyType}.");
             }
+        }
 
-        public static object GetFieldValue(object item, string fieldName, 
+        public static object GetFieldValue(object item, string fieldName,
             BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Instance)
         {
             var type = item.GetType();
             return GetFieldValue(type, item, fieldName, flags);
         }
 
-        private static object GetFieldValue(Type type, object item, string fieldName, 
+        private static object GetFieldValue(Type type, object item, string fieldName,
             BindingFlags flags)
         {
             var fld = type.GetField(fieldName, flags);
@@ -92,7 +92,7 @@ private static object GetFieldValue(Type type, object item, string fieldName,
             return fld.GetValue(item);
         }
 
-        public static object GetPropertyValue(object item, string propertyName, 
+        public static object GetPropertyValue(object item, string propertyName,
             BindingFlags flags = BindingFlags.NonPublic | BindingFlags.Instance)
         {
             var type = item.GetType();
diff --git a/UnitTests/Serialization/SerializationTests.cs b/UnitTests/Serialization/SerializationTests.cs
index 3625a71b..c22b4667 100644
--- a/UnitTests/Serialization/SerializationTests.cs
+++ b/UnitTests/Serialization/SerializationTests.cs
@@ -1,13 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Runtime.InteropServices;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using BruTile;
+using BruTile;
 using BruTile.Cache;
 using BruTile.MbTiles;
 using BruTile.Predefined;
@@ -15,6 +6,14 @@
 using BruTile.Wmts;
 using NUnit.Framework;
 using SharpMap.Utilities;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
 
 namespace UnitTests.Serialization
 {
@@ -35,9 +34,9 @@ public void TestExtent()
         [Test]
         public void TestResolution()
         {
-            var r1 = new Resolution("XXX", 1245, 999,999, 5, 5, 4, 4, 0.1);
+            var r1 = new Resolution(0/*"XXX"*/, 1245, 999, 999, 5, 5, 4, 4, 0.1);
             var r2 = SandD(r1);
-            Assert.AreEqual(r1.Id, r2.Id);
+            Assert.AreEqual(r1.Level, r2.Level);
             Assert.AreEqual(r1.UnitsPerPixel, r2.UnitsPerPixel);
             Assert.AreEqual(r1.TileWidth, r2.TileWidth);
             Assert.AreEqual(r1.TileHeight, r2.TileHeight);
@@ -51,30 +50,27 @@ public void TestResolution()
         [Test]
         public void TestGlobalMercatorSchema()
         {
-            string message;
             var s1 = new GlobalMercator("png", 2, 11);
             var s2 = SandD(s1);
-            var equal = EqualTileSchemas(s1, s2, out message);
+            var equal = EqualTileSchemas(s1, s2, out string message);
             Assert.IsTrue(equal, message);
         }
 
         [Test]
         public void TestGlobalSphericalMercatorSchema()
         {
-            string message;
             var s1 = new GlobalSphericalMercator("png", YAxis.OSM, 2, 11);
             var s2 = SandD(s1);
-            var equal = EqualTileSchemas(s1, s2, out message);
+            var equal = EqualTileSchemas(s1, s2, out string message);
             Assert.IsTrue(equal, message);
         }
 
         [Test]
         public void TestWkstNederlandSchema()
         {
-            string message;
             var s1 = new WkstNederlandSchema();
             var s2 = SandD(s1);
-            var equal = EqualTileSchemas(s1, s2, out message);
+            var equal = EqualTileSchemas(s1, s2, out string message);
             Assert.IsTrue(equal, message);
         }
 
@@ -94,7 +90,7 @@ public void TestMemoryCacheBytes()
 
         }
 
-        
+
         [Test]
         public void TestMemoryCacheBitmap()
         {
@@ -109,7 +105,7 @@ public void TestMemoryCacheBitmap()
             //Assert.IsTrue(c1.EqualSetup(c2));
 #endif
         }
-        
+
         [Test]
         public void FileCache()
         {
@@ -151,7 +147,7 @@ public void TestWmtsTileSource(string url)
             {
                 throw new IgnoreException("Getting the response stream failed", ex);
             }
-            
+
             if (sources == null)
                 throw new IgnoreException("Failed to get capabilities");
 
@@ -164,8 +160,7 @@ public void TestWmtsTileSource(string url)
                 Assert.NotNull(srcD);
                 System.Diagnostics.Trace.WriteLine($"{srcS}");
 
-                string message;
-                if (!EqualTileSources(srcS, srcD, out message))
+                if (!EqualTileSources(srcS, srcD, out string message))
                 {
                     messages.Add(message);
                     equal = false;
@@ -181,8 +176,7 @@ public void TestOsmTileSource()
             var ts2 = SandD(ts1);
 
             Assert.NotNull(ts2);
-            string message;
-            var equal = EqualTileSources(ts1, ts2, out message);
+            var equal = EqualTileSources(ts1, ts2, out string message);
             Assert.IsTrue(equal, message);
         }
 
@@ -199,8 +193,7 @@ public void TestMbTiles(string mbTilesFile)
             Assert.IsNotNull(p2);
             //Assert.AreEqual(p1.Format, p2.Format, "MbTiles Format not equal");
             Assert.AreEqual(p1.Type, p2.Type, "MbTiles Type not equal");
-            string msg;
-            Assert.IsTrue(EqualTileSources(p1, p2, out msg), msg);
+            Assert.IsTrue(EqualTileSources(p1, p2, out string msg), msg);
             //Assert.IsTrue(EqualTileSchemas(p1.Schema, p2.Schema, out msg), msg);
         }
 
@@ -214,8 +207,7 @@ public void TestKnownTileSources()
                     var srcS = KnownTileSources.Create(kts);
                     var srcD = SandD(srcS);
                     Assert.IsNotNull(srcD);
-                    string message;
-                    Assert.IsTrue(EqualTileSources(srcS, srcD, out message));
+                    Assert.IsTrue(EqualTileSources(srcS, srcD, out string message));
                 }
                 catch
                 {
@@ -227,7 +219,7 @@ public void TestKnownTileSources()
         [Test]
         public void TestHttpTileProvider()
         {
-            var srcS = new HttpTileProvider(new BasicRequest("http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", new [] {"a", "b"}), userAgent: "HUHU");
+            var srcS = new HttpTileProvider(new BasicRequest("http://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png", new[] { "a", "b" }), userAgent: "HUHU");
             var srcD = SandD(srcS);
             Assert.IsNotNull(srcD);
         }
@@ -269,10 +261,10 @@ private static bool EqualTileSources(ITileSource ts1, ITileSource ts2, out strin
                 if (!EqualTileSchemas(ts1.Schema, ts2.Schema, out message))
                     return false;
 
-                if (!EqualTileProviders(ts1.Schema, (ITileProvider)ts1, (ITileProvider)ts2, out message))
+                if (!EqualTileProviders(ts1.Schema, ts1, ts2, out message))
                     return false;
             }
-            
+
             message = "Tile sources seem to be equal";
             return true;
         }
@@ -299,15 +291,15 @@ private static bool EqualTileProviders(ITileSchema schema, ITileProvider tp1, IT
                 }
 
                 var keys = schema.Resolutions.Keys.ToArray();
-                var minkey = GetIndex(keys[0]);
-                var maxKey = GetIndex(keys[keys.Length - 1]);
-                var prefix = GetPrefix(keys[0]);
+                var minkey = keys[0];
+                var maxKey = keys[keys.Length - 1];
+                //var prefix = GetPrefix(keys[0]);
                 for (var i = 0; i < 3; i++)
                 {
                     TileInfo ti = null;
                     try
                     {
-                        ti = RandomTileInfo(prefix + "{0}", minkey, Math.Min(maxKey, 12));
+                        ti = RandomTileInfo(/*prefix + */"{0}", minkey, Math.Min(maxKey, 12));
                         var req1 = tp1 as IRequest;
                         var req2 = tp2 as IRequest;
                         if (req1 != null && req2 != null)
@@ -332,16 +324,16 @@ private static bool EqualTileProviders(ITileSchema schema, ITileProvider tp1, IT
                     catch (TimeoutException ex)
                     {
                         System.Diagnostics.Trace.WriteLine(string.Format(
-                            "TileInfo({4}): {0}, {1}, {2}\n{3}", 
+                            "TileInfo({4}): {0}, {1}, {2}\n{3}",
                             ti.Index.Level, ti.Index.Col, ti.Index.Row, ex.Message, i));
                     }
-                    catch(WebException ex)
+                    catch (WebException ex)
                     {
                         if (ti == null)
                             System.Diagnostics.Trace.WriteLine("No tile info!");
                         else
                             System.Diagnostics.Trace.WriteLine(string.Format(
-                                "TileInfo({5}): {0}, {1}, {2}\n{3}\n{4}", 
+                                "TileInfo({5}): {0}, {1}, {2}\n{3}\n{4}",
                                 ti.Index.Level, ti.Index.Col, ti.Index.Row,
                                 ex.Message, ex.Response.ResponseUri, i));
                     }
@@ -366,7 +358,7 @@ private static string GetPrefix(string s)
             if (pos == -1)
                 return string.Empty;
 
-            return s.Substring(0, pos+1);
+            return s.Substring(0, pos + 1);
 
         }
 
@@ -427,7 +419,7 @@ private static TileInfo RandomTileInfo(string format = "{0}", int minLevel = 3,
             return new TileInfo
             {
                 Extent = new Extent(),
-                Index = new TileIndex(Rnd.Next(0, max), Rnd.Next(0, max), string.Format(CultureInfo.InvariantCulture, format, level))
+                Index = new TileIndex(Rnd.Next(0, max), Rnd.Next(0, max), level)
             };
         }
 
@@ -479,16 +471,16 @@ private static bool EqualTileSchemas(ITileSchema ts1, ITileSchema ts2, out strin
                     return false;
                 }
 
-                foreach(var res1 in tts1.Resolutions.Values)
+                foreach (var res1 in tts1.Resolutions.Values)
                 {
-                    var res2 = tts2.Resolutions[res1.Id];
-                    if (tts1.GetTileHeight(res1.Id)  != tts2.GetTileHeight(res2.Id))
+                    var res2 = tts2.Resolutions[res1.Level];
+                    if (tts1.GetTileHeight(res1.Level) != tts2.GetTileHeight(res2.Level))
                     {
                         message = "Heights don't match";
                         return false;
                     }
 
-                    if (tts1.GetTileWidth(res1.Id) != tts2.GetTileWidth(res2.Id))
+                    if (tts1.GetTileWidth(res1.Level) != tts2.GetTileWidth(res2.Level))
                     {
                         message = "Widths don't match";
                         return false;
@@ -535,8 +527,8 @@ private static bool EqualTileSchemas(ITileSchema ts1, ITileSchema ts2, out strin
                 var r2 = ts2.Resolutions[key];
 
                 //!!! compare other resultion parameters.
-                
-                if (r1.Id != r2.Id || r1.UnitsPerPixel != r2.UnitsPerPixel)
+
+                if (r1.Level != r2.Level || r1.UnitsPerPixel != r2.UnitsPerPixel)
                 {
                     message = string.Format("Resolution doesn't match at index {0}", key);
                     return false;
diff --git a/UnitTests/Serialization/StylesTest.cs b/UnitTests/Serialization/StylesTest.cs
index 927fc65a..6d55ca68 100644
--- a/UnitTests/Serialization/StylesTest.cs
+++ b/UnitTests/Serialization/StylesTest.cs
@@ -1,8 +1,8 @@
-using System;
+using NUnit.Framework;
+using SharpMap.Styles;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
-using NUnit.Framework;
-using SharpMap.Styles;
 
 namespace UnitTests.Serialization
 {
diff --git a/UnitTests/Serialization/SurrogatesTest.cs b/UnitTests/Serialization/SurrogatesTest.cs
index ddb702b1..0b8b59d5 100644
--- a/UnitTests/Serialization/SurrogatesTest.cs
+++ b/UnitTests/Serialization/SurrogatesTest.cs
@@ -1,8 +1,7 @@
-using System;
+using NUnit.Framework;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
-using NUnit.Framework;
 
 namespace UnitTests.Serialization
 {
@@ -101,7 +100,7 @@ public void TestTextureBrush()
             {
                 for (var i = 0; i < bmp.Width; i++)
                     for (var j = 0; j < bmp.Height; j++)
-                        bmp.SetPixel(i, j, Color.FromKnownColor((KnownColor)(27+(i * bmp.Width + j) % 100)));
+                        bmp.SetPixel(i, j, Color.FromKnownColor((KnownColor)(27 + (i * bmp.Width + j) % 100)));
 
                 var brushS = new TextureBrush(bmp)
                 { WrapMode = WrapMode.TileFlipXY, Transform = new Matrix(0.9f, 1f, 1f, 0.9f, 0.2f, 0.2f) };
@@ -155,7 +154,7 @@ public void TestLinearGradientBrush()
             CompareLgb(brushS, brushD);
 
             var myBlend = new Blend();
-            myBlend.Factors = new []{ .2f, .4f, .8f, .8f, .4f, .2f };
+            myBlend.Factors = new[] { .2f, .4f, .8f, .8f, .4f, .2f };
             myBlend.Positions = new[] { 0.0f, .2f, .4f, .6f, .8f, 1.0f };
 
             brushS.Blend = myBlend;
@@ -244,14 +243,14 @@ public void TestColorMatrix()
             for (var i = 0; i < 5; i++)
                 for (var j = 0; j < 5; j++)
                 {
-                    Assert.AreEqual(cmS[i,j], cmD[i, j], "Colormatrix differs at {0}, {1}", i, j);
+                    Assert.AreEqual(cmS[i, j], cmD[i, j], "Colormatrix differs at {0}, {1}", i, j);
                 }
         }
 
         [Test]
         public void TestColorMap()
         {
-            var cmS = new []
+            var cmS = new[]
             {
                 new ColorMap {OldColor = Color.Red, NewColor = Color.Green},
                 new ColorMap {OldColor = Color.Green, NewColor = Color.Red},
@@ -268,6 +267,6 @@ public void TestColorMap()
                 Assert.AreEqual(cmS[i].OldColor, cmD[i].OldColor, "Old color differs at {0}", i);
                 Assert.AreEqual(cmS[i].NewColor, cmD[i].NewColor, "New color differs at {0}", i);
             }
-        }    
+        }
     }
 }
diff --git a/UnitTests/Serialization/SymbolizerTest.cs b/UnitTests/Serialization/SymbolizerTest.cs
index 75620078..a14e6bee 100644
--- a/UnitTests/Serialization/SymbolizerTest.cs
+++ b/UnitTests/Serialization/SymbolizerTest.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.Drawing;
-using NUnit.Framework;
+using NUnit.Framework;
 using SharpMap.Rendering.Symbolizer;
+using System.Collections.Generic;
+using System.Drawing;
 
 namespace UnitTests.Serialization
 {
@@ -12,7 +12,7 @@ public class SymbolizerTest : BaseSerializationTest
         public void TestCharacterPointSymbolizer()
         {
             var cps = new CharacterPointSymbolizer();
-            cps.CharacterIndex = (int) 'q';
+            cps.CharacterIndex = (int)'q';
             cps.Font = new Font(FontFamily.GenericSansSerif, 12f, FontStyle.Bold);
             cps.Foreground = new SolidBrush(Color.BlueViolet);
             cps.Halo = 2;
@@ -45,7 +45,7 @@ public override int GetHashCode(T obj)
     }
 
     internal class PointSymbolizerEqualityComparer<T> : SymbolizerEqualityComparer<T>
-        where T: PointSymbolizer
+        where T : PointSymbolizer
     {
         public override bool Equals(T lhs, T rhs)
         {
@@ -87,7 +87,7 @@ public override bool Equals(CharacterPointSymbolizer lhs, CharacterPointSymboliz
 
             if (lhs.HaloBrush != null)
             {
-                if (((SolidBrush) lhs.HaloBrush).Color != ((SolidBrush) rhs.HaloBrush).Color)
+                if (((SolidBrush)lhs.HaloBrush).Color != ((SolidBrush)rhs.HaloBrush).Color)
                     return false;
             }
 
diff --git a/UnitTests/Serialization/ThemeTest.cs b/UnitTests/Serialization/ThemeTest.cs
index b9346e6a..4d6022c4 100644
--- a/UnitTests/Serialization/ThemeTest.cs
+++ b/UnitTests/Serialization/ThemeTest.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
+using NUnit.Framework;
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
+using System;
+using System.Collections.Generic;
 
 namespace UnitTests.Serialization
 {
@@ -18,16 +18,16 @@ private static Dictionary<T, IStyle> CreateStylesDictionary<T>(IEnumerable<T> it
 
             return res;
         }
-        
+
         [Test]
         public void TestUniqueValueThemeInt()
         {
             var ds = VectorStyle.CreateRandomLinealStyle();
-            
-            var tS = new UniqueValuesTheme<int>("Attribute", CreateStylesDictionary(new[] {1, 2, 3, 4}), ds);
+
+            var tS = new UniqueValuesTheme<int>("Attribute", CreateStylesDictionary(new[] { 1, 2, 3, 4 }), ds);
             UniqueValuesTheme<int> tD = null;
             Assert.DoesNotThrow(() => tD = SandD(tS, GetFormatter()));
-            
+
             Assert.IsNotNull(tD, "Desrialization returned null");
 
             TestUniqueValuesThemesEqual(tS, tD);
@@ -65,7 +65,7 @@ public void TestUniqueValueThemeString()
         [Test]
         public void TestGradientTheme()
         {
-            var tS = new GradientTheme("AttributeName", 10, 50, 
+            var tS = new GradientTheme("AttributeName", 10, 50,
                 VectorStyle.CreateRandomLinealStyle(),
                 VectorStyle.CreateRandomLinealStyle());
             GradientTheme tD = null;
@@ -74,9 +74,9 @@ public void TestGradientTheme()
 
             Assert.AreEqual(tS.ColumnName, tD.ColumnName);
             Assert.AreEqual(tS.Min, tD.Min, "Min");
-            StylesTest.AreVectorStylesEqual((VectorStyle) tS.MinStyle, (VectorStyle) tS.MinStyle);
+            StylesTest.AreVectorStylesEqual((VectorStyle)tS.MinStyle, (VectorStyle)tS.MinStyle);
             Assert.AreEqual(tS.Max, tD.Max, "Max");
-            StylesTest.AreVectorStylesEqual((VectorStyle) tS.MaxStyle, (VectorStyle) tD.MaxStyle);
+            StylesTest.AreVectorStylesEqual((VectorStyle)tS.MaxStyle, (VectorStyle)tD.MaxStyle);
         }
 
         private static void TestUniqueValuesThemesEqual<T>(UniqueValuesTheme<T> lhs, UniqueValuesTheme<T> rhs)
@@ -88,7 +88,7 @@ private static void TestUniqueValuesThemesEqual<T>(UniqueValuesTheme<T> lhs, Uni
             for (var i = 0; i < uvS.Length; i++)
                 Assert.AreEqual(uvS[i], uvD[i], "Unique values differ at index {0} [{1}:{2}]", i, uvS[i], uvD[i]);
 
-            Assert.IsTrue(StylesTest.AreVectorStylesEqual((VectorStyle)lhs.DefaultStyle, 
+            Assert.IsTrue(StylesTest.AreVectorStylesEqual((VectorStyle)lhs.DefaultStyle,
                 (VectorStyle)rhs.DefaultStyle), "DefaultStyle differs");
 
             for (var i = 0; i < uvS.Length; i++)
diff --git a/UnitTests/TestData/CreatingData.cs b/UnitTests/TestData/CreatingData.cs
index ebe7d883..7a2282e5 100644
--- a/UnitTests/TestData/CreatingData.cs
+++ b/UnitTests/TestData/CreatingData.cs
@@ -31,7 +31,7 @@ public static System.Double[] GetRandomOrdinates(System.Int32 size, System.Doubl
             return arr;
         }
 
-        
+
         /// <summary>
         /// Creates a FeatureDataTable from arrays of x, y and z components
         /// </summary>
@@ -39,7 +39,7 @@ public static System.Double[] GetRandomOrdinates(System.Int32 size, System.Doubl
         /// <param name="ycomponents">an array of doubles representing the y ordinate values</param>
         /// <param name="zcomponents">an array of doubles representing the z ordinate values</param>
         /// <returns></returns>
-        public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArrays(double[] xcomponents, 
+        public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArrays(double[] xcomponents,
                                                                  double[] ycomponents,
                                                                  double[] zcomponents)
         {
@@ -59,14 +59,14 @@ public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArra
             }
 
             var fdt = new SharpMap.Data.FeatureDataTable();
-            fdt.Columns.Add("TimeStamp", typeof (System.DateTime)); // add example timestamp attribute
+            fdt.Columns.Add("TimeStamp", typeof(System.DateTime)); // add example timestamp attribute
             for (var i = 0; i < xcomponents.Length; i++)
             {
                 SharpMap.Data.FeatureDataRow fdr = fdt.NewRow();
 
                 fdr.Geometry = factory.CreatePoint(threedee
-                                   ? new GeoAPI.Geometries.Coordinate(xcomponents[i], ycomponents[i], zcomponents[i])
-                                   : new GeoAPI.Geometries.Coordinate(xcomponents[i], ycomponents[i]));
+                                   ? new NetTopologySuite.Geometries.CoordinateZ(xcomponents[i], ycomponents[i], zcomponents[i])
+                                   : new NetTopologySuite.Geometries.Coordinate(xcomponents[i], ycomponents[i]));
 
                 fdr["TimeStamp"] = System.DateTime.Now; //set the timestamp property
                 fdt.AddRow(fdr);
@@ -78,48 +78,48 @@ public static SharpMap.Data.FeatureDataTable CreatePointFeatureDataTableFromArra
 
     public static class ShapeFactory
     {
-        public static GeoAPI.Geometries.ILinearRing CreateRectangle(GeoAPI.Geometries.IGeometryFactory factory, 
-            GeoAPI.Geometries.Coordinate leftTop, GeoAPI.Geometries.Coordinate rightBottom)
+        public static NetTopologySuite.Geometries.LinearRing CreateRectangle(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate leftTop, NetTopologySuite.Geometries.Coordinate rightBottom)
         {
             var pts = new[]
                             {
-                                leftTop, 
-                                new GeoAPI.Geometries.Coordinate(rightBottom.X, leftTop.Y), 
+                                leftTop,
+                                new NetTopologySuite.Geometries.Coordinate(rightBottom.X, leftTop.Y),
                                 rightBottom,
-                                new GeoAPI.Geometries.Coordinate(leftTop.X, rightBottom.Y), 
+                                new NetTopologySuite.Geometries.Coordinate(leftTop.X, rightBottom.Y),
                                 leftTop
                             };
             return factory.CreateLinearRing(pts);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateRectangle(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size)
+        public static NetTopologySuite.Geometries.LinearRing CreateRectangle(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size)
         {
             var wh = new System.Drawing.SizeF(size.Width * 0.5f, size.Height * 0.5f);
-            var lt = new GeoAPI.Geometries.Coordinate(center.X - wh.Width, center.Y + wh.Height);
-            var rb = new GeoAPI.Geometries.Coordinate(center.X + wh.Width, center.Y - wh.Height);
+            var lt = new NetTopologySuite.Geometries.Coordinate(center.X - wh.Width, center.Y + wh.Height);
+            var rb = new NetTopologySuite.Geometries.Coordinate(center.X + wh.Width, center.Y - wh.Height);
 
             return CreateRectangle(factory, lt, rb);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size)
+        public static NetTopologySuite.Geometries.LinearRing CreateEllipse(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size)
         {
             return CreateEllipse(factory, center, size, 12);
         }
 
-        public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeometryFactory factory,
-            GeoAPI.Geometries.Coordinate center, System.Drawing.SizeF size, int segmentsPerQuadrant)
+        public static NetTopologySuite.Geometries.LinearRing CreateEllipse(NetTopologySuite.Geometries.GeometryFactory factory,
+            NetTopologySuite.Geometries.Coordinate center, System.Drawing.SizeF size, int segmentsPerQuadrant)
         {
             const double piHalf = System.Math.PI * 0.5d;
 
             var step = piHalf / segmentsPerQuadrant;
 
-            var pts = new GeoAPI.Geometries.Coordinate[4 * segmentsPerQuadrant + 1];
+            var pts = new NetTopologySuite.Geometries.Coordinate[4 * segmentsPerQuadrant + 1];
             var angle = 0d;
             for (var i = 0; i < 4 * segmentsPerQuadrant; i++)
             {
-                pts[i] = new GeoAPI.Geometries.Coordinate(center.X + System.Math.Cos(angle) * size.Width,
+                pts[i] = new NetTopologySuite.Geometries.Coordinate(center.X + System.Math.Cos(angle) * size.Width,
                                                           center.Y + System.Math.Sin(angle) * size.Height);
                 angle += step;
             }
@@ -130,17 +130,17 @@ public static GeoAPI.Geometries.ILinearRing CreateEllipse(GeoAPI.Geometries.IGeo
 
     public class TestShapeFactory
     {
-        public static readonly GeoAPI.Geometries.IGeometryFactory Factory =
+        public static readonly NetTopologySuite.Geometries.GeometryFactory Factory =
             new NetTopologySuite.Geometries.GeometryFactory(new NetTopologySuite.Geometries.PrecisionModel(0.01));
-        
+
         [NUnit.Framework.Test]
         public void TestRectangle()
         {
-            var rect = ShapeFactory.CreateRectangle(Factory, new GeoAPI.Geometries.Coordinate(1, 2), new GeoAPI.Geometries.Coordinate(2, 1));
+            var rect = ShapeFactory.CreateRectangle(Factory, new NetTopologySuite.Geometries.Coordinate(1, 2), new NetTopologySuite.Geometries.Coordinate(2, 1));
             NUnit.Framework.Assert.AreEqual(rect.StartPoint, rect.EndPoint);
             NUnit.Framework.Assert.AreEqual(4, rect.Length);
 
-            var rect2 = ShapeFactory.CreateRectangle(Factory, new GeoAPI.Geometries.Coordinate(1.5, 1.5), new System.Drawing.SizeF(1f, 1f));
+            var rect2 = ShapeFactory.CreateRectangle(Factory, new NetTopologySuite.Geometries.Coordinate(1.5, 1.5), new System.Drawing.SizeF(1f, 1f));
             NUnit.Framework.Assert.AreEqual(rect, rect2);
 
             NUnit.Framework.Assert.AreEqual("LINEARRING (1 2, 2 2, 2 1, 1 1, 1 2)", rect.ToString());
@@ -148,13 +148,13 @@ public void TestRectangle()
         [NUnit.Framework.Test]
         public void TestEllipse()
         {
-            var ell = ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1), 1);
+            var ell = ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1), 1);
             NUnit.Framework.Assert.AreEqual(ell.StartPoint, ell.EndPoint);
             NUnit.Framework.Assert.LessOrEqual(System.Math.Abs(4 * System.Math.Sqrt(2) - ell.Length), 0.00001d);
 
 
             NUnit.Framework.Assert.AreEqual("LINEARRING (2 1, 1 2, 0 1, 1 0, 2 1)", ell.ToString());
-            var ell2 = ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1));
+            var ell2 = ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(1, 1), new System.Drawing.SizeF(1, 1));
             System.Diagnostics.Trace.WriteLine(ell2.ToString());
         }
 
@@ -166,17 +166,17 @@ public void TestLayer()
                 new[]
                     {
                         Factory.CreatePolygon(
-                            ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(0, 0),
+                            ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(0, 0),
                                                        new System.Drawing.SizeF(40, 30)),
                             new[]
                                 {
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(90, 55),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(90, 55),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(77, 24),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(77, 24),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(-80, 41),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(-80, 41),
                                                                new System.Drawing.SizeF(40, 30)),
-                                    ShapeFactory.CreateEllipse(Factory, new GeoAPI.Geometries.Coordinate(-45, -36),
+                                    ShapeFactory.CreateEllipse(Factory, new NetTopologySuite.Geometries.Coordinate(-45, -36),
                                                                new System.Drawing.SizeF(40, 30)),
                                 })
                     });
diff --git a/UnitTests/TestUtility.cs b/UnitTests/TestUtility.cs
index 00585710..ca7f3038 100644
--- a/UnitTests/TestUtility.cs
+++ b/UnitTests/TestUtility.cs
@@ -1,5 +1,5 @@
-using System.IO;
-using NUnit.Framework;
+using NUnit.Framework;
+using System.IO;
 
 namespace UnitTests
 {
diff --git a/UnitTests/TestWmsCapabilityParser.cs b/UnitTests/TestWmsCapabilityParser.cs
index aceaf38a..e650a2f6 100644
--- a/UnitTests/TestWmsCapabilityParser.cs
+++ b/UnitTests/TestWmsCapabilityParser.cs
@@ -1,7 +1,7 @@
-using System;
 using NUnit.Framework;
 using SharpMap.Layers;
 using SharpMap.Web.Wms;
+using System;
 
 namespace UnitTests
 {
@@ -13,7 +13,7 @@ public class TestWmsCapabilityParser
         public void AddLayerFail()
         {
             WmsLayer layer = new WmsLayer("wms", "http://wms.iter.dk/example_capabilities_1_3_0.xml");
-            Assert.Throws<ArgumentException>(() => layer.AddLayer("NonExistingLayer") );
+            Assert.Throws<ArgumentException>(() => layer.AddLayer("NonExistingLayer"));
         }
 
         [Test]
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index 0b6293ef..6d9bec9e 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -24,22 +24,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BruTile.MbTiles" Version="2.1.2" />
-        <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-        <PackageReference Include="Npgsql" Version="4.0.10" />
-        <PackageReference Include="NUnit" Version="3.12.0" />
-        <PackageReference Include="Moq" Version="4.2.1312.1319" />
-        <PackageReference Include="NetTopologySuite" Version="1.15.3" />
-        <PackageReference Include="NetTopologySuite.Features" Version="1.15.1" />
-        <PackageReference Include="NetTopologySuite.IO.PostGis" Version="1.15.1" />
-        <PackageReference Include="NetTopologySuite.IO.GeoJson" Version="1.15.5" />
-        <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+        <PackageReference Include="BruTile.MbTiles" Version="3.1.3" />
+        <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="2.0.4" />
+        <PackageReference Include="Npgsql" Version="6.0.6" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="Moq" Version="4.18.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="ProjNet4GeoAPI" Version="1.4.1" />
-        <PackageReference Include="System.Reactive.Core" Version="4.2" />
-        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.112" />
+        <PackageReference Include="System.Reactive.Core" Version="5.0.0" />
+        <PackageReference Include="System.Data.SQLite.Core" Version="1.0.116" />
+        <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -56,7 +52,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(Configuration)' != 'ReleaseLinux' ">
-        <PackageReference Include="GDAL.Native" Version="2.4.2" />
+        <PackageReference Include="GDAL.Native" Version="3.5.0" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(Configuration)' != 'ReleaseLinux' ">
@@ -90,6 +86,9 @@
       <EmbeddedResource Include="Layers\wms.atlantedesertificazione.xml" />
       <EmbeddedResource Include="Resources\Women.png" />
     </ItemGroup>
+    <ItemGroup>
+      <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    </ItemGroup>
 
     <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(Configuration)' == 'ReleaseLinux' ">
         <ItemGroup>
diff --git a/UnitTests/UnitTestsFixture.cs b/UnitTests/UnitTestsFixture.cs
index 4d9c8c62..eb935751 100644
--- a/UnitTests/UnitTestsFixture.cs
+++ b/UnitTests/UnitTestsFixture.cs
@@ -1,32 +1,30 @@
-using System;
+using SharpMap.CoordinateSystems;
 
 namespace UnitTests
 {
-    [NUnit.Framework.SetUpFixture]
     public class UnitTestsFixture
     {
         private System.Diagnostics.Stopwatch _stopWatch;
-        private const string ImageBase = "Images"; 
-        
+        private const string ImageBase = "Images";
+
         [NUnit.Framework.OneTimeSetUp]
         public void RunBeforeAnyTests()
         {
-            var gss = new NetTopologySuite.NtsGeometryServices();
-            var css = new SharpMap.CoordinateSystems.CoordinateSystemServices(
+            var gss = NetTopologySuite.NtsGeometryServices.Instance;
+            var css = new CoordinateSystemServices(
                 new ProjNet.CoordinateSystems.CoordinateSystemFactory(),
                 new ProjNet.CoordinateSystems.Transformations.CoordinateTransformationFactory(),
                 SharpMap.Converters.WellKnownText.SpatialReference.GetAllReferenceSystems());
 
-            GeoAPI.GeometryServiceProvider.Instance = gss;
             SharpMap.Session.Instance
                 .SetGeometryServices(gss)
                 .SetCoordinateSystemServices(css)
                 .SetCoordinateSystemRepository(css);
 
             // plug-in WebMercator so that correct spherical definition is directly available to Layer Transformations using SRID
-            var pcs = (ProjNet.CoordinateSystems.ProjectedCoordinateSystem)ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator;
-            css.AddCoordinateSystem((int)pcs.AuthorityCode, pcs);
-           
+            var pcs = ProjNet.CoordinateSystems.ProjectedCoordinateSystem.WebMercator;
+            ((ICoordinateSystemRepository)css).AddCoordinateSystem((int)pcs.AuthorityCode, pcs);
+
             _stopWatch = new System.Diagnostics.Stopwatch();
             System.Diagnostics.Trace.WriteLine("Starting tests");
             _stopWatch.Start();
diff --git a/UnitTests/WFS/RequestValidationTest.cs b/UnitTests/WFS/RequestValidationTest.cs
index 52e8f278..863c1517 100644
--- a/UnitTests/WFS/RequestValidationTest.cs
+++ b/UnitTests/WFS/RequestValidationTest.cs
@@ -1,13 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using NUnit.Framework;
+using SharpMap.Utilities.Wfs;
+using System;
+using System.Collections.Specialized;
 using System.IO;
-using System.Xml.Schema;
 using System.Xml;
-using System.Collections.Specialized;
-using NUnit.Framework;
-using SharpMap.Utilities.Wfs;
+using System.Xml.Schema;
 
 namespace UnitTests.WFS
 {
@@ -15,19 +12,13 @@ namespace UnitTests.WFS
     [Ignore("Tests disabled because they download external schemas from the internet")]
     public class RequestValidationTest
     {
-        [OneTimeSetUp]
-        public void OneTimeSetUp()
-        {
-            GeoAPI.GeometryServiceProvider.Instance = new NetTopologySuite.NtsGeometryServices();
-        }
-
         [Test]
         public void TestGETFilter1_1_0()
         {
             var featureTypeInfo = new WfsFeatureTypeInfo("http://localhost/", "nsPrefix", "featureTypeNamespace", "featureType", "geometryName", GeometryTypeEnum.PointPropertyType);
 
             WFS_1_1_0_TextResources wfs = new WFS_1_1_0_TextResources();
-            string querystring = wfs.GetFeatureGETRequest(featureTypeInfo, new GeoAPI.Geometries.Envelope(1, 2, 3, 4), null, true);
+            string querystring = wfs.GetFeatureGETRequest(featureTypeInfo, new NetTopologySuite.Geometries.Envelope(1, 2, 3, 4), null, true);
 
             NameValueCollection qscoll = ParseQueryString(querystring);
 
@@ -38,7 +29,7 @@ public void TestGETFilter1_1_0()
             readerSettings.ValidationEventHandler += new ValidationEventHandler(ValidationEventHandler);
 
             MemoryStream ms = new MemoryStream(System.Text.Encoding.UTF8.GetBytes(qscoll["FILTER"]));
-            
+
             XmlTextReader xmlReader = new XmlTextReader(ms);
             XmlReader objXmlReader = XmlReader.Create(xmlReader, readerSettings);
             while (objXmlReader.Read()) { }
@@ -50,7 +41,7 @@ public void TestPOSTFilter1_1_0()
             var featureTypeInfo = new WfsFeatureTypeInfo("http://localhost/", "nsPrefix", "featureTypeNamespace", "featureType", "geometryName", GeometryTypeEnum.PointPropertyType);
 
             WFS_1_1_0_TextResources wfs = new WFS_1_1_0_TextResources();
-            byte[] request = wfs.GetFeaturePOSTRequest(featureTypeInfo, "", new GeoAPI.Geometries.Envelope(1, 2, 3, 4), null, true);
+            byte[] request = wfs.GetFeaturePOSTRequest(featureTypeInfo, "", new NetTopologySuite.Geometries.Envelope(1, 2, 3, 4), null, true);
 
             XmlReaderSettings readerSettings = new XmlReaderSettings();
             readerSettings.ValidationType = ValidationType.Schema;
diff --git a/UnitTests/WMS/Encoding.cs b/UnitTests/WMS/Encoding.cs
index 28ea35d7..241379c0 100644
--- a/UnitTests/WMS/Encoding.cs
+++ b/UnitTests/WMS/Encoding.cs
@@ -1,6 +1,6 @@
-using System;
+using NUnit.Framework;
+using System;
 using System.Drawing;
-using NUnit.Framework;
 
 namespace UnitTests.WMS
 {
@@ -38,6 +38,6 @@ private static void TestUrlColorEncoding(Color color)
             Assert.IsTrue(string.Compare(urlEncode, escapeDataString, StringComparison.InvariantCultureIgnoreCase) == 0);
         }
 
-        
+
     }
 }
diff --git a/UnitTests/app.config b/UnitTests/app.config
index 71cd046a..f534c268 100644
--- a/UnitTests/app.config
+++ b/UnitTests/app.config
@@ -35,12 +35,16 @@
     <runtime>
         <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
             <dependentAssembly>
-              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-              <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
             </dependentAssembly>
             <dependentAssembly>
-                <assemblyIdentity name="NetTopologySuite" publicKeyToken="f580a05016ebada1" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.15.3.0" newVersion="1.15.3.0" />
+                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
+            </dependentAssembly>
+            <dependentAssembly>
+                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
             </dependentAssembly>
         </assemblyBinding>
     </runtime>