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

format

Browse Source
This commit is contained in:
Huyen Chau Nguyen
2018-09-09 22:49:32 +03:00
parent 91a24bf537
commit 4a4d7ac62f
12 changed files with 71 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/extractor/graph_compressor.cpp
+2 -1
View File
@@ -51,7 +51,8 @@
// return false;
// auto const &first_annotation = node_data_container[graph.GetEdgeData(first).annotation_data];
// auto const &second_annotation = node_data_container[graph.GetEdgeData(second).annotation_data];
// auto const &second_annotation =
// node_data_container[graph.GetEdgeData(second).annotation_data];
// return first_annotation.CanCombineWith(second_annotation);
// }
unit_tests/extractor/intersection_analysis_tests.cpp
+2 -1
View File
@@ -169,7 +169,8 @@ using Graph = util::NodeBasedDynamicGraph;
// // 0
// // ↙ ↑ ↘
// // 4 5 6
// const auto unit_edge = [](const NodeID from, const NodeID to, bool allowed, bool roundabout) {
// const auto unit_edge = [](const NodeID from, const NodeID to, bool allowed, bool roundabout)
// {
// return InputEdge{from,
// to,
// 1,
unit_tests/updater/timezoner.cpp
+8 -4
View File
@@ -15,7 +15,8 @@ BOOST_AUTO_TEST_CASE(timezoner_test)
// const char json[] =
// "{ \"type\" : \"FeatureCollection\", \"features\": ["
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }} ]}";
@@ -29,7 +30,8 @@ BOOST_AUTO_TEST_CASE(timezoner_test)
// const char bad[] =
// "\"type\" : \"FeatureCollection\", \"features\": ["
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }} ]}";
@@ -39,7 +41,8 @@ BOOST_AUTO_TEST_CASE(timezoner_test)
// const char missing_type[] =
// "{ \"FeatureCollection\", \"features\": ["
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }} ]}";
@@ -48,7 +51,8 @@ BOOST_AUTO_TEST_CASE(timezoner_test)
// const char missing_featc[] =
// "{ \"type\" : \"Collection\", \"features\": ["
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }} ]}";
unit_tests/updater/validation.cpp
+12 -6
View File
@@ -74,7 +74,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
// char tzid_err[] = "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : []}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : []}, \"geometry\" : { \"type\": \"polygon\",
// "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }}";
@@ -92,7 +93,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// char nonobj_geom[] =
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : [ \"type\", \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : [ \"type\",
// \"polygon\", "
// "\"coordinates\", [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] ]}";
@@ -100,7 +102,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
// char missing_geom_type[] = "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" :
// { "
// "\"no_type\": \"polygon\", "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
@@ -109,7 +112,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// BOOST_CHECK_THROW(util::validateFeature(doc), util::exception);
// char nonstring_geom_type[] = "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\"
// : "
// "{ \"type\": [\"polygon\"], "
// "\"coordinates\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
@@ -119,7 +123,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// char missing_coords[] =
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coords\": [[[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]]] }}";
@@ -128,7 +133,8 @@ BOOST_AUTO_TEST_CASE(timezone_validation_test)
// char missing_outerring[] =
// "{ \"type\" : \"Feature\","
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\": \"polygon\", "
// "\"properties\" : { \"TZID\" : \"Europe/Berlin\"}, \"geometry\" : { \"type\":
// \"polygon\", "
// "\"coordinates\": [[8.28369,48.88277], [8.57757, "
// "48.88277], [8.57757, 49.07206], [8.28369, "
// "49.07206], [8.28369, 48.88277]] }}";