Enable travis builds for 5.2 branch

CHANGELOG.md

@@ -1,45 +1,9 @@
-# 5.2.8
-  - Bugfixes:
-    - Handle an edge case that cause the turn instruction code to segfault during osrm-extract on Egypt.
-
-# 5.2.7
-  - Bugfixes
-    - BREAKING: Fix bug that could result in failure to load 'osrm.icd' files. This breaks the dataformat
-    - Fix deduplication of parallel edges. Now uses correct weight.
-
-# 5.2.6
-  - Bugfixes
-    - Fix numeric overflow in roundabout center calculation which throws an exception
-
-# 5.2.5
-  - Bugfixes
-    - Fixes a segfault caused by incorrect trimming logic for very short steps.
-
-# 5.2.4
-  Changes from 5.2.3:
-  - Bugfixes:
-    - Fixed a crash that arised on roundabouts in combination with intermediate intersections and sliproads
-    - Fixed #2518: Invalid bilinear interpolation when using raster data
-    - Fixed #2546: The geometry returned by the match service was missing the last coordinate.
-
-  BREAKING: The data format changed between 5.2.3 and 5.2.4, you need to reprocess.
-
-# 5.2.3
-  - Bugfixes:
-    - Fixed an issue with name changes in roundabouts that could result in crashes
-
-# 5.2.2
-  Changes from 5.2.1
-  - Bugfixes:
-    - Buffer overrun in tile plugin response handling
-
 # 5.2.1
   Changes from 5.2.0
-  - Bugfixes:
+  Bugfixes:
     - Removed debug statement that was spamming the console
-
 # 5.2.0
-  Changes from 5.2.0 RC2
+  Changes form 5.2.0 RC2
    - Bugfixes:
      - Fixed crash when loading shared memory caused by invalid OSM IDs segment size.
      - Various small instructions handling fixes

CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 project(OSRM C CXX)
 set(OSRM_VERSION_MAJOR 5)
 set(OSRM_VERSION_MINOR 2)
-set(OSRM_VERSION_PATCH 7)
+set(OSRM_VERSION_PATCH 0)
 
 # these two functions build up custom variables:
 #   OSRM_INCLUDE_PATHS and OSRM_DEFINES

features/guidance/intersections.feature

@@ -149,5 +149,5 @@ Feature: Intersections Data
             | e,g       | ea,gc,gc       | depart,abcda-exit-2,arrive         | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330;true:0|
             | e,h       | ea,hd,hd       | depart,abcda-exit-3,arrive         | true:180;false:0 false:150 true:210,false:30 true:150 true:270,true:30 true:180 false:330,true:90 false:210 true:330;true:270 |
             | e,2       | ea,abcda,abcda | depart,abcda-exit-undefined,arrive | true:180;false:0 false:150 true:210,false:30 true:150 true:270;true:327 +-1|
-            | 1,g       | abcda,gc,gc    | depart,abcda-exit-2,arrive         | true:214;false:30 true:150 true:270,true:30 true:180 false:330;true:0                                                         |
+            | 1,g       | abcda,gc,gc    | depart,abcda-exit-2,arrive         | true:214;true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:0|
             | 1,3       | abcda,abcda    | depart,arrive                      | true:214,false:30 true:150 true:270,true:30 true:180 false:330;true:214|

features/guidance/roundabout.feature

@@ -361,79 +361,3 @@ Feature: Basic Roundabout
            | a,f       | ab,ef,ef | depart,roundabout-exit-2,arrive | 0->180,180->270,180->0 |
            | a,h       | ab,gh,gh | depart,roundabout-exit-1,arrive | 0->180,180->270,270->0 |
 
-    Scenario: Motorway Roundabout
-    #See 39.933742 -75.082345
-        Given the node map
-            |   |   |   |   | l |   |   |   | a |   | i |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   | b |   |   |   |   |
-            |   |   |   | c |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   |   |   | h |   |   |
-            | n |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   | d |   |   |   |   |   |   |   | j |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   | m |   |   | g |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   | e |   | f |   |   |   |   |   |   |
-
-        And the ways
-            | nodes | junction   | name     | highway    | oneway | ref    |
-            | ab    |            | crescent | trunk      | yes    | US 130 |
-            | bcd   | roundabout | crescent | trunk      | yes    | US 130 |
-            | de    |            | crescent | trunk      | yes    | US 130 |
-            | fg    |            | crescent | trunk      | yes    | US 130 |
-            | gh    | roundabout | crescent | trunk      | yes    | US 130 |
-            | hi    |            | crescent | trunk      | yes    | US 130 |
-            | jh    |            |          | trunk_link | yes    | NJ 38  |
-            | hb    | roundabout |          | trunk_link | yes    | NJ 38  |
-            | bl    |            |          | trunk_link | yes    | NJ 38  |
-            | cnd   |            | kaighns  | trunk_link | yes    |        |
-            | dmg   | roundabout |          | trunk_link | yes    |        |
-
-        When I route I should get
-            | waypoints | route                                                 | turns                           |
-            | a,e       | crescent (US 130),crescent (US 130),crescent (US 130) | depart,roundabout-exit-3,arrive |
-            | j,l       | NJ 38,NJ 38,NJ 38                                     | depart,roundabout-exit-2,arrive |
-
-    Scenario: Double Roundabout with through-lane
-    #http://map.project-osrm.org/?z=18&center=38.911752%2C-77.048667&loc=38.912003%2C-77.050831&loc=38.909277%2C-77.042516&hl=en&alt=0
-        Given the node map
-            |   |   |   |   | o |   |   |   |   |   |   |   |   |   |   |   | n |   |   |   |   |
-            |   |   |   |   | e |   |   |   |   |   |   |   |   |   |   |   | j |   |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   |   |   | q |   |   |   |   |   |   |   |   |   |   |   |   |   |   |
-            | a |   | b |   |   |   |   |   | s |   | f |   |   |   | g |   |   |   | i |   | k |
-            |   |   |   |   |   |   | r |   |   |   |   |   |   |   |   |   |   | p |   |   |   |
-            |   |   |   |   |   |   |   |   |   |   | t |   |   |   |   |   |   |   |   |   |   |
-            |   |   |   |   | c |   | d |   |   |   |   |   |   |   |   |   | h |   |   |   |   |
-            |   |   |   |   | l |   |   |   |   |   |   |   |   |   |   |   | m |   |   |   |   |
-
-        And the nodes
-            | node | highway         |
-            | i    | traffic_signals |
-
-        And the ways
-            | nodes   | junction   | name            | oneway |
-            | bcdrqeb | roundabout | sheridan circle | yes    |
-            | ghi     | roundabout | dupont circle   | yes    |
-            | ijg     | roundabout | dupont circle   | yes    |
-            | ab      |            | massachusetts   | no     |
-            | sfgpik  |            | massachusetts   | no     |
-            | cl      |            | 23rd street     | no     |
-            | oe      |            | r street        | no     |
-            | jn      |            | new hampshire   | no     |
-            | mh      |            | new hampshire   | yes    |
-            | rsq     |            | massachusetts   | yes    |
-            | ft      |            | suppressed      | no     |
-
-        And the relations
-            | type        | way:from | way:to | node:via | restriction   |
-            | restriction | sfgpik   | ijg    | i        | no_left_turn  |
-
-        When I route I should get
-            | waypoints | route                                                   | turns                                                     |
-            | a,k       | massachusetts,massachusetts,massachusetts,massachusetts | depart,sheridan circle-exit-2,dupont circle-exit-1,arrive |

features/step_definitions/data.js

@@ -17,7 +17,7 @@ module.exports = function () {
         this.setContractArgs(args, callback);
     });
 
-    this.Given(/^a grid size of ([0-9.]+) meters$/, (meters, callback) => {
+    this.Given(/^a grid size of (\d+) meters$/, (meters, callback) => {
         this.setGridSize(meters);
         callback();
     });

features/step_definitions/matching.js

@@ -1,6 +1,5 @@
 var util = require('util');
 var d3 = require('d3-queue');
-var polyline = require('polyline');
 
 module.exports = function () {
     this.When(/^I match I should get$/, (table, callback) => {
@@ -36,7 +35,6 @@ module.exports = function () {
                         route = '',
                         duration = '',
                         annotation = '',
-                        geometry = '',
                         OSMIDs = '';
 
 
@@ -65,11 +63,6 @@ module.exports = function () {
                             annotation = this.annotationList(json.matchings[0]);
                         }
 
-                        if (headers.has('geometry')) {
-                            if (json.matchings.length != 1) throw new Error('*** Checking geometry only supported for matchings with one subtrace');
-                            geometry = json.matchings[0].geometry;
-                        }
-
                         if (headers.has('OSM IDs')) {
                             if (json.matchings.length != 1) throw new Error('*** CHecking annotation only supported for matchings with one subtrace');
                             OSMIDs = this.OSMIDList(json.matchings[0]);
@@ -92,13 +85,6 @@ module.exports = function () {
                         got.annotation = annotation.toString();
                     }
 
-                    if (headers.has('geometry')) {
-                        if (this.queryParams['geometries'] === 'polyline')
-                            got.geometry = polyline.decode(geometry).toString();
-                        else
-                            got.geometry = geometry;
-                    }
-
                     if (headers.has('OSM IDs')) {
                         got['OSM IDs'] = OSMIDs;
                     }

features/testbot/basic.feature

@@ -251,18 +251,3 @@ Feature: Basic Routing
             | from | to | route |
             | d    | c  | de,ce,ce |
             | e    | d  | de,de    |
-
-    Scenario: Ambiguous edge weights - Use minimal edge weight
-        Given the node map
-            | a | b |
-
-        And the ways
-            | nodes | highway   | name |
-            | ab    | tertiary  |      |
-            | ab    | primary   |      |
-            | ab    | secondary |      |
-
-        When I route I should get
-            | from | to | route | time |
-            | a    | b  | ,     | 10s  |
-            | b    | a  | ,     | 10s  |

features/testbot/fixed.feature

@@ -24,18 +24,3 @@ Feature: Fixed bugs, kept to check for regressions
         When I route I should get
             | from | to | route   |
             | x    | y  | abc,abc |
-
-    Scenario: Step trimming with very short segments
-        Given a grid size of 0.1 meters
-        Given the node map
-            | a | 1 | b | c | d | 2 | e |
-
-        Given the ways
-            | nodes | oneway |
-            | ab    | yes    |
-            | bcd   | yes    |
-            | de    | yes    |
-
-        When I route I should get
-            | from | to | route     |
-            | 1    | 2  | bcd,bcd   |

features/testbot/matching.feature

@@ -128,21 +128,3 @@ Feature: Basic Map Matching
             | trace | matchings | OSM IDs               |
             | abeh  | abcedgh   | 1,2,3,2,3,4,5,4,5,6,7 |
             | abci  | abc,ci    | 1,2,3,2,3,8,3,8       |
-
-    Scenario: Testbot - Geometry details
-        Given the query options
-            | overview   | full     |
-            | geometries | polyline |
-
-        Given the node map
-            | a | b | c |
-            |   | d |   |
-
-        And the ways
-            | nodes | oneway |
-            | abc   | no     |
-            | bd    | no     |
-
-        When I match I should get
-            | trace | matchings | geometry                                |
-            | abd   | abd       | 1,1,1,1.00009,1,1.00009,0.99991,1.00009 |

include/engine/datafacade/internal_datafacade.hpp

@@ -330,7 +330,7 @@ class InternalDataFacade final : public BaseDataFacade
             std::vector<util::guidance::BearingClass> bearing_classes;
             // and the actual bearing values
             std::uint64_t num_bearings;
-            intersection_stream.read(reinterpret_cast<char*>(&num_bearings),sizeof(num_bearings));
+            intersection_stream >> num_bearings;
             m_bearing_values_table.resize(num_bearings);
             intersection_stream.read(reinterpret_cast<char *>(&m_bearing_values_table[0]),
                                      sizeof(m_bearing_values_table[0]) * num_bearings);

include/extractor/guidance/toolkit.hpp

@@ -405,10 +405,10 @@ inline bool requiresNameAnnounced(const std::string &from,
         (from_ref.find(to_ref) != std::string::npos || to_ref.find(from_ref) != std::string::npos);
     const auto ref_is_removed = !from_ref.empty() && to_ref.empty();
 
-    const auto obvious_change =
+    const auto obvious_change = (names_are_empty && refs_are_empty) ||
-        (names_are_empty && refs_are_empty) || (names_are_equal && ref_is_contained) ||
+                                (names_are_equal && ref_is_contained) ||
-        (names_are_equal && refs_are_empty) || (ref_is_contained && name_is_removed) ||
+                                (names_are_equal && refs_are_empty) || name_is_removed ||
-        (names_are_equal && ref_is_removed) || is_suffix_change;
+                                ref_is_removed || is_suffix_change;
 
     return !obvious_change;
 }
@@ -456,26 +456,6 @@ inline ConnectedRoad mirror(ConnectedRoad road)
     return road;
 }
 
-inline bool hasRoundaboutType(const TurnInstruction instruction)
-{
-    using namespace extractor::guidance::TurnType;
-    const constexpr TurnType::Enum valid_types[] = {TurnType::EnterRoundabout,
-                                                    TurnType::EnterAndExitRoundabout,
-                                                    TurnType::EnterRotary,
-                                                    TurnType::EnterAndExitRotary,
-                                                    TurnType::EnterRoundaboutIntersection,
-                                                    TurnType::EnterAndExitRoundaboutIntersection,
-                                                    TurnType::EnterRoundaboutAtExit,
-                                                    TurnType::ExitRoundabout,
-                                                    TurnType::EnterRotaryAtExit,
-                                                    TurnType::ExitRotary,
-                                                    TurnType::EnterRoundaboutIntersectionAtExit,
-                                                    TurnType::ExitRoundaboutIntersection,
-                                                    TurnType::StayOnRoundabout};
-    const auto valid_end = valid_types + 13;
-    return std::find(valid_types, valid_end, instruction.type) != valid_end;
-};
-
 } // namespace guidance
 } // namespace extractor
 } // namespace osrm

include/util/guidance/entry_class.hpp

@@ -62,13 +62,6 @@ class EntryClass
     friend std::size_t std::hash<EntryClass>::operator()(const EntryClass &) const;
 };
 
-#if not defined __GNUC__ or __GNUC__ > 4
-static_assert(std::is_trivially_copyable<EntryClass>::value,
-              "Class is serialized trivially in "
-              "the datafacades. Bytewise writing "
-              "requires trivially copyable type");
-#endif
-
 } // namespace guidance
 } // namespace utilr
 } // namespace osrm

package.json

@@ -9,8 +9,7 @@
     "node-timeout": "0.0.4",
     "request": "^2.69.0",
     "xmlbuilder": "^4.2.1",
-    "chalk": "^1.1.3",
+    "chalk": "^1.1.3"
-    "polyline": "^0.2.0"
   },
   "bin": {
     "cucumber": "./node_modules/cucumber/bin/cucumber.js"

src/engine/guidance/assemble_overview.cpp

@@ -85,12 +85,12 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
     std::vector<util::Coordinate> overview_geometry;
     overview_geometry.reserve(overview_size);
 
-    auto leg_reverse_index = leg_geometries.size();
+    auto leg_index = 0UL;
     for (const auto &geometry : leg_geometries)
     {
         auto begin = geometry.locations.begin();
         auto end = geometry.locations.end();
-        if (--leg_reverse_index > 0)
+        if (leg_index < leg_geometries.size() - 1)
         {
             end = std::prev(end);
         }

src/engine/guidance/post_processing.cpp

@@ -154,7 +154,7 @@ RouteStep forwardInto(RouteStep destination, const RouteStep &source)
     // Overwrites turn instruction and increases exit NR
     destination.duration += source.duration;
     destination.distance += source.distance;
-    destination.maneuver.exit = source.maneuver.exit;
+
     if (destination.geometry_begin < source.geometry_begin)
     {
         destination.intersections.insert(destination.intersections.end(),
@@ -170,6 +170,8 @@ RouteStep forwardInto(RouteStep destination, const RouteStep &source)
 
     destination.geometry_begin = std::min(destination.geometry_begin, source.geometry_begin);
     destination.geometry_end = std::max(destination.geometry_end, source.geometry_end);
+    destination.maneuver.exit = destination.intersections.size() - 1;
+
     return destination;
 }
 
@@ -182,6 +184,7 @@ void fixFinalRoundabout(std::vector<RouteStep> &steps)
         if (entersRoundabout(propagation_step.maneuver.instruction))
         {
             propagation_step.maneuver.exit = 0;
+            propagation_step.geometry_end = steps.back().geometry_begin;
 
             // remember the current name as rotary name in tha case we end in a rotary
             if (propagation_step.maneuver.instruction.type == TurnType::EnterRotary ||
@@ -262,16 +265,9 @@ void closeOffRoundabout(const bool on_roundabout,
         // instruction and move it right to the beginning to make sure to immediately announce the
         // exit.
         BOOST_ASSERT(leavesRoundabout(steps[1].maneuver.instruction) ||
-                     steps[1].maneuver.instruction.type == TurnType::StayOnRoundabout ||
+                     steps[1].maneuver.instruction.type == TurnType::StayOnRoundabout);
-                     steps[1].maneuver.instruction.type == TurnType::Suppressed ||
-                     steps[1].maneuver.instruction.type == TurnType::NoTurn);
         steps[0].geometry_end = 1;
-        steps[1].geometry_begin = 0;
         steps[1] = forwardInto(steps[1], steps[0]);
-        steps[1].intersections.erase(steps[1].intersections.begin()); // otherwise we copy the
-                                                                      // source
-        if (leavesRoundabout(steps[1].maneuver.instruction))
-            steps[1].maneuver.exit = 1;
         steps[0].duration = 0;
         steps[0].distance = 0;
         const auto exitToEnter = [](const TurnType::Enum type) {
@@ -309,6 +305,7 @@ void closeOffRoundabout(const bool on_roundabout,
             if (entersRoundabout(propagation_step.maneuver.instruction))
             {
                 propagation_step.maneuver.exit = step.maneuver.exit;
+                propagation_step.geometry_end = step.geometry_end;
                 const auto entry_intersection = propagation_step.intersections.front();
 
                 // remember rotary name
@@ -338,10 +335,8 @@ void closeOffRoundabout(const bool on_roundabout,
             }
             else
             {
-                BOOST_ASSERT(propagation_step.maneuver.instruction.type ==
+                BOOST_ASSERT(propagation_step.maneuver.instruction.type =
-                                 TurnType::StayOnRoundabout ||
+                                 TurnType::StayOnRoundabout);
-                             propagation_step.maneuver.instruction.type == TurnType::Suppressed ||
-                             propagation_step.maneuver.instruction.type == TurnType::NoTurn);
                 propagation_step.maneuver.instruction =
                     TurnInstruction::NO_TURN(); // mark intermediate instructions invalid
             }
@@ -478,6 +473,7 @@ void collapseTurnAt(std::vector<RouteStep> &steps,
                                  current_step.intersections.front()
                                      .bearings[current_step.intersections.front().out]) &&
              compatible(one_back_step, current_step))
+
     {
         BOOST_ASSERT(two_back_index < steps.size());
         // the simple case is a u-turn that changes directly into the in-name again
@@ -588,10 +584,12 @@ std::vector<RouteStep> postProcess(std::vector<RouteStep> steps)
         }
         else if (leavesRoundabout(instruction))
         {
-            // if (!has_entered_roundabout)
+            if (!has_entered_roundabout)
+            {
                 // in case the we are not on a roundabout, the very first instruction
                 // after the depart will be transformed into a roundabout and become
                 // the first valid instruction
+            }
             closeOffRoundabout(has_entered_roundabout, steps, step_index);
             has_entered_roundabout = false;
             on_roundabout = false;
@@ -928,13 +926,13 @@ void trimShortSegments(std::vector<RouteStep> &steps, LegGeometry &geometry)
     auto &next_to_last_step = *(steps.end() - 2);
     // in the end, the situation with the roundabout cannot occur. As a result, we can remove
     // all zero-length instructions
-    if (next_to_last_step.distance <= 1 && steps.size() > 2)
+    if (next_to_last_step.distance <= 1)
     {
         geometry.locations.pop_back();
         geometry.annotations.pop_back();
         geometry.osm_node_ids.pop_back();
         geometry.segment_offsets.pop_back();
-        BOOST_ASSERT(geometry.segment_distances.back() <= 1);
+        BOOST_ASSERT(geometry.segment_distances.back() < 1);
         geometry.segment_distances.pop_back();
 
         next_to_last_step.maneuver.waypoint_type = WaypointType::Arrive;

src/extractor/extraction_containers.cpp

@@ -417,13 +417,11 @@ void ExtractionContainers::PrepareEdges(lua_State *segment_state)
                 all_edges_list[i].result.weight < min_forward_weight)
             {
                 min_forward_idx = i;
-                min_forward_weight = all_edges_list[i].result.weight;
             }
             if (all_edges_list[i].result.backward &&
                 all_edges_list[i].result.weight < min_backward_weight)
             {
                 min_backward_idx = i;
-                min_backward_weight = all_edges_list[i].result.weight;
             }
 
             // this also increments the outer loop counter!

src/extractor/extractor.cpp

@@ -661,7 +661,7 @@ void Extractor::WriteIntersectionClassificationData(
     util::RangeTable<> bearing_class_range_table(bearing_counts);
     file_out_stream << bearing_class_range_table;
 
-    file_out_stream.write(reinterpret_cast<const char *>(&total_bearings), sizeof(total_bearings));
+    file_out_stream << total_bearings;
     for (const auto &bearing_class : bearing_classes)
     {
         const auto &bearings = bearing_class.getAvailableBearings();
@@ -669,18 +669,17 @@ void Extractor::WriteIntersectionClassificationData(
                               sizeof(bearings[0]) * bearings.size());
     }
 
-    if (!static_cast<bool>(file_out_stream))
+    // FIXME
-    {
+    // This should be here, but g++4.8 does not have it...
-        throw util::exception("Failed to write to " + output_file_name + ".");
+    // static_assert(std::is_trivially_copyable<util::guidance::EntryClass>::value,
-    }
+    //              "EntryClass Serialization requires trivial copyable entry classes");
 
     util::serializeVector(file_out_stream, entry_classes);
     TIMER_STOP(write_edges);
     util::SimpleLogger().Write() << "ok, after " << TIMER_SEC(write_edges) << "s for "
                                  << node_based_intersection_classes.size() << " Indices into "
                                  << bearing_classes.size() << " bearing classes and "
-                                 << entry_classes.size() << " entry classes and " << total_bearings
+                                 << entry_classes.size() << " entry classes";
-                                 << " bearing values." << std::endl;
 }
 }
 }

src/extractor/guidance/intersection_generator.cpp

@@ -138,20 +138,7 @@ Intersection IntersectionGenerator::getConnectedRoads(const NodeID from_node,
     const auto valid_count =
         boost::count_if(intersection, [](const ConnectedRoad &road) { return road.entry_allowed; });
     if (0 == valid_count && uturn_could_be_valid)
-    {
+        intersection[0].entry_allowed = true;
-        // after intersections sorting by angles, find the u-turn with (from_node == to_node)
-        // that was inserted together with setting uturn_could_be_valid flag
-        std::size_t self_u_turn = 0;
-        while (self_u_turn < intersection.size()
-               && intersection[self_u_turn].turn.angle < std::numeric_limits<double>::epsilon()
-               && from_node != node_based_graph.GetTarget(intersection[self_u_turn].turn.eid))
-        {
-            ++self_u_turn;
-        }
-
-        BOOST_ASSERT(from_node == node_based_graph.GetTarget(intersection[self_u_turn].turn.eid));
-        intersection[self_u_turn].entry_allowed = true;
-    }
 
     return mergeSegregatedRoads(std::move(intersection));
 }

src/extractor/guidance/roundabout_handler.cpp

@@ -1,5 +1,5 @@
-#include "extractor/guidance/constants.hpp"
 #include "extractor/guidance/roundabout_handler.hpp"
+#include "extractor/guidance/constants.hpp"
 #include "extractor/guidance/toolkit.hpp"
 
 #include "util/coordinate_calculation.hpp"
@@ -210,11 +210,11 @@ RoundaboutType RoundaboutHandler::getRoundaboutType(const NodeID nid) const
         return util::Coordinate(node_info_list[node].lon, node_info_list[node].lat);
     };
 
-    std::unordered_set<unsigned> roundabout_name_ids;
+    unsigned roundabout_name_id = 0;
     std::unordered_set<unsigned> connected_names;
 
     const auto getNextOnRoundabout =
-        [this, &roundabout_name_ids, &connected_names](const NodeID node) {
+        [this, &roundabout_name_id, &connected_names](const NodeID node) {
             EdgeID continue_edge = SPECIAL_EDGEID;
             for (const auto edge : node_based_graph.GetAdjacentEdgeRange(node))
             {
@@ -226,25 +226,17 @@ RoundaboutType RoundaboutHandler::getRoundaboutType(const NodeID nid) const
                         // fork in roundabout
                         return SPECIAL_EDGEID;
                     }
-
+                    // roundabout does not keep its name
-                    if (EMPTY_NAMEID != edge_data.name_id)
+                    if (roundabout_name_id != 0 && roundabout_name_id != edge_data.name_id &&
-                    {
+                        requiresNameAnnounced(name_table.GetNameForID(roundabout_name_id),
-                        bool add = true;
-                        for (auto name_id : roundabout_name_ids)
-                        {
-
-                            if (!requiresNameAnnounced(name_table.GetNameForID(name_id),
                                               name_table.GetNameForID(edge_data.name_id),
                                               street_name_suffix_table))
                     {
-                                add = false;
+                        return SPECIAL_EDGEID;
-                                break;
-                            }
-                        }
-                        if (add)
-                            roundabout_name_ids.insert(edge_data.name_id);
                     }
 
+                    roundabout_name_id = edge_data.name_id;
+
                     continue_edge = edge;
                 }
                 else if (!edge_data.roundabout)
@@ -328,8 +320,7 @@ RoundaboutType RoundaboutHandler::getRoundaboutType(const NodeID nid) const
         // used with a reference and without. This will be fixed automatically
         // when we handle references separately or if the useage is more consistent
 
-        if (1 == roundabout_name_ids.size() &&
+        if (0 != roundabout_name_id && 0 == connected_names.count(roundabout_name_id))
-            0 == connected_names.count(*roundabout_name_ids.begin()))
             return RoundaboutType::Rotary;
         else
             return RoundaboutType::Roundabout;

src/extractor/guidance/turn_analysis.cpp

@@ -1,4 +1,3 @@
-#include "extractor/guidance/classification_data.hpp"
 #include "extractor/guidance/constants.hpp"
 #include "extractor/guidance/turn_analysis.hpp"
 
@@ -124,12 +123,14 @@ TurnAnalysis::setTurnTypes(const NodeID from_nid, const EdgeID, Intersection int
 Intersection TurnAnalysis::handleSliproads(const EdgeID source_edge_id,
                                            Intersection intersection) const
 {
+
     auto intersection_node_id = node_based_graph.GetTarget(source_edge_id);
 
     const auto linkTest = [this](const ConnectedRoad &road) {
-        return !node_based_graph.GetEdgeData(road.turn.eid).roundabout && road.entry_allowed &&
+        return // isLinkClass(
-               angularDeviation(road.turn.angle, STRAIGHT_ANGLE) <= 2 * NARROW_TURN_ANGLE &&
+            //    node_based_graph.GetEdgeData(road.turn.eid).road_classification.road_class) &&
-               !hasRoundaboutType(road.turn.instruction);
+            !node_based_graph.GetEdgeData(road.turn.eid).roundabout && road.entry_allowed &&
+            angularDeviation(road.turn.angle, STRAIGHT_ANGLE) <= 2 * NARROW_TURN_ANGLE;
     };
 
     bool hasNarrow =

src/extractor/raster_source.cpp

@@ -54,9 +54,7 @@ RasterDatum RasterSource::GetRasterInterpolate(const int lon, const int lat) con
     }
 
     const auto xthP = (lon - xmin) / xstep;
-    const auto ythP =
+    const auto ythP = (ymax - lat) / ystep;
-        (ymax - lat) /
-        ystep; // the raster texture uses a different coordinate system with y pointing downwards
 
     const std::size_t top = static_cast<std::size_t>(fmax(floor(ythP), 0));
     const std::size_t bottom = static_cast<std::size_t>(fmin(ceil(ythP), height - 1));
@@ -64,8 +62,8 @@ RasterDatum RasterSource::GetRasterInterpolate(const int lon, const int lat) con
     const std::size_t right = static_cast<std::size_t>(fmin(ceil(xthP), width - 1));
 
     // Calculate distances from corners for bilinear interpolation
-    const float fromLeft = xthP - left; // this is the fraction part of xthP
+    const float fromLeft = (lon - left * xstep + xmin) / xstep;
-    const float fromTop = ythP - top;   // this is the fraction part of ythP
+    const float fromTop = (ymax - top * ystep - lat) / ystep;
     const float fromRight = 1 - fromLeft;
     const float fromBottom = 1 - fromTop;
 

src/server/request_handler.cpp

@@ -105,10 +105,11 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
         else
         {
             BOOST_ASSERT(result.is<std::string>());
-            current_reply.content.resize(result.get<std::string>().size());
+            current_reply.content.resize(current_reply.content.size() +
+                                         result.get<std::string>().size());
             std::copy(result.get<std::string>().cbegin(),
                       result.get<std::string>().cend(),
-                      current_reply.content.begin());
+                      current_reply.content.end());
 
             current_reply.headers.emplace_back("Content-Type", "application/x-protobuf");
         }

src/storage/storage.cpp

@@ -360,7 +360,7 @@ int Storage::Run()
     }
 
     std::uint64_t num_bearings;
-    intersection_stream.read(reinterpret_cast<char*>(&num_bearings),sizeof(num_bearings));
+    intersection_stream >> num_bearings;
 
     std::vector<DiscreteBearing> bearing_class_table(num_bearings);
     intersection_stream.read(reinterpret_cast<char *>(&bearing_class_table[0]),

src/util/coordinate_calculation.cpp

@@ -258,9 +258,6 @@ circleCenter(const Coordinate C1, const Coordinate C2, const Coordinate C3)
                             C2C1_slope * (C2_x + C3_x)) /
                            (2 * (C3C2_slope - C2C1_slope));
         const double lat = (0.5 * (C1_x + C2_x) - lon) / C2C1_slope + 0.5 * (C1_y + C2_y);
-        if (lon < -180.0 || lon > 180.0 || lat < -90.0 || lat > 90.0)
-            return boost::none;
-        else
         return Coordinate(FloatLongitude(lon), FloatLatitude(lat));
     }
 }

unit_tests/extractor/raster_source.cpp

@@ -24,58 +24,58 @@ BOOST_AUTO_TEST_CASE(raster_test)
 {
     SourceContainer sources;
     int source_id = sources.LoadRasterSource(
-        "../unit_tests/fixtures/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
+        "../unit_tests/fixtures/raster_data.asc", 0, 0.09, 0, 0.09, 10, 10);
     BOOST_CHECK_EQUAL(source_id, 0);
 
     // Expected nearest-neighbor queries
     //     EDGES
-    CHECK_QUERY(0, 1.00, 1.00, 10);
+    CHECK_QUERY(0, 0.00, 0.00, 10);
-    CHECK_QUERY(0, 1.00, 1.09, 10);
+    CHECK_QUERY(0, 0.00, 0.09, 10);
-    CHECK_QUERY(0, 1.09, 1.00, 40);
+    CHECK_QUERY(0, 0.09, 0.00, 40);
-    CHECK_QUERY(0, 1.09, 1.09, 100);
+    CHECK_QUERY(0, 0.09, 0.09, 100);
-    CHECK_QUERY(0, 1.09, 1.07, 140);
+    CHECK_QUERY(0, 0.09, 0.07, 140);
     //     OUT OF BOUNDS
-    CHECK_QUERY(0, -1.1, 1.07, RasterDatum::get_invalid());
+    CHECK_QUERY(0, -0.1, 0.07, RasterDatum::get_invalid());
-    CHECK_QUERY(0, -1.1, -3.0, RasterDatum::get_invalid());
+    CHECK_QUERY(0, -0.1, -3.0, RasterDatum::get_invalid());
-    CHECK_QUERY(0, 1.3, 23.0, RasterDatum::get_invalid());
+    CHECK_QUERY(0, 0.3, 23.0, RasterDatum::get_invalid());
     //     ARBITRARY - AT DATA
-    CHECK_QUERY(0, 1.06, 1.06, 100);
+    CHECK_QUERY(0, 0.06, 0.06, 100);
-    CHECK_QUERY(0, 1.08, 1.05, 160);
+    CHECK_QUERY(0, 0.08, 0.05, 160);
-    CHECK_QUERY(0, 1.01, 1.05, 20);
+    CHECK_QUERY(0, 0.01, 0.05, 20);
     //     ARBITRARY - BETWEEN DATA
-    CHECK_QUERY(0, 1.054, 1.023, 40);
+    CHECK_QUERY(0, 0.054, 0.023, 40);
-    CHECK_QUERY(0, 1.056, 1.028, 80);
+    CHECK_QUERY(0, 0.056, 0.028, 80);
-    CHECK_QUERY(0, 1.05, 1.028, 60);
+    CHECK_QUERY(0, 0.05, 0.028, 60);
 
     // Expected bilinear interpolation queries
     //     EDGES - same as above
-    CHECK_INTERPOLATE(0, 1.00, 1.00, 10);
+    CHECK_INTERPOLATE(0, 0.00, 0.00, 10);
-    CHECK_INTERPOLATE(0, 1.00, 1.09, 10);
+    CHECK_INTERPOLATE(0, 0.00, 0.09, 10);
-    CHECK_INTERPOLATE(0, 1.09, 1.00, 40);
+    CHECK_INTERPOLATE(0, 0.09, 0.00, 40);
-    CHECK_INTERPOLATE(0, 1.09, 1.09, 100);
+    CHECK_INTERPOLATE(0, 0.09, 0.09, 100);
-    CHECK_INTERPOLATE(0, 1.09, 1.07, 140);
+    CHECK_INTERPOLATE(0, 0.09, 0.07, 140);
     //     OUT OF BOUNDS - same as above
-    CHECK_INTERPOLATE(0, -1.1, 1.07, RasterDatum::get_invalid());
+    CHECK_INTERPOLATE(0, -0.1, 0.07, RasterDatum::get_invalid());
-    CHECK_INTERPOLATE(0, -1.1, -3.0, RasterDatum::get_invalid());
+    CHECK_INTERPOLATE(0, -0.1, -3.0, RasterDatum::get_invalid());
-    CHECK_INTERPOLATE(0, 1.3, 23.0, RasterDatum::get_invalid());
+    CHECK_INTERPOLATE(0, 0.3, 23.0, RasterDatum::get_invalid());
     //     ARBITRARY - AT DATA - same as above
-    CHECK_INTERPOLATE(0, 1.06, 1.06, 100);
+    CHECK_INTERPOLATE(0, 0.06, 0.06, 100);
-    CHECK_INTERPOLATE(0, 1.08, 1.05, 160);
+    CHECK_INTERPOLATE(0, 0.08, 0.05, 160);
-    CHECK_INTERPOLATE(0, 1.01, 1.05, 20);
+    CHECK_INTERPOLATE(0, 0.01, 0.05, 20);
     //     ARBITRARY - BETWEEN DATA
-    CHECK_INTERPOLATE(0, 1.054, 1.023, 53);
+    CHECK_INTERPOLATE(0, 0.054, 0.023, 54);
-    CHECK_INTERPOLATE(0, 1.056, 1.028, 68);
+    CHECK_INTERPOLATE(0, 0.056, 0.028, 68);
-    CHECK_INTERPOLATE(0, 1.05, 1.028, 56);
+    CHECK_INTERPOLATE(0, 0.05, 0.028, 56);
 
     int source_already_loaded_id = sources.LoadRasterSource(
-        "../unit_tests/fixtures/raster_data.asc", 1, 1.09, 1, 1.09, 10, 10);
+        "../unit_tests/fixtures/raster_data.asc", 0, 0.09, 0, 0.09, 10, 10);
 
     BOOST_CHECK_EQUAL(source_already_loaded_id, 0);
-    BOOST_CHECK_THROW(sources.GetRasterDataFromSource(1, normalize(1.02), normalize(1.02)),
+    BOOST_CHECK_THROW(sources.GetRasterDataFromSource(1, normalize(0.02), normalize(0.02)),
                       util::exception);
 
     BOOST_CHECK_THROW(
-        sources.LoadRasterSource("../unit_tests/fixtures/nonexistent.asc", 0, 1.1, 0, 1.1, 7, 7),
+        sources.LoadRasterSource("../unit_tests/fixtures/nonexistent.asc", 0, 0.1, 0, 0.1, 7, 7),
         util::exception);
 }
 

unit_tests/util/coordinate_calculation.cpp

@@ -302,13 +302,6 @@ BOOST_AUTO_TEST_CASE(circleCenter)
     c = Coordinate(FloatLongitude(-112.096419), FloatLatitude(41.147259));
     result = coordinate_calculation::circleCenter(a, b, c);
     BOOST_CHECK(!result);
-
-    // Out of bounds
-    a = Coordinate(FloatLongitude(-112.096234), FloatLatitude(41.147258));
-    b = Coordinate(FloatLongitude(-112.106606), FloatLatitude(41.147259));
-    c = Coordinate(FloatLongitude(-113.096419), FloatLatitude(41.147258));
-    result = coordinate_calculation::circleCenter(a, b, c);
-    BOOST_CHECK(!result);
 }
 
 BOOST_AUTO_TEST_SUITE_END()