X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=859d3daea7988ea7544eb111cb72964613e7a8cd;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=f05799265ef9e186c3f553ffc28f6a045ec3d6c9;hpb=e94014530a6e28a42bc5678e579ee07e0ee5329b;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index f057992..859d3da 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -9,52 +9,92 @@ Distributed under the GPL
 #include <msp/strings/formatter.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
+#include "aicontrol.h"
+#include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
-#include "locotype.h"
 #include "route.h"
+#include "simplecontroller.h"
+#include "timetable.h"
+#include "trackiter.h"
 #include "tracktype.h"
 #include "train.h"
 #include "vehicle.h"
+#include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
 
+namespace {
+
+struct SetFlag
+{
+	bool &flag;
+
+	SetFlag(bool &f): flag(f) { flag = true; }
+	~SetFlag() { flag = false; }
+};
+
+}
+
+
 namespace Marklin {
 
-Train::Train(Layout &l, const LocoType &t, unsigned a):
+Train::Train(Layout &l, const VehicleType &t, unsigned a, const string &p):
 	layout(l),
 	loco_type(t),
 	address(a),
+	protocol(p),
+	priority(0),
+	yielding_to(0),
+	cur_blocks_end(blocks.end()),
+	clear_blocks_end(blocks.end()),
 	pending_block(0),
-	target_speed(0),
-	current_speed(0),
+	reserving(false),
+	advancing(false),
+	controller(new AIControl(*this, new SimpleController)),
+	timetable(0),
+	active(false),
+	current_speed_step(0),
+	speed_changing(false),
 	reverse(false),
 	functions(0),
-	route(0),
-	next_route(0),
 	end_of_route(false),
 	status("Unplaced"),
 	travel_dist(0),
-	travel_speed(0),
 	pure_speed(false),
-	real_speed(15)
+	real_speed(layout.get_driver().get_protocol_speed_steps(protocol)+1),
+	accurate_position(false),
+	overshoot_dist(false)
 {
+	if(!loco_type.is_locomotive())
+		throw InvalidParameterValue("Initial vehicle must be a locomotive");
+
 	vehicles.push_back(new Vehicle(layout, loco_type));
 
 	layout.add_train(*this);
 
-	layout.get_driver().add_loco(address);
+	layout.get_driver().add_loco(address, protocol);
 	layout.get_driver().signal_loco_speed.connect(sigc::mem_fun(this, &Train::loco_speed_event));
 	layout.get_driver().signal_loco_function.connect(sigc::mem_fun(this, &Train::loco_func_event));
 
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
-	layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event));
+
+	layout.get_driver().signal_halt.connect(sigc::mem_fun(this, &Train::halt_event));
+
+	const set<Track *> &tracks = layout.get_tracks();
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if((*i)->get_turnout_id())
+			(*i)->signal_path_changed.connect(sigc::hide(sigc::bind(sigc::mem_fun(this, &Train::turnout_path_changed), sigc::ref(**i))));
+
+	controller->signal_control_changed.connect(sigc::mem_fun(this, &Train::control_changed));
 }
 
 Train::~Train()
 {
+	delete controller;
+	delete timetable;
 	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
 		delete *i;
 	layout.remove_train(*this);
@@ -67,6 +107,40 @@ void Train::set_name(const string &n)
 	signal_name_changed.emit(name);
 }
 
+void Train::set_priority(int p)
+{
+	priority = p;
+}
+
+void Train::yield_to(const Train &t)
+{
+	yielding_to = &t;
+}
+
+void Train::add_vehicle(const VehicleType &vt)
+{
+	Vehicle *veh = new Vehicle(layout, vt);
+	vehicles.back()->attach_back(*veh);
+	vehicles.push_back(veh);
+}
+
+void Train::remove_vehicle(unsigned i)
+{
+	if(i>=vehicles.size())
+		throw InvalidParameterValue("Vehicle index out of range");
+	if(i==0)
+		throw InvalidParameterValue("Can't remove the locomotive");
+	delete vehicles[i];
+	vehicles.erase(vehicles.begin()+i);
+	if(i<vehicles.size())
+		vehicles[i-1]->attach_back(*vehicles[i]);
+}
+
+unsigned Train::get_n_vehicles() const
+{
+	return vehicles.size();
+}
+
 Vehicle &Train::get_vehicle(unsigned i)
 {
 	if(i>=vehicles.size())
@@ -81,44 +155,29 @@ const Vehicle &Train::get_vehicle(unsigned i) const
 	return *vehicles[i];
 }
 
-void Train::set_speed(unsigned speed)
+void Train::set_control(const string &n, float v)
 {
-	if(speed==target_speed)
-		return;
-	travel_speed = static_cast<int>(round(get_real_speed(speed)*87*3.6/5))*5;
-
-	target_speed = speed;
-	if(!target_speed)
-	{
-		pending_block = 0;
-		stop_timeout = Time::now()+(800+current_speed*150)*Time::msec;
-	}
-	else
-		reserve_more();
-
-	signal_target_speed_changed.emit(target_speed);
-
-	update_speed();
-	pure_speed = false;
+	controller->set_control(n, v);
 }
 
-void Train::set_reverse(bool rev)
+void Train::set_active(bool a)
 {
-	if(rev==reverse)
+	if(a==active)
 		return;
+	if(!a && controller->get_speed())
+		throw InvalidState("Can't deactivate while moving");
 
-	if(target_speed)
+	active = a;
+	if(active)
 	{
-		set_speed(0);
-		return;
+		stop_timeout = Time::TimeStamp();
+		reserve_more();
+	}
+	else
+	{
+		stop_timeout = Time::now()+2*Time::sec;
+		set_status("Stopped");
 	}
-	else if(stop_timeout)
-		return;
-
-	layout.get_driver().set_loco_reverse(address, rev);
-
-	release_blocks(rsv_blocks);
-	reverse_blocks(cur_blocks);
 }
 
 void Train::set_function(unsigned func, bool state)
@@ -131,78 +190,193 @@ void Train::set_function(unsigned func, bool state)
 		layout.get_driver().set_loco_function(address+1, func-4, state);
 }
 
+float Train::get_control(const string &ctrl) const
+{
+	return controller->get_control(ctrl).value;
+}
+
+float Train::get_speed() const
+{
+	return controller->get_speed();
+}
+
 bool Train::get_function(unsigned func) const
 {
 	return (functions>>func)&1;
 }
 
-void Train::set_route(const Route *r)
+void Train::set_timetable(Timetable *tt)
 {
-	if(!rsv_blocks.empty())
+	delete timetable;
+	timetable = tt;
+}
+
+bool Train::set_route(const Route *r)
+{
+	free_noncritical_blocks();
+
+	Route *lead = 0;
+	if(r && !blocks.empty())
 	{
-		for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-			if(i->block->get_sensor_id())
-			{
-				release_blocks(rsv_blocks, ++i, rsv_blocks.end());
-				break;
-			}
+		TrackIter first = blocks.front().track_iter();
+		TrackIter next = blocks.back().next().track_iter();
+		if(!r->has_track(*next))
+		{
+			lead = Route::find(next, *r);
+			if(!lead)
+				return false;
+			create_lead_route(lead, lead);
+			routes.push_front(lead);
+		}
+		else if(!r->has_track(*first))
+			lead = create_lead_route(0, r);
 	}
 
-	route = r;
-	next_route = 0;
+	routes.clear();
+	if(lead)
+		routes.push_back(lead);
+	if(r)
+		routes.push_back(r);
 	end_of_route = false;
 
-	if(route)
-	{
-		BlockRef &last = (rsv_blocks.empty() ? cur_blocks.back() : rsv_blocks.back());
-		BlockRef next = last.next();
-		const Block::Endpoint &ep = next.block->get_endpoints()[next.entry];
-		if(!route->get_tracks().count(ep.track))
+	reserve_more();
+
+	signal_route_changed.emit(get_route());
+
+	return true;
+}
+
+bool Train::go_to(Track &to)
+{
+	for(BlockList::const_iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
+		if((*i)->has_track(to))
 		{
-			next_route = route;
-			route = Route::find(*ep.track, ep.track_ep, *next_route);
+			signal_arrived.emit();
+			return set_route(0);
 		}
-	}
 
-	if(target_speed && reserve_more()<2)
-		update_speed();
+	free_noncritical_blocks();
 
-	signal_route_changed.emit(route);
+	TrackIter next = blocks.back().next().track_iter();
+
+	Route *route = Route::find(next, to);
+	if(!route)
+		return false;
+	create_lead_route(route, route);
+	return set_route(route);
 }
 
-void Train::go_to(const Track &to)
+bool Train::divert(Track &from)
 {
-	for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
-		if(i->block->get_tracks().count(const_cast<Track *>(&to)))
+	if(!from.get_turnout_id())
+		throw InvalidParameterValue("Can't divert from a non-turnout");
+	if(routes.empty())
+		return false;
+
+	unsigned path = 0;
+	unsigned entry = 0;
+	list<RouteRef>::iterator route = routes.begin();
+
+	// Follow our routes to find out where we're entering the turnout
+	for(TrackLoopIter track = blocks.front().track_iter();;)
+	{
+		if(!advance_route(route, *track))
+			return false;
+
+		if(&*track==&from)
 		{
-			set_speed(0);
-			set_route(0);
-			return;
+			Block &block = track->get_block();
+			if(block.get_train()==this && !free_block(block))
+				return false;
+
+			int route_path = route->route->get_turnout(from.get_turnout_id());
+
+			// Check that more than one path is available
+			unsigned ep_paths = track.endpoint().paths;
+			if(!(ep_paths&(ep_paths-1)))
+				return false;
+
+			// Choose some other path
+			for(int i=0; ep_paths>>i; ++i)
+				if((ep_paths&(1<<i)) && i!=route_path)
+				{
+					path = i;
+					break;
+				}
+
+			entry = track.entry();
+			break;
 		}
 
-	BlockRef *last = 0;
-	if(rsv_blocks.empty())
-		last = &cur_blocks.back();
+		track = track.next(route->route->get_path(*track));
+
+		if(!track || track.looped())
+			return false;
+	}
+
+	TrackIter track = TrackIter(&from, entry).next(path);
+	if(!track)
+		return false;
+
+	set<Track *> tracks;
+	for(list<RouteRef>::iterator i=routes.begin(); i!=routes.end(); ++i)
+		tracks.insert(i->route->get_tracks().begin(), i->route->get_tracks().end());
+	RefPtr<Route> diversion = Route::find(track, tracks);
+	if(!diversion)
+		return false;
+
+	diversion->set_name("Diversion");
+	diversion->add_track(from);
+	diversion->set_turnout(from.get_turnout_id(), path);
+
+	if(!is_valid_diversion(*diversion, TrackIter(&from, entry)))
+		return false;
+
+	// Follow the diversion route until we get back to the original route
+	list<RouteRef>::iterator end = routes.end();
+	while(1)
+	{
+		for(list<RouteRef>::iterator i=route; (end==routes.end() && i!=routes.end()); ++i)
+			if(i->route->has_track(*track))
+				end = i;
+
+		if(end!=routes.end())
+			break;
+		else if(!diversion->has_track(*track))
+			throw LogicError("Pathfinder returned a bad route");
+
+		track = track.next(diversion->get_path(*track));
+	}
+
+	if(route==end)
+		// We are rejoining the same route we diverted from, duplicate it
+		routes.insert(end, *route);
 	else
 	{
-		for(list<BlockRef>::iterator i=rsv_blocks.begin(); (i!=rsv_blocks.end() && !last); ++i)
-			if(i->block->get_sensor_id())
-				last = &*i;
+		++route;
+		routes.erase(route, end);
 	}
+	routes.insert(end, RouteRef(diversion.release(), from.get_turnout_id()));
 
-	BlockRef next = last->next();
-	const Block::Endpoint &ep = next.block->get_endpoints()[next.entry];
+	return true;
+}
 
-	set_route(Route::find(*ep.track, ep.track_ep, to));
+const Route *Train::get_route() const
+{
+	if(routes.empty())
+		return 0;
+	return routes.front().route;
 }
 
 void Train::place(Block &block, unsigned entry)
 {
-	if(target_speed)
-		set_speed(0);
+	if(controller->get_speed())
+		throw InvalidState("Must be stopped before placing");
+
+	release_blocks();
 
-	release_blocks(rsv_blocks);
-	release_blocks(cur_blocks);
+	set_active(false);
+	accurate_position = false;
 
 	if(!block.reserve(this))
 	{
@@ -210,76 +384,217 @@ void Train::place(Block &block, unsigned entry)
 		return;
 	}
 
-	cur_blocks.push_back(BlockRef(&block, entry));
+	blocks.push_back(BlockIter(&block, entry));
 	if(reverse)
 	{
-		unsigned exit = block.traverse(entry);
-		const Block::Endpoint &bep = block.get_endpoints()[exit];
-		Track *track = bep.track->get_link(bep.track_ep);
-		unsigned ep = track->get_endpoint_by_link(*bep.track);
-		vehicles.front()->place(track, ep, 0, Vehicle::FRONT_BUFFER);
+		TrackIter track = BlockIter(&block, entry).reverse().track_iter();
+		vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_BUFFER);
 	}
 	else
 	{
-		const Block::Endpoint &bep = block.get_endpoints()[entry];
-		vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+		const Block::Endpoint &bep = block.get_endpoint(entry);
+		vehicles.back()->place(*bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
 	}
+}
+
+void Train::unplace()
+{
+	if(controller->get_speed())
+		throw InvalidState("Must be stopped before unplacing");
 
-	set_status("Stopped");
+	release_blocks();
+
+	set_active(false);
+	accurate_position = false;
+
+	for(vector<Vehicle *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+		(*i)->unplace();
+
+	set_status("Unplaced");
 }
 
 bool Train::free_block(Block &block)
 {
+	float margin = 10*layout.get_catalogue().get_scale();
+	if(get_reserved_distance_until(&block, false)<controller->get_braking_distance()*1.3+margin)
+		return false;
+
 	unsigned nsens = 0;
-	for(list<BlockRef>::iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
+	for(BlockList::iterator i=cur_blocks_end; i!=blocks.end(); ++i)
 	{
-		if(i->block==&block)
+		if(i->block()==&block)
 		{
 			if(nsens<1)
 				return false;
-			release_blocks(rsv_blocks, i, rsv_blocks.end());
-			update_speed();
+			release_blocks(i, blocks.end());
 			return true;
 		}
-		else if(i->block->get_sensor_id())
+		else if((*i)->get_sensor_id())
 			++nsens;
 	}
 
 	return false;
 }
 
+void Train::free_noncritical_blocks()
+{
+	if(blocks.empty())
+		return;
+
+	if(controller->get_speed()==0)
+	{
+		release_blocks(cur_blocks_end, blocks.end());
+		return;
+	}
+
+	float margin = 10*layout.get_catalogue().get_scale();
+	float min_dist = controller->get_braking_distance()*1.3+margin;
+
+	Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
+
+	TrackIter track(veh.get_track(), veh.get_entry());
+	BlockList::iterator block = blocks.begin();
+	bool in_rsv = false;
+	while(block!=blocks.end() && !(*block)->has_track(*track))
+	{
+		++block;
+		if(block==cur_blocks_end)
+			in_rsv = true;
+	}
+
+	float dist = veh.get_offset();
+	if(reverse)
+		track.reverse();
+	else
+		dist = track->get_type().get_path_length(track->get_active_path())-dist;
+	dist -= veh.get_type().get_length()/2;
+
+	bool nsens = 0;
+	while(1)
+	{
+		track = track.next();
+
+		if(!(*block)->has_track(*track))
+		{
+			++block;
+			if(block==cur_blocks_end)
+				in_rsv = true;
+			if(block==blocks.end())
+				return;
+
+			if(dist>min_dist && nsens>0)
+			{
+				release_blocks(block, blocks.end());
+				return;
+			}
+
+			if(in_rsv && (*block)->get_sensor_id())
+				++nsens;
+		}
+
+		dist += track->get_type().get_path_length(track->get_active_path());
+	}
+}
+
 int Train::get_entry_to_block(Block &block) const
 {
-	for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
-		if(i->block==&block)
-			return i->entry;
-	for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-		if(i->block==&block)
-			return i->entry;
+	for(BlockList::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		if(i->block()==&block)
+			return i->entry();
 	return -1;
 }
 
+float Train::get_reserved_distance() const
+{
+	return get_reserved_distance_until(0, false);
+}
+
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 {
-	if(stop_timeout && t>=stop_timeout)
+	if(!active && stop_timeout && t>=stop_timeout)
 	{
-		release_blocks(rsv_blocks);
-		end_of_route = false;
+		release_blocks(cur_blocks_end, blocks.end());
 		stop_timeout = Time::TimeStamp();
 	}
 
-	if(current_speed)
+	Driver &driver = layout.get_driver();
+
+	if(timetable)
+		timetable->tick(t);
+	controller->tick(dt);
+	float speed = controller->get_speed();
+	unsigned speed_step = find_speed_step(speed);
+
+	if(controller->get_reverse()!=reverse)
+	{
+		reverse = controller->get_reverse();
+		driver.set_loco_reverse(address, reverse);
+
+		release_blocks(cur_blocks_end, blocks.end());
+		reverse_blocks(blocks);
+
+		reserve_more();
+	}
+	if(speed_step!=current_speed_step && !speed_changing && !driver.is_halted() && driver.get_power())
 	{
-		Track *track = vehicles[0]->get_track();
+		speed_changing = true;
+		driver.set_loco_speed(address, speed_step);
+
+		pure_speed = false;
+
+		if(speed_step)
+			set_status(format("Traveling %d kmh", get_travel_speed()));
+		else
+			set_status("Waiting");
+	}
+
+	if(speed)
+	{
+		if(!active)
+			set_active(true);
+
+		Vehicle &vehicle = *(reverse ? vehicles.back() : vehicles.front());
+		Track *track = vehicle.get_track();
 
 		bool ok = false;
-		for(list<BlockRef>::const_iterator i=cur_blocks.begin(); (!ok && i!=cur_blocks.end()); ++i)
-			ok = i->block->get_tracks().count(track);
+		for(BlockList::const_iterator i=blocks.begin(); (!ok && i!=cur_blocks_end); ++i)
+			ok = (*i)->has_track(*track);
 
+		float d;
+		if(real_speed.size()>1)
+			d = get_real_speed(current_speed_step)*(dt/Time::sec);
+		else
+			d = speed*(dt/Time::sec);
 		if(ok)
 		{
-			float d = get_real_speed(current_speed)*(dt/Time::sec);
-			vehicles[0]->advance(reverse ? -d : d);
+			SetFlag setf(advancing);
+			vehicle.advance(reverse ? -d : d);
+		}
+		else if(accurate_position)
+		{
+			overshoot_dist += d;
+			if(overshoot_dist>40*layout.get_catalogue().get_scale())
+			{
+				layout.emergency(name+" has not arrived at sensor");
+				accurate_position = false;
+			}
+		}
+	}
+	else if(end_of_route && cur_blocks_end==blocks.end())
+	{
+		set_active(false);
+		signal_arrived.emit();
+		set_route(0);
+	}
+
+	if(!blocks.empty() && !blocks.front()->get_sensor_id())
+	{
+		float dist = get_reserved_distance_until(&*blocks.front(), true);
+
+		if(dist>10*layout.get_catalogue().get_scale())
+		{
+			blocks.front()->reserve(0);
+			blocks.pop_front();
 		}
 	}
 }
@@ -287,36 +602,58 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 void Train::save(list<DataFile::Statement> &st) const
 {
 	st.push_back((DataFile::Statement("name"), name));
-	for(unsigned i=0; i<=14; ++i)
+
+	st.push_back((DataFile::Statement("priority"), priority));
+
+	for(vector<Vehicle *>::const_iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
+		if(i!=vehicles.begin())
+			st.push_back((DataFile::Statement("vehicle"), (*i)->get_type().get_article_number()));
+
+	for(unsigned i=0; i<real_speed.size(); ++i)
 		if(real_speed[i].weight)
 			st.push_back((DataFile::Statement("real_speed"), i, real_speed[i].speed, real_speed[i].weight));
 
-	if(!cur_blocks.empty())
+	if(!blocks.empty() && cur_blocks_end!=blocks.begin())
 	{
-		list<BlockRef> blocks = cur_blocks;
+		BlockList blks(blocks.begin(), BlockList::const_iterator(cur_blocks_end));
 		if(reverse)
-			reverse_blocks(blocks);
+			reverse_blocks(blks);
 
-		Block *prev = blocks.front().block->get_endpoints()[blocks.front().entry].link;
+		BlockIter prev = blks.front().flip();
 		st.push_back((DataFile::Statement("block_hint"), prev->get_id()));
 
-		for(list<BlockRef>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
-			st.push_back((DataFile::Statement("block"), i->block->get_id()));
+		for(BlockList::const_iterator i=blks.begin(); i!=blks.end(); ++i)
+			st.push_back((DataFile::Statement("block"), (*i)->get_id()));
+	}
+
+	if(!routes.empty())
+	{
+		list<RouteRef>::const_iterator i = routes.begin();
+		for(; (i!=routes.end() && i->route->is_temporary()); ++i) ;
+		if(i!=routes.end())
+			st.push_back((DataFile::Statement("route"), i->route->get_name()));
 	}
 
-	if(route)
-		st.push_back((DataFile::Statement("route"), route->get_name()));
+	if(timetable)
+	{
+		DataFile::Statement ss("timetable");
+		timetable->save(ss.sub);
+		st.push_back(ss);
+	}
 }
 
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
+void Train::control_changed(const Controller::Control &ctrl)
+{
+	signal_control_changed.emit(ctrl.name, ctrl.value);
+}
+
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
 {
 	if(addr==address)
 	{
-		current_speed = speed;
-		reverse = rev;
-
-		signal_speed_changed.emit(current_speed);
-		signal_reverse_changed.emit(reverse);
+		current_speed_step = speed;
+		speed_changing = false;
+		pure_speed = false;
 	}
 }
 
@@ -340,291 +677,430 @@ void Train::sensor_event(unsigned addr, bool state)
 	if(state)
 	{
 		// Find the first sensor block from our reserved blocks that isn't this sensor
-		list<BlockRef>::iterator i;
-		for(i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-			if(i->block->get_sensor_id() && i->block->get_sensor_id()!=addr)
-				break;
+		BlockList::iterator end;
+		unsigned result = 0;
+		for(end=cur_blocks_end; end!=blocks.end(); ++end)
+			if((*end)->get_sensor_id())
+			{
+				if((*end)->get_sensor_id()!=addr)
+				{
+					if(result==0)
+						result = 2;
+					else if(result==1)
+						break;
+				}
+				else if(result==0)
+					result = 1;
+				else if(result==2)
+					result = 3;
+			}
 
-		if(i!=rsv_blocks.begin())
+		if(result==1)
 		{
 			// Compute speed and update related state
 			float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
-			travel_speed = static_cast<int>(round(travel_dist/travel_time_secs*87*3.6/5))*5;
 
 			if(pure_speed)
 			{
-				RealSpeed &rs = real_speed[current_speed];
-				rs.add(travel_dist/travel_time_secs, travel_time_secs);
+				if(current_speed_step>0)
+				{
+					RealSpeed &rs = real_speed[current_speed_step];
+					rs.add(travel_dist/travel_time_secs, travel_time_secs);
+				}
+				set_status(format("Traveling %d kmh", get_travel_speed()));
 			}
 
 			travel_dist = 0;
-			float block_len;
-			for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
+			for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
 			{
-				j->block->traverse(j->entry, &block_len);
-				travel_dist += block_len;
+				travel_dist += (*j)->get_path_length(j->entry());
 
-				if(j->block->get_sensor_id()==addr)
+				if((*j)->get_sensor_id()==addr && !advancing)
 				{
-					const Block::Endpoint &bep = j->block->get_endpoints()[j->entry];
+					TrackIter track = j->track_iter();
 					if(reverse)
 					{
-						Track *track = bep.track->get_link(bep.track_ep);
-						unsigned ep = track->get_endpoint_by_link(*bep.track);
-						vehicles.back()->place(track, ep, 0, Vehicle::BACK_AXLE);
+						track = track.flip();
+						vehicles.back()->place(*track, track.entry(), 0, Vehicle::BACK_AXLE);
 					}
 					else
-						vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::FRONT_AXLE);
+						vehicles.front()->place(*track, track.entry(), 0, Vehicle::FRONT_AXLE);
 				}
 			}
 			last_entry_time = Time::now();
 			pure_speed = true;
+			accurate_position = true;
+			overshoot_dist = 0;
 
 			// Check if we've reached the next route
-			if(next_route)
+			if(routes.size()>1)
 			{
-				const set<const Track *> &rtracks = next_route->get_tracks();
-				for(list<BlockRef>::iterator j=rsv_blocks.begin(); j!=i; ++j)
-					if(rtracks.count(j->block->get_endpoints()[j->entry].track))
+				const Route &route = *(++routes.begin())->route;
+				for(BlockList::iterator j=cur_blocks_end; j!=end; ++j)
+					if(route.has_track(*j->track_iter()))
 					{
-						route = next_route;
-						next_route = 0;
+						routes.pop_front();
 						// XXX Exceptions?
-						signal_route_changed.emit(route);
+						signal_route_changed.emit(routes.front().route);
 						break;
 					}
 			}
 
 			// Move blocks up to the next sensor to our current blocks
-			cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
+			cur_blocks_end = end;
 
 			// Try to get more blocks if we're moving
-			if(target_speed)
-			{
-				unsigned nsens = reserve_more();
-				if(!nsens && end_of_route)
-				{
-					set_speed(0);
-					set_route(0);
-				}
-				else if(nsens<2)
-					update_speed();
-			}
+			if(active)
+				reserve_more();
 		}
+		else if(result==3)
+			layout.emergency("Sensor for "+name+" triggered out of order");
 	}
 	else
 	{
+		const Vehicle &veh = *(reverse ? vehicles.front() : vehicles.back());
+
 		// Find the first sensor in our current blocks that's still active
-		list<BlockRef>::iterator end = cur_blocks.begin();
-		for(list<BlockRef>::iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
-			if(i->block->get_sensor_id())
+		BlockList::iterator end = blocks.begin();
+		for(BlockList::iterator i=blocks.begin(); i!=cur_blocks_end; ++i)
+		{
+			if((*i)->has_track(*veh.get_track()))
+				break;
+			if((*i)->get_sensor_id())
 			{
-				if(layout.get_driver().get_sensor(i->block->get_sensor_id()))
+				if(layout.get_driver().get_sensor((*i)->get_sensor_id()))
 					break;
 				else
+				{
 					end = i;
+					++end;
+				}
 			}
+		}
 		
-		if(end!=cur_blocks.begin())
-		{
+		if(end!=blocks.begin() && end!=cur_blocks_end)
 			// Free blocks up to the last inactive sensor
-			++end;
-			release_blocks(cur_blocks, cur_blocks.begin(), end);
-		}
+			release_blocks(blocks.begin(), end);
 	}
 }
 
-void Train::turnout_event(unsigned addr, bool)
+void Train::turnout_path_changed(Track &track)
 {
-	if(pending_block)
-	{
-		unsigned pending_addr = pending_block->get_turnout_id();
-		bool double_addr = (*pending_block->get_tracks().begin())->get_type().is_double_address();
-		if(addr==pending_addr || (double_addr && addr==pending_addr+1))
-			reserve_more();
-	}
+	for(list<BlockIter>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		if((*i)->get_turnout_id()==track.get_turnout_id() && !reserving)
+			check_turnout_paths(false);
+}
+
+void Train::halt_event(bool h)
+{
+	if(h)
+		accurate_position = false;
 }
 
 void Train::block_reserved(const Block &block, const Train *train)
 {
-	if(&block==pending_block && !train)
+	if(&block==pending_block && !train && !reserving)
 		reserve_more();
 }
 
-unsigned Train::reserve_more()
+void Train::reserve_more()
 {
-	BlockRef *last = 0;
-	if(!rsv_blocks.empty())
-		last = &rsv_blocks.back();
-	else if(!cur_blocks.empty())
-		last = &cur_blocks.back();
-	if(!last)
-		return 0;
+	if(!active || blocks.empty() || end_of_route)
+		return;
+
+	BlockIter start = blocks.back();
 
 	pending_block = 0;
 
-	// See how many sensor blocks we already have
+	// See how many sensor blocks and how much track we already have
 	unsigned nsens = 0;
-	for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-		if(i->block->get_sensor_id())
+	float dist = 0;
+	for(BlockList::const_iterator i=cur_blocks_end; i!=blocks.end(); ++i)
+	{
+		if((*i)->get_sensor_id())
 			++nsens;
-	
-	const Route *cur_route = 0;
-	if(route)
-	{
-		unsigned exit = last->block->traverse(last->entry);
-		Track *track = last->block->get_endpoints()[exit].track;
-		if(route->get_tracks().count(track))
-			cur_route = route;
-		else if(next_route && next_route->get_tracks().count(track))
-			cur_route = next_route;
-	}
-
-	bool got_more = false;
-	BlockRef *good = last;
-	unsigned good_sens = nsens;
-	while(good_sens<3)
-	{
-		// Traverse to the next block
-		unsigned exit = last->block->traverse(last->entry);
-		Block *link = last->block->get_link(exit);
-		if(!link)
-			break;
+		if(nsens>0)
+			dist += (*i)->get_path_length(i->entry());
+	}
+
+	list<RouteRef>::iterator cur_route = routes.begin();
+	advance_route(cur_route, *start.track_iter());
 
-		int entry = link->get_endpoint_by_link(*last->block);
-		if(entry<0)
-			throw LogicError("Block links are inconsistent!");
+	float approach_margin = 50*layout.get_catalogue().get_scale();
+	float min_dist = controller->get_braking_distance()*1.3+approach_margin*2;
 
-		const Block::Endpoint &entry_ep = link->get_endpoints()[entry];
+	BlockIter block = start;
+	list<BlockIter>::iterator good_end = blocks.end();
+	Track *divert_track = 0;
+	bool try_divert = false;
+	Train *blocking_train = 0;
+	BlockList contested_blocks;
 
-		if(cur_route)
+	SetFlag setf(reserving);
+
+	while(1)
+	{
+		BlockIter last = block;
+		block = block.next(cur_route!=routes.end() ? cur_route->route : 0);
+		if(!block || block->get_endpoints().size()<2)
 		{
-			if(cur_route!=next_route && next_route && next_route->get_tracks().count(entry_ep.track))
-				cur_route = next_route;
-			else if(!cur_route->get_tracks().count(entry_ep.track))
+			if(!blocking_train)
+				good_end = blocks.end();
+			break;
+		}
+
+		TrackIter track = block.track_iter();
+
+		if(cur_route!=routes.end())
+		{
+			if(!advance_route(cur_route, *track))
 			{
 				// Keep the blocks if we arrived at the end of the route
-				good = last;
-				good_sens = nsens;
-				end_of_route = true;
+				if(!blocking_train)
+				{
+					good_end = blocks.end();
+					end_of_route = true;
+				}
 				break;
 			}
 		}
-		else if(route && route->get_tracks().count(entry_ep.track))
-			cur_route = route;
 
-		if(!link->reserve(this))
+		if(block->get_turnout_id() && !last->get_turnout_id())
 		{
-			// If we found another train and it's not headed straight for us, we can keep the blocks we got
-			int other_entry = link->get_train()->get_entry_to_block(*link);
-			if(other_entry<0)
-				throw LogicError("Block reservation inconsistency");
-			if(static_cast<unsigned>(entry)!=link->traverse(other_entry))
+			/* We can keep the blocks if we arrive at a turnout from a non-turnout
+			block.  Having a turnout block as our last reserved block is not good
+			as it would limit our diversion possibilities for little benefit. */
+			good_end = blocks.end();
+			if(nsens>=3 && dist>=min_dist)
+				break;
+		}
+
+		if(blocking_train)
+		{
+			if(block->get_train()!=blocking_train)
+			{
+				if(blocking_train->free_block(*contested_blocks.back()))
+				{
+					// Roll back and start actually reserving the blocks
+					block = blocks.back();
+					cur_route = routes.begin();
+					advance_route(cur_route, *block.track_iter().track());
+					if(blocking_train->get_priority()==priority)
+						blocking_train->yield_to(*this);
+					blocking_train = 0;
+					continue;
+				}
+				else
+				{
+					yield_to(*blocking_train);
+					pending_block = contested_blocks.front().block();
+					try_divert = divert_track;
+					break;
+				}
+			}
+			else
 			{
-				good = last;
-				good_sens = nsens;
+				contested_blocks.push_back(block);
+				continue;
 			}
-			pending_block = link;
-			break;
 		}
 
-		if(link->get_turnout_id())
+		bool reserved = block->reserve(this);
+		if(!reserved)
 		{
-			const Endpoint &track_ep = entry_ep.track->get_type().get_endpoints()[entry_ep.track_ep];
-
-			// Keep the blocks reserved so far, as either us or the other train can diverge
-			good = last;
-			good_sens = nsens;
-
-			// Figure out what path we'd like to take on the turnout
-			int path = -1;
-			if(cur_route)
-				path = cur_route->get_turnout(link->get_turnout_id());
-			if(path<0)
-				path = entry_ep.track->get_active_path();
-			if(!((track_ep.paths>>path)&1))
+			/* We've found another train.  If it wants to exit the block from the
+			same endpoint we're trying to enter from or the other way around,
+			treat it as coming towards us.  Otherwise treat it as going in the
+			same direction. */
+			Train *other_train = block->get_train();
+			int other_entry = other_train->get_entry_to_block(*block);
+			if(other_entry<0)
+				throw LogicError("Block reservation inconsistency");
+
+			unsigned exit = block.reverse().entry();
+			unsigned other_exit = BlockIter(block.block(), other_entry).reverse().entry();
+			bool entry_conflict = (block.entry()==other_exit);
+			bool exit_conflict = (exit==static_cast<unsigned>(other_entry));
+			if(!entry_conflict && !last->get_turnout_id())
+				/* The other train is not coming to the blocks we're holding, so we
+				can keep them. */
+				good_end = blocks.end();
+
+			int other_prio = other_train->get_priority();
+
+			if(!entry_conflict && !exit_conflict && other_prio<priority)
+			{
+				/* Ask a lesser priority train going to the same direction to free
+				the block for us */
+				if(other_train->free_block(*block))
+					reserved = block->reserve(this);
+			}
+			else if(other_train!=yielding_to && (other_prio<priority || (other_prio==priority && entry_conflict)))
 			{
-				for(unsigned i=0; track_ep.paths>>i; ++i)
-					if((track_ep.paths>>i)&1)
-						path = i;
+				/* A lesser priority train is coming at us, we must ask it to free
+				enough blocks to get clear of it to avoid a potential deadlock */
+				blocking_train = other_train;
+				contested_blocks.clear();
+				contested_blocks.push_back(block);
+				continue;
 			}
+			else if(divert_track && (entry_conflict || exit_conflict))
+				// We are blocked, but there's a diversion possibility
+				try_divert = true;
 
-			if(path!=static_cast<int>(entry_ep.track->get_active_path()))
+			if(!reserved)
 			{
-				// The turnout is set to wrong path - switch and wait for it
-				link->reserve(0);
-				pending_block = link;
-				entry_ep.track->set_active_path(path);
+				pending_block = &*block;
 				break;
 			}
 		}
 
-		rsv_blocks.push_back(BlockRef(link, entry));
-		last = &rsv_blocks.back();
-		if(last->block->get_sensor_id())
+		if(block->get_turnout_id())
 		{
-			++nsens;
-			got_more = true;
+			const TrackType::Endpoint &track_ep = track.endpoint();
+			bool multiple_paths = (track_ep.paths&(track_ep.paths-1));
+
+			if(multiple_paths && cur_route!=routes.end() && cur_route->diversion!=block->get_turnout_id())
+				/* There's multiple paths to be taken and we are on a route - take
+				note of the diversion possibility */
+				divert_track = &*track;
 		}
+
+		if(!contested_blocks.empty() && contested_blocks.front()==block)
+			contested_blocks.pop_front();
+
+		blocks.push_back(block);
+
+		if(cur_blocks_end==blocks.end())
+			--cur_blocks_end;
+		if(clear_blocks_end==blocks.end())
+			--clear_blocks_end;
+		if(good_end==blocks.end())
+			--good_end;
+
+		if(block->get_sensor_id())
+			++nsens;
+		if(nsens>0)
+			dist += block->get_path_length(block.entry());
 	}
 
 	// Unreserve blocks that were not good
-	while(!rsv_blocks.empty() && last!=good)
-	{
-		last->block->reserve(0);
-		rsv_blocks.erase(--rsv_blocks.end());
-		if(!rsv_blocks.empty())
-			last = &rsv_blocks.back();
-	}
+	release_blocks(good_end, blocks.end());
+
+	if(blocks.back()!=start)
+		// We got some new blocks, so no longer need to yield
+		yielding_to = 0;
+
+	check_turnout_paths(true);
 
-	if(got_more)
-		update_speed();
+	// Make any sensorless blocks at the beginning immediately current
+	while(cur_blocks_end!=clear_blocks_end && !(*cur_blocks_end)->get_sensor_id())
+		++cur_blocks_end;
 
-	return good_sens;
+	if(try_divert && divert(*divert_track))
+		reserve_more();
 }
 
-void Train::update_speed()
+void Train::check_turnout_paths(bool set)
 {
-	Driver &driver = layout.get_driver();
+	if(clear_blocks_end==blocks.end())
+		return;
 
-	unsigned speed;
-	if(!target_speed)
+	for(list<BlockIter>::iterator i=clear_blocks_end; i!=blocks.end(); ++i)
 	{
-		speed = 0;
-		set_status("Stopped");
+		if((*i)->get_turnout_id())
+		{
+			TrackIter track = i->track_iter();
+			const TrackType::Endpoint &track_ep = track.endpoint();
+
+			unsigned path = 0;
+			list<BlockIter>::iterator j = i;
+			if(++j!=blocks.end())
+			{
+				TrackIter rev = j->track_iter().flip();
+				unsigned mask = rev.endpoint().paths&track_ep.paths;
+				for(path=0; mask>1; mask>>=1, ++path) ;
+			}
+			else
+				return;
+
+			if(path!=track->get_active_path())
+			{
+				if(set)
+					track->set_active_path(path);
+
+				/* Check again, in case the driver was able to service the request
+				instantly */
+				if(!set || path!=track->get_active_path())
+					continue;
+			}
+		}
+
+		if(i==clear_blocks_end)
+			++clear_blocks_end;
 	}
+}
+
+float Train::get_reserved_distance_until(const Block *until_block, bool back) const
+{
+	if(blocks.empty())
+		return 0;
+
+	Vehicle &veh = *(reverse!=back ? vehicles.back() : vehicles.front());
+	const VehicleType &vtype = veh.get_type();
+
+	TrackIter track(veh.get_track(), veh.get_entry());
+	if(!track)  // XXX Probably unnecessary
+		return 0;
+
+	BlockList::const_iterator block = blocks.begin();
+	while(block!=clear_blocks_end && !(*block)->has_track(*track))
+		++block;
+	if(block==clear_blocks_end || &**block==until_block)
+		return 0;
+
+	float result = veh.get_offset();
+	if(reverse!=back)
+		track = track.reverse();
 	else
+		result = track->get_type().get_path_length(track->get_active_path())-result;
+	result -= vtype.get_length()/2;
+
+	while(1)
 	{
-		unsigned nsens = 0;
-		for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-			if(i->block->get_sensor_id())
-				++nsens;
+		track = track.next();
+		if(!track)
+			break;
 
-		unsigned slow_speed = find_speed(0.1);  // 31.3 km/h
-		if(nsens==0)
-		{
-			speed = 0;
-			pure_speed = false;
-			set_status("Blocked");
-		}
-		else if(nsens==1 && target_speed>slow_speed)
+		if(!(*block)->has_track(*track))
 		{
-			speed = slow_speed;
-			pure_speed = false;
-			set_status("Slow");
-		}
-		else
-		{
-			speed = target_speed;
-			set_status(format("Traveling %d kmh", travel_speed));
+			if(back)
+			{
+				if(block==blocks.begin())
+					break;
+				--block;
+			}
+			else
+			{
+				++block;
+				if(block==clear_blocks_end)
+					break;
+			}
+
+			if(&**block==until_block)
+				break;
 		}
+
+		result += track->get_type().get_path_length(track->get_active_path());
 	}
 
-	driver.set_loco_speed(address, speed);
+	return result;
 }
 
 float Train::get_real_speed(unsigned i) const
 {
+	if(i==0)
+		return 0;
 	if(real_speed[i].weight)
 		return real_speed[i].speed;
 
@@ -633,7 +1109,7 @@ float Train::get_real_speed(unsigned i) const
 	for(low=i; low>0; --low)
 		if(real_speed[low].weight)
 			break;
-	for(high=i; high<14; ++high)
+	for(high=i; high+1<real_speed.size(); ++high)
 		if(real_speed[high].weight)
 			break;
 
@@ -653,16 +1129,20 @@ float Train::get_real_speed(unsigned i) const
 		return 0;
 }
 
-unsigned Train::find_speed(float real) const
+unsigned Train::find_speed_step(float real) const
 {
-	if(real<=real_speed[0].speed)
+	if(real_speed.size()<=1)
+		return 0;
+	if(real<=real_speed[1].speed*0.5)
 		return 0;
 
 	unsigned low = 0;
 	unsigned high = 0;
-	for(unsigned i=0; (!high && i<=14); ++i)
+	unsigned last = 0;
+	for(unsigned i=0; (!high && i<real_speed.size()); ++i)
 		if(real_speed[i].weight)
 		{
+			last = i;
 			if(real_speed[i].speed<real)
 				low = i;
 			else
@@ -670,62 +1150,155 @@ unsigned Train::find_speed(float real) const
 		}
 	if(!high)
 	{
+		unsigned limit = real_speed.size()/5;
 		if(!low)
-			return 0;
-		return min(static_cast<unsigned>(low*real/real_speed[low].speed), 14U);
+		{
+			if(real)
+				return limit;
+			else
+				return 0;
+		}
+		return min(min(static_cast<unsigned>(low*real/real_speed[low].speed), real_speed.size()-1), last+limit);
 	}
 
 	float f = (real-real_speed[low].speed)/(real_speed[high].speed-real_speed[low].speed);
 	return static_cast<unsigned>(low*(1-f)+high*f+0.5);
 }
 
+float Train::get_travel_speed() const
+{
+	float speed = get_real_speed(current_speed_step);
+	float scale = layout.get_catalogue().get_scale();
+	return static_cast<int>(round(speed/scale*3.6/5))*5;
+}
+
 void Train::set_status(const string &s)
 {
 	status = s;
 	signal_status_changed.emit(s);
 }
 
-void Train::release_blocks(list<BlockRef> &blocks)
+void Train::release_blocks()
 {
-	release_blocks(blocks, blocks.begin(), blocks.end());
+	release_blocks(blocks.begin(), blocks.end());
 }
 
-void Train::release_blocks(list<BlockRef> &blocks, list<BlockRef>::iterator begin, list<BlockRef>::iterator end)
+void Train::release_blocks(BlockList::iterator begin, BlockList::iterator end)
 {
 	while(begin!=end)
 	{
-		Block *block = begin->block;
+		if(begin==cur_blocks_end)
+			cur_blocks_end = end;
+		if(begin==clear_blocks_end)
+			clear_blocks_end = end;
+
+		Block &block = **begin;
 		blocks.erase(begin++);
-		block->reserve(0);
+		block.reserve(0);
+
+		if(begin==blocks.end())
+			end_of_route = false;
 	}
 }
 
-void Train::reverse_blocks(list<BlockRef> &blocks) const
+void Train::reverse_blocks(BlockList &blks) const
 {
-	blocks.reverse();
-	for(list<BlockRef>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-		i->entry = i->block->traverse(i->entry);
+	blks.reverse();
+	for(BlockList::iterator i=blks.begin(); i!=blks.end(); ++i)
+		*i = i->reverse();
 }
 
+bool Train::advance_route(list<RouteRef>::iterator &iter, Track &track)
+{
+	while(iter!=routes.end() && !iter->route->has_track(track))
+		++iter;
+	if(iter==routes.end())
+		return false;
 
-Train::BlockRef::BlockRef(Block *b, unsigned e):
-	block(b),
-	entry(e)
-{ }
+	list<RouteRef>::iterator next = iter;
+	++next;
+	if(next!=routes.end() && next->diversion && next->route->has_track(track))
+		iter = next;
 
-Train::BlockRef Train::BlockRef::next() const
+	return true;
+}
+
+Route *Train::create_lead_route(Route *lead, const Route *target)
 {
-	Block *blk = block->get_endpoints()[block->traverse(entry)].link;
-	if(!blk)
-		throw InvalidState("At end of line");
+	if(!lead)
+	{
+		lead = new Route(layout);
+		lead->set_name("Lead");
+		lead->set_temporary(true);
+	}
 
-	int ep = blk->get_endpoint_by_link(*block);
-	if(ep<0)
-		throw LogicError("Block links are inconsistent");
+	set<Track *> tracks;
+	for(BlockList::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+	{
+		const set<Track *> &btracks = (*i)->get_tracks();
+		for(set<Track *>::const_iterator j=btracks.begin(); j!=btracks.end(); ++j)
+			if(!target || !target->has_track(**j))
+				tracks.insert(*j);
+	}
 
-	return BlockRef(blk, ep);
+	lead->add_tracks(tracks);
+
+	return lead;
 }
 
+bool Train::is_valid_diversion(const Route &diversion, const TrackIter &from)
+{
+	float diversion_len = 0;
+	TrackLoopIter track1 = from;
+	while(diversion.has_track(*track1))
+	{
+		unsigned path = diversion.get_path(*track1);
+		diversion_len += track1->get_type().get_path_length(path);
+
+		track1 = track1.next(path);
+
+		if(track1.looped())
+			return false;
+	}
+
+	list<RouteRef>::iterator route = routes.begin();
+	if(!advance_route(route, *from))
+		return false;
+
+	float route_len = 0;
+	TrackLoopIter track2 = from;
+	while(1)
+	{
+		unsigned path = route->route->get_path(*track2);
+		route_len += track2->get_type().get_path_length(path);
+
+		bool ok = (track2!=from && diversion.has_track(*track2));
+
+		track2 = track2.next(path);
+
+		if(ok)
+			break;
+
+		if(track2.looped())
+			return false;
+
+		if(!advance_route(route, *track2))
+			return false;
+	}
+
+	// Must end up at the same place through both routes
+	if(track2!=track1)
+		return false;
+
+	return diversion_len<route_len*1.2;
+}
+
+
+Train::RouteRef::RouteRef(const Route *r, unsigned d):
+	route(r),
+	diversion(d)
+{ }
+
 
 Train::RealSpeed::RealSpeed():
 	speed(0),
@@ -741,39 +1314,72 @@ void Train::RealSpeed::add(float s, float w)
 
 Train::Loader::Loader(Train &t):
 	DataFile::BasicLoader<Train>(t),
-	prev_block(0)
+	prev_block(0),
+	blocks_valid(true)
 {
 	add("block",       &Loader::block);
 	add("block_hint",  &Loader::block_hint);
 	add("name",        &Loader::name);
+	add("priority",    &Train::priority);
 	add("real_speed",  &Loader::real_speed);
 	add("route",       &Loader::route);
+	add("timetable",   &Loader::timetable);
+	add("vehicle",     &Loader::vehicle);
+}
+
+void Train::Loader::finish()
+{
+	if(!obj.blocks.empty())
+	{
+		TrackIter track = obj.blocks.front().track_iter();
+		float offset = 2*obj.layout.get_catalogue().get_scale();
+		obj.vehicles.back()->place(*track, track.entry(), offset, Vehicle::BACK_BUFFER);
+
+		obj.set_status("Stopped");
+	}
 }
 
 void Train::Loader::block(unsigned id)
 {
-	Block &blk = obj.layout.get_block(id);
+	if(!blocks_valid)
+		return;
+
+	Block *blk;
+	try
+	{
+		blk = &obj.layout.get_block(id);
+	}
+	catch(const KeyError &)
+	{
+		blocks_valid = false;
+		return;
+	}
+
 	int entry = -1;
 	if(prev_block)
-		entry = blk.get_endpoint_by_link(*prev_block);
+		entry = blk->get_endpoint_by_link(*prev_block);
 	if(entry<0)
 		entry = 0;
 
-	blk.reserve(&obj);
-	obj.cur_blocks.push_back(BlockRef(&blk, entry));
-	obj.set_status("Stopped");
-	const Block::Endpoint &bep = blk.get_endpoints()[entry];
-	obj.vehicles.back()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
+	blk->reserve(&obj);
+	obj.blocks.push_back(BlockIter(blk, entry));
 
-	if(blk.get_sensor_id())
-		obj.layout.get_driver().set_sensor(blk.get_sensor_id(), true);
+	if(blk->get_sensor_id())
+		obj.layout.get_driver().set_sensor(blk->get_sensor_id(), true);
 
-	prev_block = &blk;
+	prev_block = blk;
 }
 
 void Train::Loader::block_hint(unsigned id)
 {
-	prev_block = &obj.layout.get_block(id);
+	try
+	{
+		prev_block = &obj.layout.get_block(id);
+	}
+	catch(const KeyError &)
+	{
+		blocks_valid = false;
+	}
 }
 
 void Train::Loader::name(const string &n)
@@ -783,6 +1389,8 @@ void Train::Loader::name(const string &n)
 
 void Train::Loader::real_speed(unsigned i, float speed, float weight)
 {
+	if(i>=obj.real_speed.size())
+		return;
 	obj.real_speed[i].speed = speed;
 	obj.real_speed[i].weight = weight;
 }
@@ -792,4 +1400,21 @@ void Train::Loader::route(const string &n)
 	obj.set_route(&obj.layout.get_route(n));
 }
 
+void Train::Loader::timetable()
+{
+	if(obj.timetable)
+		throw InvalidState("A timetable has already been loaded");
+
+	obj.timetable = new Timetable(obj);
+	load_sub(*obj.timetable);
+}
+
+void Train::Loader::vehicle(ArticleNumber art_nr)
+{
+	const VehicleType &vtype = obj.layout.get_catalogue().get_vehicle(art_nr);
+	Vehicle *veh = new Vehicle(obj.layout, vtype);
+	obj.vehicles.back()->attach_back(*veh);
+	obj.vehicles.push_back(veh);
+}
+
 } // namespace Marklin