Changeset 31

Timestamp:

Apr 18, 2015, 11:43:05 PM (10 years ago)

Author:

chronos

Message:

• Added: Track points now belong to TTrack class. TTrackPoint and TTrackLine have Track as Parent instead of TMetroLine. This change is needed to gradually separate TTrack, TTrackLink and TTrackPoint to separate unit and allow consistent implementations of TTrackLinks and direct object references between TTrackPoints insted of searching in list using IndexOf.

File:

• trunk/UEngine.pas (modified) (49 diffs)

trunk/UEngine.pas

@@ -20 +20 @@
   TTrackPoint = class;
   TLineStation = class;
+  TTrackPoints = class;
+  TTrack = class;
 
   { TMapStation }
@@ -64 +66 @@
 
   TTrackPoint = class
-    Line: TMetroLine;
     LineStation: TLineStation;
     Position: TPoint;
@@ -70 +71 @@
     PositionDesigned: TPoint;
     Pending: Boolean;
+    NeighPoints: TTrackPoints;
+    Track: TTrack;
     function GetDown: TTrackPoint;
     function GetUp: TTrackPoint;
@@ -76 +79 @@
     // Move to TTrackLink later
     function GetDistance: Integer;
-  end;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TTrackPoints }
 
   TTrackPoints = class(TObjectList)
-    Line: TMetroLine;
-  end;
-
-  TTrack = class
+    Track: TTrack;
+    function AddNew: TTrackPoint;
+  end;
+
+  { TTrackLink }
+
+  TTrackLink = class
+    Points: TTrackPoints;
     PointDown: TTrackPoint;
     PointUp: TTrackPoint;
     Line: TMetroLine;
     Shift: TPoint;
+    Track: TTrack;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  TTrackLinks = class(TObjectList)
+  end;
+
+  TTrack = class
+    Points: TTrackPoints;
+    Links: TTrackLinks;
+    Line: TMetroLine;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -92 +117 @@
 
   TTracks = class(TObjectList)
-    function SearchPointUp(TrackPoint: TTrackPoint; Skip: TTrack): TTrack;
-    function SearchPointDown(TrackPoint: TTrackPoint; Skip: TTrack): TTrack;
+    function SearchPointUp(TrackPoint: TTrackPoint; Skip: TTrackLink): TTrackLink;
+    function SearchPointDown(TrackPoint: TTrackPoint; Skip: TTrackLink): TTrackLink;
   end;
 
@@ -122 +147 @@
     LineStations: TLineStations;
     Trains: TMetroTrains;
-    TrackPoints: TTrackPoints;
+    Track: TTrack;
     procedure ConnectStation(Station: TMapStation; LineStationDown, LineStationUp: TLineStation);
     procedure DisconnectStation(ALineStation: TLineStation);
@@ -246 +271 @@
     function GetExistStationShapes: TStationShapeSet;
     function GetStationOnPos(Pos: TPoint): TMapStation;
-    function GetTrackOnPos(Pos: TPoint): TTrack;
+    function GetTrackOnPos(Pos: TPoint): TTrackLink;
     function GetTrainOnPos(Pos: TPoint): TMetroTrain;
     procedure DrawLine(Canvas: TCanvas; Pos: TPoint);
@@ -325 +350 @@
   SZeroZoomNotAlowed = 'Zero zoom not allowed';
 
+{ TTrackPoints }
+
+function TTrackPoints.AddNew: TTrackPoint;
+begin
+  Result := TTrackPoint.Create;
+  Result.Track := Track;
+end;
+
+{ TTrack }
+
+constructor TTrack.Create;
+begin
+  Points := TTrackPoints.Create;
+  Points.Track := Self;
+  Links := TTrackLinks.Create;
+end;
+
+destructor TTrack.Destroy;
+begin
+  Points.Free;
+  Links.Free;
+  inherited Destroy;
+end;
+
+{ TTrackLink }
+
+constructor TTrackLink.Create;
+begin
+  Points := TTrackPoints.Create;
+  Points.OwnsObjects := False;
+end;
+
+destructor TTrackLink.Destroy;
+begin
+  Points.Free;
+  inherited Destroy;
+end;
+
 { TRiver }
 
@@ -407 +470 @@
 { TTracks }
 
-function TTracks.SearchPointUp(TrackPoint: TTrackPoint; Skip: TTrack): TTrack;
+function TTracks.SearchPointUp(TrackPoint: TTrackPoint; Skip: TTrackLink): TTrackLink;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TTrack(Items[I]).PointUp <> TrackPoint) and (TTrack(Items[I]) <> Skip) do Inc(I);
-  if I < Count then Result := TTrack(Items[I])
+  while (I < Count) and (TTrackLink(Items[I]).PointUp <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
+  if I < Count then Result := TTrackLink(Items[I])
     else Result := nil;
 end;
 
-function TTracks.SearchPointDown(TrackPoint: TTrackPoint; Skip: TTrack): TTrack;
+function TTracks.SearchPointDown(TrackPoint: TTrackPoint; Skip: TTrackLink): TTrackLink;
 var
   I: Integer;
 begin
   I := 0;
-  while (I < Count) and (TTrack(Items[I]).PointDown <> TrackPoint) and (TTrack(Items[I]) <> Skip) do Inc(I);
-  if I < Count then Result := TTrack(Items[I])
+  while (I < Count) and (TTrackLink(Items[I]).PointDown <> TrackPoint) and (TTrackLink(Items[I]) <> Skip) do Inc(I);
+  if I < Count then Result := TTrackLink(Items[I])
     else Result := nil;
 end;
@@ -459 +522 @@
   I: Integer;
 begin
-  I := Line.TrackPoints.IndexOf(Self) - 1;
-  while (I >= 0) and not Assigned(TTrackPoint(Line.TrackPoints[I]).LineStation) do
+  I := Track.Points.IndexOf(Self) - 1;
+  while (I >= 0) and not Assigned(TTrackPoint(Track.Points[I]).LineStation) do
     Dec(I);
-  if I >= 0 then Result := TTrackPoint(Line.TrackPoints[I])
+  if I >= 0 then Result := TTrackPoint(Track.Points[I])
     else Result := nil;
 end;
@@ -470 +533 @@
   I: Integer;
 begin
-  I := Line.TrackPoints.IndexOf(Self) + 1;
-  while (I < Line.TrackPoints.Count) and not Assigned(TTrackPoint(Line.TrackPoints[I]).LineStation) do
+  I := Track.Points.IndexOf(Self) + 1;
+  while (I < Track.Points.Count) and not Assigned(TTrackPoint(Track.Points[I]).LineStation) do
     Inc(I);
-  if I < Line.TrackPoints.Count then Result := TTrackPoint(Line.TrackPoints[I])
+  if I < Track.Points.Count then Result := TTrackPoint(Track.Points[I])
     else Result := nil;
 end;
@@ -482 +545 @@
 begin
   Result := nil;
-  NewIndex := Line.TrackPoints.IndexOf(Self) - 1;
-  if NewIndex >= 0 then Result := TTrackPoint(Line.TrackPoints[NewIndex]);
+  NewIndex := Track.Points.IndexOf(Self) - 1;
+  if NewIndex >= 0 then Result := TTrackPoint(Track.Points[NewIndex]);
 end;
 
@@ -491 +554 @@
 begin
   Result := nil;
-  if Assigned(Line) then begin
-    NewIndex := Line.TrackPoints.IndexOf(Self) + 1;
-    if NewIndex < Line.TrackPoints.Count then Result := TTrackPoint(Line.TrackPoints[NewIndex]);
+  if Assigned(Track) then begin
+    NewIndex := Track.Points.IndexOf(Self) + 1;
+    if NewIndex < Track.Points.Count then Result := TTrackPoint(Track.Points[NewIndex]);
   end;
 end;
@@ -501 +564 @@
   Index: Integer;
 begin
-  Index := Line.TrackPoints.IndexOf(Self);
-  Result := Distance(TTrackPoint(Line.TrackPoints[Index + 1]).Position,
-    TTrackPoint(Line.TrackPoints[Index]).Position);
+  Index := Track.Points.IndexOf(Self);
+  Result := Distance(TTrackPoint(Track.Points[Index + 1]).Position,
+    TTrackPoint(Track.Points[Index]).Position);
+end;
+
+constructor TTrackPoint.Create;
+begin
+  NeighPoints := TTrackPoints.Create;
+  NeighPoints.OwnsObjects := False;
+end;
+
+destructor TTrackPoint.Destroy;
+begin
+  NeighPoints.Free;
+  inherited Destroy;
 end;
 
@@ -639 +714 @@
 begin
   if LineStations.Count >= 2 then begin
-    Index := TrackPoints.IndexOf(TLineStation(LineStations.First).TrackPoint);
+    Index := Track.Points.IndexOf(TLineStation(LineStations.First).TrackPoint);
     if Index = 0 then begin
-      NewTrackPoint := TTrackPoint.Create;
-      NewTrackPoint.Line := Self;
-      TrackPoints.Insert(0, NewTrackPoint);
-    end;
-    Index := TrackPoints.IndexOf(TLineStation(LineStations.Last).TrackPoint);
-    if Index = TrackPoints.Count - 1 then begin
-      NewTrackPoint := TTrackPoint.Create;
-      NewTrackPoint.Line := Self;
-      TrackPoints.Insert(TrackPoints.Count, NewTrackPoint);
-    end;
-
-    Angle := arctan2((TTrackPoint(TrackPoints[2]).Position.Y - TTrackPoint(TrackPoints[1]).Position.Y),
-      (TTrackPoint(TrackPoints[2]).Position.X - TTrackPoint(TrackPoints[1]).Position.X));
-    EndPoint := Point(Round(TTrackPoint(TrackPoints[1]).Position.X - EndStationLength * Cos(Angle)),
-      Round(TTrackPoint(TrackPoints[1]).Position.Y - EndStationLength * Sin(Angle)));
-    TTrackPoint(TrackPoints.First).Position := EndPoint;
-    TTrackPoint(TrackPoints.First).PositionDesigned := EndPoint;
-
-    Angle := arctan2((TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Position.Y - TTrackPoint(TrackPoints[TrackPoints.Count - 3]).Position.Y),
-      (TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Position.X - TTrackPoint(TrackPoints[TrackPoints.Count - 3]).Position.X));
-    EndPoint := Point(Round(TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Position.X + EndStationLength * Cos(Angle)),
-      Round(TTrackPoint(TrackPoints[TrackPoints.Count - 2]).Position.Y + EndStationLength * Sin(Angle)));
-    TTrackPoint(TrackPoints.Last).Position := EndPoint;
-    TTrackPoint(TrackPoints.Last).PositionDesigned := EndPoint;
+      NewTrackPoint := Track.Points.AddNew;
+      Track.Points.Insert(0, NewTrackPoint);
+    end;
+    Index := Track.Points.IndexOf(TLineStation(LineStations.Last).TrackPoint);
+    if Index = Track.Points.Count - 1 then begin
+      NewTrackPoint := Track.Points.AddNew;
+      Track.Points.Insert(Track.Points.Count, NewTrackPoint);
+    end;
+
+    Angle := arctan2((TTrackPoint(Track.Points[2]).Position.Y - TTrackPoint(Track.Points[1]).Position.Y),
+      (TTrackPoint(Track.Points[2]).Position.X - TTrackPoint(Track.Points[1]).Position.X));
+    EndPoint := Point(Round(TTrackPoint(Track.Points[1]).Position.X - EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(Track.Points[1]).Position.Y - EndStationLength * Sin(Angle)));
+    TTrackPoint(Track.Points.First).Position := EndPoint;
+    TTrackPoint(Track.Points.First).PositionDesigned := EndPoint;
+
+    Angle := arctan2((TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.Y - TTrackPoint(Track.Points[Track.Points.Count - 3]).Position.Y),
+      (TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.X - TTrackPoint(Track.Points[Track.Points.Count - 3]).Position.X));
+    EndPoint := Point(Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.X + EndStationLength * Cos(Angle)),
+      Round(TTrackPoint(Track.Points[Track.Points.Count - 2]).Position.Y + EndStationLength * Sin(Angle)));
+    TTrackPoint(Track.Points.Last).Position := EndPoint;
+    TTrackPoint(Track.Points.Last).PositionDesigned := EndPoint;
   end;
 end;
@@ -688 +761 @@
   Station.Lines.Add(Self);
 
-  NewTrackPoint := TTrackPoint.Create;
+  NewTrackPoint := Track.Points.AddNew;
   NewTrackPoint.LineStation := NewLineStation;
   NewTrackPoint.Position := Station.Position;
   NewTrackPoint.PositionDesigned := NewTrackPoint.Position;
-  NewTrackPoint.Line := TrackPoints.Line;
   Index := 0;
-  if Assigned(LineStationDown) then Index := TrackPoints.IndexOf(LineStationDown.TrackPoint) + 1
-    else if Assigned(LineStationUp) then Index := TrackPoints.IndexOf(LineStationUp.TrackPoint);
-  TrackPoints.Insert(Index, NewTrackPoint);
+  if Assigned(LineStationDown) then Index := Track.Points.IndexOf(LineStationDown.TrackPoint) + 1
+    else if Assigned(LineStationUp) then Index := Track.Points.IndexOf(LineStationUp.TrackPoint);
+  Track.Points.Insert(Index, NewTrackPoint);
   NewLineStation.TrackPoint := NewTrackPoint;
 
@@ -710 +782 @@
       Train.Line := Self;
       Train.TargetStation := TLineStation(LineStations[0]);
-      Train.BaseTrackPoint := TTrackPoint(TrackPoints.First);
+      Train.BaseTrackPoint := TTrackPoint(Track.Points.First);
       Trains.Add(Train);
     end;
@@ -729 +801 @@
   // Determine track point range to be removed
   TP1 := ALineStation.TrackPoint.GetDown;
-  if not Assigned(TP1) then TP1 := TTrackPoint(TrackPoints.First);
+  if not Assigned(TP1) then TP1 := TTrackPoint(Track.Points.First);
   TP2 := ALineStation.TrackPoint.GetUp;
-  if not Assigned(TP2) then TP2 := TTrackPoint(TrackPoints.Last);
+  if not Assigned(TP2) then TP2 := TTrackPoint(Track.Points.Last);
 
   // Remove track points from trains
@@ -737 +809 @@
   with TMetroTrain(Trains[I]) do begin
     IsOnTrack := False;
-    for J := TrackPoints.IndexOf(TP1) to TrackPoints.IndexOf(TP2) do
-    if TTrackPoint(TrackPoints[J]) = BaseTrackPoint then begin
+    for J := Track.Points.IndexOf(TP1) to Track.Points.IndexOf(TP2) do
+    if TTrackPoint(Track.Points[J]) = BaseTrackPoint then begin
       IsOnTrack := True;
       Break;
@@ -753 +825 @@
 
   // Delete old trackpoints
-  Index := TrackPoints.IndexOf(ALineStation.TrackPoint) - 1;
-  while (Index >= 0) and (not Assigned(TTrackPoint(TrackPoints[Index]).LineStation)) do begin
-    TrackPoints.Delete(Index);
+  Index := Track.Points.IndexOf(ALineStation.TrackPoint) - 1;
+  while (Index >= 0) and (not Assigned(TTrackPoint(Track.Points[Index]).LineStation)) do begin
+    Track.Points.Delete(Index);
     Dec(Index);
   end;
   Index := Index + 1;
-  TrackPoints.Delete(Index);
-  while (Index < TrackPoints.Count) and (not Assigned(TTrackPoint(TrackPoints[Index]).LineStation)) do
-    TrackPoints.Delete(Index);
-
-  if ((Index - 1) >= 0) and (Index < TrackPoints.Count) then
-    RouteTrack(TTrackPoint(TrackPoints[Index - 1]), TTrackPoint(TrackPoints[Index]));
+  Track.Points.Delete(Index);
+  while (Index < Track.Points.Count) and (not Assigned(TTrackPoint(Track.Points[Index]).LineStation)) do
+    Track.Points.Delete(Index);
+
+  if ((Index - 1) >= 0) and (Index < Track.Points.Count) then
+    RouteTrack(TTrackPoint(Track.Points[Index - 1]), TTrackPoint(Track.Points[Index]));
 
   ALineStation.MapStation.Lines.Remove(Self);
@@ -796 +868 @@
 begin
   RemoveTrackBetween(TP1, TP2);
-  Index1 := TrackPoints.IndexOf(TP1);
-  Index2 := TrackPoints.IndexOf(TP2);
-  P1 := TTrackPoint(TrackPoints[Index1]).Position;
-  P2 := TTrackPoint(TrackPoints[Index2]).Position;
-  NewTrackPoint := TTrackPoint.Create;
-  NewTrackPoint.Line := Self;
+  Index1 := Track.Points.IndexOf(TP1);
+  Index2 := Track.Points.IndexOf(TP2);
+  P1 := TTrackPoint(Track.Points[Index1]).Position;
+  P2 := TTrackPoint(Track.Points[Index2]).Position;
+  NewTrackPoint := Track.Points.AddNew;
   Delta := Point(P2.X - P1.X, P2.Y - P1.Y);
   if Abs(Delta.X) > Abs(Delta.Y) then begin
@@ -810 +881 @@
     NewTrackPoint.PositionDesigned := NewTrackPoint.Position;
   end;
-  TrackPoints.Insert(Index1 + 1, NewTrackPoint);
+  Track.Points.Insert(Index1 + 1, NewTrackPoint);
 end;
 
@@ -819 +890 @@
   I: Integer;
 begin
-  Index1 := TrackPoints.IndexOf(TP1);
-  Index2 := TrackPoints.IndexOf(TP2);
+  Index1 := Track.Points.IndexOf(TP1);
+  Index2 := Track.Points.IndexOf(TP2);
   if (Index1 = -1) then
     raise Exception.Create('TrackPoint1 not found');
@@ -831 +902 @@
   end;
   for I := 1 to Index2 - Index1 - 1 do
-    TrackPoints.Delete(Index1 + 1);
+    Track.Points.Delete(Index1 + 1);
 end;
 
@@ -839 +910 @@
 begin
   Result := 0;
-  for I := 0 to TrackPoints.Count - 1 do
+  for I := 0 to Track.Points.Count - 1 do
   if I > 0 then
-    Result := Result + Distance(TTrackPoint(TrackPoints[I]).Position, TTrackPoint(TrackPoints[I - 1]).Position);
+    Result := Result + Distance(TTrackPoint(Track.Points[I]).Position, TTrackPoint(Track.Points[I - 1]).Position);
 end;
 
@@ -850 +921 @@
   Trains := TMetroTrains.Create;
   Trains.OwnsObjects := False;
-  TrackPoints := TTrackPoints.Create;
-  TrackPoints.Line := Self;
+  Track := TTrack.Create;
+  Track.Line := Self;
 end;
 
 destructor TMetroLine.Destroy;
 begin
-  TrackPoints.Free;
   Trains.Free;
   LineStations.Free;
+  Track.Free;
   inherited Destroy;
 end;
@@ -890 +961 @@
   Result := 0;
   if Assigned(BaseTrackPoint) and Assigned(TargetStation) then begin
-  Current := Line.TrackPoints.IndexOf(BaseTrackPoint);
-  Target := Line.TrackPoints.IndexOf(TargetStation.TrackPoint);
+  Current := Line.Track.Points.IndexOf(BaseTrackPoint);
+  Target := Line.Track.Points.IndexOf(TargetStation.TrackPoint);
   if Current < Target then begin
     for I := Current to Target - 1 do
-      Result := Result + TTrackPoint(Line.TrackPoints[I]).GetDistance;
+      Result := Result + TTrackPoint(Line.Track.Points[I]).GetDistance;
     Result := Result - Trunc(RelPos);
   end else
   if Current > Target then begin
     for I := Current - 1 downto Target do
-      Result := Result + TTrackPoint(Line.TrackPoints[I]).GetDistance;
+      Result := Result + TTrackPoint(Line.Track.Points[I]).GetDistance;
     Result := Result + Trunc(RelPos);
   end else Result := Trunc(RelPos);
@@ -969 +1040 @@
   TPAngleGroup: TTrackPointsAngleGroup;
   GroupItem: TTrackPointsAngle;
-  NewTrack: TTrack;
+  NewTrack: TTrackLink;
   HAngle: Double;
-  PairTrack: TTrack;
+  PairTrack: TTrackLink;
   NewPoint: TPoint;
 begin
@@ -982 +1053 @@
     LS := Line.LineStations.SearchMapStation(Self);
     TP := LS.TrackPoint;
-    Index := Line.TrackPoints.IndexOf(TP);
+    Index := Line.Track.Points.IndexOf(TP);
     if Index > 0 then begin
-      NewTrack := TTrack.Create;
-      NewTrack.PointDown := TTrackPoint(Line.TrackPoints[Index - 1]);
-      NewTrack.PointUp := TTrackPoint(Line.TrackPoints[Index]);
+      NewTrack := TTrackLink.Create;
+      NewTrack.PointDown := TTrackPoint(Line.Track.Points[Index - 1]);
+      NewTrack.PointUp := TTrackPoint(Line.Track.Points[Index]);
       Tracks.Add(NewTrack);
     end;
-    if Index < (Line.TrackPoints.Count - 1) then begin
-      NewTrack := TTrack.Create;
-      NewTrack.PointDown := TTrackPoint(Line.TrackPoints[Index + 1]);
-      NewTrack.PointUp := TTrackPoint(Line.TrackPoints[Index]);
+    if Index < (Line.Track.Points.Count - 1) then begin
+      NewTrack := TTrackLink.Create;
+      NewTrack.PointDown := TTrackPoint(Line.Track.Points[Index + 1]);
+      NewTrack.PointUp := TTrackPoint(Line.Track.Points[Index]);
       Tracks.Add(NewTrack);
     end;
@@ -1000 +1071 @@
   TPAngleGroup := TTrackPointsAngleGroup.Create;
   for I := 0 to Tracks.Count - 1 do begin
-    Angle := ArcTan2(TTrack(Tracks[I]).PointDown.PositionDesigned.Y - Position.Y,
-      TTrack(Tracks[I]).PointDown.PositionDesigned.X - Position.X);
+    Angle := ArcTan2(TTrackLink(Tracks[I]).PointDown.PositionDesigned.Y - Position.Y,
+      TTrackLink(Tracks[I]).PointDown.PositionDesigned.X - Position.X);
     GroupItem := TPAngleGroup.SearchAngle(Angle);
     if not Assigned(GroupItem) then begin
@@ -1008 +1079 @@
       TPAngleGroup.Add(GroupItem);
     end;
-    GroupItem.Tracks.Add(TTrack(Tracks[I]))
+    GroupItem.Tracks.Add(TTrackLink(Tracks[I]))
   end;
 
@@ -1015 +1086 @@
   with TTrackPointsAngle(TPAngleGroup[I]) do begin
     for J := 0 to Tracks.Count - 1 do
-      with TTrack(Tracks[J]) do begin
+      with TTrackLink(Tracks[J]) do begin
         // Get orthogonal angle
         HAngle := Angle + Pi / 2;
@@ -1157 +1228 @@
 end;
 
-function TEngine.GetTrackOnPos(Pos: TPoint): TTrack;
+function TEngine.GetTrackOnPos(Pos: TPoint): TTrackLink;
 var
   I: Integer;
@@ -1164 +1235 @@
   MinD: Integer;
 begin
-  Result := TTrack.Create;
+  Result := TTrackLink.Create;
   Result.PointDown := nil;
   Result.PointUp := nil;
@@ -1171 +1242 @@
   while (I < Lines.Count) do
   with TMetroLine(Lines[I]) do begin
-    for T := 1 to TrackPoints.Count - 1 do begin
-      D := PointToLineDistance(Pos, TTrackPoint(TrackPoints[T - 1]).Position, TTrackPoint(TrackPoints[T]).Position);
+    for T := 1 to Track.Points.Count - 1 do begin
+      D := PointToLineDistance(Pos, TTrackPoint(Track.Points[T - 1]).Position, TTrackPoint(Track.Points[T]).Position);
       if (D < MinD) and (D < TrackClickDistance) then begin
         MinD := D;
-        Result.PointDown := TTrackPoint(TrackPoints[T - 1]);
-        Result.PointUp := TTrackPoint(TrackPoints[T]);
+        Result.PointDown := TTrackPoint(Track.Points[T - 1]);
+        Result.PointUp := TTrackPoint(Track.Points[T]);
       end;
     end;
@@ -1522 +1593 @@
 begin
   I := 0;
-  while (I < Lines.Count) and (TMetroLine(Lines[I]).TrackPoints.Count > 0) do Inc(I);
+  while (I < Lines.Count) and (TMetroLine(Lines[I]).Track.Points.Count > 0) do Inc(I);
   if I < Lines.Count then Result := TMetroLine(Lines[I])
     else Result := nil;
@@ -1538 +1609 @@
   for I := 0 to Lines.Count - 1 do
   with TMetroLine(Lines[I]) do
-    for J := 0 to TrackPoints.Count - 1 do
-    TTrackPoint(TrackPoints[J]).Position := TTrackPoint(TrackPoints[J]).PositionDesigned;
+    for J := 0 to Track.Points.Count - 1 do
+    TTrackPoint(Track.Points[J]).Position := TTrackPoint(Track.Points[J]).PositionDesigned;
 
   // Calculate new position shifts
@@ -1548 +1619 @@
   for L := 0 to Lines.Count - 1 do
   with TMetroLine(Lines[L]) do begin
-    if TrackPoints.Count > 0 then
-      TTrackPoint(TrackPoints[0]).Position := AddPoint(TTrackPoint(TrackPoints[0]).PositionDesigned,
-        TTrackPoint(TrackPoints[0]).PositionShift);
-    for I := 1 to TrackPoints.Count - 1 do
-    with TTrackPoint(TrackPoints[I]) do begin
-      Link1 := SubPoint(AddPoint(TTrackPoint(TrackPoints[I]).PositionDesigned, TTrackPoint(TrackPoints[I]).PositionShift),
-        AddPoint(TTrackPoint(TrackPoints[I - 1]).PositionDesigned, TTrackPoint(TrackPoints[I - 1]).PositionShift));
-      if (I + 1) < TrackPoints.Count then
-        Link2 := SubPoint(AddPoint(TTrackPoint(TrackPoints[I + 1]).PositionDesigned, TTrackPoint(TrackPoints[I + 1]).PositionShift),
-          AddPoint(TTrackPoint(TrackPoints[I]).PositionDesigned, TTrackPoint(TrackPoints[I]).PositionShift))
+    if Track.Points.Count > 0 then
+      TTrackPoint(Track.Points[0]).Position := AddPoint(TTrackPoint(Track.Points[0]).PositionDesigned,
+        TTrackPoint(Track.Points[0]).PositionShift);
+    for I := 1 to Track.Points.Count - 1 do
+    with TTrackPoint(Track.Points[I]) do begin
+      Link1 := SubPoint(AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
+        AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned, TTrackPoint(Track.Points[I - 1]).PositionShift));
+      if (I + 1) < Track.Points.Count then
+        Link2 := SubPoint(AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I + 1]).PositionShift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift))
         else Link2 := Link1;
 
       if ArcTanPoint(Link1) = ArcTanPoint(Link2) then begin
         // Parallel lines
-        TTrackPoint(TrackPoints[I]).Position := AddPoint(TTrackPoint(TrackPoints[I]).PositionDesigned,
-          TTrackPoint(TrackPoints[I]).PositionShift);
+        TTrackPoint(Track.Points[I]).Position := AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned,
+          TTrackPoint(Track.Points[I]).PositionShift);
       end else begin
         // Intersected lines
-        NewPoint := LineIntersect(AddPoint(TTrackPoint(TrackPoints[I - 1]).PositionDesigned, TTrackPoint(TrackPoints[I - 1]).PositionShift),
-          AddPoint(TTrackPoint(TrackPoints[I]).PositionDesigned, TTrackPoint(TrackPoints[I]).PositionShift),
-          AddPoint(TTrackPoint(TrackPoints[I]).PositionDesigned, TTrackPoint(TrackPoints[I]).PositionShift),
-          AddPoint(TTrackPoint(TrackPoints[I + 1]).PositionDesigned, TTrackPoint(TrackPoints[I + 1]).PositionShift));
-        TTrackPoint(TrackPoints[I]).Position := NewPoint;
+        NewPoint := LineIntersect(AddPoint(TTrackPoint(Track.Points[I - 1]).PositionDesigned, TTrackPoint(Track.Points[I - 1]).PositionShift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
+          AddPoint(TTrackPoint(Track.Points[I]).PositionDesigned, TTrackPoint(Track.Points[I]).PositionShift),
+          AddPoint(TTrackPoint(Track.Points[I + 1]).PositionDesigned, TTrackPoint(Track.Points[I + 1]).PositionShift));
+        TTrackPoint(Track.Points[I]).Position := NewPoint;
       end;
     end;
@@ -1727 +1798 @@
       FocusedStation := GetStationOnPos(View.PointDestToSrc(Position));
       Line := nil;
-      if Assigned(TrackStationDown) then Line := TrackStationDown.Line;
-      if Assigned(TrackStationUp) then Line := TrackStationUp.Line;
+      if Assigned(TrackStationDown) then Line := TrackStationDown.Track.Line;
+      if Assigned(TrackStationUp) then Line := TrackStationUp.Track.Line;
       if Assigned(Line) and not Assigned(LastFocusedStation) and Assigned(FocusedStation) then begin
         if Assigned(TrackStationDown) and (TrackStationDown.LineStation.MapStation = FocusedStation) then begin
@@ -1766 +1837 @@
 var
   I: Integer;
-  FocusedTrack: TTrack;
+  FocusedTrack: TTrackLink;
 begin
   if Button = mbLeft then begin
@@ -1779 +1850 @@
       FocusedTrack := GetTrackOnPos(View.PointDestToSrc(Position));
       if Assigned(FocusedTrack.PointDown) then begin
-        SelectedTrain.Line := FocusedTrack.PointDown.Line;
+        SelectedTrain.Line := FocusedTrack.PointDown.Track.Line;
         SelectedTrain.Line.Trains.Add(SelectedTrain);
         SelectedTrain.BaseTrackPoint := FocusedTrack.PointDown;
       end else
       if Assigned(FocusedTrack.PointDown) then begin
-        SelectedTrain.Line := FocusedTrack.PointUp.Line;
+        SelectedTrain.Line := FocusedTrack.PointUp.Track.Line;
         SelectedTrain.Line.Trains.Add(SelectedTrain);
         SelectedTrain.BaseTrackPoint := FocusedTrack.PointUp;
@@ -1800 +1871 @@
 
     // Remove single line station on line
-    if Assigned(TrackStationDown) and (TrackStationDown.Line.LineStations.Count = 1) then begin
-      TrackStationDown.Line.DisconnectStation(TLineStation(TrackStationDown.Line.LineStations.First));
-    end;
-    if Assigned(TrackStationUp) and (TrackStationUp.Line.LineStations.Count = 1) then begin
-      TrackStationUp.Line.DisconnectStation(TLineStation(TrackStationUp.Line.LineStations.First));
+    if Assigned(TrackStationDown) and (TrackStationDown.Track.Line.LineStations.Count = 1) then begin
+      TrackStationDown.Track.Line.DisconnectStation(TLineStation(TrackStationDown.Track.Line.LineStations.First));
+    end;
+    if Assigned(TrackStationUp) and (TrackStationUp.Track.Line.LineStations.Count = 1) then begin
+      TrackStationUp.Track.Line.DisconnectStation(TLineStation(TrackStationUp.Track.Line.LineStations.First));
     end;
   end else
@@ -1822 +1893 @@
   I: Integer;
   NewLine: TMetroLine;
-  Track: TTrack;
+  Track: TTrackLink;
   NewIndex: Integer;
 begin
@@ -1846 +1917 @@
     Track := GetTrackOnPos(View.PointDestToSrc(Position));
     if Assigned(Track) and Assigned(Track.PointDown) and Assigned(Track.PointUp) then begin
-      SelectedLine := Track.PointDown.Line;
+      SelectedLine := Track.PointDown.Track.Line;
 
       TrackStationDown := Track.PointDown;
-      NewIndex := TrackStationDown.Line.TrackPoints.IndexOf(TrackStationDown);
+      NewIndex := TrackStationDown.Track.Points.IndexOf(TrackStationDown);
       while Assigned(TrackStationDown) and (not Assigned(TrackStationDown.LineStation)) do begin
         NewIndex := NewIndex - 1;
-        if NewIndex >= 0 then TrackStationDown := TTrackPoint(TrackStationDown.Line.TrackPoints[NewIndex])
+        if NewIndex >= 0 then TrackStationDown := TTrackPoint(TrackStationDown.Track.Points[NewIndex])
           else TrackStationDown := nil;
       end;
       TrackStationUp := Track.PointUp;
-      NewIndex := TrackStationUp.Line.TrackPoints.IndexOf(TrackStationDown);
+      NewIndex := TrackStationUp.Track.Points.IndexOf(TrackStationDown);
       while Assigned(TrackStationUp) and (not Assigned(TrackStationUp.LineStation)) do begin
         NewIndex := NewIndex + 1;
-        if NewIndex < TrackStationUp.Line.TrackPoints.Count then
-          TrackStationUp := TTrackPoint(TrackStationUp.Line.TrackPoints[NewIndex])
+        if NewIndex < TrackStationUp.Track.Points.Count then
+          TrackStationUp := TTrackPoint(TrackStationUp.Track.Points[NewIndex])
           else TrackStationUp := nil;
       end;
@@ -1875 +1946 @@
       if Assigned(NewLine) then begin
         NewLine.ConnectStation(Station, nil, nil);
-        TrackStationDown := TTrackPoint(NewLine.TrackPoints.Last);
+        TrackStationDown := TTrackPoint(NewLine.Track.Points.Last);
         TrackStationUp := nil;
         LastFocusedStation := Station;
@@ -2003 +2074 @@
     Canvas.Pen.Style := psSolid;
     Canvas.Pen.Width := MetroLineThickness;
-    if TrackPoints.Count > 0 then Canvas.MoveTo(TTrackPoint(TrackPoints[0]).Position);
-    for S := 1 to TrackPoints.Count - 1 do begin
-      Canvas.LineTo(TTrackPoint(TrackPoints[S]).Position);
+    if Track.Points.Count > 0 then Canvas.MoveTo(TTrackPoint(Track.Points[0]).Position);
+    for S := 1 to Track.Points.Count - 1 do begin
+      Canvas.LineTo(TTrackPoint(Track.Points[S]).Position);
 {      if (S = TrackPoints.Count - 1) then begin
         Canvas.Pen.EndCap := pecSquare;
@@ -2039 +2110 @@
   // Draw design time lines
   if Assigned(TrackStationDown) and Assigned(TrackStationDown.LineStation) then begin
-    Canvas.Pen.Color := TrackStationDown.Line.Color;
+    Canvas.Pen.Color := TrackStationDown.Track.Line.Color;
     Canvas.MoveTo(TrackStationDown.LineStation.TrackPoint.Position);
     DrawLine(Canvas, View.PointDestToSrc(LastMousePos));
   end;
   if Assigned(TrackStationUp) and Assigned(TrackStationUp.LineStation) then begin
-    Canvas.Pen.Color := TrackStationUp.Line.Color;
+    Canvas.Pen.Color := TrackStationUp.Track.Line.Color;
     Canvas.MoveTo(TrackStationUp.LineStation.TrackPoint.Position);
     DrawLine(Canvas, View.PointDestToSrc(LastMousePos));
@@ -2111 +2182 @@
 
   // Line selection
+  TargetCanvas.Pen.Width := 4;
   for I := 0 to High(LineColors) do begin
     if Assigned(Lines.SearchByColor(LineColors[I])) then begin
@@ -2140 +2212 @@
   // Status interface
   Text := IntToStr(ServedPassengerCount);
-  TargetCanvas.Draw(TargetCanvas.Width - 140, 20, ImagePassenger.Picture.Bitmap);
+  TargetCanvas.Draw(TargetCanvas.Width - 100, TargetCanvas.Height - 60, ImagePassenger.Picture.Bitmap);
   TargetCanvas.Brush.Style := bsClear;
-  TargetCanvas.TextOut(TargetCanvas.Width - 146 - TargetCanvas.TextWidth(Text), 25, Text);
+  TargetCanvas.TextOut(TargetCanvas.Width - 50 - TargetCanvas.TextWidth(Text), TargetCanvas.Height - 55, Text);
 
   DrawClock(TargetCanvas);