[osrm] 05/22: Imported Upstream version 5.0.1+ds
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Apr 29 22:44:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osrm.
commit 5be4318c6f8fa4bb15df9bd0d7bf6ca2bb9b8e2b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 29 23:13:22 2016 +0200
Imported Upstream version 5.0.1+ds
---
.travis.yml | 2 +-
CHANGELOG.md | 6 ++++++
features/bicycle/area.feature | 6 +++---
features/car/advisory.feature | 3 ---
features/testbot/mode.feature | 13 +++----------
features/testbot/via.feature | 1 -
include/engine/routing_algorithms/routing_base.hpp | 7 ++-----
src/engine/guidance/post_processing.cpp | 2 +-
8 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index df8df0a..e62a965 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ notifications:
branches:
only:
- master
- - develop
+ - "5.0"
matrix:
fast_finish: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b324d15..e498592 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 5.0.1
+ - Fixes:
+ - Issue #2309: Fixes local path looping, same coordinates crash
+ - Issue #2311: Fixes invalid assertion in loop unpacking
+ - Issue #2310: Local paths could falsely end up trying to remove the start step
+
# 5.0.0
Changes with regard 5.0.0 RC2:
- API:
diff --git a/features/bicycle/area.feature b/features/bicycle/area.feature
index 626b383..5f139f6 100644
--- a/features/bicycle/area.feature
+++ b/features/bicycle/area.feature
@@ -4,7 +4,7 @@ Feature: Bike - Squares and other areas
Background:
Given the profile "bicycle"
- @square @mokob @2154
+ @square
Scenario: Bike - Route along edge of a squares
Given the node map
| x | |
@@ -50,7 +50,7 @@ Feature: Bike - Squares and other areas
| d | a | xa,xa |
| a | d | xa,xa |
- @parking @mokob @2154
+ @parking
Scenario: Bike - parking areas
Given the node map
| e | | | f |
@@ -78,7 +78,7 @@ Feature: Bike - Squares and other areas
| a | d | abcda,abcda |
- @train @platform @mokob @2154
+ @train @platform
Scenario: Bike - railway platforms
Given the node map
| x | a | b | y |
diff --git a/features/car/advisory.feature b/features/car/advisory.feature
index b84ff05..698d6fd 100644
--- a/features/car/advisory.feature
+++ b/features/car/advisory.feature
@@ -34,7 +34,6 @@ OSRM will use 4/5 of the projected free-flow speed.
| a | b | ab,ab | 47 km/h +- 1 |
| b | c | bc,bc | 47 km/h +- 1 |
- @mokob @2162
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c |
@@ -49,7 +48,6 @@ OSRM will use 4/5 of the projected free-flow speed.
| b | a | ab,ab | 47 km/h +- 1 |
| c | b | bc,bc | 47 km/h +- 1 |
- @mokob @2162 @deleteme
Scenario: Car - Advisory speed overwrites backwards maxspeed
Given the node map
| a | b | c | d |
@@ -65,7 +63,6 @@ OSRM will use 4/5 of the projected free-flow speed.
| c | b | bc,bc | 47 km/h +- 1 |
| d | c | cd,cd | 47 km/h +- 1 |
- @mokob @2162
Scenario: Car - Directional advisory speeds play nice with eachother
Given the node map
| a | b | c |
diff --git a/features/testbot/mode.feature b/features/testbot/mode.feature
index 3f2463d..b98c8bf 100644
--- a/features/testbot/mode.feature
+++ b/features/testbot/mode.feature
@@ -12,7 +12,6 @@ Feature: Testbot - Travel mode
Background:
Given the profile "testbot"
- @mokob @2166
Scenario: Testbot - Always announce mode change
Given the node map
| a | b | c | d |
@@ -28,7 +27,6 @@ Feature: Testbot - Travel mode
| a | d | foo,foo,foo,foo | driving,river downstream,driving,driving |
| b | d | foo,foo,foo | river downstream,driving,driving |
- @mokob @2166
Scenario: Testbot - Compressed Modes
Given the node map
| a | b | c | d | e | f | g |
@@ -44,7 +42,6 @@ Feature: Testbot - Travel mode
| a | g | road,liquid,solid,solid | driving,river downstream,driving,driving |
| c | g | liquid,solid,solid | river downstream,driving,driving |
- @mokob @2166
Scenario: Testbot - Modes in each direction, different forward/backward speeds
Given the node map
| | 0 | 1 | |
@@ -79,7 +76,7 @@ Feature: Testbot - Travel mode
| 0 | 1 | ab,ab | steps down,steps down | 60s +-1 |
| 1 | 0 | ab,ab | steps up,steps up | 60s +-1 |
- @oneway @mokob @2166
+ @oneway
Scenario: Testbot - Modes for oneway, different forward/backward speeds
Given the node map
| a | b |
@@ -107,7 +104,7 @@ Feature: Testbot - Travel mode
| a | b | ab,ab | steps down,steps down |
| b | a | | |
- @oneway @mokob @2166
+ @oneway
Scenario: Testbot - Modes for reverse oneway, different forward/backward speeds
Given the node map
| a | b |
@@ -135,7 +132,7 @@ Feature: Testbot - Travel mode
| a | b | | |
| b | a | ab,ab | steps up,steps up |
- @via @mokob @2166
+ @via
Scenario: Testbot - Mode should be set at via points
Given the node map
| a | 1 | b |
@@ -149,7 +146,6 @@ Feature: Testbot - Travel mode
| a,1,b | ab,ab,ab,ab | river downstream,river downstream,river downstream,river downstream |
| b,1,a | ab,ab,ab,ab | river upstream,river upstream,river upstream,river upstream |
- @mokob @2166
Scenario: Testbot - Starting at a tricky node
Given the node map
| | a | | | |
@@ -164,7 +160,6 @@ Feature: Testbot - Travel mode
| from | to | route | modes |
| b | a | ab,ab | river upstream,river upstream |
- @mokob @2166
Scenario: Testbot - Mode changes on straight way without name change
Given the node map
| a | 1 | b | 2 | c |
@@ -204,7 +199,6 @@ Feature: Testbot - Travel mode
| b | d | bc,cd,cd | route,driving,driving |
| a | f | ab,bc,cd,de,ef,ef | driving,route,driving,driving,driving,driving |
- @mokob @2166
Scenario: Testbot - Modes, triangle map
Given the node map
| | | | | | | d |
@@ -239,7 +233,6 @@ Feature: Testbot - Travel mode
| a | d | abc,cd,cd | driving,driving,driving |
| d | a | de,ce,abc,abc | driving,river upstream,driving,driving |
- @mokob @2166
Scenario: Testbot - River in the middle
Given the node map
| a | b | c | | |
diff --git a/features/testbot/via.feature b/features/testbot/via.feature
index 84b939b..e7ebd54 100644
--- a/features/testbot/via.feature
+++ b/features/testbot/via.feature
@@ -46,7 +46,6 @@ Feature: Via points
| a,d,c | abc,bd,bd,bd,abc,abc |
| c,d,a | abc,bd,bd,bd,abc,abc |
- @mokob
Scenario: Multiple via points
Given the node map
| a | | | | e | f | g | |
diff --git a/include/engine/routing_algorithms/routing_base.hpp b/include/engine/routing_algorithms/routing_base.hpp
index 0a9b1f2..360eb98 100644
--- a/include/engine/routing_algorithms/routing_base.hpp
+++ b/include/engine/routing_algorithms/routing_base.hpp
@@ -373,8 +373,7 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
// t: fwd_segment 3
// -> (U, v), (v, w), (w, x)
// note that (x, t) is _not_ included but needs to be added later.
- BOOST_ASSERT(start_index <= end_index);
- for (std::size_t i = start_index; i != end_index; ++i)
+ for (std::size_t i = start_index; i != end_index; (start_index < end_index ? ++i : --i))
{
BOOST_ASSERT(i < id_vector.size());
BOOST_ASSERT(phantom_node_pair.target_phantom.forward_travel_mode > 0);
@@ -559,9 +558,7 @@ template <class DataFacadeT, class Derived> class BasicRoutingInterface
// make sure to correctly unpack loops
if (distance != forward_heap.GetKey(middle) + reverse_heap.GetKey(middle))
{
- // self loop
- BOOST_ASSERT(forward_heap.GetData(middle).parent == middle &&
- reverse_heap.GetData(middle).parent == middle);
+ // self loop makes up the full path
packed_leg.push_back(middle);
packed_leg.push_back(middle);
}
diff --git a/src/engine/guidance/post_processing.cpp b/src/engine/guidance/post_processing.cpp
index 6d02a07..a9bafc3 100644
--- a/src/engine/guidance/post_processing.cpp
+++ b/src/engine/guidance/post_processing.cpp
@@ -331,7 +331,7 @@ void trimShortSegments(std::vector<RouteStep> &steps, LegGeometry &geometry)
BOOST_ASSERT(geometry.locations.size() >= steps.size());
// Look for distances under 1m
- const bool zero_length_step = steps.front().distance <= 1;
+ const bool zero_length_step = steps.front().distance <= 1 && steps.size() > 2;
const bool duplicated_coordinate = util::coordinate_calculation::haversineDistance(
geometry.locations[0], geometry.locations[1]) <= 1;
if (zero_length_step || duplicated_coordinate)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git
More information about the Pkg-grass-devel
mailing list