Changeset 8369

Timestamp:

07/31/12 12:52:57 (12 years ago)

Author:

spimming

Message:

#1894

• consider driving directions (one way roads) and
• check if edges (ways) can be traversed

Location:

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3

Files:

• Graph/Graph.cs (modified) (1 diff)
• Osm/TagConstants.cs (modified) (1 diff)
• Osm/Way.cs (modified) (2 diffs)

branches/RoutePlanning/HeuristicLab.Problems.RoutePlanning/3.3/Graph/Graph.cs

@@ -34 +34 @@
         List<Vertex<Node>> vertices = GetNeighborVerticesOnEdge(edge, vertex);
         foreach (Vertex<Node> neighbor in vertices) {
-          float weight = GetWeight(edge, vertex, neighbor);
-          neighbors[neighbor.Node.Id] = weight;
+          if (edge.CanBeTraversed(vertex.Node, neighbor.Node)) {
+            float weight = GetWeight(edge, vertex, neighbor);
+            neighbors[neighbor.Node.Id] = weight;
+          }
         }
       }

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

@@ -3 +3 @@
   public class TagConstants {
     public const string HighwayTagKey = "highway";
+    public const string OneWayTag = "oneway";
+    public const string YesValue = "yes";
   }
 }

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

@@ -52 +52 @@
     }
 
-    private HighwayType highwayTag;
     public HighwayType HighwayTag {
       get {
@@ -69 +68 @@
       }
     }
+
+    public bool OneWay {
+      get {
+        if (base.Tags.ContainsKey(TagConstants.OneWayTag)) {
+          string value = base.Tags[TagConstants.OneWayTag];
+          return value.Equals(TagConstants.YesValue);
+        } else {
+          return false;
+        }
+      }
+    }
+
+    public bool CanBeTraversed(Node source, Node target) {
+      // check if way can be traveld by a specific vehicle (car, public transport, pedestiran, bicycle)
+      // if (!CanBeTraversed(Vehicle)) return false
+      if (OneWay) {
+        // if vehicle == pedestrian or bicylce -> return true
+        int sourceIndex = Nodes.IndexOf(source);
+        int targetIndex = Nodes.IndexOf(target);
+        // order of the nodes determines the driving direction
+        return (sourceIndex < targetIndex);
+      }
+      return true;
+    }
+
+    //public bool CanBeTraversed(Vehicle) {}
   }
 }