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

clean-up unused headers, use NoTurn for ferries instead of suppressed

Browse Source
This commit is contained in:
Moritz Kobitzsch 2016-12-23 14:17:23 +01:00 committed by Daniel J. H
parent 9af67c5a9f
commit b9b52cb857
5 changed files with 53 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,7 +1,9 @@
# 5.5.2 # 5.6.0
- Changes from 5.5.1 - Changes from 5.5
- Bugfixes - Bugfixes
- Fix #3475 removed an invalid `exit` field from the `arrive` maneuver - Fix #3475 removed an invalid `exit` field from the `arrive` maneuver
- Guidance
- No longer emitting turns on ferries, if a ferry should use multiple docking locations
# 5.5.1 # 5.5.1
- Changes from 5.5.0 - Changes from 5.5.0

44
features/guidance/collapse-ferry.feature
View File

@ -26,11 +26,11 @@ Feature: Collapse
| bd | | ferry | sea | | bd | | ferry | sea |
| cd | | ferry | sea | | cd | | ferry | sea |
| de | | ferry | sea | | de | | ferry | sea |
| ef | primary | | land | | ef | primary | | pennydog-island |
When I route I should get When I route I should get
| waypoints | route | turns | modes | | waypoints | route | turns | modes | locations |
| f,j | land,sea,land,land | depart,notification right,end of road left,arrive | driving,ferry,driving,driving | | f,j | pennydog-island,sea,land,land | depart,notification right,turn left,arrive | driving,ferry,driving,driving | f,e,b,j |
Scenario: Switching Ferry in a Harbour Scenario: Switching Ferry in a Harbour
Given the node map Given the node map
@ -52,13 +52,42 @@ Feature: Collapse
| nodes | highway | route | name | | nodes | highway | route | name |
| ea | primary | | melee-island | | ea | primary | | melee-island |
| ab | | ferry | melee-island-ferry | | ab | | ferry | melee-island-ferry |
| cf | primary | | pennydog-island | | cf | primary | | monkey-island |
| bd | primary | | landmass | | bd | primary | | scabb-island |
| bc | primary | ferry | pennydog-island-ferry | | bc | primary | ferry | monkey-island-ferry |
When I route I should get When I route I should get
| waypoints | route | turns | modes | | waypoints | route | turns | modes |
| e,f | melee-island,melee-island-ferry,pennydog-island-ferry,pennydog-island,pennydog-island | depart,notification straight,turn right,notification straight,arrive | driving,ferry,ferry,driving,driving | | e,f | melee-island,melee-island-ferry,monkey-island-ferry,monkey-island,monkey-island | depart,notification straight,turn right,notification straight,arrive | driving,ferry,ferry,driving,driving |
Scenario: End of Road Ferries
Given the node map
"""
a - b ~ ~ ~ ~ c ~ ~ ~ ~ ~ d - e
~
~
~
~
~
~
~
f
|
g
"""
And the ways
| nodes | highway | route | name |
| ab | primary | | land-left |
| de | primary | | land-right |
| gf | primary | | land-bottom |
| bcd | | ferry | ferry |
| fc | | ferry | ferry |
When I route I should get
| waypoints | route | turns |
| g,e | land-bottom,ferry,land-right,land-right | depart,notification straight,notification straight,arrive |
Scenario: Fork Ferries Scenario: Fork Ferries
Given the node map Given the node map
@ -86,6 +115,7 @@ Feature: Collapse
| cd | | ferry | ferry | | cd | | ferry | ferry |
| fc | | ferry | ferry | | fc | | ferry | ferry |
When I route I should get When I route I should get
| waypoints | route | turns | | waypoints | route | turns |
| g,e | land-bottom,ferry,land-right,land-right | depart,notification straight,notification right,arrive | | g,e | land-bottom,ferry,land-right,land-right | depart,notification straight,notification right,arrive |

2
include/extractor/travel_mode.hpp
View File

@ -28,8 +28,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef TRAVEL_MODE_HPP #ifndef TRAVEL_MODE_HPP
#define TRAVEL_MODE_HPP #define TRAVEL_MODE_HPP
#include <array>
namespace osrm namespace osrm
{ {
namespace extractor namespace extractor

1
src/extractor/guidance/intersection_handler.cpp
View File

@ -1,6 +1,5 @@
#include "extractor/guidance/intersection_handler.hpp" #include "extractor/guidance/intersection_handler.hpp"
#include "extractor/guidance/constants.hpp" #include "extractor/guidance/constants.hpp"
#include "extractor/travel_mode.hpp"
#include "util/coordinate_calculation.hpp" #include "util/coordinate_calculation.hpp"
#include "util/guidance/name_announcements.hpp" #include "util/guidance/name_announcements.hpp"

3
src/extractor/guidance/suppress_mode_handler.cpp
View File

@ -57,7 +57,8 @@ operator()(const NodeID, const EdgeID, Intersection intersection) const
std::for_each(first, last, [&](auto &road) { std::for_each(first, last, [&](auto &road) {
const auto modifier = road.instruction.direction_modifier; const auto modifier = road.instruction.direction_modifier;
const auto type = TurnType::Suppressed; // use NoTurn, to not even have it as an IntermediateIntersection
const auto type = TurnType::NoTurn;
road.instruction = {type, modifier}; road.instruction = {type, modifier};
}); });