Skip to content

Commit 087210e

Browse files
authored
Merge branch 'master' into fix-large-osmids-json-rendering
2 parents 45bea7d + d8680a0 commit 087210e

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- ADDED: Add support for opposite approach request parameter. [#6842](https://github.com/Project-OSRM/osrm-backend/pull/6842)
1010
- ADDED: Add support for accessing edge flags in `process_segment` [#6658](https://github.com/Project-OSRM/osrm-backend/pull/6658)
1111
- Build:
12+
- CHANGED: Fix compilation with upcoming Boost 1.87.0 [#7073](https://github.com/Project-OSRM/osrm-backend/pull/7073)
1213
- CHANGED: Upgrade clang-format to version 15. [#6919](https://github.com/Project-OSRM/osrm-backend/pull/6919)
1314
- CHANGED: Use Debian Bookworm as base Docker image [#6904](https://github.com/Project-OSRM/osrm-backend/pull/6904)
1415
- CHANGED: Upgrade CI actions to latest versions [#6893](https://github.com/Project-OSRM/osrm-backend/pull/6893)
@@ -79,6 +80,7 @@
7980
- FIXED: Correct HTTP docs to reflect summary output dependency on steps parameter. [#6655](https://github.com/Project-OSRM/osrm-backend/pull/6655)
8081
- ADDED: Extract prerelease/build information from package semver [#6839](https://github.com/Project-OSRM/osrm-backend/pull/6839)
8182
- FIXED: Fix json rendering problem for large osm ids [#7096](https://github.com/Project-OSRM/osrm-backend/pull/7096)
83+
- CHANGED: Replaced PL:trunk with PL:expressway to match the latest changes in Polish tagging [#7079](https://github.com/Project-OSRM/osrm-backend/pull/7079)
8284
- Profiles:
8385
- FIXED: Bicycle and foot profiles now don't route on proposed ways [#6615](https://github.com/Project-OSRM/osrm-backend/pull/6615)
8486
- ADDED: Add optional support of cargo bike exclusion and width to bicyle profile [#7044](https://github.com/Project-OSRM/osrm-backend/pull/7044)

include/server/server.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ class Server
5353
const auto port_string = std::to_string(port);
5454

5555
boost::asio::ip::tcp::resolver resolver(io_context);
56-
boost::asio::ip::tcp::resolver::query query(address, port_string);
57-
boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
56+
boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port_string).begin();
5857

5958
acceptor.open(endpoint.protocol());
6059
#ifdef SO_REUSEPORT

profiles/car.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function setup()
300300
['ph:rural'] = 80,
301301
['ph:motorway'] = 100,
302302
['pl:rural'] = 100,
303-
['pl:trunk'] = 120,
303+
['pl:expressway'] = 120,
304304
['pl:motorway'] = 140,
305305
["ro:trunk"] = 100,
306306
["ru:living_street"] = 20,

taginfo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
{"key": "maxspeed", "value": "PH:rural"},
177177
{"key": "maxspeed", "value": "PH:motorway"},
178178
{"key": "maxspeed", "value": "PL:rural"},
179-
{"key": "maxspeed", "value": "PL:trunk"},
179+
{"key": "maxspeed", "value": "PL:expressway"},
180180
{"key": "maxspeed", "value": "PL:motorway"},
181181
{"key": "maxspeed", "value": "RO:trunk"},
182182
{"key": "maxspeed", "value": "RU:living_street"},

0 commit comments

Comments
 (0)