Compare commits

...

2 Commits

Author SHA1 Message Date
Moritz Kobitzsch 1db794b2cb prepare 5.4.0-rc.7 2016-09-30 14:48:32 +02:00
Moritz Kobitzsch a1ccedb5bf re-introduce space into summaries 2016-09-30 14:46:34 +02:00
4 changed files with 23 additions and 19 deletions
+4
View File
@@ -1,3 +1,7 @@
# 5.4.0-rc.7
- Chages from 5.4.0-rc.6
- Bugfixes re-introduce space between two entries in summaries
# 5.4.0-rc.6 # 5.4.0-rc.6
- Changes from 5.4.0-rc.5 - Changes from 5.4.0-rc.5
- Bugfixes - Bugfixes
+8 -8
View File
@@ -23,10 +23,10 @@ Feature: Basic Routing
| df | street | | df | street |
When I route I should get When I route I should get
| waypoints | route | summary | | waypoints | route | summary |
| a,e | road,,1 st,1 st | road,1 st | | a,e | road,,1 st,1 st | road, 1 st |
| a,d,f | road,,,street,street | road;street | | a,d,f | road,,,street,street | road;street |
| a,e,f | road,,1 st,1 st,1 st,street,street | road,1 st;1 st,street | | a,e,f | road,,1 st,1 st,1 st,street,street | road, 1 st;1 st, street |
Scenario: Name Empty Scenario: Name Empty
Given the node map Given the node map
@@ -51,8 +51,8 @@ Feature: Basic Routing
| bc | | 101 | | bc | | 101 |
When I route I should get When I route I should get
| waypoints | route | summary | | waypoints | route | summary |
| a,c | road, | road,101 | | a,c | road, | road, 101 |
Scenario: Only Refs Scenario: Only Refs
Given the node map Given the node map
@@ -64,8 +64,8 @@ Feature: Basic Routing
| bc | | 101 | | bc | | 101 |
When I route I should get When I route I should get
| waypoints | route | summary | | waypoints | route | summary |
| a,c | , | 100,101 | | a,c | , | 100, 101 |
Scenario: Single Ref Scenario: Single Ref
Given the node map Given the node map
+10 -10
View File
@@ -18,12 +18,12 @@ Feature: Basic Routing
| de | | de |
When I route I should get When I route I should get
| from | to | route | summary | | from | to | route | summary |
| a | e | ab,bc,cd,de,de | ab,bc | | a | e | ab,bc,cd,de,de | ab, bc |
| e | a | de,cd,bc,ab,ab | de,bc | | e | a | de,cd,bc,ab,ab | de, bc |
| a | b | ab,ab | ab | | a | b | ab,ab | ab |
| b | d | bc,cd,cd | bc,cd | | b | d | bc,cd,cd | bc, cd |
| 1 | c | bc,bc | bc | | 1 | c | bc,bc | bc |
@smallest @smallest
Scenario: Check handling empty values Scenario: Check handling empty values
@@ -40,8 +40,8 @@ Feature: Basic Routing
| df | df | | df | df |
When I route I should get When I route I should get
| from | to | route | summary | | from | to | route | summary |
| e | a | de,,bc,ab,ab | de,bc | | e | a | de,,bc,ab,ab | de, bc |
@smallest @todo @smallest @todo
Scenario: Summaries when routing on a simple network Scenario: Summaries when routing on a simple network
@@ -74,6 +74,6 @@ Feature: Basic Routing
| xey | cross |we need this because phantom node segments are not considered for the summary | | xey | cross |we need this because phantom node segments are not considered for the summary |
When I route I should get When I route I should get
| from | to | route | summary | | from | to | route | summary |
| a | 1 | first,first,second,second | first,second | | a | 1 | first,first,second,second | first, second |
+1 -1
View File
@@ -198,7 +198,7 @@ inline RouteLeg assembleLeg(const datafacade::BaseDataFacade &facade,
const auto summary_names = summary_array | boost::adaptors::transformed(name_id_to_string) | const auto summary_names = summary_array | boost::adaptors::transformed(name_id_to_string) |
boost::adaptors::filtered(not_empty); boost::adaptors::filtered(not_empty);
summary = boost::algorithm::join(summary_names, ","); summary = boost::algorithm::join(summary_names, ", ");
} }
return RouteLeg{duration, distance, summary, {}}; return RouteLeg{duration, distance, summary, {}};