Skip to content

Commit a61fdd2

Browse files
DennisOSRMDennisOSRM
authored
Merge branch 'master' into fix-large-osmids-json-rendering
2 parents d5b1ba0 + f12c553 commit a61fdd2

File tree

190 files changed

+19
-320
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+19
-320
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions

‎include/contractor/contractor_config.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
#include "updater/updater_config.hpp"
3333

3434
#include <filesystem>
35-
#include <string>
3635

3736
namespace osrm::contractor
3837
{

‎include/contractor/graph_contractor.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
#include "util/filtered_graph.hpp"
77

8-
#include <tuple>
98
#include <vector>
109

1110
namespace osrm::contractor

‎include/customizer/customizer_config.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
#ifndef OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
22
#define OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP
33

4-
#include <array>
54
#include <filesystem>
6-
#include <string>
75

86
#include "storage/io_config.hpp"
97
#include "updater/updater_config.hpp"

‎include/engine/api/route_api.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "util/integer_range.hpp"
2828
#include "util/json_util.hpp"
2929

30+
#include <bitset>
3031
#include <iterator>
3132
#include <map>
3233
#include <vector>

‎include/engine/api/trip_parameters.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131
#include "engine/api/route_parameters.hpp"
3232

3333
#include <optional>
34-
#include <vector>
3534

3635
namespace osrm::engine::api
3736
{

‎include/engine/base64.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@
33

44
#include <iterator>
55
#include <string>
6-
#include <type_traits>
7-
#include <vector>
86

97
#include <climits>
108
#include <cstddef>
119

12-
#include <boost/algorithm/string/trim.hpp>
1310
#include <boost/archive/iterators/base64_from_binary.hpp>
1411
#include <boost/archive/iterators/binary_from_base64.hpp>
1512
#include <boost/archive/iterators/transform_width.hpp>

‎include/engine/datafacade/contiguous_internalmem_datafacade.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <algorithm>
2323
#include <cstddef>
2424
#include <iterator>
25-
#include <limits>
2625
#include <memory>
2726
#include <string>
2827
#include <utility>

‎include/engine/datafacade/datafacade_base.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include <ranges>
3737
#include <string>
3838
#include <string_view>
39-
#include <utility>
4039
#include <vector>
4140

4241
namespace osrm::engine::datafacade

‎include/engine/datafacade/mmap_memory_allocator.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include <boost/iostreams/device/mapped_file.hpp>
1111

12-
#include <memory>
1312
#include <string>
1413

1514
namespace osrm::engine::datafacade

‎include/engine/datafacade_factory.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "storage/shared_datatype.hpp"
1414

15-
#include <array>
1615
#include <memory>
1716
#include <unordered_map>
1817

‎include/engine/engine.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "util/json_container.hpp"
2222

2323
#include <memory>
24-
#include <string>
2524

2625
namespace osrm::engine
2726
{

‎include/engine/engine_config.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
#include "osrm/datasets.hpp"
3333

3434
#include <filesystem>
35-
#include <set>
3635
#include <string>
3736

3837
namespace osrm::engine

‎include/engine/geospatial_query.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <algorithm>
1818
#include <cmath>
1919
#include <iterator>
20-
#include <memory>
2120
#include <vector>
2221

2322
namespace osrm::engine

‎include/engine/guidance/assemble_geometry.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <algorithm>
1515
#include <cmath>
16-
#include <utility>
1716
#include <vector>
1817

1918
namespace osrm::engine::guidance

‎include/engine/guidance/assemble_leg.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <array>
2121
#include <numeric>
2222
#include <string>
23-
#include <utility>
2423
#include <vector>
2524

2625
namespace osrm::engine::guidance

‎include/engine/guidance/step_maneuver.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
#include "util/coordinate.hpp"
66

77
#include <cstdint>
8-
#include <string>
9-
#include <vector>
108

119
namespace osrm::engine::guidance
1210
{

‎include/engine/map_matching/bayes_classifier.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#include <cmath>
55

66
#include <utility>
7-
#include <vector>
87

98
#include <numbers>
109

‎include/engine/plugins/match.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "util/json_util.hpp"
99

10-
#include <vector>
11-
1210
namespace osrm::engine::plugins
1311
{
1412

‎include/engine/plugins/tile.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
#include "engine/plugins/plugin_base.hpp"
66
#include "engine/routing_algorithms.hpp"
77

8-
#include <utility>
9-
#include <vector>
10-
118
/*
129
* This plugin generates Mapbox Vector tiles that show the internal
1310
* routing geometry and speed values on all road segments.

‎include/engine/plugins/trip.hpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,9 @@
88

99
#include "util/json_container.hpp"
1010

11-
#include <boost/assert.hpp>
12-
1311
#include <algorithm>
1412
#include <cstdlib>
1513
#include <iterator>
16-
#include <memory>
17-
#include <string>
18-
#include <utility>
1914
#include <vector>
2015

2116
namespace osrm::engine::plugins

‎include/engine/plugins/viaroute.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
#include <cstdlib>
1212

1313
#include <algorithm>
14-
#include <memory>
15-
#include <string>
16-
#include <vector>
1714

1815
namespace osrm::engine::plugins
1916
{

‎include/engine/polyline_compressor.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
#include "util/coordinate.hpp"
55

6-
#include <algorithm>
7-
#include <boost/assert.hpp>
86
#include <string>
97
#include <vector>
108

‎include/engine/routing_algorithms/routing_base.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,11 @@
1616
#include <boost/assert.hpp>
1717

1818
#include <cstddef>
19-
#include <cstdint>
2019

2120
#include <algorithm>
22-
#include <functional>
2321
#include <iterator>
24-
#include <memory>
2522
#include <numeric>
2623
#include <stack>
27-
#include <utility>
2824
#include <vector>
2925

3026
namespace osrm::engine::routing_algorithms

‎include/engine/trip/trip_brute_force.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
#include <algorithm>
1111
#include <cstdlib>
1212
#include <iterator>
13-
#include <limits>
1413
#include <numeric>
15-
#include <string>
1614
#include <vector>
1715

1816
namespace osrm::engine::trip

‎include/engine/trip/trip_farthest_insertion.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include <algorithm>
1111
#include <cstdlib>
1212
#include <limits>
13-
#include <string>
1413
#include <vector>
1514

1615
namespace osrm::engine::trip

‎include/engine/trip/trip_nearest_neighbour.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99

1010
#include <algorithm>
1111
#include <cstdlib>
12-
#include <limits>
13-
#include <string>
1412
#include <vector>
1513

1614
namespace osrm::engine::trip

‎include/extractor/compressed_edge_container.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
#include <unordered_map>
99

10-
#include <string>
1110
#include <vector>
1211

1312
namespace osrm::extractor

‎include/extractor/edge_based_graph_factory.hpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,8 @@
2525
#include "storage/io.hpp"
2626
#include "traffic_signals.hpp"
2727

28-
#include <algorithm>
29-
#include <cstddef>
3028
#include <cstdint>
31-
#include <iosfwd>
32-
#include <memory>
33-
#include <queue>
3429
#include <string>
35-
#include <unordered_map>
3630
#include <unordered_set>
3731
#include <vector>
3832

‎include/extractor/extraction_turn.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
#include <boost/numeric/conversion/cast.hpp>
88

9-
#include <cstdint>
109
#include <vector>
1110

1211
namespace osrm::extractor

‎include/extractor/extraction_way.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "util/typedefs.hpp"
88

99
#include <string>
10-
#include <vector>
1110

1211
namespace osrm::extractor
1312
{

‎include/extractor/extractor_config.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

3131
#include "storage/io_config.hpp"
3232

33-
#include <array>
3433
#include <filesystem>
3534
#include <string>
3635

‎include/extractor/files.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
#include "util/range_table.hpp"
1717
#include "util/serialization.hpp"
1818

19-
#include <boost/assert.hpp>
20-
2119
namespace osrm::extractor::files
2220
{
2321

‎include/extractor/graph_compressor.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "traffic_signals.hpp"
88
#include "util/node_based_graph.hpp"
99

10-
#include <memory>
1110
#include <unordered_set>
1211
#include <vector>
1312

‎include/extractor/internal_extractor_edge.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#include "util/typedefs.hpp"
88

99
#include <boost/assert.hpp>
10-
#include <utility>
11-
#include <variant>
1210

1311
namespace osrm::extractor
1412
{

‎include/extractor/intersection/intersection_edge.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include "util/typedefs.hpp"
55

6+
#include <tuple>
67
#include <vector>
78

89
namespace osrm::extractor::intersection

‎include/extractor/intersection/intersection_view.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
#include <boost/range/algorithm/min_element.hpp>
1616

1717
#include <algorithm>
18-
#include <functional>
1918
#include <limits>
20-
#include <string>
2119
#include <type_traits>
2220
#include <vector>
2321

‎include/extractor/intersection/mergable_road_detector.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
#include "util/node_based_graph.hpp"
1515
#include "util/typedefs.hpp"
1616

17-
#include <cstdint>
18-
#include <functional>
19-
#include <limits>
2017
#include <unordered_set>
2118
#include <vector>
2219

‎include/extractor/maneuver_override.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "util/std_hash.hpp"
1212
#include "util/vector_view.hpp"
1313

14-
#include <variant>
15-
1614
#include <algorithm>
1715

1816
namespace osrm::extractor

‎include/extractor/maneuver_override_relation_parser.hpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#include "maneuver_override.hpp"
55

66
#include <optional>
7-
#include <string>
8-
#include <vector>
97

108
namespace osmium
119
{

‎include/extractor/node_based_graph_factory.hpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
#include "util/coordinate.hpp"
1313
#include "util/node_based_graph.hpp"
1414

15-
#include <filesystem>
16-
#include <memory>
17-
#include <string>
1815
#include <unordered_set>
1916
#include <vector>
2017

‎include/extractor/node_restriction_map.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
#include "restriction_graph.hpp"
66
#include "util/typedefs.hpp"
77

8-
#include <unordered_map>
9-
#include <utility>
10-
#include <vector>
11-
128
namespace osrm::extractor
139
{
1410

0 commit comments

Comments
 (0)