This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osrm.
commit 069adfc920299c30850acb01d24939aff44e54dc Merge: 8cac7dc 8c9b14d Author: Bas Couwenberg <[email protected]> Date: Mon Jun 13 19:31:08 2016 +0200 Merge tag 'upstream/5.2.1+ds' Upstream version 5.2.1+ds .clang-format | 82 +- .travis.yml | 39 +- CHANGELOG.md | 98 ++ CMakeLists.txt | 108 +- README.md | 2 +- cmake/FindTBB.cmake | 1 + cmake/pkgconfig.in | 2 +- codecov.yml | 7 + docker/Dockerfile | 10 +- docker/run-clang.sh | 2 +- docker/run-gcc.sh | 2 +- docker/test.sh | 11 +- docs/http.md | 98 +- docs/testing.md | 239 +++++ example/CMakeLists.txt | 13 +- example/cmake/FindLibOSRM.cmake | 50 +- example/example.cpp | 10 +- features/bicycle/oneway.feature | 28 +- features/car/names.feature | 17 + features/car/oneway.feature | 24 +- features/car/restrictions.feature | 1 + features/car/traffic_turn_penalties.feature | 54 +- features/guidance/collapse.feature | 287 +++++- features/guidance/continue.feature | 45 +- features/guidance/dedicated-turn-roads.feature | 125 +++ features/guidance/destination-signs.feature | 20 +- features/guidance/fork.feature | 15 + features/guidance/intersections.feature | 153 +++ features/guidance/motorway.feature | 88 +- features/guidance/new-name.feature | 6 +- features/guidance/roundabout-turn.feature | 22 + features/guidance/roundabout.feature | 24 + features/guidance/turn.feature | 27 + features/options/contract/datasources.feature | 30 + features/step_definitions/data.js | 11 +- features/step_definitions/matching.js | 23 +- features/step_definitions/options.js | 6 + features/step_definitions/routability.js | 3 +- features/step_definitions/trip.js | 4 +- features/support/config.js | 35 +- features/support/data.js | 75 +- features/support/data_classes.js | 79 +- features/support/env.js | 11 +- features/support/hash.js | 12 +- features/support/hooks.js | 2 + features/support/launch_classes.js | 39 +- features/support/route.js | 42 +- features/support/run.js | 2 +- features/support/shared_steps.js | 17 +- features/testbot/alternative.feature | 5 +- features/testbot/basic.feature | 2 +- features/testbot/bearing.feature | 146 +-- features/testbot/bearing_param.feature | 84 +- features/testbot/compression.feature | 4 +- features/testbot/continue_straight.feature | 1 + features/testbot/matching.feature | 24 + features/testbot/mode.feature | 7 +- features/testbot/projection.feature | 12 +- features/testbot/summary.feature | 6 +- include/contractor/contractor.hpp | 4 +- include/contractor/graph_contractor.hpp | 161 +-- include/engine/api/base_api.hpp | 12 +- include/engine/api/base_parameters.hpp | 10 +- include/engine/api/json_factory.hpp | 19 +- include/engine/api/match_api.hpp | 2 +- include/engine/api/match_parameters.hpp | 1 + include/engine/api/nearest_api.hpp | 6 +- include/engine/api/route_api.hpp | 85 +- include/engine/api/route_parameters.hpp | 5 +- include/engine/api/table_api.hpp | 28 +- include/engine/api/table_parameters.hpp | 5 +- include/engine/api/trip_api.hpp | 3 +- include/engine/base64.hpp | 10 +- include/engine/datafacade/datafacade_base.hpp | 39 +- include/engine/datafacade/internal_datafacade.hpp | 207 +++- include/engine/datafacade/shared_datafacade.hpp | 197 +++- include/engine/douglas_peucker.hpp | 2 +- include/engine/engine.hpp | 4 +- include/engine/geospatial_query.hpp | 121 +-- include/engine/guidance/assemble_geometry.hpp | 47 +- include/engine/guidance/assemble_leg.hpp | 77 +- include/engine/guidance/assemble_route.hpp | 2 +- include/engine/guidance/assemble_steps.hpp | 167 ++- include/engine/guidance/leg_geometry.hpp | 13 +- include/engine/guidance/post_processing.hpp | 9 +- include/engine/guidance/route_step.hpp | 42 +- include/engine/guidance/step_maneuver.hpp | 16 +- include/engine/guidance/toolkit.hpp | 2 +- include/engine/hint.hpp | 5 +- include/engine/internal_route_result.hpp | 6 +- include/engine/map_matching/bayes_classifier.hpp | 2 +- include/engine/phantom_node.hpp | 4 +- include/engine/plugins/match.hpp | 2 +- include/engine/plugins/nearest.hpp | 2 +- include/engine/plugins/plugin_base.hpp | 110 +- include/engine/plugins/tile.hpp | 2 +- include/engine/plugins/trip.hpp | 6 +- include/engine/plugins/viaroute.hpp | 6 +- .../engine/routing_algorithms/alternative_path.hpp | 161 ++- .../routing_algorithms/direct_shortest_path.hpp | 20 +- include/engine/routing_algorithms/many_to_many.hpp | 13 +- include/engine/routing_algorithms/map_matching.hpp | 47 +- include/engine/routing_algorithms/routing_base.hpp | 127 ++- .../engine/routing_algorithms/shortest_path.hpp | 120 ++- include/engine/search_engine_data.hpp | 2 +- include/engine/trip/trip_brute_force.hpp | 8 +- include/engine/trip/trip_farthest_insertion.hpp | 7 +- include/engine/trip/trip_nearest_neighbour.hpp | 8 +- include/extractor/edge_based_graph_factory.hpp | 28 +- include/extractor/edge_based_node.hpp | 12 +- include/extractor/external_memory_node.hpp | 8 +- include/extractor/extraction_containers.hpp | 8 +- include/extractor/extraction_helper_functions.hpp | 134 +-- include/extractor/extraction_way.hpp | 4 + include/extractor/extractor.hpp | 21 +- include/extractor/extractor_callbacks.hpp | 7 +- include/extractor/extractor_config.hpp | 4 +- include/extractor/guidance/classification_data.hpp | 11 + include/extractor/guidance/constants.hpp | 5 +- .../extractor/guidance/intersection_handler.hpp | 2 +- include/extractor/guidance/motorway_handler.hpp | 8 +- include/extractor/guidance/roundabout_type.hpp | 8 +- include/extractor/guidance/toolkit.hpp | 87 +- include/extractor/guidance/turn_analysis.hpp | 6 + include/extractor/guidance/turn_classification.hpp | 104 +- include/extractor/guidance/turn_instruction.hpp | 132 +-- include/extractor/internal_extractor_edge.hpp | 35 +- include/extractor/original_edge_data.hpp | 11 +- include/extractor/profile_properties.hpp | 13 +- include/extractor/query_node.hpp | 6 +- include/extractor/raster_source.hpp | 10 +- include/extractor/restriction.hpp | 3 +- include/extractor/restriction_map.hpp | 2 +- include/extractor/restriction_parser.hpp | 2 +- include/extractor/scripting_environment.hpp | 2 +- include/extractor/tarjan_scc.hpp | 14 +- include/osrm/bearing.hpp | 2 +- include/server/api/base_parameters_grammar.hpp | 109 +- include/server/api/match_parameter_grammar.hpp | 18 +- include/server/api/nearest_parameter_grammar.hpp | 17 +- include/server/api/route_parameters_grammar.hpp | 50 +- include/server/api/table_parameter_grammar.hpp | 25 +- include/server/api/tile_parameter_grammar.hpp | 12 +- include/server/api/trip_parameter_grammar.hpp | 8 +- include/server/http/header.hpp | 2 +- include/server/server.hpp | 11 +- include/server/service/base_service.hpp | 5 +- include/server/service/match_service.hpp | 5 +- include/server/service/nearest_service.hpp | 5 +- include/server/service/route_service.hpp | 5 +- include/server/service/table_service.hpp | 5 +- include/server/service/tile_service.hpp | 5 +- include/server/service/trip_service.hpp | 5 +- include/storage/shared_barriers.hpp | 2 +- include/storage/shared_datatype.hpp | 7 + include/storage/shared_memory.hpp | 15 +- include/storage/storage_config.hpp | 1 + include/util/bearing.hpp | 7 + include/util/cast.hpp | 4 +- include/util/coordinate.hpp | 8 +- include/util/coordinate_calculation.hpp | 5 +- include/util/dist_table_wrapper.hpp | 6 +- include/util/for_each_pair.hpp | 2 +- include/util/graph_loader.hpp | 19 +- include/util/guidance/bearing_class.hpp | 79 ++ include/util/guidance/entry_class.hpp | 80 ++ include/util/guidance/toolkit.hpp | 32 +- include/util/io.hpp | 23 +- include/util/iso_8601_duration_parser.hpp | 82 -- include/util/json_container.hpp | 4 +- include/util/json_deep_compare.hpp | 51 +- include/util/json_renderer.hpp | 4 +- include/util/lua_util.hpp | 2 +- include/util/matrix_graph_wrapper.hpp | 6 +- include/util/node_based_graph.hpp | 10 +- include/util/packed_vector.hpp | 195 ++++ include/util/percent.hpp | 2 +- include/util/rectangle.hpp | 28 +- include/util/shared_memory_vector_wrapper.hpp | 4 +- include/util/static_graph.hpp | 2 +- include/util/static_rtree.hpp | 363 ++++--- include/util/string_util.hpp | 3 +- include/util/strong_typedef.hpp | 2 +- include/util/timing_util.hpp | 41 - include/util/trigonometry_table.hpp | 3 +- include/util/typedefs.hpp | 25 +- include/util/vector_tile.hpp | 1 - include/util/web_mercator.hpp | 49 +- include/util/xor_fast_hash.hpp | 2 +- profiles/bicycle.lua | 4 +- profiles/car.lua | 11 +- src/benchmarks/CMakeLists.txt | 18 +- src/benchmarks/match.cpp | 236 +++++ src/benchmarks/static_rtree.cpp | 24 +- src/contractor/contractor.cpp | 739 +++++++++----- src/engine/api/json_factory.cpp | 139 ++- src/engine/douglas_peucker.cpp | 13 +- src/engine/engine.cpp | 11 +- src/engine/guidance/assemble_overview.cpp | 38 +- src/engine/guidance/assemble_route.cpp | 18 +- src/engine/guidance/assemble_steps.cpp | 76 +- src/engine/guidance/post_processing.cpp | 629 +++++++++--- src/engine/hint.cpp | 2 +- src/engine/plugins/match.cpp | 80 +- src/engine/plugins/nearest.cpp | 2 +- src/engine/plugins/table.cpp | 8 +- src/engine/plugins/tile.cpp | 74 +- src/engine/plugins/trip.cpp | 16 +- src/engine/plugins/viaroute.cpp | 22 +- src/engine/polyline_compressor.cpp | 31 +- src/extractor/compressed_edge_container.cpp | 4 +- src/extractor/edge_based_graph_factory.cpp | 133 ++- src/extractor/extraction_containers.cpp | 70 +- src/extractor/extractor.cpp | 142 ++- src/extractor/extractor_callbacks.cpp | 156 ++- src/extractor/graph_compressor.cpp | 8 +- src/extractor/guidance/intersection_generator.cpp | 22 +- src/extractor/guidance/intersection_handler.cpp | 21 +- .../guidance/intersection_scenario_three_way.cpp | 2 +- src/extractor/guidance/motorway_handler.cpp | 78 +- src/extractor/guidance/roundabout_handler.cpp | 75 +- src/extractor/guidance/turn_analysis.cpp | 140 ++- src/extractor/guidance/turn_classification.cpp | 116 +++ src/extractor/guidance/turn_handler.cpp | 139 ++- src/extractor/restriction_map.cpp | 4 +- src/extractor/restriction_parser.cpp | 24 +- src/extractor/scripting_environment.cpp | 80 +- src/extractor/suffix_table.cpp | 5 +- src/osrm/osrm.cpp | 6 +- src/server/api/parameters_parser.cpp | 53 +- src/server/api/url_parser.cpp | 19 +- src/server/connection.cpp | 29 +- src/server/request_handler.cpp | 77 +- src/server/service/match_service.cpp | 22 +- src/server/service/nearest_service.cpp | 18 +- src/server/service/route_service.cpp | 18 +- src/server/service/table_service.cpp | 18 +- src/server/service/tile_service.cpp | 2 +- src/server/service/trip_service.cpp | 15 +- src/server/service_handler.cpp | 6 +- src/storage/storage.cpp | 206 +++- src/storage/storage_config.cpp | 43 +- src/tools/components.cpp | 23 +- src/tools/contract.cpp | 31 +- src/tools/extract.cpp | 12 +- src/tools/io-benchmark.cpp | 4 +- src/tools/routed.cpp | 153 +-- src/tools/springclean.cpp | 5 +- src/tools/store.cpp | 14 +- src/tools/unlock_all_mutexes.cpp | 2 +- src/util/coordinate.cpp | 12 +- src/util/coordinate_calculation.cpp | 12 +- src/util/guidance/bearing_class.cpp | 81 ++ src/util/guidance/entry_class.cpp | 38 + src/util/name_table.cpp | 5 +- taginfo.json | 1 + third_party/fast-cpp-csv-parser/LICENSE | 28 - third_party/fast-cpp-csv-parser/README.md | 252 ----- third_party/fast-cpp-csv-parser/csv.h | 1068 -------------------- unit_tests/CMakeLists.txt | 4 +- unit_tests/engine/base64.cpp | 6 +- unit_tests/engine/douglas_peucker.cpp | 12 +- unit_tests/engine/geometry_string.cpp | 6 +- unit_tests/engine/guidance_assembly.cpp | 8 +- unit_tests/extractor/compressed_edge_container.cpp | 2 +- unit_tests/extractor/graph_compressor.cpp | 2 +- unit_tests/extractor/raster_source.cpp | 4 +- unit_tests/library/args.hpp | 2 +- unit_tests/library/limits.cpp | 8 +- unit_tests/library/match.cpp | 23 +- unit_tests/library/nearest.cpp | 6 +- unit_tests/library/route.cpp | 112 +- unit_tests/library/table.cpp | 10 +- unit_tests/library/tile.cpp | 91 +- unit_tests/library/trip.cpp | 3 +- unit_tests/mocks/mock_datafacade.hpp | 30 +- unit_tests/server/parameters_parser.cpp | 52 +- unit_tests/util/bearing.cpp | 2 +- unit_tests/util/binary_heap.cpp | 7 +- unit_tests/util/coordinate_calculation.cpp | 32 +- unit_tests/util/duration_parsing.cpp | 29 +- unit_tests/util/dynamic_graph.cpp | 11 +- unit_tests/util/io.cpp | 6 +- unit_tests/util/packed_vector.cpp | 47 + unit_tests/util/range_table.cpp | 2 +- unit_tests/util/rectangle.cpp | 114 ++- unit_tests/util/static_graph.cpp | 11 +- unit_tests/util/static_rtree.cpp | 35 +- unit_tests/util/string_util.cpp | 2 +- unit_tests/util/viewport.cpp | 2 +- unit_tests/util/web_mercator.cpp | 30 +- 291 files changed, 8023 insertions(+), 4862 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
