X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrackoffsetiter.cpp;h=8f21e950a5e3de4dfa3cfa5b1462b455cf90c9bb;hb=3dfcd6a470a96dc7b6f2f100e604c7f0db6da00c;hp=d23b4d7e44813aa5727604b7df465a2974242a86;hpb=64d23de66c33d0f77454c3db2e40cccc18f7851b;p=r2c2.git

diff --git a/source/libr2c2/trackoffsetiter.cpp b/source/libr2c2/trackoffsetiter.cpp
index d23b4d7..8f21e95 100644
--- a/source/libr2c2/trackoffsetiter.cpp
+++ b/source/libr2c2/trackoffsetiter.cpp
@@ -24,25 +24,50 @@ TrackOffsetIter::TrackOffsetIter(Track *t, unsigned e, float o):
 	_track(t, e),
 	_offset(_track ? o : 0),
 	_path((_track && _offset) ? _track->get_active_path() : -1)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(Track *t, unsigned e, unsigned p, float o):
 	_track(t, e),
 	_offset(o),
 	_path(p)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(const TrackIter &t, float o):
 	_track(t),
 	_offset(_track ? o : 0),
 	_path((_track && _offset) ? _track->get_active_path() : -1)
-{ }
+{
+	validate();
+}
 
 TrackOffsetIter::TrackOffsetIter(const TrackIter &t, unsigned p, float o):
 	_track(t),
 	_offset(o),
 	_path(p)
-{ }
+{
+	validate();
+}
+
+void TrackOffsetIter::validate()
+{
+	if(!_track)
+		return;
+
+	if(_offset<0)
+		throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+
+	if(_path>=0)
+	{
+		if(!_track.endpoint().has_path(_path))
+			throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+		if(_offset>_track->get_type().get_path_length(_path))
+			throw invalid_argument("TrackOffsetIter::TrackOffsetIter");
+	}
+}
 
 BlockIter TrackOffsetIter::block_iter() const
 {
@@ -91,13 +116,8 @@ TrackOffsetIter TrackOffsetIter::advance(float d, const Route *r) const
 	while(t)
 	{
 		if(p<0)
-		{
-			if(r)
-				if(unsigned tid = t->get_turnout_id())
-					p = r->get_turnout(tid);
-			if(p<0)
-				p = t->get_active_path();
-		}
+			p = (r ? r->get_path(*t) : t->get_active_path());
+		p = t->get_type().coerce_path(t.entry(), p);
 
 		float length = t->get_type().get_path_length(p);
 		if(o<length)
@@ -118,6 +138,9 @@ TrackOffsetIter TrackOffsetIter::reverse() const
 
 	int p = (_path>=0 ? _path : _track->get_active_path());
 	TrackIter t = _track.reverse(p);
+	if(!t)
+		return TrackOffsetIter();
+
 	float o = t->get_type().get_path_length(p)-_offset;
 
 	return TrackOffsetIter(t, p, o);