Merge branch 'sumo-integration' into tm/vehicular-services

src/de/tudarmstadt/maki/simonstrator/api/component/vehicular/roadnetwork/RoadNetworkEdge.java

@@ -31,6 +31,7 @@ public class RoadNetworkEdge {
 	private double _angle;
 
 	private double _originalMaxSpeed = 0;
+	private double _maxSpeed = 0;
 
 	private List<RoadNetworkLane> _lanes = new ArrayList<>();
 
@@ -85,9 +86,18 @@ public class RoadNetworkEdge {
 	public void setOriginalMaxSpeed(double pMaxSpeed) {
 		if (pMaxSpeed > _originalMaxSpeed) {
 			_originalMaxSpeed = pMaxSpeed;
+			_maxSpeed = pMaxSpeed;
 		}
 	}
 
+	public void setMaxSpeed(double pMaxSpeed) {
+		_maxSpeed = pMaxSpeed;
+	}
+
+	public double getMaxSpeed() {
+		return _maxSpeed;
+	}
+
 	public void addConnectedEdge(RoadNetworkEdge pEdge) {
 		if (!_accessibleEdges.contains(pEdge)) {
 			_accessibleEdges.add(pEdge);