This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit b06efba011f18e46536f84840dd541d97539df80
Merge: 264c2fa 3d1b318
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Sat Aug 22 20:03:22 2015 +0200

    Merge tag 'upstream/4.7.0'
    
    Upstream version 4.7.0

 .gitignore                                         |   4 +
 .travis.yml                                        |   3 +-
 CMakeLists.txt                                     |   8 +-
 Gemfile.lock                                       |  27 +-
 README.md                                          |  31 +-
 algorithms/polyline_compressor.cpp                 |  38 +
 algorithms/polyline_compressor.hpp                 |   4 +
 algorithms/tiny_components.hpp                     |   2 +-
 appveyor-build.bat                                 | 113 +++
 appveyor.yml                                       |  43 +-
 build-local.bat                                    |  19 +
 contractor/contractor.hpp                          |   5 +-
 contractor/contractor_options.cpp                  | 135 ++++
 .../contractor_options.hpp                         |  27 +-
 contractor/edge_based_graph_factory.cpp            |  90 ++-
 contractor/edge_based_graph_factory.hpp            |  17 +-
 contractor/processing_chain.cpp                    | 507 +++++--------
 contractor/processing_chain.hpp                    |  58 +-
 data_structures/dynamic_graph.hpp                  |   3 +
 data_structures/import_edge.cpp                    |   7 +
 data_structures/import_edge.hpp                    |   5 +-
 data_structures/node_based_graph.hpp               | 268 +++----
 data_structures/restriction_map.hpp                |   7 +-
 data_structures/route_parameters.cpp               |   8 +
 data_structures/static_rtree.hpp                   |  39 +-
 datastore.cpp                                      |   5 +-
 descriptors/description_factory.cpp                |   7 +-
 extract.cpp                                        |   2 +-
 extractor/extraction_containers.cpp                | 841 +++++++++++++--------
 extractor/extraction_containers.hpp                |  17 +-
 extractor/extraction_helper_functions.hpp          |   2 +-
 extractor/extractor.cpp                            |  21 +-
 extractor/extractor.hpp                            |   9 +-
 extractor/extractor_callbacks.cpp                  |  74 +-
 extractor/extractor_options.cpp                    |   4 +
 extractor/extractor_options.hpp                    |   1 +
 extractor/internal_extractor_edge.hpp              | 112 +--
 extractor/restriction_parser.cpp                   |   2 +-
 extractor/scripting_environment.cpp                |   2 +-
 features/bicycle/access.feature                    |   6 +-
 features/bicycle/access_node.feature               |  35 +-
 features/bicycle/surface.feature                   |   2 +-
 features/car/maxspeed.feature                      |  19 +
 features/car/names.feature                         |  10 +-
 features/foot/access.feature                       |   4 +-
 features/foot/access_node.feature                  |   4 +-
 features/foot/surface.feature                      |   2 +-
 features/foot/way.feature                          |   6 +
 features/nearest/pick.feature                      |  20 +-
 features/options/prepare/help.feature              |   2 +-
 features/step_definitions/data.rb                  |   4 +
 features/step_definitions/distance_matrix.rb       |   2 +-
 features/step_definitions/locate.rb                |   4 +-
 features/step_definitions/matching.rb              |   2 +-
 features/step_definitions/nearest.rb               |   4 +-
 features/step_definitions/routability.rb           |   2 +-
 features/step_definitions/routing.rb               |   2 +-
 features/support/cucumber.rb                       |  76 --
 features/support/env.rb                            |  10 +-
 features/support/hooks.rb                          |  16 +-
 features/support/http.rb                           |  34 +
 features/support/locate.rb                         |  17 +-
 features/support/match.rb                          |  12 +-
 features/support/nearest.rb                        |  17 +-
 features/support/route.rb                          |  14 +-
 features/testbot/ferry.feature                     |  30 +
 features/testbot/loop.feature                      |  19 +
 features/testbot/post.feature                      | 100 +++
 features/testbot/snap.feature                      |  42 +-
 features/testbot/via.feature                       |  22 +-
 include/osrm/route_parameters.hpp                  |   2 +
 prepare.cpp                                        |  70 +-
 profiles/bicycle.lua                               | 123 +--
 profiles/car.lua                                   |  60 +-
 profiles/foot.lua                                  | 291 +++----
 profiles/lib/access.lua                            |   8 +-
 profiles/lib/maxspeed.lua                          |   6 +-
 routing_algorithms/alternative_path.hpp            |   4 +-
 routing_algorithms/shortest_path.hpp               |   6 +-
 server/api_grammar.hpp                             |   7 +-
 server/request_parser.cpp                          |  71 +-
 server/request_parser.hpp                          |   8 +-
 tools/components.cpp                               | 142 ++--
 tools/graph_compare.cpp                            | 199 -----
 unit_tests/algorithms/duration_parsing.cpp         |  24 +-
 unit_tests/algorithms/geometry_string.cpp          |  74 ++
 util/fingerprint.hpp                               |  13 +-
 util/fingerprint_impl.hpp.in                       |  45 +-
 util/graph_loader.hpp                              | 444 ++---------
 util/iso_8601_duration_parser.hpp                  |   2 +-
 util/lua_util.hpp                                  |   5 +-
 91 files changed, 2460 insertions(+), 2250 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osrm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to