Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix json rendering of large osm ids #7096

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
- FIXED: Segfault in `UnresolvedManeuverOverride::Turns()` on Australia extracts [#7112](https://github.com/Project-OSRM/osrm-backend/pull/7112)
- CHANGED: Replaced PL:trunk with PL:expressway to match the latest changes in Polish tagging [#7079](https://github.com/Project-OSRM/osrm-backend/pull/7079)
- FIXED: Remove unused C++ headers [#7105](https://github.com/Project-OSRM/osrm-backend/pull/7105)
- FIXED: Fix json rendering problem for large osm ids [#7096](https://github.com/Project-OSRM/osrm-backend/pull/7096)
- Profiles:
- FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
- ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)
Expand Down
2 changes: 1 addition & 1 deletion include/util/json_renderer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ template <typename Out> struct Renderer
// `fmt::memory_buffer` stores first 500 bytes in the object itself(i.e. on stack in this
// case) and then grows using heap if needed
fmt::memory_buffer buffer;
fmt::format_to(std::back_inserter(buffer), FMT_COMPILE("{:.10g}"), number.value);
fmt::format_to(std::back_inserter(buffer), FMT_COMPILE("{:.12g}"), number.value);

write(buffer.data(), buffer.size());
}
Expand Down
21 changes: 13 additions & 8 deletions unit_tests/util/json_render.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ BOOST_AUTO_TEST_CASE(number_truncating)
std::string str;
Renderer<std::string> renderer(str);

// this number would have more than 10 decimals if not truncated
// this number would have more than 12 decimals if not truncated
renderer(Number{42.9995999594999399299});
BOOST_CHECK_EQUAL(str, "42.99959996");
BOOST_CHECK_EQUAL(str, "42.9995999595");
}

BOOST_AUTO_TEST_CASE(integer)
Expand All @@ -30,7 +30,7 @@ BOOST_AUTO_TEST_CASE(test_json_issue_6531)
std::string output;
osrm::util::json::Renderer<std::string> renderer(output);
renderer(0.0000000000017114087924596788);
BOOST_CHECK_EQUAL(output, "1.711408792e-12");
BOOST_CHECK_EQUAL(output, "1.71140879246e-12");

output.clear();
renderer(42.0);
Expand Down Expand Up @@ -70,23 +70,28 @@ BOOST_AUTO_TEST_CASE(test_json_issue_6531)

output.clear();
renderer(42.123456789);
BOOST_CHECK_EQUAL(output, "42.12345679");
BOOST_CHECK_EQUAL(output, "42.123456789");

output.clear();
renderer(0.12345678912345);
BOOST_CHECK_EQUAL(output, "0.1234567891");
BOOST_CHECK_EQUAL(output, "0.123456789123");

output.clear();
renderer(0.123456789);
BOOST_CHECK_EQUAL(output, "0.123456789");

output.clear();
renderer(0.12345678916);
BOOST_CHECK_EQUAL(output, "0.1234567892");
BOOST_CHECK_EQUAL(output, "0.12345678916");

output.clear();
renderer(123456789123456789.);
BOOST_CHECK_EQUAL(output, "1.234567891e+17");
renderer(12345678912345678.0);
BOOST_CHECK_EQUAL(output, "1.23456789123e+16");

// handle large osm ids, till 12 digits
output.clear();
renderer(100396615812);
BOOST_CHECK_EQUAL(output, "100396615812");
}

BOOST_AUTO_TEST_SUITE_END()