[osrm] 02/04: Merge tag 'upstream/5.3.0+ds'
Bas Couwenberg
sebastic at debian.org
Sat Jul 23 10:16:34 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 6578e5a3f9b7b7d538b8ab48504721c75055b930
Merge: a6bccd5 1df4402
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jul 23 11:42:38 2016 +0200
Merge tag 'upstream/5.3.0+ds'
Upstream version 5.3.0+ds
.clang-format | 2 +-
.travis.yml | 16 +-
CHANGELOG.md | 63 +-
CMakeLists.txt | 11 +-
CONTRIBUTING.md | 55 ++
README.md | 4 +-
docker/Dockerfile | 17 +-
docker/run-gcc.sh | 3 +-
docs/http.md | 138 ++--
example/example.cpp | 4 +-
features/bicycle/mode.feature | 7 +-
features/bicycle/oneway.feature | 6 +-
features/bicycle/pushing.feature | 6 +-
features/bicycle/surface.feature | 17 +
features/car/oneway.feature | 6 +-
features/guidance/anticipate-lanes.feature | 500 ++++++++++++++
features/guidance/collapse.feature | 18 +-
features/guidance/dedicated-turn-roads.feature | 64 +-
features/guidance/end-of-road.feature | 124 ++--
features/guidance/fork.feature | 18 +
features/guidance/intersections.feature | 59 +-
features/guidance/merge.feature | 24 +
features/guidance/motorway.feature | 18 +
features/guidance/post-processing.feature | 22 +
features/guidance/roundabout.feature | 39 ++
features/guidance/turn-lanes.feature | 739 +++++++++++++++++++++
features/guidance/turn.feature | 46 ++
features/step_definitions/hooks.js | 12 -
features/support/data.js | 4 +-
features/support/env.js | 2 +-
features/support/hooks.js | 5 -
features/support/route.js | 11 +
features/support/shared_steps.js | 8 +-
features/testbot/basic.feature | 38 +-
features/testbot/bearing.feature | 20 +-
features/testbot/bearing_param.feature | 38 +-
features/testbot/continue_straight.feature | 2 +-
features/testbot/loop.feature | 8 +-
features/testbot/oneway.feature | 7 +-
features/testbot/summary.feature | 2 +-
features/testbot/time.feature | 6 +-
features/testbot/via.feature | 18 +-
include/contractor/contractor.hpp | 2 +-
include/contractor/crc32_processor.hpp | 10 +-
include/engine/api/route_api.hpp | 3 +
include/engine/datafacade/datafacade_base.hpp | 6 +
include/engine/datafacade/internal_datafacade.hpp | 65 +-
include/engine/datafacade/shared_datafacade.hpp | 62 +-
include/engine/guidance/assemble_geometry.hpp | 10 +-
include/engine/guidance/assemble_steps.hpp | 36 +-
include/engine/guidance/lane_processing.hpp | 27 +
include/engine/guidance/post_processing.hpp | 9 +
include/engine/guidance/route_step.hpp | 11 +-
include/engine/guidance/step_maneuver.hpp | 2 +
include/engine/guidance/toolkit.hpp | 68 +-
include/engine/internal_route_result.hpp | 6 +-
.../engine/routing_algorithms/alternative_path.hpp | 4 +-
include/engine/routing_algorithms/routing_base.hpp | 5 +
include/extractor/edge_based_graph_factory.hpp | 60 +-
include/extractor/external_memory_node.hpp | 8 +-
include/extractor/extraction_containers.hpp | 18 +-
include/extractor/extraction_helper_functions.hpp | 8 +
include/extractor/extraction_way.hpp | 5 +
include/extractor/extractor.hpp | 4 +-
include/extractor/extractor_callbacks.hpp | 3 +
include/extractor/extractor_config.hpp | 4 +
include/extractor/guidance/classification_data.hpp | 6 +
include/extractor/guidance/intersection.hpp | 4 +
.../extractor/guidance/intersection_generator.hpp | 1 +
include/extractor/guidance/motorway_handler.hpp | 6 +-
include/extractor/guidance/toolkit.hpp | 59 +-
include/extractor/guidance/turn_analysis.hpp | 10 +-
include/extractor/guidance/turn_discovery.hpp | 38 ++
include/extractor/guidance/turn_instruction.hpp | 41 +-
.../extractor/guidance/turn_lane_augmentation.hpp | 24 +
include/extractor/guidance/turn_lane_data.hpp | 44 ++
include/extractor/guidance/turn_lane_handler.hpp | 85 +++
include/extractor/guidance/turn_lane_matcher.hpp | 51 ++
include/extractor/guidance/turn_lane_types.hpp | 102 +++
include/extractor/internal_extractor_edge.hpp | 47 +-
include/extractor/node_based_edge.hpp | 10 +-
include/extractor/original_edge_data.hpp | 9 +-
include/extractor/query_node.hpp | 17 +-
include/server/api/base_parameters_grammar.hpp | 18 +-
include/storage/shared_datatype.hpp | 62 +-
include/storage/storage_config.hpp | 2 +
include/util/assert.hpp | 20 -
include/util/coordinate.hpp | 12 +-
include/util/coordinate_calculation.hpp | 8 +-
include/util/debug.hpp | 91 +++
include/util/dynamic_graph.hpp | 4 +-
include/util/group_by.hpp | 40 ++
include/util/guidance/entry_class.hpp | 7 +
include/util/guidance/toolkit.hpp | 64 ++
include/util/guidance/turn_lanes.hpp | 81 +++
include/util/io.hpp | 80 +++
include/util/node_based_graph.hpp | 15 +-
include/util/packed_vector.hpp | 13 +-
include/util/rectangle.hpp | 28 +-
include/util/static_rtree.hpp | 4 +-
include/util/strong_typedef.hpp | 52 +-
include/util/typedefs.hpp | 41 +-
include/util/web_mercator.hpp | 20 +-
package.json | 8 +-
profiles/bicycle.lua | 18 +-
profiles/car.lua | 75 +++
profiles/testbot.lua | 1 +
scripts/poly2req.js | 2 +-
scripts/travis/before_install.armhf.sh | 28 +
scripts/travis/before_install.i686.sh | 10 +
src/contractor/contractor.cpp | 253 +++----
src/engine/api/json_factory.cpp | 40 +-
src/engine/guidance/lane_processing.cpp | 109 +++
src/engine/guidance/post_processing.cpp | 235 +++++--
src/engine/plugins/tile.cpp | 37 +-
src/engine/polyline_compressor.cpp | 4 +-
src/extractor/edge_based_graph_factory.cpp | 89 ++-
src/extractor/extraction_containers.cpp | 197 ++++--
src/extractor/extractor.cpp | 37 +-
src/extractor/extractor_callbacks.cpp | 180 ++++-
src/extractor/graph_compressor.cpp | 38 +-
src/extractor/guidance/intersection.cpp | 23 +-
src/extractor/guidance/intersection_generator.cpp | 13 +-
src/extractor/guidance/intersection_handler.cpp | 2 +-
src/extractor/guidance/motorway_handler.cpp | 37 +-
src/extractor/guidance/roundabout_handler.cpp | 13 +-
src/extractor/guidance/turn_analysis.cpp | 61 +-
src/extractor/guidance/turn_discovery.cpp | 85 +++
src/extractor/guidance/turn_handler.cpp | 29 +-
src/extractor/guidance/turn_lane_augmentation.cpp | 303 +++++++++
src/extractor/guidance/turn_lane_data.cpp | 130 ++++
src/extractor/guidance/turn_lane_handler.cpp | 538 +++++++++++++++
src/extractor/guidance/turn_lane_matcher.cpp | 255 +++++++
src/extractor/raster_source.cpp | 16 +-
src/extractor/scripting_environment.cpp | 3 +
src/server/request_handler.cpp | 1 +
src/storage/storage.cpp | 82 ++-
src/storage/storage_config.cpp | 3 +-
src/tools/store.cpp | 3 +-
src/util/assert.cpp | 13 +-
src/util/coordinate.cpp | 12 +-
src/util/coordinate_calculation.cpp | 17 +-
src/util/guidance/turn_lanes.cpp | 36 +
src/util/name_table.cpp | 8 +-
taginfo.json | 30 +
unit_tests/engine/douglas_peucker.cpp | 30 +-
unit_tests/engine/geometry_string.cpp | 10 +-
unit_tests/extractor/graph_compressor.cpp | 408 +++++++++++-
unit_tests/library/waypoint_check.hpp | 4 +-
unit_tests/mocks/mock_datafacade.hpp | 12 +
unit_tests/server/parameters_parser.cpp | 32 +-
unit_tests/server/url_parser.cpp | 2 +-
unit_tests/util/coordinate_calculation.cpp | 156 ++---
unit_tests/util/group_by.cpp | 68 ++
unit_tests/util/packed_vector.cpp | 2 +-
unit_tests/util/rectangle.cpp | 72 +-
unit_tests/util/static_rtree.cpp | 32 +-
unit_tests/util/web_mercator.cpp | 10 +-
158 files changed, 6585 insertions(+), 1186 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