_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
{
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)
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);