Context Navigation

Changeset 8300

Timestamp:

07/18/12 12:56:35 (12 years ago)

Author:

spimming

Message:

#1894:

Location:

Files:

-                      r8293
+                      r8300
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Graph\Edge.cs" />
+    <Compile Include="Graph\Graph.cs" />
+    <Compile Include="Graph\IEdge.cs" />
+    <Compile Include="Graph\Vertex.cs" />
     <Compile Include="Osm.Data\XmlDataSource.cs" />
     <Compile Include="Osm\IDataSource.cs" />
 …
     <None Include="Properties\AssemblyInfo.cs.frame" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

-                      r8293
+                      r8300
     private IDictionary<long, Way> ways;
     private IDictionary<long, Relation> relations;
+    private IDictionary<long, List<long>> nodeWays;
 …
       relations = new Dictionary<long, Relation>();
+      nodeWays = new Dictionary<long, List<long>>();
       ReadData();
+    }
 …
       if (ways.ContainsKey(wayId)) {
         return ways[wayId];
+      }
+      return null;
+    }
+    public List<Way> GetWays(Node node) {
+      if (nodeWays.ContainsKey(node.Id)) {
+        List<long> wayIds = nodeWays[node.Id];
+        List<Way> result = new List<Way>(wayIds.Count);
+        for (int i = 0; i < wayIds.Count; i++) {
+          result.Add(GetWay(wayIds[i]));
+        }
+        return result;
+      }
       return null;
 …
           ways.Add(way.Id, way);
+          InsertNodeWayRelation(way);
           reader.Read();
 …
+    }
+    private void InsertNodeWayRelation(Way way) {
+      foreach (Node node in way.Nodes) {
+        if (!nodeWays.ContainsKey(node.Id)) {
+          nodeWays.Add(node.Id, new List<long>());
+        }
+        nodeWays[node.Id].Add(way.Id);
+      }
+    }
+  }
+}

-                      r8293
+                      r8300
+using System.Collections.Generic;
 namespace HeuristicLab.Problems.RoutePlanning.Osm {
   public interface IDataSource {
 …
     Node GetNode(long nodeId);
     Way GetWay(long wayId);
+    List<Way> GetWays(Node node);
     Relation GetRelation(long relationId);
+  }

Note: See TracChangeset for help on using the changeset viewer.