Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8293


Ignore:
Timestamp:
07/16/12 15:41:45 (11 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:
13 added
6 edited

Legend:

Unmodified
Added
Removed
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/HeuristicLab.Problems.RoutePlanning.csproj

    r8291 r8293  
    5656  </ItemGroup>
    5757  <ItemGroup>
     58    <Compile Include="Osm.Data\XmlDataSource.cs" />
     59    <Compile Include="Osm\IDataSource.cs" />
    5860    <Compile Include="Osm\Node.cs" />
    5961    <Compile Include="Osm\OsmBase.cs" />
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Node.cs

    r8290 r8293  
    1313    }
    1414
    15     public Node(int id, double lat, double lon)
     15    public Node() {
     16      point = new PointD();
     17    }
     18
     19    public Node(long id, double lat, double lon)
    1620      : base(id) {
    1721      point = new PointD(lat, lon);
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/OsmBase.cs

    r8290 r8293  
    44namespace HeuristicLab.Problems.RoutePlanning.Osm {
    55  public abstract class OsmBase {
    6     public int Id { get; set; }
     6    public long Id { get; set; }
    77    public string User { get; set; }
    88    public int UserId { get; set; }
    99    public DateTime Timestamp { get; set; }
    10     public int Changeset { get; set; }
     10    public long Changeset { get; set; }
    1111    public int Version { get; set; }
    1212    public bool Visible { get; set; }
    1313    public IDictionary<string, string> Tags { get; set; }
    1414
    15     public OsmBase(int id) {
     15    public OsmBase() {
     16      Tags = new Dictionary<string, string>();
     17    }
     18
     19    public OsmBase(long id) {
    1620      Id = id;
    1721      Tags = new Dictionary<string, string>();
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Relation.cs

    r8290 r8293  
    55    private List<RelationMember> members;
    66
    7     public Relation(int id)
     7    public Relation() {
     8      members = new List<RelationMember>();
     9    }
     10
     11    public Relation(long id)
    812      : base(id) {
    913      members = new List<RelationMember>();
  • branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Osm/Way.cs

    r8290 r8293  
    3939    private List<Node> nodes;
    4040
    41     public Way(int id)
     41    public Way() {
     42      nodes = new List<Node>();
     43    }
     44
     45    public Way(long id)
    4246      : base(id) {
    4347      nodes = new List<Node>();
  • branches/RoutePlanning/RoutePlanning.sln

    r8284 r8293  
    66Project("{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}"
    77EndProject
     8Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.RoutePlanning.Test", "HeuristicLab.Problems.RoutePlanning.Test\HeuristicLab.Problems.RoutePlanning.Test.csproj", "{004241D1-2127-4489-9DFB-9F7707983371}"
     9EndProject
    810Global
    911  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1012    Debug|Any CPU = Debug|Any CPU
     13    Debug|Mixed Platforms = Debug|Mixed Platforms
     14    Debug|x86 = Debug|x86
    1115    Release|Any CPU = Release|Any CPU
     16    Release|Mixed Platforms = Release|Mixed Platforms
     17    Release|x86 = Release|x86
    1218  EndGlobalSection
    1319  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1420    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1521    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     22    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     23    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     24    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Debug|x86.ActiveCfg = Debug|Any CPU
    1625    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1726    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Any CPU.Build.0 = Release|Any CPU
     27    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     28    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     29    {E93A30BD-D4C8-4DEC-8ECF-2BC3CD9F027B}.Release|x86.ActiveCfg = Release|Any CPU
    1830    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1931    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
     32    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     33    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     34    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Debug|x86.ActiveCfg = Debug|Any CPU
    2035    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2136    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Any CPU.Build.0 = Release|Any CPU
     37    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     38    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     39    {0C6B9F99-DBC1-49BE-B90A-36CB86DD1D0C}.Release|x86.ActiveCfg = Release|Any CPU
     40    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Any CPU.ActiveCfg = Debug|x86
     41    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     42    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|Mixed Platforms.Build.0 = Debug|x86
     43    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|x86.ActiveCfg = Debug|x86
     44    {004241D1-2127-4489-9DFB-9F7707983371}.Debug|x86.Build.0 = Debug|x86
     45    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Any CPU.ActiveCfg = Release|x86
     46    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Mixed Platforms.ActiveCfg = Release|x86
     47    {004241D1-2127-4489-9DFB-9F7707983371}.Release|Mixed Platforms.Build.0 = Release|x86
     48    {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.ActiveCfg = Release|x86
     49    {004241D1-2127-4489-9DFB-9F7707983371}.Release|x86.Build.0 = Release|x86
    2250  EndGlobalSection
    2351  GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset for help on using the changeset viewer.