[osrm] 03/14: Merge tag 'upstream/4.9.0+ds'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Dec 26 00:51:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osrm.
commit dba0ca46453de73217f0524b4daad37ce6248a5c
Merge: 6909549 2292c01
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Dec 25 18:44:06 2015 +0100
Merge tag 'upstream/4.9.0+ds'
Upstream version 4.9.0+ds
.clang-tidy | 4 +
.gitignore | 2 -
.travis.yml | 199 ++--
CMakeLists.txt | 164 ++-
Doxyfile.in | 43 +
algorithms/coordinate_calculation.cpp | 14 +-
algorithms/coordinate_calculation.hpp | 8 +-
algorithms/geospatial_query.hpp | 180 ++++
algorithms/graph_compressor.hpp | 2 +-
algorithms/object_encoder.hpp | 12 +-
algorithms/trip_brute_force.hpp | 4 +-
algorithms/trip_farthest_insertion.hpp | 11 +-
appveyor-build.bat | 4 +-
benchmarks/static_rtree.cpp | 142 +--
build-local.bat | 2 +-
cmake/FingerPrint-Config.cmake | 6 +-
cmake/GetGitRevisionDescription.cmake | 123 ---
cmake/GetGitRevisionDescription.cmake.in | 38 -
cmake/check_luabind.cmake | 2 +-
cmake/pkgconfig.in | 6 +-
contractor/contractor.hpp | 236 +++--
contractor/contractor_options.cpp | 46 +-
contractor/contractor_options.hpp | 18 +-
contractor/processing_chain.cpp | 474 ++++-----
contractor/processing_chain.hpp | 31 +-
data_structures/concurrent_queue.hpp | 85 --
data_structures/deallocating_vector.hpp | 14 +
data_structures/edge_based_node.hpp | 12 +-
data_structures/external_memory_node.cpp | 6 +-
data_structures/external_memory_node.hpp | 2 +-
data_structures/hidden_markov_model.hpp | 2 +-
data_structures/import_edge.cpp | 5 +-
data_structures/import_edge.hpp | 22 +
data_structures/node_based_graph.hpp | 10 +-
data_structures/node_id.hpp | 8 +-
data_structures/phantom_node.cpp | 9 +-
data_structures/phantom_node.hpp | 32 +-
data_structures/query_node.hpp | 12 +-
data_structures/range_table.hpp | 5 +-
data_structures/raster_source.cpp | 4 +-
data_structures/rectangle.hpp | 48 +-
data_structures/restriction.hpp | 4 +-
data_structures/restriction_map.cpp | 9 +-
data_structures/route_parameters.cpp | 48 +-
data_structures/segment_information.hpp | 7 +-
data_structures/static_rtree.hpp | 767 ++------------
datastore.cpp | 900 ++++++++---------
descriptors/description_factory.cpp | 14 +-
descriptors/json_descriptor.hpp | 43 +-
extract.cpp | 90 +-
.../edge_based_graph_factory.cpp | 145 ++-
.../edge_based_graph_factory.hpp | 34 +-
extractor/extraction_containers.cpp | 154 ++-
extractor/extraction_containers.hpp | 8 +-
extractor/extraction_helper_functions.hpp | 13 +-
extractor/extraction_way.hpp | 2 +
extractor/extractor.cpp | 395 +++++++-
extractor/extractor.hpp | 33 +-
extractor/extractor_callbacks.cpp | 81 +-
extractor/extractor_callbacks.hpp | 14 +-
extractor/extractor_options.cpp | 58 +-
extractor/extractor_options.hpp | 14 +
extractor/first_and_last_segment_of_way.hpp | 43 +-
extractor/internal_extractor_edge.hpp | 64 +-
extractor/lat | 0
extractor/restriction_parser.cpp | 23 +-
extractor/restriction_parser.hpp | 13 +-
extractor/scripting_environment.cpp | 1 +
extractor/source_coordinate.lat | 0
{contractor => extractor}/speed_profile.hpp | 0
features/car/advisory.feature | 67 ++
features/car/mode.feature | 40 +
features/locate/locate.feature | 197 ----
features/options/extract/help.feature | 12 +-
features/options/prepare/help.feature | 15 +-
features/options/routed/help.feature | 12 +-
features/step_definitions/data.rb | 10 +-
features/step_definitions/distance_matrix.rb | 38 +-
features/step_definitions/locate.rb | 51 -
features/step_definitions/matching.rb | 211 +---
features/step_definitions/nearest.rb | 4 +-
features/step_definitions/options.rb | 2 +-
features/step_definitions/requests.rb | 2 +-
features/step_definitions/routability.rb | 6 +-
features/step_definitions/routing.rb | 145 +--
features/step_definitions/trip.rb | 2 +-
features/support/config.rb | 4 +
features/support/data.rb | 16 +-
features/support/hooks.rb | 2 +-
features/support/http.rb | 39 +-
features/support/locate.rb | 12 -
features/support/match.rb | 20 -
features/support/nearest.rb | 12 -
features/support/route.rb | 116 ++-
features/support/trip.rb | 14 -
features/testbot/64bit.feature | 23 +
features/testbot/alternative.feature | 38 +
features/testbot/bearing_param.feature | 80 +-
features/testbot/distance_matrix.feature | 79 ++
features/testbot/matching_turns.feature | 43 +-
features/testbot/post.feature | 18 -
features/testbot/snap.feature | 20 +
features/testbot/status.feature | 50 +-
features/testbot/uturn.feature | 24 +
features/testbot/via.feature | 24 -
include/osrm/libosrm_config.hpp | 37 +-
{library => include/osrm}/osrm.hpp | 11 +-
include/osrm/route_parameters.hpp | 10 +
include/osrm/server_paths.hpp | 38 -
include/osrm/strong_typedef.hpp | 68 ++
library/osrm_impl.cpp | 51 +-
library/osrm_impl.hpp | 10 +-
plugins/distance_table.hpp | 164 ++-
plugins/hello_world.hpp | 13 +-
plugins/locate.hpp | 79 --
plugins/match.hpp | 170 ++--
plugins/nearest.hpp | 59 +-
plugins/plugin_base.hpp | 90 +-
plugins/timestamp.hpp | 7 +-
plugins/trip.hpp | 129 ++-
plugins/viaroute.hpp | 413 ++++----
prepare.cpp | 124 +--
profiles/bicycle.lua | 5 +-
profiles/car.lua | 42 +-
routed.cpp | 207 ++--
routing_algorithms/alternative_path.hpp | 43 +-
routing_algorithms/direct_shortest_path.hpp | 177 +---
routing_algorithms/many_to_many.hpp | 70 +-
routing_algorithms/map_matching.hpp | 34 +-
routing_algorithms/routing_base.hpp | 319 ++++--
routing_algorithms/shortest_path.hpp | 655 +++++++-----
scripts/analyze.sh | 19 +
scripts/modernize.sh | 6 +
scripts/tidy.sh | 6 +
.../update_depdendencies.sh | 2 +-
server/api_grammar.hpp | 34 +-
server/data_structures/datafacade_base.hpp | 31 +-
server/data_structures/internal_datafacade.hpp | 183 ++--
server/data_structures/shared_datafacade.hpp | 66 +-
server/http/reply.cpp | 6 +-
server/request_handler.cpp | 70 +-
server/request_parser.cpp | 9 +-
server/server.hpp | 4 +-
test/.stxxl | 2 +-
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 ++++++++++++++++++++
third_party/variant/.gitignore | 4 +-
third_party/variant/Jamroot | 2 +-
third_party/variant/appveyor.yml | 22 +-
third_party/variant/common.gypi | 2 +-
third_party/variant/scripts/build-appveyor.bat | 32 +
third_party/variant/scripts/build-local.bat | 7 +
third_party/variant/test/bench_variant.cpp | 107 +-
third_party/variant/variant.hpp | 68 +-
tools/components.cpp | 23 +-
tools/io-benchmark.cpp | 4 +-
tools/simpleclient.cpp | 15 +-
tools/springclean.cpp | 4 +-
tools/unlock_all_mutexes.cpp | 4 +-
typedefs.h | 19 +-
unit_tests/algorithms/douglas_peucker.cpp | 3 +-
unit_tests/algorithms/graph_compressor.cpp | 70 +-
unit_tests/algorithms/string_util.cpp | 10 -
unit_tests/data_structures/binary_heap.cpp | 3 +
unit_tests/data_structures/dynamic_graph.cpp | 5 +-
unit_tests/data_structures/range_table.cpp | 19 +-
unit_tests/data_structures/static_graph.cpp | 4 +-
unit_tests/data_structures/static_rtree.cpp | 318 +++---
unit_tests/util/bearing.cpp | 72 ++
util/git_sha.hpp => unit_tests/util_tests.cpp | 11 +-
util/bearing.cpp | 65 --
util/bearing.hpp | 84 +-
util/boost_filesystem_2_fix.hpp | 144 ---
util/cast.hpp | 180 +---
util/container.hpp | 2 +-
util/datastore_options.hpp | 95 +-
util/debug_geometry.hpp | 198 ++++
util/fingerprint.cpp | 4 +-
util/fingerprint.hpp | 1 -
util/fingerprint_impl.hpp.in | 12 +-
util/graph_loader.hpp | 37 +-
util/integer_range.hpp | 12 +-
util/iterator_range.hpp | 71 --
util/json_logger.hpp | 5 +-
util/json_renderer.hpp | 4 +-
util/matching_debug_info.hpp | 10 +-
util/routed_options.hpp | 141 ++-
util/string_util.hpp | 7 -
util/{git_sha.cpp.in => version.hpp.in} | 12 +-
util/xml_renderer.hpp | 2 +-
191 files changed, 7695 insertions(+), 5502 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