From 3f36df9e1828733a748df87b3913e6b40378c936 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:04:11 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump fast-xml-parser from 5.9.3 to 5.10.1 Bumps [fast-xml-parser](https://github.com/NaturalIntelligence/fast-xml-parser) from 5.9.3 to 5.10.1. - [Release notes](https://github.com/NaturalIntelligence/fast-xml-parser/releases) - [Changelog](https://github.com/NaturalIntelligence/fast-xml-parser/blob/master/CHANGELOG.md) - [Commits](https://github.com/NaturalIntelligence/fast-xml-parser/compare/v5.9.3...v5.10.1) --- updated-dependencies: - dependency-name: fast-xml-parser dependency-version: 5.10.1 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 50 +++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5e4362d52..4fe837e759 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "@project-osrm/osrm", - "version": "26.6.5", + "version": "26.7.3", "hasInstallScript": true, "license": "BSD-2-Clause", "dependencies": { @@ -3951,9 +3951,9 @@ } }, "node_modules/@nodable/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-3.0.0.tgz", + "integrity": "sha512-8L9xFeTYKhm49xfIypoe2W5wV1m/3Z58kT+7kR9A8OyFxcPduI4VmxaUMQyKYrRjUoLLSXv6EKKID5Tvj9cUVw==", "dev": true, "funding": [ { @@ -9166,9 +9166,9 @@ } }, "node_modules/fast-xml-parser": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz", - "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==", + "version": "5.10.1", + "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.10.1.tgz", + "integrity": "sha512-IEMIf7298kXuZSRFoGfMYrl7is8LpavODgbNz1cwIudv7KwVFnuU+UsMporfq6PD6aXSlawZlARiA3UywCTfMw==", "dev": true, "funding": [ { @@ -9178,17 +9178,33 @@ ], "license": "MIT", "dependencies": { - "@nodable/entities": "^2.2.0", + "@nodable/entities": "^3.0.0", "fast-xml-builder": "^1.2.0", - "is-unsafe": "^1.0.1", - "path-expression-matcher": "^1.5.0", + "is-unsafe": "^2.0.0", + "path-expression-matcher": "^1.6.2", "strnum": "^2.4.1", - "xml-naming": "^0.1.0" + "xml-naming": "^0.3.0" }, "bin": { "fxparser": "src/cli/cli.js" } }, + "node_modules/fast-xml-parser/node_modules/xml-naming": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.3.0.tgz", + "integrity": "sha512-ghig2TBE/H11aOVgmahA3MhimvkBr6JIYknH/Dhdk10nXwdbIqBJsbfMxpvFPG8bAw77gN29aQWvKpmVoPlvPQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/fdir": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", @@ -10605,9 +10621,9 @@ } }, "node_modules/is-unsafe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-1.0.1.tgz", - "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-2.0.0.tgz", + "integrity": "sha512-2LdV822R+wmI86unXA93WCFpL6g+av8ynWk0nrHyJqGop5VoocYsSLFgN8jrfalT6iGeLNM4KXuVSsULP53kEA==", "dev": true, "funding": [ { @@ -11873,9 +11889,9 @@ } }, "node_modules/path-expression-matcher": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.5.0.tgz", - "integrity": "sha512-cbrerZV+6rvdQrrD+iGMcZFEiiSrbv9Tfdkvnusy6y0x0GKBXREFg/Y65GhIfm0tnLntThhzCnfKwp1WRjeCyQ==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/path-expression-matcher/-/path-expression-matcher-1.6.2.tgz", + "integrity": "sha512-enSlaiat05iasnzmgNxRj8reFdj3puY2QpNgP1aPIaVfT6nn9ICuPoFlKHk8EN22HcwewshO+mN2DGbkCEOtqQ==", "dev": true, "funding": [ { From c0b23813467d10cb1258647632116f49c7534e63 Mon Sep 17 00:00:00 2001 From: "openai-code-agent[bot]" <242516109+Codex@users.noreply.github.com> Date: Sat, 25 Jul 2026 08:02:13 +0000 Subject: [PATCH 2/3] Initial plan From 85ca9c66066204e563aa82978ad0bc2ae8396e8a Mon Sep 17 00:00:00 2001 From: "openai-code-agent[bot]" <242516109+Codex@users.noreply.github.com> Date: Sat, 25 Jul 2026 08:04:57 +0000 Subject: [PATCH 3/3] chore(deps): resolve CI audit failure by pinning tar override and refreshing lockfile Agent-Logs-Url: https://github.com/Project-OSRM/osrm-backend/sessions/e5283164-c5e6-47d2-bc29-5a94e34719c3 Co-authored-by: DennisOSRM <1067895+DennisOSRM@users.noreply.github.com> --- include/contractor/graph_contractor.hpp | 8 +- include/contractor/query_edge.hpp | 4 +- include/engine/api/base_api.hpp | 6 +- include/engine/api/json_factory.hpp | 8 +- include/engine/api/route_api.hpp | 8 +- include/engine/api/route_parameters.hpp | 13 +- include/engine/api/table_parameters.hpp | 13 +- include/engine/base64.hpp | 8 +- include/engine/bearing.hpp | 4 +- .../contiguous_internalmem_datafacade.hpp | 192 +++++++++++++----- include/engine/datafacade_factory.hpp | 16 +- include/engine/datafacade_provider.hpp | 24 ++- include/engine/douglas_peucker.hpp | 4 +- include/engine/engine.hpp | 28 ++- include/engine/geospatial_query.hpp | 12 +- .../engine/guidance/collapsing_utility.hpp | 44 +++- include/engine/guidance/leg_geometry.hpp | 8 +- include/engine/guidance/route_step.hpp | 8 +- include/engine/internal_route_result.hpp | 4 +- .../map_matching/hidden_markov_model.hpp | 4 +- include/engine/phantom_node.hpp | 20 +- include/engine/plugins/plugin_base.hpp | 6 +- include/engine/routing_algorithms.hpp | 40 +++- .../routing_algorithms/many_to_many.hpp | 22 +- .../routing_algorithms/routing_base_mld.hpp | 19 +- .../routing_algorithms/shortest_path_impl.hpp | 8 +- include/extractor/edge_based_node_segment.hpp | 4 +- .../extractor/extraction_helper_functions.hpp | 8 +- include/extractor/extraction_relation.hpp | 4 +- include/extractor/extraction_way.hpp | 8 +- include/extractor/extractor_config.hpp | 4 +- .../intersection/intersection_edge.hpp | 4 +- .../intersection/intersection_view.hpp | 8 +- include/extractor/maneuver_override.hpp | 4 +- include/extractor/node_data_container.hpp | 24 ++- include/extractor/node_restriction_map.hpp | 12 +- include/extractor/obstacles.hpp | 12 +- include/extractor/profile_properties.hpp | 24 ++- include/extractor/restriction.hpp | 8 +- include/extractor/segment_data_container.hpp | 8 +- include/extractor/serialization.hpp | 12 +- include/extractor/turn_path.hpp | 12 +- include/guidance/statistics_handler.hpp | 4 +- include/guidance/turn_data_container.hpp | 4 +- include/guidance/turn_instruction.hpp | 20 +- include/nodejs/json_v8_renderer.hpp | 8 +- include/nodejs/node_osrm_support.hpp | 12 +- include/partitioner/cell_storage.hpp | 20 +- include/partitioner/multi_level_partition.hpp | 8 +- include/partitioner/partitioner_config.hpp | 4 +- include/partitioner/remove_unconnected.hpp | 14 +- include/partitioner/renumber.hpp | 4 +- .../server/api/base_parameters_grammar.hpp | 141 +++++++------ .../server/api/route_parameters_grammar.hpp | 40 ++-- include/server/server.hpp | 4 +- include/storage/io.hpp | 16 +- include/storage/io_config.hpp | 4 +- include/storage/serialization.hpp | 24 ++- include/storage/shared_datatype.hpp | 15 +- include/storage/shared_monitor.hpp | 8 +- include/storage/storage_config.hpp | 4 +- include/storage/tar.hpp | 12 +- include/storage/view_factory.hpp | 28 ++- include/updater/csv_file_parser.hpp | 3 +- include/updater/source.hpp | 16 +- include/updater/updater_config.hpp | 4 +- include/util/alias.hpp | 36 +++- include/util/bearing.hpp | 4 +- include/util/bit_range.hpp | 4 +- include/util/coordinate.hpp | 16 +- include/util/coordinate_calculation.hpp | 4 +- include/util/deallocating_vector.hpp | 28 ++- include/util/dist_table_wrapper.hpp | 4 +- include/util/dynamic_graph.hpp | 24 ++- include/util/filtered_graph.hpp | 8 +- include/util/filtered_integer_range.hpp | 12 +- include/util/for_each_indexed.hpp | 4 +- include/util/format.hpp | 4 +- include/util/integer_range.hpp | 12 +- include/util/iterator_adapters.hpp | 28 ++- include/util/json_deep_compare.hpp | 4 +- include/util/json_renderer.hpp | 20 +- include/util/linear_hash_storage.hpp | 4 +- include/util/mmap_file.hpp | 12 +- include/util/opening_hours.hpp | 4 +- include/util/packed_vector.hpp | 46 +++-- include/util/percent.hpp | 4 +- include/util/permutation.hpp | 4 +- include/util/query_heap.hpp | 4 +- include/util/static_assert.hpp | 4 +- include/util/static_graph.hpp | 24 ++- include/util/static_rtree.hpp | 8 +- include/util/std_hash.hpp | 12 +- include/util/tarjan_scc.hpp | 8 +- include/util/typedefs.hpp | 4 +- include/util/vector_view.hpp | 12 +- include/util/web_mercator.hpp | 12 +- package-lock.json | 6 +- package.json | 2 +- src/contractor/graph_contractor.cpp | 19 +- src/engine/api/json_factory.cpp | 12 +- src/engine/guidance/collapse_turns.cpp | 8 +- src/engine/hint.cpp | 8 +- src/engine/plugins/tile.cpp | 28 ++- src/engine/plugins/trip.cpp | 4 +- src/engine/plugins/viaroute.cpp | 28 +-- .../alternative_path_ch.cpp | 4 +- src/engine/routing_algorithms/tile_turns.cpp | 4 +- src/extractor/edge_based_graph_factory.cpp | 8 +- src/extractor/extraction_containers.cpp | 8 +- src/extractor/extractor_callbacks.cpp | 8 +- .../intersection/coordinate_extractor.cpp | 4 +- src/extractor/intersection/intersection.cpp | 4 +- .../intersection/intersection_analysis.cpp | 8 +- src/extractor/node_based_graph_factory.cpp | 4 +- src/extractor/scripting_environment_lua.cpp | 16 +- src/extractor/suffix_table.cpp | 8 +- src/extractor/way_restriction_map.cpp | 8 +- src/guidance/motorway_handler.cpp | 8 +- src/guidance/sliproad_handler.cpp | 4 +- src/guidance/turn_handler.cpp | 23 ++- src/guidance/turn_lane_data.cpp | 4 +- src/nodejs/node_osrm.cpp | 4 +- src/osrm/osrm.cpp | 24 ++- src/partitioner/bisection_graph_view.cpp | 8 +- src/partitioner/dinic_max_flow.cpp | 20 +- src/partitioner/inertial_flow.cpp | 4 +- src/partitioner/recursive_bisection.cpp | 4 +- src/partitioner/recursive_bisection_state.cpp | 12 +- src/partitioner/tarjan_graph_wrapper.cpp | 8 +- .../include/python/types/jsoncontainer_nb.hpp | 23 ++- .../src/parameters/tableparameter_nb.cpp | 3 +- src/python/src/types/jsoncontainer_nb.cpp | 3 +- src/python/src/utility/osrm_utility.cpp | 6 +- src/server/api/parameters_parser.cpp | 4 +- src/server/connection.cpp | 4 +- src/server/request_handler.cpp | 4 +- src/storage/shared_memory.cpp | 4 +- src/tools/components.cpp | 4 +- src/util/assert.cpp | 8 +- src/util/coordinate.cpp | 8 +- src/util/coordinate_calculation.cpp | 4 +- src/util/guidance/bearing_class.cpp | 7 +- src/util/guidance/entry_class.cpp | 8 +- src/util/guidance/turn_lanes.cpp | 4 +- src/util/log.cpp | 4 +- src/util/opening_hours.cpp | 8 +- unit_tests/engine/offline_facade.cpp | 136 +++++++++---- .../extractor/car_profile_width_penalty.cpp | 4 +- unit_tests/extractor/restriction_graph.cpp | 16 +- .../extractor/turn_lane_matcher_tests.cpp | 24 ++- unit_tests/library/limits.cpp | 4 +- unit_tests/library/nearest.cpp | 32 ++- unit_tests/library/route.cpp | 72 +++++-- unit_tests/library/table.cpp | 40 +++- unit_tests/library/tile.cpp | 28 ++- unit_tests/library/trip.cpp | 32 ++- unit_tests/mocks/mock_datafacade.hpp | 108 +++++++--- unit_tests/util/static_rtree.cpp | 24 ++- 159 files changed, 1727 insertions(+), 699 deletions(-) diff --git a/include/contractor/graph_contractor.hpp b/include/contractor/graph_contractor.hpp index 457c4325b1..4479f4fdf7 100644 --- a/include/contractor/graph_contractor.hpp +++ b/include/contractor/graph_contractor.hpp @@ -23,13 +23,17 @@ std::vector contractGraph(ContractorGraph &graph, // Overload for contracting all nodes inline auto contractGraph(ContractorGraph &graph, double core_factor = 1.0) -{ return contractGraph(graph, {}, {}, core_factor); } +{ + return contractGraph(graph, {}, {}, core_factor); +} // Overload no contracted nodes inline auto contractGraph(ContractorGraph &graph, std::vector node_is_contractible, double core_factor = 1.0) -{ return contractGraph(graph, {}, std::move(node_is_contractible), core_factor); } +{ + return contractGraph(graph, {}, std::move(node_is_contractible), core_factor); +} } // namespace osrm::contractor diff --git a/include/contractor/query_edge.hpp b/include/contractor/query_edge.hpp index 477d63a66d..c3056f3554 100644 --- a/include/contractor/query_edge.hpp +++ b/include/contractor/query_edge.hpp @@ -62,7 +62,9 @@ struct QueryEdge } bool operator<(const QueryEdge &rhs) const - { return std::tie(source, target) < std::tie(rhs.source, rhs.target); } + { + return std::tie(source, target) < std::tie(rhs.source, rhs.target); + } bool operator==(const QueryEdge &right) const { diff --git a/include/engine/api/base_api.hpp b/include/engine/api/base_api.hpp index 1d9ffd1b7b..b88b1bcbae 100644 --- a/include/engine/api/base_api.hpp +++ b/include/engine/api/base_api.hpp @@ -47,8 +47,7 @@ class BaseAPI util::json::Object MakeWaypoint(const PhantomNodeCandidates &candidates) const { // TODO: check forward/reverse - const auto toName = [this](const auto &phantom) - { + const auto toName = [this](const auto &phantom) { return std::string( facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))); }; @@ -117,8 +116,7 @@ class BaseAPI static_cast(static_cast(util::toFloating(snapped_location.lon))), static_cast(static_cast(util::toFloating(snapped_location.lat)))); - const auto toName = [this](const auto &phantom) - { + const auto toName = [this](const auto &phantom) { return std::string( facade.GetNameForID(facade.GetNameIndex(phantom.forward_segment_id.id))); }; diff --git a/include/engine/api/json_factory.hpp b/include/engine/api/json_factory.hpp index c5f9a26668..f66ccf19b8 100644 --- a/include/engine/api/json_factory.hpp +++ b/include/engine/api/json_factory.hpp @@ -37,7 +37,9 @@ inline bool isValidModifier(const guidance::StepManeuver maneuver) } inline bool hasValidLanes(const guidance::IntermediateIntersection &intersection) -{ return intersection.lanes.lanes_in_turn > 0; } +{ + return intersection.lanes.lanes_in_turn > 0; +} util::json::Value coordinateToLonLat(const util::Coordinate &coordinate); @@ -50,7 +52,9 @@ inline double roundAndClampBearing(double bearing) { return std::fmod(std::round template util::json::String makePolyline(ForwardIter begin, ForwardIter end) -{ return {encodePolyline(begin, end)}; } +{ + return {encodePolyline(begin, end)}; +} template util::json::Object makeGeoJSONGeometry(ForwardIter begin, ForwardIter end) diff --git a/include/engine/api/route_api.hpp b/include/engine/api/route_api.hpp index e9adb87b43..12d5bdbebb 100644 --- a/include/engine/api/route_api.hpp +++ b/include/engine/api/route_api.hpp @@ -571,10 +571,14 @@ class RouteAPI : public BaseAPI GeometryVisitor(Builder &builder) : builder(builder) {} void operator()(const flatbuffers::Offset &value) - { builder.add_polyline(value); } + { + builder.add_polyline(value); + } void operator()( const flatbuffers::Offset> &value) - { builder.add_coordinates(value); } + { + builder.add_coordinates(value); + } private: Builder &builder; diff --git a/include/engine/api/route_parameters.hpp b/include/engine/api/route_parameters.hpp index 5e21684e40..9b5e163090 100644 --- a/include/engine/api/route_parameters.hpp +++ b/include/engine/api/route_parameters.hpp @@ -198,17 +198,16 @@ inline bool operator&(RouteParameters::AnnotationsType lhs, RouteParameters::Ann inline RouteParameters::AnnotationsType operator|(RouteParameters::AnnotationsType lhs, RouteParameters::AnnotationsType rhs) { - return ( - RouteParameters:: - AnnotationsType)(static_cast>( - lhs) | - static_cast>( - rhs)); + return (RouteParameters::AnnotationsType)( + static_cast>(lhs) | + static_cast>(rhs)); } inline RouteParameters::AnnotationsType &operator|=(RouteParameters::AnnotationsType &lhs, RouteParameters::AnnotationsType rhs) -{ return lhs = lhs | rhs; } +{ + return lhs = lhs | rhs; +} } // namespace osrm::engine::api #endif diff --git a/include/engine/api/table_parameters.hpp b/include/engine/api/table_parameters.hpp index 5c5c8754e7..c349ab56c5 100644 --- a/include/engine/api/table_parameters.hpp +++ b/include/engine/api/table_parameters.hpp @@ -153,17 +153,16 @@ inline bool operator&(TableParameters::AnnotationsType lhs, TableParameters::Ann inline TableParameters::AnnotationsType operator|(TableParameters::AnnotationsType lhs, TableParameters::AnnotationsType rhs) { - return ( - TableParameters:: - AnnotationsType)(static_cast>( - lhs) | - static_cast>( - rhs)); + return (TableParameters::AnnotationsType)( + static_cast>(lhs) | + static_cast>(rhs)); } inline TableParameters::AnnotationsType &operator|=(TableParameters::AnnotationsType &lhs, TableParameters::AnnotationsType rhs) -{ return lhs = lhs | rhs; } +{ + return lhs = lhs | rhs; +} } // namespace osrm::engine::api #endif // ENGINE_API_TABLE_PARAMETERS_HPP diff --git a/include/engine/base64.hpp b/include/engine/base64.hpp index 66b5e275ab..8af51b7397 100644 --- a/include/engine/base64.hpp +++ b/include/engine/base64.hpp @@ -72,11 +72,15 @@ inline std::string encodeBase64(const unsigned char *first, std::size_t size) // Overload for signed char catches (not only but also) C-string literals. inline std::string encodeBase64(const signed char *first, std::size_t size) -{ return encodeBase64(reinterpret_cast(first), size); } +{ + return encodeBase64(reinterpret_cast(first), size); +} // Overload for char catches (not only but also) C-string literals. inline std::string encodeBase64(const char *first, std::size_t size) -{ return encodeBase64(reinterpret_cast(first), size); } +{ + return encodeBase64(reinterpret_cast(first), size); +} // Convenience specialization, encoding from string instead of byte-dumping it. inline std::string encodeBase64(const std::string &x) { return encodeBase64(x.data(), x.size()); } diff --git a/include/engine/bearing.hpp b/include/engine/bearing.hpp index 2651ffa373..c64e689d5f 100644 --- a/include/engine/bearing.hpp +++ b/include/engine/bearing.hpp @@ -40,7 +40,9 @@ struct Bearing }; inline bool operator==(const Bearing lhs, const Bearing rhs) -{ return lhs.bearing == rhs.bearing && lhs.range == rhs.range; } +{ + return lhs.bearing == rhs.bearing && lhs.range == rhs.range; +} inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); } } // namespace osrm::engine diff --git a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp index 5f10905369..137beaafc6 100644 --- a/include/engine/datafacade/contiguous_internalmem_datafacade.hpp +++ b/include/engine/datafacade/contiguous_internalmem_datafacade.hpp @@ -71,7 +71,9 @@ class ContiguousInternalMemoryAlgorithmDataFacade : public datafacade::Algor const std::string &metric_name, std::size_t exclude_index) : allocator(std::move(allocator_)) - { InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); } + { + InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); + } void InitializeInternalPointers(const storage::SharedDataIndex &index, const std::string &metric_name, @@ -87,25 +89,37 @@ class ContiguousInternalMemoryAlgorithmDataFacade : public datafacade::Algor unsigned GetNumberOfEdges() const override final { return m_query_graph.GetNumberOfEdges(); } unsigned GetOutDegree(const NodeID edge_based_node_id) const override final - { return m_query_graph.GetOutDegree(edge_based_node_id); } + { + return m_query_graph.GetOutDegree(edge_based_node_id); + } NodeID GetTarget(const EdgeID edge_based_edge_id) const override final - { return m_query_graph.GetTarget(edge_based_edge_id); } + { + return m_query_graph.GetTarget(edge_based_edge_id); + } const EdgeData &GetEdgeData(const EdgeID edge_based_edge_id) const override final - { return m_query_graph.GetEdgeData(edge_based_edge_id); } + { + return m_query_graph.GetEdgeData(edge_based_edge_id); + } EdgeRange GetAdjacentEdgeRange(const NodeID edge_based_node_id) const override final - { return m_query_graph.GetAdjacentEdgeRange(edge_based_node_id); } + { + return m_query_graph.GetAdjacentEdgeRange(edge_based_node_id); + } // searches for a specific edge EdgeID FindEdge(const NodeID edge_based_node_from, const NodeID edge_based_node_to) const override final - { return m_query_graph.FindEdge(edge_based_node_from, edge_based_node_to); } + { + return m_query_graph.FindEdge(edge_based_node_from, edge_based_node_to); + } EdgeID FindEdgeInEitherDirection(const NodeID edge_based_node_from, const NodeID edge_based_node_to) const override final - { return m_query_graph.FindEdgeInEitherDirection(edge_based_node_from, edge_based_node_to); } + { + return m_query_graph.FindEdgeInEitherDirection(edge_based_node_from, edge_based_node_to); + } EdgeID FindEdgeIndicateIfReverse(const NodeID edge_based_node_from, const NodeID edge_based_node_to, @@ -119,7 +133,9 @@ class ContiguousInternalMemoryAlgorithmDataFacade : public datafacade::Algor FindSmallestEdge(const NodeID edge_based_node_from, const NodeID edge_based_node_to, const std::function &filter) const override final - { return m_query_graph.FindSmallestEdge(edge_based_node_from, edge_based_node_to, filter); } + { + return m_query_graph.FindSmallestEdge(edge_based_node_from, edge_based_node_to, filter); + } }; /** @@ -258,46 +274,68 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade const std::string &metric_name, const std::size_t exclude_index) : allocator(std::move(allocator_)) - { InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); } + { + InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); + } // node and edge information access util::Coordinate GetCoordinateOfNode(const NodeID node_based_node_id) const override final - { return m_coordinate_list[node_based_node_id]; } + { + return m_coordinate_list[node_based_node_id]; + } OSMNodeID GetOSMNodeIDOfNode(const NodeID node_based_node_id) const override final - { return m_osmnodeid_list[node_based_node_id]; } + { + return m_osmnodeid_list[node_based_node_id]; + } NodeForwardRange GetUncompressedForwardGeometry(const PackedGeometryID id) const override final - { return segment_data.GetForwardGeometry(id); } + { + return segment_data.GetForwardGeometry(id); + } NodeReverseRange GetUncompressedReverseGeometry(const PackedGeometryID id) const override final - { return segment_data.GetReverseGeometry(id); } + { + return segment_data.GetReverseGeometry(id); + } DurationForwardRange GetUncompressedForwardDurations(const PackedGeometryID id) const override final - { return segment_data.GetForwardDurations(id); } + { + return segment_data.GetForwardDurations(id); + } DurationReverseRange GetUncompressedReverseDurations(const PackedGeometryID id) const override final - { return segment_data.GetReverseDurations(id); } + { + return segment_data.GetReverseDurations(id); + } WeightForwardRange GetUncompressedForwardWeights(const PackedGeometryID id) const override final - { return segment_data.GetForwardWeights(id); } + { + return segment_data.GetForwardWeights(id); + } WeightReverseRange GetUncompressedReverseWeights(const PackedGeometryID id) const override final - { return segment_data.GetReverseWeights(id); } + { + return segment_data.GetReverseWeights(id); + } // Returns the data source ids that were used to supply the edge // weights. DatasourceForwardRange GetUncompressedForwardDatasources(const PackedGeometryID id) const override final - { return segment_data.GetForwardDatasources(id); } + { + return segment_data.GetForwardDatasources(id); + } // Returns the data source ids that were used to supply the edge // weights. DatasourceReverseRange GetUncompressedReverseDatasources(const PackedGeometryID id) const override final - { return segment_data.GetReverseDatasources(id); } + { + return segment_data.GetReverseDatasources(id); + } TurnPenalty GetWeightPenaltyForEdgeID(const EdgeID edge_based_edge_id) const override final { @@ -369,22 +407,34 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade std::uint32_t GetCheckSum() const override final { return m_check_sum; } std::string GetTimestamp() const override final - { return std::string(m_data_timestamp.begin(), m_data_timestamp.end()); } + { + return std::string(m_data_timestamp.begin(), m_data_timestamp.end()); + } GeometryID GetGeometryIndex(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.GetGeometryID(edge_based_node_id); } + { + return edge_based_node_data.GetGeometryID(edge_based_node_id); + } ComponentID GetComponentID(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.GetComponentID(edge_based_node_id); } + { + return edge_based_node_data.GetComponentID(edge_based_node_id); + } extractor::TravelMode GetTravelMode(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.GetTravelMode(edge_based_node_id); } + { + return edge_based_node_data.GetTravelMode(edge_based_node_id); + } extractor::ClassData GetClassData(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.GetClassData(edge_based_node_id); } + { + return edge_based_node_data.GetClassData(edge_based_node_id); + } bool ExcludeNode(const NodeID edge_based_node_id) const override final - { return (edge_based_node_data.GetClassData(edge_based_node_id) & exclude_mask) > 0; } + { + return (edge_based_node_data.GetClassData(edge_based_node_id) & exclude_mask) > 0; + } std::vector GetClasses(const extractor::ClassData class_data) const override final { @@ -400,7 +450,9 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade } StringViewID GetNameIndex(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.GetNameID(edge_based_node_id); } + { + return edge_based_node_data.GetNameID(edge_based_node_id); + } std::string_view GetNameForID(const StringViewID id) const override final { @@ -433,24 +485,36 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade } std::string_view GetDatasourceName(const DatasourceID id) const override final - { return m_datasources->GetSourceName(id); } + { + return m_datasources->GetSourceName(id); + } bool GetContinueStraightDefault() const override final - { return m_profile_properties->continue_straight_at_waypoint; } + { + return m_profile_properties->continue_straight_at_waypoint; + } double GetMapMatchingMaxSpeed() const override final - { return m_profile_properties->max_speed_for_map_matching; } + { + return m_profile_properties->max_speed_for_map_matching; + } double GetMaxCollapseDistance() const override final - { return m_profile_properties->GetMaxCollapseDistance(); } + { + return m_profile_properties->GetMaxCollapseDistance(); + } const char *GetWeightName() const override final { return m_profile_properties->weight_name; } unsigned GetWeightPrecision() const override final - { return m_profile_properties->weight_precision; } + { + return m_profile_properties->weight_precision; + } double GetWeightMultiplier() const override final - { return m_profile_properties->GetWeightMultiplier(); } + { + return m_profile_properties->GetWeightMultiplier(); + } util::guidance::BearingClass GetBearingClass(const NodeID node_based_node_id) const override final @@ -519,7 +583,9 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade } bool IsSegregated(const NodeID edge_based_node_id) const override final - { return edge_based_node_data.IsSegregated(edge_based_node_id); } + { + return edge_based_node_data.IsSegregated(edge_based_node_id); + } std::vector GetOverridesThatStartAt(const NodeID edge_based_node_id) const override final @@ -530,9 +596,13 @@ class ContiguousInternalMemoryDataFacadeBase : public BaseDataFacade struct Comp { bool operator()(const extractor::StorageManeuverOverride &s, NodeID i) const - { return s.start_node < i; } + { + return s.start_node < i; + } bool operator()(NodeID i, const extractor::StorageManeuverOverride &s) const - { return i < s.start_node; } + { + return i < s.start_node; + } }; auto found_range = std::equal_range( @@ -606,10 +676,14 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo const std::string &metric_name, const std::size_t exclude_index) : allocator(std::move(allocator_)) - { InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); } + { + InitializeInternalPointers(allocator->GetIndex(), metric_name, exclude_index); + } const partitioner::MultiLevelPartitionView &GetMultiLevelPartition() const override - { return mld_partition; } + { + return mld_partition; + } const partitioner::CellStorageView &GetCellStorage() const override { return mld_cell_storage; } @@ -623,40 +697,62 @@ template <> class ContiguousInternalMemoryAlgorithmDataFacade : public Algo unsigned GetNumberOfEdges() const override final { return query_graph.GetNumberOfEdges(); } unsigned GetOutDegree(const NodeID edge_based_node_id) const override final - { return query_graph.GetOutDegree(edge_based_node_id); } + { + return query_graph.GetOutDegree(edge_based_node_id); + } EdgeRange GetAdjacentEdgeRange(const NodeID edge_based_node_id) const override final - { return query_graph.GetAdjacentEdgeRange(edge_based_node_id); } + { + return query_graph.GetAdjacentEdgeRange(edge_based_node_id); + } EdgeWeight GetNodeWeight(const NodeID edge_based_node_id) const override final - { return query_graph.GetNodeWeight(edge_based_node_id); } + { + return query_graph.GetNodeWeight(edge_based_node_id); + } EdgeDuration GetNodeDuration(const NodeID edge_based_node_id) const override final - { return query_graph.GetNodeDuration(edge_based_node_id); } + { + return query_graph.GetNodeDuration(edge_based_node_id); + } EdgeDistance GetNodeDistance(const NodeID edge_based_node_id) const override final - { return query_graph.GetNodeDistance(edge_based_node_id); } + { + return query_graph.GetNodeDistance(edge_based_node_id); + } bool IsForwardEdge(const NodeID edge_based_node_id) const override final - { return query_graph.IsForwardEdge(edge_based_node_id); } + { + return query_graph.IsForwardEdge(edge_based_node_id); + } bool IsBackwardEdge(const NodeID edge_based_node_id) const override final - { return query_graph.IsBackwardEdge(edge_based_node_id); } + { + return query_graph.IsBackwardEdge(edge_based_node_id); + } NodeID GetTarget(const EdgeID edge_based_edge_id) const override final - { return query_graph.GetTarget(edge_based_edge_id); } + { + return query_graph.GetTarget(edge_based_edge_id); + } const EdgeData &GetEdgeData(const EdgeID edge_based_edge_id) const override final - { return query_graph.GetEdgeData(edge_based_edge_id); } + { + return query_graph.GetEdgeData(edge_based_edge_id); + } EdgeRange GetBorderEdgeRange(const LevelID level, const NodeID edge_based_node_id) const override final - { return query_graph.GetBorderEdgeRange(level, edge_based_node_id); } + { + return query_graph.GetBorderEdgeRange(level, edge_based_node_id); + } // searches for a specific edge EdgeID FindEdge(const NodeID edge_based_node_from, const NodeID edge_based_node_to) const override final - { return query_graph.FindEdge(edge_based_node_from, edge_based_node_to); } + { + return query_graph.FindEdge(edge_based_node_from, edge_based_node_to); + } }; template <> diff --git a/include/engine/datafacade_factory.hpp b/include/engine/datafacade_factory.hpp index 3b63c23b4c..1eaf1411b1 100644 --- a/include/engine/datafacade_factory.hpp +++ b/include/engine/datafacade_factory.hpp @@ -29,10 +29,14 @@ template