1 files changed, 38 insertions, 7 deletions

diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index 07a6bed95..cad557e19 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -41,6 +41,22 @@ class LinkGraph : public LinkGraphPool::PoolItem<&_link_graph_pool> {
 public:
 
 	/**
+	 * Special modes for updating links. 'Restricted' means that vehicles with
+	 * 'no loading' orders are serving the link. If a link is only served by
+	 * such vehicles it's 'fully restricted'. This means the link can be used
+	 * by cargo arriving in such vehicles, but not by cargo generated or
+	 * transferring at the source station of the link. In order to find out
+	 * about this condition we keep two update timestamps in each link, one for
+	 * the restricted and one for the unrestricted part of it. If either one
+	 * times out while the other is still valid the link becomes fully
+	 * restricted or fully unrestricted, respectively.
+	 */
+	enum UpdateMode {
+		REFRESH_RESTRICTED = UINT_MAX - 1, ///< Refresh restricted link.
+		REFRESH_UNRESTRICTED = UINT_MAX    ///< Refresh unrestricted link.
+	};
+
+	/**
 	 * Node of the link graph. contains all relevant information from the associated
 	 * station. It's copied so that the link graph job can work on its own data set
 	 * in a separate thread.
@@ -60,11 +76,12 @@ public:
 	 * the column as next_edge.
 	 */
 	struct BaseEdge {
-		uint distance;    ///< Length of the link.
-		uint capacity;    ///< Capacity of the link.
-		uint usage;       ///< Usage of the link.
-		Date last_update; ///< When the link was last updated.
-		NodeID next_edge; ///< Destination of next valid edge starting at the same source node.
+		uint distance;                 ///< Length of the link.
+		uint capacity;                 ///< Capacity of the link.
+		uint usage;                    ///< Usage of the link.
+		Date last_unrestricted_update; ///< When the unrestricted part of the link was last updated.
+		Date last_restricted_update;   ///< When the restricted part of the link was last updated.
+		NodeID next_edge;              ///< Destination of next valid edge starting at the same source node.
 		void Init(uint distance = 0);
 	};
 
@@ -104,10 +121,22 @@ public:
 		uint Distance() const { return this->edge.distance; }
 
 		/**
-		 * Get edge's last update.
+		 * Get the date of the last update to the edge's unrestricted capacity.
+		 * @return Last update.
+		 */
+		Date LastUnrestrictedUpdate() const { return this->edge.last_unrestricted_update; }
+
+		/**
+		 * Get the date of the last update to the edge's restricted capacity.
+		 * @return Last update.
+		 */
+		Date LastRestrictedUpdate() const { return this->edge.last_restricted_update; }
+
+		/**
+		 * Get the date of the last update to any part of the edge's capacity.
 		 * @return Last update.
 		 */
-		Date LastUpdate() const { return this->edge.last_update; }
+		Date LastUpdate() const { return max(this->edge.last_unrestricted_update, this->edge.last_restricted_update); }
 	};
 
 	/**
@@ -285,6 +314,8 @@ public:
 		 */
 		Edge(BaseEdge &edge) : EdgeWrapper<BaseEdge>(edge) {}
 		void Update(uint capacity, uint usage);
+		void Restrict() { this->edge.last_unrestricted_update = INVALID_DATE; }
+		void Release() { this->edge.last_restricted_update = INVALID_DATE; }
 	};
 
 	/**