Skip to content

Commit

Permalink
Merge branch 'master' into fix-maneuver-overrides-bug
Browse files Browse the repository at this point in the history
  • Loading branch information
mjjbell authored Mar 24, 2024
2 parents c5d3c65 + c28ba66 commit a011494
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@
- FIXED: Fix adding traffic signal penalties during compression [#6419](https://github.com/Project-OSRM/osrm-backend/pull/6419)
- FIXED: Correctly handle compressed traffic signals. [#6724](https://github.com/Project-OSRM/osrm-backend/pull/6724)
- FIXED: Fix bug when searching for maneuver overrides [#6739](https://github.com/Project-OSRM/osrm-backend/pull/6739)
- Debug tiles:
- FIXED: Ensure speed layer features have unique ids. [#6726](https://github.com/Project-OSRM/osrm-backend/pull/6726)

# 5.27.1
- Changes from 5.27.0
- Misc:
Expand Down
4 changes: 2 additions & 2 deletions src/engine/plugins/tile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ void encodeVectorTile(const DataFacadeBase &facade,
auto tile_line = coordinatesToTileLine(a, b, tile_bbox);
if (!tile_line.empty())
{
SpeedLayerFeatureBuilder fbuilder{speeds_layer, id};
SpeedLayerFeatureBuilder fbuilder{speeds_layer, id++};
fbuilder.add_linestring_from_container(tile_line);

fbuilder.set_speed(speed_kmh_idx);
Expand Down Expand Up @@ -542,7 +542,7 @@ void encodeVectorTile(const DataFacadeBase &facade,
auto tile_line = coordinatesToTileLine(b, a, tile_bbox);
if (!tile_line.empty())
{
SpeedLayerFeatureBuilder fbuilder{speeds_layer, id};
SpeedLayerFeatureBuilder fbuilder{speeds_layer, id++};
fbuilder.add_linestring_from_container(tile_line);

fbuilder.set_speed(speed_kmh_idx);
Expand Down
2 changes: 1 addition & 1 deletion test/nodejs/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports.three_test_coordinates = [[7.41337, 43.72956],

exports.two_test_coordinates = exports.three_test_coordinates.slice(0, 2)

exports.test_tile = {'at': [17059, 11948, 15], 'size': 156539};
exports.test_tile = {'at': [17059, 11948, 15], 'size': 159125};

// Test files generated by the routing engine; check test/data
if (process.env.OSRM_DATA_PATH !== undefined) {
Expand Down

0 comments on commit a011494

Please sign in to comment.