Merge branch 'master' into sf-cpp-17

.github/workflows/osrm-backend.yml

@@ -177,7 +177,7 @@ jobs:
             build_node_package: true
             continue-on-error: false
             node: 12
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang
@@ -190,7 +190,7 @@ jobs:
             build_node_package: true
             continue-on-error: false
             node: 14
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang
@@ -203,7 +203,7 @@ jobs:
             build_node_package: true
             continue-on-error: false
             node: 16
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TOOLS: ON
             BUILD_TYPE: Release
             CCOMPILER: clang
@@ -294,7 +294,7 @@ jobs:
             continue-on-error: true
             # TODO: Use node 'latest' once supported: https://github.com/actions/setup-node/issues/257
             node: 16
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++
@@ -330,7 +330,7 @@ jobs:
             build_node_package: true
             continue-on-error: true
             node: "lts/*"
-            runs-on: macos-10.15
+            runs-on: macos-11
             BUILD_TYPE: Release
             CCOMPILER: clang
             CXXCOMPILER: clang++

CHANGELOG.md

@@ -2,8 +2,11 @@
   - Changes from 5.26.0
     - API:
       - FIXED: Fix inefficient osrm-routed connection handling [#6113](https://github.com/Project-OSRM/osrm-backend/pull/6113)
+    - Misc:
+      - FIXED: Fix bug with reading Set values from Lua scripts. [#6285](https://github.com/Project-OSRM/osrm-backend/pull/6285)
     - Build:
       - CHANGED: Migrate to C++17. Update sol2 to 3.3.0. Fix bug with reading Set values from Lua scripts. [#6279](https://github.com/Project-OSRM/osrm-backend/pull/6279)
+      - CHANGED: Update macOS CI image to macos-11. [#6286](https://github.com/Project-OSRM/osrm-backend/pull/6286)
       - CHANGED: Enable even more clang-tidy checks. [#6273](https://github.com/Project-OSRM/osrm-backend/pull/6273)
       - CHANGED: Configure CMake to not build flatbuffers tests and samples. [#6274](https://github.com/Project-OSRM/osrm-backend/pull/6274)
       - CHANGED: Enable more clang-tidy checks. [#6270](https://github.com/Project-OSRM/osrm-backend/pull/6270)

features/foot/names.feature

@@ -20,3 +20,20 @@ Feature: Foot - Street names in instructions
         When I route I should get
             | from | to | route    | ref    |
             | a    | c  | My Way,, | ,A7,A7 |
+
+
+    Scenario: Foot - Combines named roads with suffix changes
+        Given the node map
+            """
+            a b c d
+            """
+
+        And the ways
+            | nodes | name           |
+            | ab    | High Street W  |
+            | bc    | High Street E  |
+            | cd    | Market Street  |
+
+        When I route I should get
+            | from | to | route                                     |
+            | a    | d  | High Street W,Market Street,Market Street |

src/extractor/scripting_environment_lua.cpp

@@ -953,6 +953,7 @@ std::string GetSetOrSequenceValue(const std::pair<sol::object, sol::object> &pai
     {
         return pair.second.as<std::string>();
     }
+    BOOST_ASSERT(pair.first.is<std::string>());
     return pair.first.as<std::string>();
 }