(svn r26393) -Fix: Update distances between link graph nodes when station sign is moved

3 files changed, 24 insertions, 0 deletions

diff --git a/src/linkgraph/linkgraph.cpp b/src/linkgraph/linkgraph.cpp
index 6bd29c92d..e8c792c37 100644
--- a/src/linkgraph/linkgraph.cpp
+++ b/src/linkgraph/linkgraph.cpp
@@ -145,6 +145,21 @@ void LinkGraph::RemoveNode(NodeID id)
 }
 
 /**
+ * Update distances between the given node and all others.
+ * @param id Node that changed position.
+ * @param xy New position of the node.
+ */
+void LinkGraph::UpdateDistances(NodeID id, TileIndex xy)
+{
+	assert(id < this->Size());
+	for (NodeID other = 0; other < this->Size(); ++other) {
+		if (other == id) continue;
+		this->edges[id][other].distance = this->edges[other][id].distance =
+				DistanceManhattan(xy, Station::Get(this->nodes[other].station)->xy);
+	}
+}
+
+/**
  * Add a node to the component and create empty edges associated with it. Set
  * the station's last_component to this component. Calculate the distances to all
  * other nodes. The distances to _all_ nodes are important as the demand
diff --git a/src/linkgraph/linkgraph.h b/src/linkgraph/linkgraph.h
index 4bcc27b31..4306ad2b3 100644
--- a/src/linkgraph/linkgraph.h
+++ b/src/linkgraph/linkgraph.h
@@ -529,6 +529,7 @@ public:
 
 	NodeID AddNode(const Station *st);
 	void RemoveNode(NodeID id);
+	void UpdateDistances(NodeID id, TileIndex xy);
 
 protected:
 	friend class LinkGraph::ConstNode;
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 1aa9ab0de..55b6fae14 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -641,6 +641,14 @@ static void UpdateStationSignCoord(BaseStation *st)
 	/* clamp sign coord to be inside the station rect */
 	st->xy = TileXY(ClampU(TileX(st->xy), r->left, r->right), ClampU(TileY(st->xy), r->top, r->bottom));
 	st->UpdateVirtCoord();
+
+	if (!Station::IsExpected(st)) return;
+	Station *full_station = Station::From(st);
+	for (CargoID c = 0; c < NUM_CARGO; ++c) {
+		LinkGraphID lg = full_station->goods[c].link_graph;
+		if (!LinkGraph::IsValidID(lg)) continue;
+		LinkGraph::Get(lg)->UpdateDistances(full_station->goods[c].node, st->xy);
+	}
 }
 
 /**