Skip to content

Commit

Permalink
chore: merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
rawi-coding committed Jan 22, 2025
1 parent b1f0d7a commit fff98d1
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class SegmentProfileMapper {
order: calculateOrder(mapperData.segmentIndex, timingPoint.location),
mandatoryStop: tpConstraint.stoppingPointInformation?.stopType?.mandatoryStop ?? true,
isStop: tpConstraint.stopSkipPass == StopSkipPass.stoppingPoint,
isStation: tafTapLocation.locationType != TafTapLocationType.stoppingLocation,
isStation: tafTapLocation.locationType != TafTapLocationType.halt,
bracketMainStation: _parseBracketMainStation(tafTapLocations, tafTapLocation),
kilometre: mapperData.kilometreMap[timingPoint.location] ?? [],
speedData:
Expand Down

0 comments on commit fff98d1

Please sign in to comment.