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

Review fixes.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2017-10-17 15:46:39 +03:00 • committed by mpimenov
parent 433648bf98
commit e86d2b7a12
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
generator/generator_tests/transit_test.cpp
View file

@ -1,7 +1,5 @@
#include "testing/testing.hpp"
#include "drape/drape_global.hpp"
#include "generator/transit_generator.hpp"
#include "routing_common/transit_types.hpp"
@ -42,8 +40,8 @@ UNIT_TEST(DeserializerFromJson_TitleAnchors)
{ "min_zoom": 14, "anchor": 6 }
]})";
vector<TitleAnchor> expected = {TitleAnchor(11 /* min zoom */, dp::Anchor::Top),
TitleAnchor(14 /* min zoom */, dp::Anchor::RightTop)};
vector<TitleAnchor> expected = {TitleAnchor(11 /* min zoom */, 4 /* anchor */),
TitleAnchor(14 /* min zoom */, 6 /* anchor */)};
TestDeserializerFromJson(jsonBuffer, "title_anchors", expected);
}
@ -88,8 +86,7 @@ UNIT_TEST(DeserializerFromJson_Stops)
{} /* anchors */),
Stop(266680843 /* id */, 2345 /* featureId */, 5 /* transfer id */,
{19213568, 19213569} /* lineIds */, {27.5227942, 64.25206634443111} /* point */,
{TitleAnchor(12 /* min zoom */, dp::Anchor::Center),
TitleAnchor(15, dp::Anchor::LeftBottom)} /* anchor */)};
{TitleAnchor(12 /* min zoom */, 0 /* anchor */), TitleAnchor(15, 9)})};
TestDeserializerFromJson(jsonBuffer, "stops", expected);
}

6
routing_common/routing_common_tests/transit_test.cpp
View file

@ -60,11 +60,11 @@ UNIT_TEST(Transit_TitleAnchorSerialization)
TestSerialization(anchor);
}
{
TitleAnchor anchor(10 /* min zoom */, 4 /* anchor */);
TitleAnchor anchor(10 /* min zoom */, 2 /* anchor */);
TestSerialization(anchor);
}
{
TitleAnchor anchor(18 /* min zoom */, 3 /* anchor */);
TitleAnchor anchor(18 /* min zoom */, 7 /* anchor */);
TestSerialization(anchor);
}
}
@ -111,7 +111,7 @@ UNIT_TEST(Transit_EdgeSerialization)
UNIT_TEST(Transit_TransferSerialization)
{
Transfer transfer(1 /* id */, {40.0, 35.0} /* point */, {1, 2, 3} /* stop ids */,
{TitleAnchor(16, 3)});
{TitleAnchor(16, 0 /* anchor */)});
TestSerialization(transfer);
}