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 2016-09-12 18:03:43 +03:00
parent 9c37891c0a
commit 38969d8130
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/chart_generator.cpp
View file

@ -169,7 +169,8 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
double const freeHeightSpacePxl = drawHeightPxl - deltaAltM / metersPerPxl;
if (freeHeightSpacePxl < 0 || freeHeightSpacePxl > drawHeightPxl)
{
LOG(LERROR, ("freeHeightSpacePxl is out of the range [0, drawHeightPxl]."));
LOG(LERROR, ("Number of pixels free of chart points (", freeHeightSpacePxl,
") is below zero or greater number of pixels for the chart (", drawHeightPxl, ")."));
return false;
}

8
map/map_tests/chart_generator_tests.cpp
View file

@ -104,8 +104,8 @@ UNIT_TEST(GenerateYAxisChartData_SmokeTest)
vector<double> yAxisDataPxl;
TEST(maps::GenerateYAxisChartData(30 /* height */, 1.0 /* minMetersPerPxl */, altitudeDataM, yAxisDataPxl), ());
vector<double> expecttedYAxisDataPxl = {15.0, 15.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expecttedYAxisDataPxl), ());
vector<double> expectedYAxisDataPxl = {15.0, 15.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expectedYAxisDataPxl), ());
}
UNIT_TEST(GenerateYAxisChartData_EmptyAltitudeDataTest)
@ -123,8 +123,8 @@ UNIT_TEST(GenerateYAxisChartData_Test)
vector<double> yAxisDataPxl;
TEST(maps::GenerateYAxisChartData(100 /* height */, 1.0 /* minMetersPerPxl */, altitudeDataM, yAxisDataPxl), ());
vector<double> expecttedYAxisDataPxl = {50.0, 48.0, 50.0, 52.0, 49.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expecttedYAxisDataPxl), ());
vector<double> expectedYAxisDataPxl = {50.0, 48.0, 50.0, 52.0, 49.0};
TEST(AlmostEqualAbs(yAxisDataPxl, expectedYAxisDataPxl), ());
}
UNIT_TEST(GenerateChartByPoints_NoGeometryTest)