[osrm] 02/07: Merge tag 'upstream/5.1.0+ds'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Tue May 10 20:12:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osrm.
commit 0c41e78ec29c8622249b766d5da925709a3eddb9
Merge: 75646e3 d28a124
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue May 10 21:30:22 2016 +0200
Merge tag 'upstream/5.1.0+ds'
Upstream version 5.1.0+ds
.gitignore | 1 +
.travis.yml | 158 +++---
CHANGELOG.md | 36 +-
CMakeLists.txt | 7 +-
README.md | 53 +-
appveyor-build.bat | 2 +-
appveyor.yml | 1 -
docs/http.md | 509 +++++++++++++++++
docs/libosrm.md | 26 +
docs/profiles.md | 34 ++
docs/releasing.md | 50 ++
example/CMakeLists.txt | 4 +-
features/bicycle/names.feature | 10 +-
features/bicycle/ref.feature | 2 +-
.../{traffic.feature => traffic_speeds.feature} | 2 +-
features/car/traffic_turn_penalties.feature | 97 ++++
features/foot/names.feature | 10 +-
features/foot/ref.feature | 2 +-
features/guidance/bridges_and_tunnels.feature | 120 ++++
features/guidance/collapse.feature | 347 +++++++++++
features/guidance/destination-signs.feature | 41 ++
features/guidance/end-of-road.feature | 6 +-
features/guidance/fork.feature | 1 -
features/guidance/motorway.feature | 56 +-
features/guidance/new-name.feature | 31 +
features/guidance/ramp.feature | 64 +--
features/guidance/rotary.feature | 20 +-
...{roundabout.feature => roundabout-turn.feature} | 202 +++++--
features/guidance/roundabout.feature | 108 +++-
features/guidance/suffix-changes.feature | 101 ++++
features/guidance/turn.feature | 7 +-
features/step_definitions/data.js | 39 +-
features/step_definitions/options.js | 2 +-
features/step_definitions/routability.js | 1 +
features/step_definitions/routing.js | 3 +-
features/support/config.js | 11 +-
features/support/data.js | 6 +-
features/support/env.js | 29 +-
features/support/hooks.js | 10 +-
features/support/http.js | 2 +-
features/support/launch_classes.js | 4 +-
features/support/route.js | 13 +-
features/support/shared_steps.js | 7 +-
features/testbot/status.feature | 18 +-
features/testbot/summary.feature | 77 +++
features/testbot/traffic_turn_penalties.feature | 37 ++
features/testbot/via.feature | 41 ++
include/contractor/contractor.hpp | 1 +
include/contractor/contractor_config.hpp | 1 +
include/contractor/crc32_processor.hpp | 16 +-
include/contractor/graph_contractor.hpp | 30 +-
include/engine/api/route_api.hpp | 1 +
include/engine/base64.hpp | 6 +-
include/engine/datafacade/datafacade_base.hpp | 22 +-
include/engine/datafacade/internal_datafacade.hpp | 116 ++--
include/engine/datafacade/shared_datafacade.hpp | 187 +++---
include/engine/geospatial_query.hpp | 64 +--
include/engine/guidance/assemble_leg.hpp | 24 +-
include/engine/guidance/assemble_steps.hpp | 21 +-
include/engine/guidance/post_processing.hpp | 10 +
include/engine/guidance/route_step.hpp | 5 +
include/engine/guidance/step_maneuver.hpp | 16 +-
include/engine/guidance/toolkit.hpp | 21 +-
include/engine/hint.hpp | 11 +-
include/engine/map_matching/bayes_classifier.hpp | 8 +-
.../engine/map_matching/hidden_markov_model.hpp | 4 +-
include/engine/phantom_node.hpp | 12 +-
include/engine/plugins/trip.hpp | 1 -
include/engine/routing_algorithms/map_matching.hpp | 2 +-
include/engine/routing_algorithms/routing_base.hpp | 66 ++-
.../engine/routing_algorithms/shortest_path.hpp | 7 +-
include/engine/trip/trip_tabu_search.hpp | 41 --
include/extractor/compressed_edge_container.hpp | 2 +
include/extractor/guidance/constants.hpp | 5 +-
.../extractor/guidance/intersection_handler.hpp | 11 +-
.../guidance/intersection_scenario_three_way.hpp | 27 +
include/extractor/guidance/motorway_handler.hpp | 5 +-
include/extractor/guidance/roundabout_handler.hpp | 31 +-
include/extractor/guidance/roundabout_type.hpp | 21 +
include/extractor/guidance/toolkit.hpp | 126 ++--
include/extractor/guidance/turn_analysis.hpp | 8 +-
include/extractor/guidance/turn_classification.hpp | 5 +-
include/extractor/guidance/turn_handler.hpp | 7 +-
include/extractor/guidance/turn_instruction.hpp | 92 +--
include/extractor/raster_source.hpp | 12 +-
include/extractor/suffix_table.hpp | 30 +
include/extractor/tarjan_scc.hpp | 10 +-
include/server/api/base_parameters_grammar.hpp | 140 +++--
include/server/api/match_parameter_grammar.hpp | 68 +--
include/server/api/nearest_parameter_grammar.hpp | 35 +-
include/server/api/parameters_parser.hpp | 3 +-
include/server/api/parsed_url.hpp | 10 +-
include/server/api/route_parameters_grammar.hpp | 96 ++--
include/server/api/table_parameter_grammar.hpp | 64 ++-
include/server/api/tile_parameter_grammar.hpp | 33 +-
include/server/api/trip_parameter_grammar.hpp | 54 +-
include/server/service/base_service.hpp | 2 +-
include/server/service/match_service.hpp | 2 +-
include/server/service/nearest_service.hpp | 2 +-
include/server/service/route_service.hpp | 2 +-
include/server/service/table_service.hpp | 2 +-
include/server/service/tile_service.hpp | 2 +-
include/server/service/trip_service.hpp | 2 +-
include/storage/shared_memory.hpp | 4 +-
include/util/coordinate.hpp | 35 +-
include/util/coordinate_calculation.hpp | 43 +-
include/util/dist_table_wrapper.hpp | 1 +
include/util/guidance/toolkit.hpp | 48 ++
include/util/lua_util.hpp | 3 +-
include/util/percent.hpp | 18 +-
include/util/shared_memory_vector_wrapper.hpp | 12 +
include/util/static_rtree.hpp | 184 +++---
include/util/typedefs.hpp | 7 +-
include/util/web_mercator.hpp | 29 +-
profiles/bicycle.lua | 2 +-
profiles/car.lua | 18 +
profiles/foot.lua | 2 +-
profiles/lib/destination.lua | 27 +
scripts/check_taginfo.py | 3 +
src/benchmarks/static_rtree.cpp | 7 +-
src/contractor/contractor.cpp | 156 +++--
src/engine/api/json_factory.cpp | 34 +-
src/engine/douglas_peucker.cpp | 48 +-
src/engine/guidance/assemble_overview.cpp | 4 +-
src/engine/guidance/post_processing.cpp | 418 +++++++++++---
src/engine/plugins/trip.cpp | 15 +-
src/extractor/compressed_edge_container.cpp | 18 +-
src/extractor/edge_based_graph_factory.cpp | 43 +-
src/extractor/extractor.cpp | 14 +-
src/extractor/graph_compressor.cpp | 2 +-
src/extractor/guidance/classification_data.cpp | 6 +-
src/extractor/guidance/intersection_generator.cpp | 55 +-
src/extractor/guidance/intersection_handler.cpp | 31 +-
.../guidance/intersection_scenario_three_way.cpp | 36 ++
src/extractor/guidance/motorway_handler.cpp | 40 +-
src/extractor/guidance/roundabout_handler.cpp | 224 ++++++--
src/extractor/guidance/turn_analysis.cpp | 17 +-
src/extractor/guidance/turn_handler.cpp | 632 ++++-----------------
src/extractor/raster_source.cpp | 18 +-
src/extractor/scripting_environment.cpp | 23 +-
src/extractor/suffix_table.cpp | 48 ++
src/server/api/parameters_parser.cpp | 51 +-
src/server/api/url_parser.cpp | 30 +-
src/server/service/match_service.cpp | 4 +-
src/server/service/nearest_service.cpp | 4 +-
src/server/service/route_service.cpp | 4 +-
src/server/service/table_service.cpp | 4 +-
src/server/service/tile_service.cpp | 4 +-
src/server/service/trip_service.cpp | 4 +-
src/server/service_handler.cpp | 2 +-
src/storage/storage.cpp | 2 +-
src/tools/components.cpp | 15 +-
src/tools/contract.cpp | 4 +
src/util/coordinate.cpp | 36 --
src/util/coordinate_calculation.cpp | 41 +-
taginfo.json | 10 +
unit_tests/extractor/raster_source.cpp | 18 +-
unit_tests/mocks/mock_datafacade.hpp | 22 +-
unit_tests/server/parameters_parser.cpp | 71 ++-
unit_tests/server/url_parser.cpp | 17 +-
unit_tests/util/static_rtree.cpp | 35 +-
161 files changed, 4564 insertions(+), 2149 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git
More information about the Pkg-grass-devel
mailing list