Changeset 8293

Timestamp:

07/16/12 15:41:45 (12 years ago)

Author:

spimming

Message:

#1894:

• new default constructor for osm base types
• defined common interface for data sources
• implemented xml data source
• added test project with osm test files

Location:

branches/RoutePlanning

Files:

• HeuristicLab.Problems.RoutePlanning.Test (added)
• HeuristicLab.Problems.RoutePlanning.Test/HeuristicLab.Problems.RoutePlanning.Test.csproj (added)
• HeuristicLab.Problems.RoutePlanning.Test/OsmTestFiles (added)
• HeuristicLab.Problems.RoutePlanning.Test/OsmTestFiles/test.osm (added)
• HeuristicLab.Problems.RoutePlanning.Test/OsmTestFiles/testNode1.osm (added)
• HeuristicLab.Problems.RoutePlanning.Test/OsmTestFiles/testRelation1.osm (added)
• HeuristicLab.Problems.RoutePlanning.Test/OsmTestFiles/testWay1.osm (added)
• HeuristicLab.Problems.RoutePlanning.Test/Program.cs (added)
• HeuristicLab.Problems.RoutePlanning.Test/Properties (added)
• HeuristicLab.Problems.RoutePlanning.Test/Properties/AssemblyInfo.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data (added)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm.Data/XmlDataSource.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/IDataSource.cs (added)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/Node.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/OsmBase.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/Relation.cs (modified) (1 diff)
• HeuristicLab.Problems.RoutePlanning/3.3/Osm/Way.cs (modified) (1 diff)
• RoutePlanning.sln (modified) (1 diff)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj

@@ -56 +56 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Osm.Data\XmlDataSource.cs" />
+    <Compile Include="Osm\IDataSource.cs" />
     <Compile Include="Osm\Node.cs" />
     <Compile Include="Osm\OsmBase.cs" />

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Node.cs

@@ -13 +13 @@
     }
 
-    public Node(int id, double lat, double lon)
+    public Node() {
+      point = new PointD();
+    }
+
+    public Node(long id, double lat, double lon)
       : base(id) {
       point = new PointD(lat, lon);

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/OsmBase.cs

@@ -4 +4 @@
 namespace HeuristicLab.Problems.RoutePlanning.Osm {
   public abstract class OsmBase {
-    public int Id { get; set; }
+    public long Id { get; set; }
     public string User { get; set; }
     public int UserId { get; set; }
     public DateTime Timestamp { get; set; }
-    public int Changeset { get; set; }
+    public long Changeset { get; set; }
     public int Version { get; set; }
     public bool Visible { get; set; }
     public IDictionary<string, string> Tags { get; set; }
 
-    public OsmBase(int id) {
+    public OsmBase() {
+      Tags = new Dictionary<string, string>();
+    }
+
+    public OsmBase(long id) {
       Id = id;
       Tags = new Dictionary<string, string>();

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Relation.cs

@@ -5 +5 @@
     private List<RelationMember> members;
 
-    public Relation(int id)
+    public Relation() {
+      members = new List<RelationMember>();
+    }
+
+    public Relation(long id)
       : base(id) {
       members = new List<RelationMember>();

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Way.cs

@@ -39 +39 @@
     private List<Node> nodes;
 
-    public Way(int id)
+    public Way() {
+      nodes = new List<Node>();
+    }
+
+    public Way(long id)
       : base(id) {
       nodes = new List<Node>();

branches/RoutePlanning/RoutePlanning.sln

@@ -6 +6 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.RoutePlanning.Views", "HeuristicLab.Problems.RoutePlanning.Views\3.3\HeuristicLab.Problems.RoutePlanning.Views.csproj", "{0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.RoutePlanning.Test", "HeuristicLab.Problems.RoutePlanning.Test\HeuristicLab.Problems.RoutePlanning.Test.csproj", "{004241D1-2127-4489-9DFB-9F7707983371}"
+EndProject
 Global
   GlobalSection(SolutionConfigurationPlatforms) = preSolution
     Debug|Any CPU = Debug|Any CPU
+    Debug|Mixed Platforms = Debug|Mixed Platforms
+    Debug|x86 = Debug|x86
     Release|Any CPU = Release|Any CPU
+    Release|Mixed Platforms = Release|Mixed Platforms
+    Release|x86 = Release|x86
   EndGlobalSection
   GlobalSection(ProjectConfigurationPlatforms) = postSolution
     {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|x86.ActiveCfg = Debug|Any CPU
     {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Any CPU.Build.0 = Release|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|x86.ActiveCfg = Release|Any CPU
     {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|x86.ActiveCfg = Debug|Any CPU
     {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
     {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Any CPU.Build.0 = Release|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|x86.ActiveCfg = Release|Any CPU
+    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Any CPU.ActiveCfg = Debug|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Mixed Platforms.Build.0 = Debug|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|x86.ActiveCfg = Debug|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|x86.Build.0 = Debug|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Any CPU.ActiveCfg = Release|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Mixed Platforms.ActiveCfg = Release|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Mixed Platforms.Build.0 = Release|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.ActiveCfg = Release|x86
+    {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution