Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(json_render): json_render is not accurate enough for extremely sm… (#6531)

Browse Source
This commit is contained in:
zephyr 2023-02-03 01:58:25 +08:00 committed by GitHub
parent 376282d946
commit ebd9ab4548
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/osrm-backend.yml vendored
View File

@ -376,9 +376,9 @@ jobs:
uses: actions/cache@v3
with:
path: ${{github.workspace}}/test/cache
key: v3-test-${{ matrix.name }}-${{ github.sha }}
key: v4-test-${{ matrix.name }}-${{ github.sha }}
restore-keys: |
v3-test-${{ matrix.name }}-
v4-test-${{ matrix.name }}-
- name: Prepare environment
run: |

2
features/testbot/annotations.feature
View File

@ -115,4 +115,4 @@ Feature: Annotations
When I route I should get
| from | to | route | a:speed | a:distance | a:duration | a:nodes |
| a | c | abc,abc | 10:10 | 249.987618946:299.962882039 | 25:30 | 1:2:3 |
| a | c | abc,abc | 10:10 | 249.9876189:299.962882 | 25:30 | 1:2:3 |

4
features/testbot/matching.feature
View File

@ -810,6 +810,6 @@ Feature: Basic Map Matching
# These should have the same weights/duration in either direction
When I match I should get
| trace | geometry | a:distance | a:duration | a:weight | duration |
| 2345 | 1.00018,1,1.000314,1 | 14.914666491 | 1.4 | 1.4 | 1.4 |
| 4321 | 1.00027,1,1.000135,1 | 15.025969972 | 1.5 | 1.5 | 1.5 |
| 2345 | 1.00018,1,1.000314,1 | 14.91466649 | 1.4 | 1.4 | 1.4 |
| 4321 | 1.00027,1,1.000135,1 | 15.02596997 | 1.5 | 1.5 | 1.5 |

4
features/testbot/snap_intersection.feature
View File

@ -570,7 +570,7 @@ Feature: Snapping at intersections
| a,f,k | ac,cf,cf,fj,kj,kj | 132.8s | 132.8 |
| k,f | ik,fi,fi | 54.3s | 54.3 |
| f,a | ef,ae,ae | 66.6s | 66.6 |
| k,f,a | kj,fj,fj,ef,ae,ae | 141.399999999s | 141.399999999 |
| k,f,a | kj,fj,fj,ef,ae,ae | 141.4s | 141.4 |
When I request a travel time matrix I should get
| | a | f | k |
@ -626,4 +626,4 @@ Feature: Snapping at intersections
| a,f,k | ad,df,df,fj,kj,kj | 105.6s | 105.6 |
| k,f | ik,fi,fi | 54.3s | 54.3 |
| f,a | ef,ae,ae | 66.6s | 66.6 |
| k,f,a | ik,fi,fi,ef,ae,ae | 120.899999999s | 120.899999999 |
| k,f,a | ik,fi,fi,ef,ae,ae | 120.9s | 120.9 |

8
features/testbot/weight.feature
View File

@ -53,10 +53,10 @@ Feature: Weight tests
When I route I should get
| waypoints | route | distances | weights | times | a:distance | a:duration | a:weight | a:speed |
| s,t | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034626629 | 2 | 2 | 10 |
| t,s | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.034626629 | 2 | 2 | 10 |
| s,e | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 29.940636463:10.017313314 | 3:0.9 | 3:0.9 | 10:11.1 |
| e,s | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 10.017313314:29.940636463 | 0.9:3 | 0.9:3 | 11.1:10 |
| s,t | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.03462663 | 2 | 2 | 10 |
| t,s | abc,abc | 20m,0m | 2,0 | 2s,0s | 20.03462663 | 2 | 2 | 10 |
| s,e | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 29.94063646:10.01731331 | 3:0.9 | 3:0.9 | 10:11.1 |
| e,s | abc,abc | 40m,0m | 3.9,0 | 3.9s,0s | 10.01731331:29.94063646 | 0.9:3 | 0.9:3 | 11.1:10 |
Scenario: Step weights -- way_function: fail if no weight or weight_per_meter property

13
include/util/json_renderer.hpp
View File

@ -14,6 +14,8 @@
#include <string>
#include <vector>
#include <boost/assert.hpp>
#include <fmt/compile.h>
namespace osrm::util::json
@ -47,17 +49,12 @@ template <typename Out> struct Renderer
void operator()(const Number &number)
{
// we don't want to print NaN or Infinity
BOOST_ASSERT(std::isfinite(number.value));
// `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("{}"), number.value);
// Truncate to 10 decimal places
size_t decimalpos = std::find(buffer.begin(), buffer.end(), '.') - buffer.begin();
if (buffer.size() > (decimalpos + 10))
{
buffer.resize(decimalpos + 10);
}
fmt::format_to(std::back_inserter(buffer), FMT_COMPILE("{:.10g}"), number.value);
write(buffer.data(), buffer.size());
}

66
unit_tests/util/json_render.cpp
View File

@ -16,7 +16,7 @@ BOOST_AUTO_TEST_CASE(number_truncating)
// this number would have more than 10 decimals if not truncated
renderer(Number{42.9995999594999399299});
BOOST_CHECK_EQUAL(str, "42.999599959");
BOOST_CHECK_EQUAL(str, "42.99959996");
}
BOOST_AUTO_TEST_CASE(integer)
@ -27,4 +27,68 @@ BOOST_AUTO_TEST_CASE(integer)
BOOST_CHECK_EQUAL(str, "42");
}
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");
output.clear();
renderer(42.0);
BOOST_CHECK_EQUAL(output, "42");
output.clear();
renderer(42.1);
BOOST_CHECK_EQUAL(output, "42.1");
output.clear();
renderer(42.12);
BOOST_CHECK_EQUAL(output, "42.12");
output.clear();
renderer(42.123);
BOOST_CHECK_EQUAL(output, "42.123");
output.clear();
renderer(42.1234);
BOOST_CHECK_EQUAL(output, "42.1234");
output.clear();
renderer(42.12345);
BOOST_CHECK_EQUAL(output, "42.12345");
output.clear();
renderer(42.123456);
BOOST_CHECK_EQUAL(output, "42.123456");
output.clear();
renderer(42.1234567);
BOOST_CHECK_EQUAL(output, "42.1234567");
output.clear();
renderer(42.12345678);
BOOST_CHECK_EQUAL(output, "42.12345678");
output.clear();
renderer(42.123456789);
BOOST_CHECK_EQUAL(output, "42.12345679");
output.clear();
renderer(0.12345678912345);
BOOST_CHECK_EQUAL(output, "0.1234567891");
output.clear();
renderer(0.123456789);
BOOST_CHECK_EQUAL(output, "0.123456789");
output.clear();
renderer(0.12345678916);
BOOST_CHECK_EQUAL(output, "0.1234567892");
output.clear();
renderer(123456789123456789);
BOOST_CHECK_EQUAL(output, "1.234567891e+17");
}
BOOST_AUTO_TEST_SUITE_END()