AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[drape_frontend] Fix rendering of 'cross-mwm' stops and transfers.

Browse source
This commit is contained in:
Olga Khlopkova 2020-10-02 15:27:50 +03:00 • committed by Anatoliy V. Tomilov
parent f4682329d4
commit a47c82a04b
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drape_frontend/transit_scheme_builder.cpp
View file

@ -63,6 +63,8 @@ std::string const kTransitStopInnerColor = "TransitStopInnerMarker";
float constexpr kTransitMarkTextSize = 11.0f;
m2::PointD constexpr kDefaultDirection{0.5, 0.5};
struct TransitStaticVertex
{
using TPosition = glsl::vec3;
@ -873,6 +875,16 @@ void UpdateShapeInfos(std::vector<ShapeInfoPT> & shapeInfos, m2::PointD const &
UpdateShapeInfos(shapeInfos, newDir, std::set<std::string>{color});
}
StopNodeParamsPT & TransitSchemeBuilder::GetStopOrTransfer(MwmSchemeData & scheme,
::transit::TransitId id)
{
auto itStop = scheme.m_stopsPT.find(id);
if (itStop != scheme.m_stopsPT.end())
return itStop->second;
return scheme.m_transfersPT[id];
}
void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDisplayInfo,
LinesDataPT const & lineData, MwmSchemeData & scheme)
{
@ -893,13 +905,8 @@ void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDis
::transit::TransitId stop1Id = lineData.m_stopIds[i];
::transit::TransitId stop2Id = lineData.m_stopIds[i + 1];
StopNodeParamsPT & params1 = (scheme.m_stopsPT.find(stop1Id) == scheme.m_stopsPT.end())
? scheme.m_transfersPT[stop1Id]
: scheme.m_stopsPT[stop1Id];
StopNodeParamsPT & params2 = (scheme.m_stopsPT.find(stop2Id) == scheme.m_stopsPT.end())
? scheme.m_transfersPT[stop2Id]
: scheme.m_stopsPT[stop2Id];
StopNodeParamsPT & params1 = GetStopOrTransfer(scheme, stop1Id);
StopNodeParamsPT & params2 = GetStopOrTransfer(scheme, stop2Id);
m2::PointD dir1;
m2::PointD dir2;
@ -909,6 +916,9 @@ void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDis
if (it == transitDisplayInfo.m_edgesPT.end())
{
dir1 = (params2.m_pivot - params1.m_pivot).Normalize();
if (dir1.IsAlmostZero() && dir2.IsAlmostZero())
dir1 = kDefaultDirection;
dir2 = -dir1;
}
else

2
drape_frontend/transit_scheme_builder.hpp
View file

@ -264,6 +264,8 @@ private:
m2::PointD const & pivot, dp::Color const & colorConst, float lineOffset,
float halfWidth, float depth, dp::Batcher & batcher);
StopNodeParamsPT & GetStopOrTransfer(MwmSchemeData & scheme, ::transit::TransitId id);
using TransitSchemes = std::map<MwmSet::MwmId, MwmSchemeData>;
TransitSchemes m_schemes;