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

Map matching test coverage fix (#3201)

Browse Source 
* fixed map matching test coverage
This commit is contained in:
Kajari Ghosh 2016-10-29 11:22:09 -04:00 committed by GitHub
parent f02b7b0910
commit 6fc0609a62
4 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
features/step_definitions/matching.js
View File

@ -43,7 +43,17 @@ module.exports = function () {
if (res.statusCode === 200) { if (res.statusCode === 200) {
if (headers.has('matchings')) { if (headers.has('matchings')) {
subMatchings = json.matchings.filter(m => !!m).map(sub => sub.matched_points); subMatchings = [];
var sub = [json.tracepoints[0].location];
for(var i = 1; i < json.tracepoints.length; i++){
if(json.tracepoints[i-1].matchings_index === json.tracepoints[i].matchings_index) {
sub.push(json.tracepoints[i].location);
} else {
subMatchings.push(sub);
sub = [json.tracepoints[i].location];
}
}
subMatchings.push(sub);
} }
if (headers.has('turns')) { if (headers.has('turns')) {
@ -68,7 +78,7 @@ module.exports = function () {
if (headers.has('geometry')) { if (headers.has('geometry')) {
if (json.matchings.length != 1) throw new Error('*** Checking geometry only supported for matchings with one subtrace'); if (json.matchings.length != 1) throw new Error('*** Checking geometry only supported for matchings with one subtrace');
geometry = json.matchings[0].geometry; geometry = json.matchings[0].geometry.coordinates;
} }
if (headers.has('OSM IDs')) { if (headers.has('OSM IDs')) {

29
features/testbot/matching.feature
View File

@ -5,15 +5,14 @@ Feature: Basic Map Matching
Given the profile "testbot" Given the profile "testbot"
Given a grid size of 10 meters Given a grid size of 10 meters
Given the extract extra arguments "--generate-edge-lookup" Given the extract extra arguments "--generate-edge-lookup"
Given the query options
| geometries | geojson |
Scenario: Testbot - Map matching with outlier that has no candidate Scenario: Testbot - Map matching with outlier that has no candidate
Given a grid size of 100 meters Given a grid size of 10 meters
Given the node map Given the node map
""" """
a b c d a b c d
1 1
""" """
@ -114,13 +113,13 @@ Feature: Basic Map Matching
| fe | yes | | fe | yes |
When I match I should get When I match I should get
| trace | matchings | | trace | matchings |
| dcba | hg,gf,fe | | dcba | hgfe |
| efgh | ab,bc,cd | | efgh | abcd |
Scenario: Testbot - Duration details Scenario: Testbot - Duration details
Given the query options Given the query options
| annotations | true | | annotations | true |
Given the node map Given the node map
""" """
@ -142,19 +141,19 @@ Feature: Basic Map Matching
When I match I should get When I match I should get
| trace | matchings | annotation | | trace | matchings | annotation |
| abeh | abcedgh | 1:9.897633:1,0:0:0,1:10.008842:0,1:10.008842:0,1:10.008842:0,0:0:0,2:20.017685:0,1:10.008842:0 | | abeh | abeh | 1:9.897633:1,0:0:0,1:10.008842:0,1:10.008842:0,1:10.008842:0,0:0:0,2:20.017685:0,1:10.008842:0 |
| abci | abc,ci | 1:9.897633:1,0:0:0,1:10.008842:0,0:0.111209:0,1:10.010367:0 | | abci | abci | 1:9.897633:1,0:0:0,1:10.008842:0,0:0.111209:0,1:10.010367:0 |
# The following is the same as the above, but separated for readability (line length) # The following is the same as the above, but separated for readability (line length)
When I match I should get When I match I should get
| trace | matchings | OSM IDs | | trace | matchings | OSM IDs |
| abeh | abcedgh | 1,2,3,2,3,4,5,4,5,6,7 | | abeh | abeh | 1,2,3,2,3,4,5,4,5,6,7 |
| abci | abc,ci | 1,2,3,2,3,8,3,8 | | abci | abci | 1,2,3,2,3,8,3,8 |
Scenario: Testbot - Geometry details Scenario: Testbot - Geometry details
Given the query options Given the query options
| overview | full | | overview | full |
| geometries | polyline | | geometries | geojson |
Given the node map Given the node map
""" """
@ -168,5 +167,5 @@ Feature: Basic Map Matching
| bd | no | | bd | no |
When I match I should get When I match I should get
| trace | matchings | geometry | | trace | matchings | geometry |
| abd | abd | 1,1,1,1.00009,1,1.00009,0.99991,1.00009 | | abd | abd | 1,1,1.000089,1,1.000089,1,1.000089,0.99991 |

3
include/engine/routing_algorithms/map_matching.hpp
View File

@ -247,6 +247,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
for (const auto s_prime : util::irange<std::size_t>(0UL, current_viterbi.size())) for (const auto s_prime : util::irange<std::size_t>(0UL, current_viterbi.size()))
{ {
const double emission_pr = emission_log_probabilities[t][s_prime]; const double emission_pr = emission_log_probabilities[t][s_prime];
double new_value = prev_viterbi[s] + emission_pr; double new_value = prev_viterbi[s] + emission_pr;
if (current_viterbi[s_prime] > new_value) if (current_viterbi[s_prime] > new_value)
@ -288,7 +289,7 @@ class MapMatching final : public BasicRoutingInterface<DataFacadeT, MapMatching<
// very low probability transition -> prune // very low probability transition -> prune
if (d_t >= max_distance_delta) if (d_t >= max_distance_delta)
{ {
continue; continue;
} }
const double transition_pr = transition_log_probability(d_t); const double transition_pr = transition_log_probability(d_t);

2
include/extractor/profile_properties.hpp
View File

@ -12,7 +12,7 @@ struct ProfileProperties
{ {
ProfileProperties() ProfileProperties()
: traffic_signal_penalty(0), u_turn_penalty(0), continue_straight_at_waypoint(true), : traffic_signal_penalty(0), u_turn_penalty(0), continue_straight_at_waypoint(true),
use_turn_restrictions(false), left_hand_driving(false) use_turn_restrictions(false), left_hand_driving(false)
{ {
} }