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

remove movable bridge travel mode references

Browse Source
This commit is contained in:
karenzshea 2016-04-19 12:59:33 -04:00
parent bca8593eef
commit 58c13d2c07
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
features/car/bridge.feature
View File

@ -1,5 +1,5 @@
@routing @car @bridge @routing @car @bridge
Feature: Car - Handle movable bridge Feature: Car - Handle driving
Background: Background:
Given the profile "car" Given the profile "car"
@ -18,14 +18,14 @@ Feature: Car - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | | from | to | route | modes |
| a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving | | a | g | abc,cde,efg,efg | driving,driving,driving,driving |
| b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving | | b | f | abc,cde,efg,efg | driving,driving,driving,driving |
| e | c | cde,cde | movable bridge,movable bridge | | e | c | cde,cde | driving,driving |
| e | b | cde,abc,abc | movable bridge,driving,driving | | e | b | cde,abc,abc | driving,driving,driving |
| e | a | cde,abc,abc | movable bridge,driving,driving | | e | a | cde,abc,abc | driving,driving,driving |
| c | e | cde,cde | movable bridge,movable bridge | | c | e | cde,cde | driving,driving |
| c | f | cde,efg,efg | movable bridge,driving,driving | | c | f | cde,efg,efg | driving,driving,driving |
| c | g | cde,efg,efg | movable bridge,driving,driving | | c | g | cde,efg,efg | driving,driving,driving |
Scenario: Car - Properly handle durations Scenario: Car - Properly handle durations
Given the node map Given the node map
@ -41,7 +41,7 @@ Feature: Car - Handle movable bridge
When I route I should get When I route I should get
| from | to | route | modes | speed | | from | to | route | modes | speed |
| a | g | abc,cde,efg,efg | driving,movable bridge,driving,driving | 7 km/h | | a | g | abc,cde,efg,efg | driving,driving,driving,driving | 7 km/h |
| b | f | abc,cde,efg,efg | driving,movable bridge,driving,driving | 5 km/h | | b | f | abc,cde,efg,efg | driving,driving,driving,driving | 5 km/h |
| c | e | cde,cde | movable bridge,movable bridge | 2 km/h | | c | e | cde,cde | driving,driving | 2 km/h |
| e | c | cde,cde | movable bridge,movable bridge | 2 km/h | | e | c | cde,cde | driving,driving | 2 km/h |

1
include/extractor/travel_mode.hpp
View File

@ -46,7 +46,6 @@ const constexpr osrm::extractor::TravelMode TRAVEL_MODE_WALKING = 3;
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_FERRY = 4; const constexpr osrm::extractor::TravelMode TRAVEL_MODE_FERRY = 4;
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_TRAIN = 5; const constexpr osrm::extractor::TravelMode TRAVEL_MODE_TRAIN = 5;
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_PUSHING_BIKE = 6; const constexpr osrm::extractor::TravelMode TRAVEL_MODE_PUSHING_BIKE = 6;
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_MOVABLE_BRIDGE = 7;
// FIXME only for testbot.lua // FIXME only for testbot.lua
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_STEPS_UP = 8; const constexpr osrm::extractor::TravelMode TRAVEL_MODE_STEPS_UP = 8;
const constexpr osrm::extractor::TravelMode TRAVEL_MODE_STEPS_DOWN = 9; const constexpr osrm::extractor::TravelMode TRAVEL_MODE_STEPS_DOWN = 9;

3
src/engine/api/json_factory.cpp
View File

@ -100,9 +100,6 @@ std::string modeToString(const extractor::TravelMode mode)
case TRAVEL_MODE_PUSHING_BIKE: case TRAVEL_MODE_PUSHING_BIKE:
token = "pushing bike"; token = "pushing bike";
break; break;
case TRAVEL_MODE_MOVABLE_BRIDGE:
token = "movable bridge";
break;
case TRAVEL_MODE_STEPS_UP: case TRAVEL_MODE_STEPS_UP:
token = "steps up"; token = "steps up";
break; break;

1
src/extractor/scripting_environment.cpp
View File

@ -80,7 +80,6 @@ void ScriptingEnvironment::InitContext(ScriptingEnvironment::Context &context)
luabind::value("ferry", TRAVEL_MODE_FERRY), luabind::value("ferry", TRAVEL_MODE_FERRY),
luabind::value("train", TRAVEL_MODE_TRAIN), luabind::value("train", TRAVEL_MODE_TRAIN),
luabind::value("pushing_bike", TRAVEL_MODE_PUSHING_BIKE), luabind::value("pushing_bike", TRAVEL_MODE_PUSHING_BIKE),
luabind::value("movable_bridge", TRAVEL_MODE_MOVABLE_BRIDGE),
luabind::value("steps_up", TRAVEL_MODE_STEPS_UP), luabind::value("steps_up", TRAVEL_MODE_STEPS_UP),
luabind::value("steps_down", TRAVEL_MODE_STEPS_DOWN), luabind::value("steps_down", TRAVEL_MODE_STEPS_DOWN),
luabind::value("river_up", TRAVEL_MODE_RIVER_UP), luabind::value("river_up", TRAVEL_MODE_RIVER_UP),