itinero · xivk · Dec 18, 2017 · Dec 18, 2017 · Dec 18, 2017 · Dec 18, 2017
diff --git a/.github/workflows/build-and-package.yml b/.github/workflows/build-and-package.yml
@@ -0,0 +1,42 @@
+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 Github
+      run: dotnet nuget push **/*.nupkg --skip-duplicate -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/itinero/index.json
+      working-directory: ./src/
+
+    # - 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/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,42 @@
+name: .NET Core
+
+on:
+  push:
+    branches: [ main ]
+
+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 Github
+      run: dotnet nuget push **/*.nupkg --skip-duplicate -k ${{ secrets.GITHUB_TOKEN }} -s https://nuget.pkg.github.com/itinero/index.json
+      working-directory: ./src/
+
+    - 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/.gitignore b/.gitignore
@@ -34,5 +34,10 @@ test-results*/
 *.routerdb
 *.osm.pbf
 
+.idea
+.idea/*
+
+test/OpenLR.Test.Functional/logs/*
+
 packages/*
-!packages/repositories.config
+!packages/repositories.config
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-pre13</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
@@ -1,26 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-<<<<<<< HEAD
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-=======
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
->>>>>>> develop
+VisualStudioVersion = 15.0.27004.2009
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenLR", "src\OpenLR\OpenLR.csproj", "{EC64B4E2-6637-4BC5-8FFE-0A16049ACD04}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{684B6559-C01F-4862-BA85-F0BF7642FB77}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenLR.Geo", "src\OpenLR.Geo\OpenLR.Geo.csproj", "{A2D0D3EA-6D13-46A4-A5DD-7C181F6F00AD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{C698DA28-DCEF-4DE6-8F2E-9147E241CFE0}"
-	ProjectSection(SolutionItems) = preProject
-		nuspec\OpenLR.Geo.nuspec = nuspec\OpenLR.Geo.nuspec
-		nuspec\OpenLR.nuspec = nuspec\OpenLR.nuspec
-		nuspec\OpenLR_logo64.png = nuspec\OpenLR_logo64.png
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E9F7404A-912C-429C-AD40-E4A8E4E47D20}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenLR.Test.Functional", "test\OpenLR.Test.Functional\OpenLR.Test.Functional.csproj", "{FB4094CB-9898-4112-B2CB-CD4F91818890}"
@@ -32,92 +20,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		LICENSE.md = LICENSE.md
 		README.md = README.md
+		OpenLR.Common.props = OpenLR.Common.props
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenLR.Test.Runner", "test\OpenLR.Test.Runner\OpenLR.Test.Runner.csproj", "{DC53D05F-CF36-40D0-A6FD-221C93074BAA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{082AB082-0910-4B42-AC57-330BE7C57771}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.NWB", "samples\Samples.NWB\Samples.NWB.csproj", "{EC408DBE-A08C-4132-AFC1-4939690E3D75}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.NWB", "samples\Samples.NWB\Samples.NWB.csproj", "{EC408DBE-A08C-4132-AFC1-4939690E3D75}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.OSM", "samples\Samples.OSM\Samples.OSM.csproj", "{EC179DC9-835B-4549-B996-AD616A3566EF}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E9C52C9-A228-41C8-91C4-25C65FDE2411}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.EncodeRoute", "samples\Sample.EncodeRoute\Sample.EncodeRoute.csproj", "{C97DCD83-68DB-4E79-8D22-847EA160CCA7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.OSM", "samples\Samples.OSM\Samples.OSM.csproj", "{EC179DC9-835B-4549-B996-AD616A3566EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-<<<<<<< HEAD
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Debug|x64.ActiveCfg = Debug|x64
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Debug|x64.Build.0 = Debug|x64
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Release|x64.ActiveCfg = Release|x64
-		{036AD1DA-006A-48B6-826C-83D12561411D}.Release|x64.Build.0 = Release|x64
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Debug|x64.ActiveCfg = Debug|x64
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Debug|x64.Build.0 = Debug|x64
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Release|Any CPU.Build.0 = Release|Any CPU
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Release|x64.ActiveCfg = Release|x64
-		{252D884C-8BED-4711-A2DA-21F8DC05D697}.Release|x64.Build.0 = Release|x64
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Debug|x64.ActiveCfg = Debug|x64
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Debug|x64.Build.0 = Debug|x64
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Release|x64.ActiveCfg = Release|x64
-		{FBE5BE08-EF13-4108-92B2-46A960879F33}.Release|x64.Build.0 = Release|x64
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Debug|x64.ActiveCfg = Debug|x64
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Debug|x64.Build.0 = Debug|x64
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Release|x64.ActiveCfg = Release|x64
-		{CF358CF6-913D-47DC-9A83-DE90153A82F2}.Release|x64.Build.0 = Release|x64
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Debug|x64.ActiveCfg = Debug|x64
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Debug|x64.Build.0 = Debug|x64
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Release|x64.ActiveCfg = Release|x64
-		{61C1F8E2-9AFB-4EDA-8465-B0ECB20296D7}.Release|x64.Build.0 = Release|x64
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Debug|x64.ActiveCfg = Debug|x64
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Debug|x64.Build.0 = Debug|x64
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Release|x64.ActiveCfg = Release|x64
-		{1130C7F7-C993-4669-9B93-010C9BBADE1C}.Release|x64.Build.0 = Release|x64
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Debug|x64.ActiveCfg = Debug|x64
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Debug|x64.Build.0 = Debug|x64
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Release|x64.ActiveCfg = Release|x64
-		{E14B6468-C422-4811-828E-BCF522266EFF}.Release|x64.Build.0 = Release|x64
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7}.Release|x64.Build.0 = Release|Any CPU
-=======
 		{EC64B4E2-6637-4BC5-8FFE-0A16049ACD04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC64B4E2-6637-4BC5-8FFE-0A16049ACD04}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC64B4E2-6637-4BC5-8FFE-0A16049ACD04}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -134,10 +51,6 @@ Global
 		{9DAC0F4B-F928-4C53-AAFD-E60BCE6182F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9DAC0F4B-F928-4C53-AAFD-E60BCE6182F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9DAC0F4B-F928-4C53-AAFD-E60BCE6182F7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DC53D05F-CF36-40D0-A6FD-221C93074BAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DC53D05F-CF36-40D0-A6FD-221C93074BAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DC53D05F-CF36-40D0-A6FD-221C93074BAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DC53D05F-CF36-40D0-A6FD-221C93074BAA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EC408DBE-A08C-4132-AFC1-4939690E3D75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EC408DBE-A08C-4132-AFC1-4939690E3D75}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC408DBE-A08C-4132-AFC1-4939690E3D75}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -146,22 +59,19 @@ Global
 		{EC179DC9-835B-4549-B996-AD616A3566EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EC179DC9-835B-4549-B996-AD616A3566EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EC179DC9-835B-4549-B996-AD616A3566EF}.Release|Any CPU.Build.0 = Release|Any CPU
->>>>>>> develop
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-<<<<<<< HEAD
-		{C97DCD83-68DB-4E79-8D22-847EA160CCA7} = {4E9C52C9-A228-41C8-91C4-25C65FDE2411}
-=======
 		{EC64B4E2-6637-4BC5-8FFE-0A16049ACD04} = {684B6559-C01F-4862-BA85-F0BF7642FB77}
 		{A2D0D3EA-6D13-46A4-A5DD-7C181F6F00AD} = {684B6559-C01F-4862-BA85-F0BF7642FB77}
 		{FB4094CB-9898-4112-B2CB-CD4F91818890} = {E9F7404A-912C-429C-AD40-E4A8E4E47D20}
 		{9DAC0F4B-F928-4C53-AAFD-E60BCE6182F7} = {E9F7404A-912C-429C-AD40-E4A8E4E47D20}
-		{DC53D05F-CF36-40D0-A6FD-221C93074BAA} = {E9F7404A-912C-429C-AD40-E4A8E4E47D20}
 		{EC408DBE-A08C-4132-AFC1-4939690E3D75} = {082AB082-0910-4B42-AC57-330BE7C57771}
 		{EC179DC9-835B-4549-B996-AD616A3566EF} = {082AB082-0910-4B42-AC57-330BE7C57771}
->>>>>>> develop
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {450F7C5F-5081-4385-BC20-DC6117BAD3D2}
 	EndGlobalSection
 EndGlobal
diff --git a/OpenLR.sln.DotSettings b/OpenLR.sln.DotSettings
@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Abelshausen/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=NONINFRINGEMENT/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=traversable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # OpenLR for .NET
 
-![Build status](http://build.itinero.tech/app/rest/builds/buildType:(id:Itinero_Openlr)/statusIcon)
+[![Build status](http://build.itinero.tech:8080/app/rest/builds/buildType:(id:Itinero_Openlr)/statusIcon)](https://build.itinero.tech/viewType.html?buildTypeId=Itinero_Openlr)
 [![Visit our website](https://img.shields.io/badge/website-itinero.tech-020031.svg) ](http://www.itinero.tech/)
 [![GPL licensed](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/itinero/openlr/blob/develop/LICENSE.md)
 
-- OpenLR: [![NuGet](https://img.shields.io/nuget/v/OpenLR.svg?style=flat)](https://www.nuget.org/packages/OpenLR/)  
-- OpenLR.Geo: [![NuGet](https://img.shields.io/nuget/v/OpenLR.Geo.svg?style=flat)](https://www.nuget.org/packages/OpenLR.Geo/)  
+- OpenLR: [![NuGet Badge](https://buildstats.info/nuget/OpenLR)](https://www.nuget.org/packages/OpenLR/)
+- OpenLR.Geo: [![NuGet Badge](https://buildstats.info/nuget/OpenLR.Geo)](https://www.nuget.org/packages/OpenLR.Geo/)
 
 This is an implementation of the OpenLR (Open Location Reference) protocol using Itinero. Development was initially sponsered by via.nl (http://via.nl/) and Be-Mobile (http://www.be-mobile-international.com/). 
 

diff --git a/SharedAssemblyVersion.cs b/SharedAssemblyVersion.cs
diff --git a/nuspec/OpenLR_logo64.png → logo.png b/nuspec/OpenLR_logo64.png → logo.png
diff --git a/nuspec/OpenLR-old.nuspec b/nuspec/OpenLR-old.nuspec
diff --git a/nuspec/OpenLR.Geo.nuspec b/nuspec/OpenLR.Geo.nuspec