This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository osrm.
commit c303af21a0056e6d30a9508d9e8813c8f23bbeb8 Merge: 441664c 619a71f Author: Bas Couwenberg <[email protected]> Date: Tue Oct 4 16:29:33 2016 +0200 Merge tag 'upstream/5.4.0+ds' Upstream version 5.4.0+ds .github/PULL_REQUEST_TEMPLATE.md | 12 + .travis.yml | 27 +- CHANGELOG.md | 78 ++- CMakeLists.txt | 48 +- README.md | 5 + cucumber.js | 10 +- docs/http.md | 49 +- docs/profiles.md | 13 + docs/releasing.md | 64 +-- example/example.cpp | 10 +- features/bicycle/names.feature | 4 +- features/bicycle/ref.feature | 8 +- features/car/access.feature | 41 +- features/car/ferry.feature | 16 +- features/car/names.feature | 57 +- features/car/restrictions.feature | 48 +- features/car/service.feature | 13 + features/car/summaries.feature | 94 ++++ features/car/traffic_speeds.feature | 106 +++- features/car/traffic_turn_penalties.feature | 28 +- features/foot/names.feature | 2 +- features/foot/ref.feature | 6 +- features/guidance/advanced-lanes.feature | 236 +++++++++ features/guidance/anticipate-lanes.feature | 343 +++++++++--- features/guidance/bugs.feature | 35 ++ features/guidance/collapse-detail.feature | 53 ++ features/guidance/collapse.feature | 280 ++++++++-- features/guidance/dedicated-turn-roads.feature | 190 ++++++- features/guidance/destination-signs.feature | 20 +- features/guidance/fork.feature | 6 +- features/guidance/merge.feature | 76 ++- features/guidance/new-name.feature | 177 ++++++- features/guidance/perception.feature | 126 +++++ features/guidance/ramp.feature | 30 +- features/guidance/roundabout-bike.feature | 31 -- features/guidance/roundabout-turn-bike.feature | 37 ++ features/guidance/roundabout-turn.feature | 122 +++++ features/guidance/roundabout.feature | 225 +++----- features/guidance/staggered-intersections.feature | 92 ++++ features/guidance/suffix-changes.feature | 23 +- features/guidance/suppressed.feature | 4 +- features/guidance/turn-lanes.feature | 204 +++++-- features/guidance/turn.feature | 211 +++++++- features/lib/hash.js | 31 ++ features/{support/build_osm.js => lib/osm.js} | 8 +- features/lib/osrm_loader.js | 169 ++++++ features/lib/table_diff.js | 54 ++ features/lib/try_connect.js | 13 + features/lib/utils.js | 17 + features/options/contract/datasources.feature | 10 +- features/options/contract/files.feature | 13 +- features/options/contract/help.feature | 8 +- features/options/contract/invalid.feature | 4 +- features/options/contract/version.feature | 4 +- features/options/extract/files.feature | 14 +- features/options/extract/help.feature | 6 +- features/options/extract/invalid.feature | 4 +- features/options/extract/version.feature | 4 +- features/options/routed/files.feature | 2 +- features/options/routed/help.feature | 6 +- features/options/routed/invalid.feature | 10 +- features/options/routed/version.feature | 4 +- features/raster/extract.feature | 19 +- features/raster/weights.feature | 12 +- features/step_definitions/data.js | 60 +-- features/step_definitions/distance_matrix.js | 11 +- features/step_definitions/hooks.js | 18 - features/step_definitions/matching.js | 4 +- features/step_definitions/nearest.js | 11 +- features/step_definitions/options.js | 56 +- features/step_definitions/requests.js | 5 +- features/step_definitions/routability.js | 8 +- features/step_definitions/trip.js | 12 +- features/support/cache.js | 184 +++++++ features/support/config.js | 127 ----- features/support/data.js | 255 +++------ features/support/data_classes.js | 40 +- features/support/env.js | 130 +++-- features/support/exception_classes.js | 132 ----- features/support/exceptions.js | 15 - features/support/hash.js | 43 -- features/support/hooks.js | 73 ++- features/support/http.js | 12 +- features/support/launch.js | 5 - features/support/launch_classes.js | 164 ------ features/support/log.js | 90 ---- features/support/route.js | 23 +- features/support/run.js | 70 ++- features/support/shared_steps.js | 29 +- features/support/table_patch.js | 11 - features/testbot/bad.feature | 4 +- features/testbot/bearing_param.feature | 18 +- features/testbot/bugs.feature | 5 - features/testbot/matching.feature | 14 +- features/testbot/side_bias.feature | 83 +++ features/testbot/summary.feature | 6 +- features/testbot/traffic_turn_penalties.feature | 4 +- features/testbot/utf.feature | 15 + features/testbot/via.feature | 2 +- fuzz/CMakeLists.txt | 58 ++ fuzz/escape_json.cc | 18 + fuzz/match_parameters.cc | 23 + fuzz/nearest_parameters.cc | 23 + fuzz/request_parser.cc | 28 + fuzz/route_parameters.cc | 23 + fuzz/table_parameters.cc | 23 + fuzz/tile_parameters.cc | 23 + fuzz/trip_parameters.cc | 23 + fuzz/uri_decode.cc | 21 + fuzz/url_parser.cc | 21 + fuzz/util.hpp | 16 + include/engine/api/route_api.hpp | 21 +- include/engine/api/route_parameters.hpp | 15 + include/engine/datafacade/datafacade_base.hpp | 2 + include/engine/datafacade/internal_datafacade.hpp | 11 +- include/engine/datafacade/shared_datafacade.hpp | 16 +- include/engine/engine.hpp | 14 +- include/engine/engine_config.hpp | 2 + include/engine/geospatial_query.hpp | 131 +++-- include/engine/guidance/assemble_geometry.hpp | 16 +- include/engine/guidance/assemble_leg.hpp | 38 +- include/engine/guidance/assemble_steps.hpp | 12 +- include/engine/guidance/lane_processing.hpp | 6 + include/engine/guidance/leg_geometry.hpp | 1 + include/engine/guidance/post_processing.hpp | 17 +- include/engine/guidance/route_step.hpp | 8 +- include/engine/guidance/step_maneuver.hpp | 7 +- include/engine/internal_route_result.hpp | 3 + include/engine/plugins/nearest.hpp | 5 +- include/engine/routing_algorithms/routing_base.hpp | 41 +- include/extractor/edge_based_graph_factory.hpp | 43 +- include/extractor/extraction_containers.hpp | 15 +- include/extractor/extraction_helper_functions.hpp | 6 + include/extractor/extraction_way.hpp | 5 + include/extractor/extractor.hpp | 17 +- include/extractor/extractor_callbacks.hpp | 34 +- include/extractor/extractor_config.hpp | 1 - include/extractor/guidance/classification_data.hpp | 84 --- include/extractor/guidance/constants.hpp | 15 +- .../extractor/guidance/intersection_generator.hpp | 42 +- .../extractor/guidance/intersection_handler.hpp | 19 +- .../guidance/intersection_scenario_three_way.hpp | 5 - include/extractor/guidance/motorway_handler.hpp | 14 +- include/extractor/guidance/road_classification.hpp | 127 +++++ include/extractor/guidance/roundabout_handler.hpp | 9 +- .../{motorway_handler.hpp => sliproad_handler.hpp} | 31 +- include/extractor/guidance/toolkit.hpp | 350 ++---------- include/extractor/guidance/turn_analysis.hpp | 8 +- include/extractor/guidance/turn_handler.hpp | 22 +- include/extractor/guidance/turn_instruction.hpp | 8 +- .../extractor/guidance/turn_lane_augmentation.hpp | 2 + include/extractor/guidance/turn_lane_data.hpp | 11 +- include/extractor/guidance/turn_lane_handler.hpp | 100 +++- include/extractor/guidance/turn_lane_matcher.hpp | 16 +- include/extractor/guidance/turn_lane_types.hpp | 13 +- include/extractor/internal_extractor_edge.hpp | 11 +- include/extractor/node_based_edge.hpp | 37 +- include/extractor/profile_properties.hpp | 3 +- include/extractor/query_node.hpp | 6 +- include/extractor/restriction_parser.hpp | 6 +- include/extractor/scripting_environment.hpp | 70 ++- include/extractor/scripting_environment_lua.hpp | 80 +++ include/extractor/suffix_table.hpp | 8 +- .../engine_config.hpp => osrm/exception.hpp} | 45 +- include/osrm/osrm.hpp | 12 +- include/util/attributes.hpp | 13 + include/util/bearing.hpp | 2 +- include/util/debug.hpp | 40 +- include/util/exception.hpp | 27 + include/util/guidance/toolkit.hpp | 131 ++++- include/util/io.hpp | 2 +- include/util/name_table.hpp | 6 + include/util/node_based_graph.hpp | 14 +- include/util/static_rtree.hpp | 9 +- include/util/strong_typedef.hpp | 52 +- include/util/typedefs.hpp | 5 +- package.json | 2 + profiles/bicycle.lua | 22 +- profiles/car.lua | 195 ++++--- profiles/foot.lua | 9 +- profiles/lhs.lua | 20 + profiles/lib/guidance.lua | 127 +++++ profiles/rasterbot.lua | 6 +- profiles/rasterbotinterp.lua | 6 +- profiles/rhs.lua | 20 + profiles/turnbot.lua | 3 +- scripts/format.sh | 27 +- scripts/gdb_printers.py | 63 +++ src/contractor/contractor.cpp | 84 +-- src/engine/api/json_factory.cpp | 21 +- src/engine/engine.cpp | 16 +- src/engine/engine_config.cpp | 14 +- src/engine/guidance/lane_processing.cpp | 179 +++++-- src/engine/guidance/post_processing.cpp | 457 ++++++++++------ src/engine/plugins/nearest.cpp | 15 +- src/engine/plugins/tile.cpp | 2 +- src/engine/polyline_compressor.cpp | 10 +- src/extractor/edge_based_graph_factory.cpp | 72 +-- src/extractor/extraction_containers.cpp | 130 ++--- src/extractor/extractor.cpp | 223 ++++---- src/extractor/extractor_callbacks.cpp | 59 +-- src/extractor/graph_compressor.cpp | 20 +- src/extractor/guidance/classification_data.cpp | 53 -- src/extractor/guidance/intersection_generator.cpp | 388 ++++++++++++-- src/extractor/guidance/intersection_handler.cpp | 386 +++++++++++++- .../guidance/intersection_scenario_three_way.cpp | 8 - src/extractor/guidance/motorway_handler.cpp | 103 ++-- src/extractor/guidance/roundabout_handler.cpp | 183 ++++--- src/extractor/guidance/sliproad_handler.cpp | 282 ++++++++++ src/extractor/guidance/turn_analysis.cpp | 163 +----- src/extractor/guidance/turn_discovery.cpp | 23 +- src/extractor/guidance/turn_handler.cpp | 393 +++++--------- src/extractor/guidance/turn_lane_augmentation.cpp | 24 +- src/extractor/guidance/turn_lane_data.cpp | 16 +- src/extractor/guidance/turn_lane_handler.cpp | 585 +++++++++++++++------ src/extractor/guidance/turn_lane_matcher.cpp | 67 ++- src/extractor/raster_source.cpp | 5 +- src/extractor/restriction_map.cpp | 8 +- src/extractor/restriction_parser.cpp | 65 +-- src/extractor/scripting_environment.cpp | 207 -------- src/extractor/scripting_environment_lua.cpp | 407 ++++++++++++++ src/extractor/suffix_table.cpp | 27 +- src/osrm/osrm.cpp | 12 +- src/storage/storage.cpp | 9 +- src/tools/components.cpp | 7 +- src/tools/contract.cpp | 23 +- src/tools/extract.cpp | 57 +- src/tools/io-benchmark.cpp | 13 +- src/tools/routed.cpp | 34 +- src/tools/springclean.cpp | 7 +- src/tools/store.cpp | 24 +- src/tools/unlock_all_mutexes.cpp | 7 +- src/util/coordinate_calculation.cpp | 6 +- src/util/name_table.cpp | 21 + taginfo.json | 59 ++- unit_tests/engine/json_factory.cpp | 16 + unit_tests/library/limits.cpp | 30 ++ unit_tests/mocks/mock_datafacade.hpp | 5 +- unit_tests/util/bearing.cpp | 3 + unit_tests/util/packed_vector.cpp | 2 +- unit_tests/util/static_rtree.cpp | 3 + 241 files changed, 8851 insertions(+), 4335 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
