Updated to NTS 2.0 and removed use of GeoAPI where required. Also Fixed 4 Bugs and Fixed most of the Unit Tests

Itinero.sln

@@ -1,20 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4B330D21-2EE5-4C34-B716-0DB1FBC58E29}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C142786B-F60E-4B6B-B9F2-1D25C3A3D7B5}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
+		build.sh = build.sh
 		CONTRIBUTING.md = CONTRIBUTING.md
 		LICENSE.md = LICENSE.md
 		NOTICE.md = NOTICE.md
 		README.md = README.md
 		SharedAssemblyVersion.cs = SharedAssemblyVersion.cs
 		test.sh = test.sh
-		build.sh = build.sh
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{7E594B3F-4CA9-4198-B90D-DD16972D0481}"
@@ -47,13 +47,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Itinero.Test", "test\Itiner
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Itinero.Test.Functional", "test\Itinero.Test.Functional\Itinero.Test.Functional.csproj", "{9D719B37-42DD-486A-9FFC-CD8B0230D114}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Itinero.Geo", "src\Itinero.Geo\Itinero.Geo.csproj", "{87E5FF87-E75F-4462-937F-538AB570EE1F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Itinero.Geo", "src\Itinero.Geo\Itinero.Geo.csproj", "{87E5FF87-E75F-4462-937F-538AB570EE1F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Itinero.IO.Shape", "src\Itinero.IO.Shape\Itinero.IO.Shape.csproj", "{C18E5106-ECC6-4C7B-A611-7D8514B0D3BD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Itinero.IO.Shape", "src\Itinero.IO.Shape\Itinero.IO.Shape.csproj", "{C18E5106-ECC6-4C7B-A611-7D8514B0D3BD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.Shape", "samples\Sample.Shape\Sample.Shape.csproj", "{EB6A7F79-3540-4E31-A1A8-3ADA0F232E67}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Shape", "samples\Sample.Shape\Sample.Shape.csproj", "{EB6A7F79-3540-4E31-A1A8-3ADA0F232E67}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample.DynamicProfiles", "samples\Sample.DynamicProfiles\Sample.DynamicProfiles.csproj", "{8DED4253-89E6-4333-9750-E830DB789B2D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.DynamicProfiles", "samples\Sample.DynamicProfiles\Sample.DynamicProfiles.csproj", "{8DED4253-89E6-4333-9750-E830DB789B2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsmSharp", "..\AmstedDigital.OperationalTwins\osmsharp\core-develop\src\OsmSharp\OsmSharp.csproj", "{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsmSharp.Geo", "..\AmstedDigital.OperationalTwins\osmsharp\core-develop\src\OsmSharp.Geo\OsmSharp.Geo.csproj", "{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -151,6 +155,22 @@ Global
 		{8DED4253-89E6-4333-9750-E830DB789B2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8DED4253-89E6-4333-9750-E830DB789B2D}.Release|x64.ActiveCfg = Release|Any CPU
 		{8DED4253-89E6-4333-9750-E830DB789B2D}.Release|x64.Build.0 = Release|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Debug|x64.Build.0 = Debug|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Release|x64.ActiveCfg = Release|Any CPU
+		{4E4348CD-2E8E-4FC9-996F-95DBFD37AE1A}.Release|x64.Build.0 = Release|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Debug|x64.Build.0 = Debug|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Release|x64.ActiveCfg = Release|Any CPU
+		{FF50E1A3-80F2-41D0-AACA-A8D7DBD34C22}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -168,9 +188,6 @@ Global
 		{EB6A7F79-3540-4E31-A1A8-3ADA0F232E67} = {77BC0AC3-41A6-4672-A3AB-9C27710756BE}
 		{8DED4253-89E6-4333-9750-E830DB789B2D} = {77BC0AC3-41A6-4672-A3AB-9C27710756BE}
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {647068E9-BC76-4E51-B225-D6BBD4689F76}
-	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B9A2B2E1-FE8E-4F87-80E2-1A3F620ED1E8}
 	EndGlobalSection

samples/Sample.Basic/Sample.Basic.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

samples/Sample.DynamicProfiles/Sample.DynamicProfiles.csproj

@@ -3,6 +3,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>netcoreapp3.1</TargetFramework>
+      <PlatformTarget>x64</PlatformTarget>
     </PropertyGroup>
 
     <ItemGroup>

samples/Sample.Elevation/Sample.Elevation.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

samples/Sample.Matrix/Sample.Matrix.csproj

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>

samples/Sample.Shape/Sample.Shape.csproj

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Itinero.IO.Shape\Itinero.IO.Shape.csproj" />

src/Itinero.Geo/Extensions.cs

@@ -29,30 +29,30 @@ public static class Extensions
         /// <summary>
         /// Converts the coordinate to a geoapi coordinate.
         /// </summary>
-        public static GeoAPI.Geometries.Coordinate ToCoordinate(this LocalGeo.Coordinate coordinate)
+        public static NetTopologySuite.Geometries.Coordinate ToCoordinate(this LocalGeo.Coordinate coordinate)
         {
-            return new GeoAPI.Geometries.Coordinate(coordinate.Longitude, coordinate.Latitude);
+            return new NetTopologySuite.Geometries.Coordinate(coordinate.Longitude, coordinate.Latitude);
         }
 
         /// <summary>
         /// Converts a geoapi coordinate to a coordinate.
         /// </summary>
-        public static LocalGeo.Coordinate FromCoordinate(this GeoAPI.Geometries.Coordinate coordinate)
+        public static LocalGeo.Coordinate FromCoordinate(this NetTopologySuite.Geometries.Coordinate coordinate)
         {
             return new LocalGeo.Coordinate((float)coordinate.Y, (float)coordinate.X);
         }
 
         /// <summary>
         /// Converts a list of coordinates to geoapi coordinates.
         /// </summary>
-        public static List<GeoAPI.Geometries.Coordinate> ToCoordinates(this List<LocalGeo.Coordinate> coordinates)
+        public static List<NetTopologySuite.Geometries.Coordinate> ToCoordinates(this List<LocalGeo.Coordinate> coordinates)
         {
             if (coordinates == null)
             {
                 return null;
             }
 
-            var geoApiCoordinates = new List<GeoAPI.Geometries.Coordinate>(coordinates.Count);
+            var geoApiCoordinates = new List<NetTopologySuite.Geometries.Coordinate>(coordinates.Count);
             for (var i = 0; i < coordinates.Count; i++)
             {
                 geoApiCoordinates.Add(coordinates[i].ToCoordinate());
@@ -63,14 +63,14 @@ public static LocalGeo.Coordinate FromCoordinate(this GeoAPI.Geometries.Coordina
         /// <summary>
         /// Converts a list of coordinates to geoapi coordinates.
         /// </summary>
-        public static GeoAPI.Geometries.Coordinate[] ToCoordinatesArray(this List<LocalGeo.Coordinate> coordinates)
+        public static NetTopologySuite.Geometries.Coordinate[] ToCoordinatesArray(this List<LocalGeo.Coordinate> coordinates)
         {
             if (coordinates == null)
             {
                 return null;
             }
 
-            var geoApiCoordinates = new GeoAPI.Geometries.Coordinate[coordinates.Count];
+            var geoApiCoordinates = new NetTopologySuite.Geometries.Coordinate[coordinates.Count];
             for (var i = 0; i < coordinates.Count; i++)
             {
                 geoApiCoordinates[i] = coordinates[i].ToCoordinate();
@@ -81,14 +81,14 @@ public static GeoAPI.Geometries.Coordinate[] ToCoordinatesArray(this List<LocalG
         /// <summary>
         /// Converts a list of coordinates to geoapi coordinates.
         /// </summary>
-        public static List<GeoAPI.Geometries.Coordinate> ToCoordinates(this LocalGeo.Coordinate[] coordinates)
+        public static List<NetTopologySuite.Geometries.Coordinate> ToCoordinates(this LocalGeo.Coordinate[] coordinates)
         {
             if (coordinates == null)
             {
                 return null;
             }
 
-            var geoApiCoordinates = new List<GeoAPI.Geometries.Coordinate>(coordinates.Length);
+            var geoApiCoordinates = new List<NetTopologySuite.Geometries.Coordinate>(coordinates.Length);
             for (var i = 0; i < coordinates.Length; i++)
             {
                 geoApiCoordinates.Add(coordinates[i].ToCoordinate());
@@ -99,14 +99,14 @@ public static GeoAPI.Geometries.Coordinate[] ToCoordinatesArray(this List<LocalG
         /// <summary>
         /// Converts an array of coordinates to an array of geoapi coordinates.
         /// </summary>
-        public static GeoAPI.Geometries.Coordinate[] ToCoordinatesArray(this LocalGeo.Coordinate[] coordinates)
+        public static NetTopologySuite.Geometries.Coordinate[] ToCoordinatesArray(this LocalGeo.Coordinate[] coordinates)
         {
             if (coordinates == null)
             {
                 return null;
             }
 
-            var geoApiCoordinates = new GeoAPI.Geometries.Coordinate[coordinates.Length];
+            var geoApiCoordinates = new NetTopologySuite.Geometries.Coordinate[coordinates.Length];
             for (var i = 0; i < coordinates.Length; i++)
             {
                 geoApiCoordinates[i] = coordinates[i].ToCoordinate();
@@ -163,10 +163,10 @@ public static NetTopologySuite.Features.FeatureCollection ToFeatureCollection(th
         /// </summary>
         public static NetTopologySuite.Geometries.LineString ToLineString(this Algorithms.Networks.Analytics.Trees.Models.TreeEdge edge)
         {
-            var coordinates = new GeoAPI.Geometries.Coordinate[edge.Shape.Length];
+            var coordinates = new NetTopologySuite.Geometries.Coordinate[edge.Shape.Length];
             for(var i = 0; i < coordinates.Length; i++)
             {
-                coordinates[i] = new GeoAPI.Geometries.Coordinate(edge.Shape[i][0], edge.Shape[i][1]);
+                coordinates[i] = new NetTopologySuite.Geometries.Coordinate(edge.Shape[i][0], edge.Shape[i][1]);
             }
             return new NetTopologySuite.Geometries.LineString(coordinates);
         }
@@ -213,7 +213,7 @@ public static NetTopologySuite.Features.FeatureCollection ToFeatures(this IEnume
         /// </summary>
         public static void Add(this NetTopologySuite.Features.FeatureCollection features, NetTopologySuite.Features.FeatureCollection featuresToAdd)
         {
-            foreach(var feature in featuresToAdd.Features)
+            foreach(var feature in featuresToAdd)
             {
                 features.Add(feature);
             }

src/Itinero.Geo/Itinero.Geo.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <AssemblyName>Itinero.Geo</AssemblyName>
     <PackageId>Itinero.Geo</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -18,10 +18,17 @@
     <PackageIconUrl>http://www.itinero.tech/logos/itinero_logo_notext.svg.128.png</PackageIconUrl>
     <RepositoryUrl>https://github.com/itinero/routing/</RepositoryUrl>
     <RepositoryType>osm, openstreetmap, routing, mapping</RepositoryType>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NetTopologySuite" Version="1.15.1" />
-    <PackageReference Include="NetTopologySuite.Features" Version="1.15.1" />
+    <PackageReference Include="NetTopologySuite.Core" Version="1.15.3" />
+    <PackageReference Include="NetTopologySuite.Features" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Itinero\Itinero.csproj" />

src/Itinero.Geo/Navigation/InstructionExtensions.cs

@@ -16,7 +16,6 @@
  *  limitations under the License.
  */
 
- using GeoAPI.Geometries;
 using NetTopologySuite.Features;
 using NetTopologySuite.Geometries;
 using Itinero.Navigation;

src/Itinero.Geo/RouteExtensions.cs

@@ -32,26 +32,27 @@ public static class RouteExtensions
         /// <summary>
         /// Returns the bounding box around this route.
         /// </summary>
-        public static GeoAPI.Geometries.Envelope GetBox(this Route route)
+        public static Envelope GetBox(this Route route)
         {
             if (route == null) { throw new ArgumentNullException("route"); }
+
             if (route.Shape  == null)
             {
                 return null;
             }
 
             if (route.Shape.Length == 1)
             {
-                return new GeoAPI.Geometries.Envelope(
-                    route.Shape[0].ToCoordinate(), route.Shape[0].ToCoordinate());
+                return new Envelope(route.Shape[0].ToCoordinate(), route.Shape[0].ToCoordinate());
             }
 
-            var envelope = new GeoAPI.Geometries.Envelope(
-                    route.Shape[0].ToCoordinate(), route.Shape[1].ToCoordinate());
-            for(var i = 2; i < route.Shape.Length; i++)
+            var envelope = new Envelope(route.Shape[0].ToCoordinate(), route.Shape[1].ToCoordinate());
+
+            for (var i = 2; i < route.Shape.Length; i++)
             {
                 envelope.ExpandToInclude(route.Shape[i].ToCoordinate());
             }
+
             return envelope;
         }
 
@@ -96,7 +97,7 @@ public static FeatureCollection ToFeatureCollection(this Route route)
                         Logging.Logger.Log("RouteExtensions", Logging.TraceEventType.Warning, 
                             "Invalid meta-data detected on route. One of the meta-description has a shape index smaller than the previous one.");
                     }
-                    var shape = new GeoAPI.Geometries.Coordinate[current.Shape - previous.Shape + 1];
+                    var shape = new Coordinate[current.Shape - previous.Shape + 1];
                     for(var s = previous.Shape; s <= current.Shape; s++)
                     {
                         if (s < 0 || s >= route.Shape.Length)
@@ -116,7 +117,7 @@ public static FeatureCollection ToFeatureCollection(this Route route)
                 for (var i = 0; i < route.Stops.Length; i++)
                 {
                     featureCollection.Add(new Feature(
-                        new Point(new GeoAPI.Geometries.Coordinate(
+                        new Point(new Coordinate(
                             route.Stops[i].Coordinate.ToCoordinate())), 
                         route.Stops[i].Attributes.ToAttributesTable()));
                 }

src/Itinero.Geo/RouterDbExtensions.cs

@@ -16,7 +16,6 @@
  *  limitations under the License.
  */
 
- using GeoAPI.Geometries;
 using NetTopologySuite.Features;
 using NetTopologySuite.Geometries;
 using Itinero.Data.Network;