Updated to latest itinero.

itinero · Jul 16, 2018 · eec15a7 · eec15a7
1 parent 1043417
commit eec15a7
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -47,4 +47,5 @@ packages/*
 *.shp
 *.shx
 
-*.hgt.zip
+*.hgt.zip
+.idea/*
diff --git a/SharedAssemblyVersion.cs b/SharedAssemblyVersion.cs
@@ -23,4 +23,4 @@
 using System.Reflection;
 
 [assembly: AssemblyVersion("3.0.0")] // semantic versioning Major.Minor.Patch.Build (9999 will be updated by CI server)
-[assembly: AssemblyInformationalVersion("3.0.0-pre05")] // do not change this; build server update this automatically (.9999 will be updated by CI server with -{buildnumber})
+[assembly: AssemblyInformationalVersion("3.0.0-pre06")] // do not change this; build server update this automatically (.9999 will be updated by CI server with -{buildnumber})
diff --git a/src/IDP/IDP.csproj b/src/IDP/IDP.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>IDP</AssemblyName>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win8-x64;win10-x64;osx.10.11-x64;ubuntu.16.04-x64</RuntimeIdentifiers>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -18,14 +17,14 @@
 
   <ItemGroup>
     <PackageReference Include="GTFS" Version="2.1.5-pre02" />
-    <PackageReference Include="Itinero" Version="1.4.0-pre37" />
+    <PackageReference Include="Itinero" Version="1.4.0-pre63" />
     <PackageReference Include="Itinero.Geo" Version="1.4.0-pre18" />
-    <PackageReference Include="Itinero.IO.Osm" Version="1.4.0-pre37" />
+    <PackageReference Include="Itinero.IO.Osm" Version="1.4.0-pre63" />
     <PackageReference Include="Itinero.IO.Shape" Version="1.4.0-pre18" />
     <PackageReference Include="Itinero.Transit" Version="0.4.0-alpha" />
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="3.2.0" />
     <PackageReference Include="SRTM" Version="0.0.1" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/IDP/Program.cs b/src/IDP/Program.cs
@@ -38,9 +38,6 @@ static void Main(string[] args)
                 Console.WriteLine(string.Format("[{0}-{3}] {1} - {2}", origin, level, message, DateTime.Now.ToString()));
             };
 
-            // register vehicles.
-            Itinero.Osm.Vehicles.Vehicle.RegisterVehicles();
-
             // register switches.
             Switches.SwitchParsers.RegisterAll();
 

diff --git a/src/IDP/Switches/RouterDb/SwitchCreateRouterDb.cs b/src/IDP/Switches/RouterDb/SwitchCreateRouterDb.cs
@@ -67,6 +67,8 @@ public override int Parse(List<Processor> previous, out Processor processor)
             var allCore = false;
             var keepWayIds = false;
             var simplification = (new Itinero.IO.Osm.LoadSettings()).NetworkSimplificationEpsilon;
+
+            Itinero.Osm.Vehicles.Vehicle.RegisterVehicles();
 
             for (var i = 0; i < this.Arguments.Length; i++)
             {
@@ -118,7 +120,6 @@ public override int Parse(List<Processor> previous, out Processor processor)
                                             using (var stream = vehicleFile.OpenRead())
                                             {
                                                 vehicle = DynamicVehicle.LoadFromStream(stream);
-                                                vehicle.Register();
                                                 vehicles.Add(vehicle);
                                             }
                                         }
@@ -168,6 +169,9 @@ public override int Parse(List<Processor> previous, out Processor processor)
             {
                 var routerDb = new Itinero.RouterDb();
 
+                // make sure the routerdb can handle multiple edges.
+                routerDb.Network.GeometricGraph.Graph.MarkAsMulti();
+                
                 // load the data.
                 var target = new Itinero.IO.Osm.Streams.RouterDbStreamTarget(routerDb,
                     vehicles.ToArray(), allCore, processRestrictions: true);
@@ -183,6 +187,10 @@ public override int Parse(List<Processor> previous, out Processor processor)
                     target.RegisterSource(source);
                 }
                 target.Pull();
+                
+                // optimize the network for routing.
+                routerDb.SplitLongEdges();
+                routerDb.ConvertToSimple();
 
                 // sort the network.
                 routerDb.Sort();

diff --git a/src/IDP/Switches/Shape/SwitchReadShape.cs b/src/IDP/Switches/Shape/SwitchReadShape.cs
@@ -94,7 +94,6 @@ public override int Parse(List<Processor> previous, out Processor processor)
                                         using (var stream = vehicleFile.OpenRead())
                                         {
                                             vehicle = DynamicVehicle.LoadFromStream(stream);
-                                            vehicle.Register();
                                             vehicles.Add(vehicle);
                                         }
                                     }

diff --git a/test/IDP.Test/IDP.Test.csproj b/test/IDP.Test/IDP.Test.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <AssemblyName>IDP.Test</AssemblyName>
     <PackageId>IDP.Test</PackageId>
-    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>