Modernized codebase and added build action.

itinero · Apr 25, 2024 · 96279cc · 96279cc
1 parent bc511be
commit 96279cc
Show file tree

Hide file tree

Showing 17 changed files with 101 additions and 61 deletions.
diff --git a/.github/workflows/build-and-package.yml b/.github/workflows/build-and-package.yml
@@ -0,0 +1,38 @@
+name: .NET Core
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build-and-test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: 'true'
+    - name: Setup .NET Core 6.
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore packages.
+      run: dotnet restore
+    - name: Build all projects.
+      run: dotnet build --configuration Release --no-restore
+
+    - name: Unittests.
+      run: dotnet test
+      working-directory: ./test/OpenLR.Test/
+
+    - name: Nuget Pack
+      run: dotnet pack -c release
+      working-directory: ./src/OpenLR/
+    - name: Nuget Pack
+      run: dotnet pack -c release
+      working-directory: ./src/OpenLR.Geo/
+
+    # - name: Nuget push
+    #   run: dotnet nuget push **/*.nupkg --skip-duplicate -k ${{ secrets.NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
+    #   working-directory: ./src/
diff --git a/OpenLR.Common.props b/OpenLR.Common.props
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+
+    <!--- Package information, Version -->
+    <PropertyGroup>
+        <PackageVersion>1.1.1-pre11=2</PackageVersion>
+        <NeutralLanguage>en</NeutralLanguage>
+        <Description>OpenLR library for .NET.</Description>
+        <Copyright>Itinero BV</Copyright>
+        <PackageProjectUrl>https://github.com/Itinero/OpenLR</PackageProjectUrl>
+        <PackageLicenseUrl>https://github.com/itinero/OpenLR/blob/develop/LICENSE.md</PackageLicenseUrl>
+        <PackageIconUrl>http://www.itinero.tech/logos/openlr_logo64.png</PackageIconUrl>
+        <RepositoryUrl>https://github.com/Itinero/OpenLR</RepositoryUrl>
+        <PackageTags>openlr, routing</PackageTags>
+        <RepositoryType>git</RepositoryType>
+        <Authors>Itinero Contributors</Authors>
+        <Company>Itinero BV</Company>
+    </PropertyGroup>
+</Project>
diff --git a/OpenLR.sln b/OpenLR.sln
@@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		LICENSE.md = LICENSE.md
 		README.md = README.md
-		SharedAssemblyVersion.cs = SharedAssemblyVersion.cs
+		OpenLR.Common.props = OpenLR.Common.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{082AB082-0910-4B42-AC57-330BE7C57771}"

diff --git a/SharedAssemblyVersion.cs b/SharedAssemblyVersion.cs
diff --git a/src/OpenLR.Geo/NtsExtensions.cs b/src/OpenLR.Geo/NtsExtensions.cs
@@ -20,7 +20,6 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using GeoAPI.Geometries;
 using Itinero;
 using Itinero.Attributes;
 using Itinero.Data.Network;
@@ -207,18 +206,18 @@ public static FeatureCollection ToFeatures(this OpenLR.Model.Locations.PointAlon
             var features = new FeatureCollection();
 
             var first = location.First.ToFeature();
-            first.Attributes.AddAttribute("positive_offset_percentage", location.PositiveOffsetPercentage == null ? string.Empty :
+            first.Attributes.Add("positive_offset_percentage", location.PositiveOffsetPercentage == null ? string.Empty :
                 location.PositiveOffsetPercentage.ToInvariantString());
-            first.Attributes.AddAttribute("orientation", location.Orientation == null ? string.Empty :
+            first.Attributes.Add("orientation", location.Orientation == null ? string.Empty :
                 location.Orientation.ToInvariantString());
-            first.Attributes.AddAttribute("side_of_road", location.SideOfRoad == null ? string.Empty : 
+            first.Attributes.Add("side_of_road", location.SideOfRoad == null ? string.Empty : 
                 location.SideOfRoad.ToInvariantString());
-            first.Attributes.AddAttribute("type", "first");
+            first.Attributes.Add("type", "first");
             features.Add(first);
             var last = location.Last.ToFeature();
-            last.Attributes.AddAttribute("negative_offset_percentage", location.NegativeOffsetPercentage == null ? string.Empty :
+            last.Attributes.Add("negative_offset_percentage", location.NegativeOffsetPercentage == null ? string.Empty :
                 location.NegativeOffsetPercentage.ToInvariantString());
-            last.Attributes.AddAttribute("type", "last");
+            last.Attributes.Add("type", "last");
             features.Add(last);
 
             return features;

diff --git a/src/OpenLR.Geo/OpenLR.Geo.csproj b/src/OpenLR.Geo/OpenLR.Geo.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../OpenLR.Common.props" />
+
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>OpenLR.Geo</AssemblyName>
     <PackageId>OpenLR.Geo</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -9,22 +11,14 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <LangVersion>default</LangVersion>
-    <PackageVersion />
     <Title>OpenLR.Geo</Title>
-    <Authors>Itinero BV</Authors>
-    <Description>OpenLR library for .NET.</Description>
-    <Copyright>Itinero BV</Copyright>
-    <PackageProjectUrl>https://github.com/Itinero/OpenLR</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/itinero/OpenLR/blob/develop/LICENSE.md</PackageLicenseUrl>
-    <PackageIconUrl>http://www.itinero.tech/logos/openlr_logo64.png</PackageIconUrl>
-    <RepositoryUrl>https://github.com/Itinero/OpenLR</RepositoryUrl>
     <PackageTags>openlr, routing, NTS</PackageTags>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenLR\OpenLR.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Itinero.Geo" Version="1.6.0-pre025" />
+    <PackageReference Include="Itinero.Geo" Version="1.6.0-pre037" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />

diff --git a/src/OpenLR/LocationExtensions.cs b/src/OpenLR/LocationExtensions.cs
@@ -381,7 +381,7 @@ public static void AdjustToValidPoints(this ReferencedLine line, Coder coder)
             { // already valid.
                 return;
             }
-            if (line.Vertices.Length > 2) { return; } // line was already adjusted.
+            // if (line.Vertices.Length > 2) { return; } // line was already adjusted.
 
             var vertex1 = line.Vertices[0];
             var vertex2 = line.Vertices[1];

diff --git a/src/OpenLR/OpenLR.csproj b/src/OpenLR/OpenLR.csproj
@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="../../OpenLR.Common.props" />
+
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>OpenLR</AssemblyName>
     <PackageId>OpenLR</PackageId>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -9,23 +11,12 @@
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <LangVersion>default</LangVersion>
-    <PackageVersion />
     <Title>OpenLR</Title>
-    <Description>OpenLR library for .NET.</Description>
-    <Copyright>Itinero BV</Copyright>
-    <PackageProjectUrl>https://github.com/Itinero/OpenLR</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/itinero/OpenLR/blob/develop/LICENSE.md</PackageLicenseUrl>
-    <PackageIconUrl>http://www.itinero.tech/logos/openlr_logo64.png</PackageIconUrl>
-    <RepositoryUrl>https://github.com/Itinero/OpenLR</RepositoryUrl>
-    <PackageTags>openlr, routing</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyVersion.cs" Link="Properties\SharedAssemblyVersion.cs" />
+    <PackageReference Include="Itinero" Version="1.6.0-pre037" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Itinero" Version="1.6.0-pre025" />
-  </ItemGroup>
 </Project>
diff --git a/test/OpenLR.Test.Functional/Download.cs b/test/OpenLR.Test.Functional/Download.cs
@@ -31,7 +31,7 @@ namespace OpenLR.Test.Functional
 {
     public static class Download
     {
-        public static string NetherlandsPbf = "http://files.itinero.tech/data/OSM/planet/europe/netherlands-latest.osm.pbf";
+        public static string NetherlandsPbf = "http://planet.anyways.eu/planet/europe/netherlands/netherlands-latest.osm.pbf";
 
         /// <summary>
         /// Downloads all test-data.

diff --git a/test/OpenLR.Test.Functional/Extensions.cs b/test/OpenLR.Test.Functional/Extensions.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Coordinate = Itinero.LocalGeo.Coordinate;
 
 namespace OpenLR.Test.Functional
 {
@@ -58,7 +59,7 @@ public static Tuple<Coordinate, IAttributesTable>[] PointsFromGeoJsonFile(string
         {
             var coordinates = new List<Tuple<Coordinate, IAttributesTable>>();
             var features = FromGeoJsonFile(geoJsonFile);
-            foreach(var feature in features.Features)
+            foreach(var feature in features)
             {
                 if (feature.Geometry is Point)
                 {

diff --git a/test/OpenLR.Test.Functional/NWB/Netherlands.cs b/test/OpenLR.Test.Functional/NWB/Netherlands.cs
@@ -87,7 +87,7 @@ public static void TestAll(RouterDb routerDb)
         public static void TestEncodeDecodeRoutes(RouterDb routerDb)
         {
             var coder = new Coder(routerDb, new NWBCoderProfile(routerDb.GetSupportedVehicle("nwb.car")));
-            var features = Extensions.FromGeoJsonFile(Path.Combine(".", "Data", "line_locations.geojson")).Features.ToList();
+            var features = Extensions.FromGeoJsonFile(Path.Combine(".", "Data", "line_locations.geojson")).ToList();
 
             for (var i = 0; i < features.Count; i++)
             {

diff --git a/test/OpenLR.Test.Functional/OpenLR.Test.Functional.csproj b/test/OpenLR.Test.Functional/OpenLR.Test.Functional.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>OpenLR.Test.Functional</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>OpenLR.Test.Functional</PackageId>
@@ -39,9 +39,9 @@
     <ProjectReference Include="..\..\src\OpenLR\OpenLR.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Itinero.IO.Osm" Version="1.6.0-pre025" />
-    <PackageReference Include="Itinero.IO.Shape" Version="1.6.0-pre025" />
-    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="1.15.5" />
+    <PackageReference Include="Itinero.IO.Osm" Version="1.6.0-pre036" />
+    <PackageReference Include="Itinero.IO.Shape" Version="1.6.0-pre036" />
+    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="Serilog">
       <Version>2.9.0</Version>

diff --git a/test/OpenLR.Test.Functional/Osm/Netherlands.cs b/test/OpenLR.Test.Functional/Osm/Netherlands.cs
@@ -92,7 +92,7 @@ public static void TestEncodeDecodeRoutes(RouterDb routerDb)
             var features = Extensions.FromGeoJsonFile(Path.Combine(".", "Data", "line_locations.geojson"));
 
             var i = 0;
-            foreach (var feature in features.Features)
+            foreach (var feature in features)
             {
                 var points = new List<Coordinate>();
                 var coordinates = (feature.Geometry as NetTopologySuite.Geometries.LineString).Coordinates;
@@ -102,7 +102,7 @@ public static void TestEncodeDecodeRoutes(RouterDb routerDb)
                     points.Add(new Coordinate((float)c.Y, (float)c.X));
                 }
 
-                Log.Logger.Verbose($"Testing line location {i + 1}/{features.Features.Count}" +
+                Log.Logger.Verbose($"Testing line location {i + 1}/{features.Count}" +
                                    $" @ {points[0].ToInvariantString()}->{points[1].ToInvariantString()}");
                 TestEncodeDecoderRoute(coder, points.ToArray());
 

diff --git a/test/OpenLR.Test/AssertGeo.cs b/test/OpenLR.Test/AssertGeo.cs
@@ -20,8 +20,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-using GeoAPI.Geometries;
 using NetTopologySuite.Algorithm.Distance;
+using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 using NUnit.Framework;
 
@@ -38,11 +38,11 @@ public static class AssertGeo
         /// <param name="expected"></param>
         /// <param name="actual"></param>
         /// <param name="delta"></param>
-        public static void AreEqual(IGeometry expected, IGeometry actual, double delta)
+        public static void AreEqual(Geometry expected, Geometry actual, double delta)
         {
-            if(expected is ILineString && actual is ILineString)
+            if(expected is LineString && actual is LineString)
             {
-                AssertGeo.AreEqual(expected as ILineString, actual as ILineString, delta);
+                AssertGeo.AreEqual(expected as LineString, actual as LineString, delta);
             }
             //else if (expected is ILineString && actual is ILineString)
             //{
@@ -56,7 +56,7 @@ public static void AreEqual(IGeometry expected, IGeometry actual, double delta)
         /// <param name="expected"></param>
         /// <param name="actual"></param>
         /// <param name="delta"></param>
-        public static void AreEqual(ILineString expected, ILineString actual, double delta)
+        public static void AreEqual(LineString expected, LineString actual, double delta)
         {
             var distance = new PointPairDistance();
             foreach(Coordinate actualCoordinate in actual.Coordinates)
@@ -79,8 +79,8 @@ public static void AreEqual(ILineString expected, ILineString actual, double del
         public static void AreEqual(string geoJsonActual, string geoJson, double delta)
         {
             var geoJsonReader = new GeoJsonReader();
-            var actual = geoJsonReader.Read<IGeometry>(geoJsonActual);
-            var expected = geoJsonReader.Read<IGeometry>(geoJson);
+            var actual = geoJsonReader.Read<Geometry>(geoJsonActual);
+            var expected = geoJsonReader.Read<Geometry>(geoJson);
 
             AssertGeo.AreEqual(actual, expected, delta);
         }

diff --git a/test/OpenLR.Test/Extensions.cs b/test/OpenLR.Test/Extensions.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Coordinate = Itinero.LocalGeo.Coordinate;
 
 namespace OpenLR.Test
 {
@@ -58,7 +59,7 @@ public static Tuple<Coordinate, IAttributesTable>[] PointsFromGeoJsonFile(string
         {
             var coordinates = new List<Tuple<Coordinate, IAttributesTable>>();
             var features = FromGeoJsonFile(geoJsonFile);
-            foreach(var feature in features.Features)
+            foreach(var feature in features)
             {
                 if (feature.Geometry is Point)
                 {

diff --git a/test/OpenLR.Test/OpenLR.Test.csproj b/test/OpenLR.Test/OpenLR.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>OpenLR.Test</AssemblyName>
     <PackageId>OpenLR.Test</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -22,10 +22,10 @@
     <EmbeddedResource Include="test-data\networks\network3.geojson" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="1.15.5" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
+    <PackageReference Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System.Xml" />

diff --git a/test/OpenLR.Test/TestNetworkBuilder.cs b/test/OpenLR.Test/TestNetworkBuilder.cs
@@ -29,6 +29,7 @@
 using Itinero.Geo;
 using Itinero.Data.Network.Restrictions;
 using Itinero;
+using Coordinate = Itinero.LocalGeo.Coordinate;
 
 namespace OpenLR.Test
 {
@@ -58,7 +59,7 @@ public static void LoadTestNetwork(this RouterDb db, string geoJson)
             var geoJsonReader = new NetTopologySuite.IO.GeoJsonReader();
             var features = geoJsonReader.Read<FeatureCollection>(geoJson);
 
-            foreach (var feature in features.Features)
+            foreach (var feature in features)
             {
                 if (feature.Geometry is Point)
                 {
@@ -74,7 +75,7 @@ public static void LoadTestNetwork(this RouterDb db, string geoJson)
                 }
             }
 
-            foreach (var feature in features.Features)
+            foreach (var feature in features)
             {
                 if (feature.Geometry is LineString)
                 {
@@ -138,7 +139,7 @@ public static void LoadTestNetwork(this RouterDb db, string geoJson)
                 }
             }
 
-            foreach (var feature in features.Features)
+            foreach (var feature in features)
             {
                 if (feature.Geometry is LineString &&
                     feature.Attributes.Contains("restriction", "yes"))