{
RouteData routeData = q->parseReply( reply->readAll() );
- ui->BusNoDisplay->setText( q->parseJOREcode( routeData.lineCode ) );
+ ui->BusNoDisplay->setText( routeData.lineCode );
ui->TimeDisplay->setText( routeData.arrivalTime );
}
if ( xml.isStartElement() && xml.name() == "LINE" ) {
QString lineCode( xml.attributes().value("code").toString() );
- retVal.lineCode = lineCode;
+ retVal.lineCode = parseJORECode( lineCode );
inLine = true;
} else
m_toLocation = toLocation;
}
-QString RoutePrivate::parseJOREcode( const QString &joreCode ) const
+QString RoutePrivate::parseJORECode( const QString &joreCode ) const
{
QString areaTransportTypeCode( joreCode.mid(0,1) );
- QString lineCode( joreCode.mid(1,4) );
- QString letterVariant( joreCode.mid(5,1) );
- QString letterNumberVariant( joreCode.mid(6,1) );
- QString direction( joreCode.mid(7,1) );
+ QString lineCode( joreCode.mid(1,3) );
+ QString letterVariant( joreCode.mid(4,1) );
+ QString letterNumberVariant( joreCode.mid(5,1) );
+ QString direction( joreCode.mid(6,1) );
+
+ lineCode.setNum( lineCode.toInt() );
return lineCode+letterVariant;
}
{
RouteData routeData = m_subject->parseReply( sampleInput );
- QCOMPARE( routeData.lineCode, QString( "2110T 1" ) );
+ QCOMPARE( routeData.lineCode, QString( "110T" ) );
QCOMPARE( routeData.arrivalTime, QString( "1834" ) );
}