This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository osrm.
commit d95508b0398385a6df33e9b82bb78d8fee51c2e8
Merge: 061d175 75b5a69
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Sep 18 02:05:59 2015 +0200
Merge tag 'upstream/4.8.0'
Upstream version 4.8.0
.travis.yml | 4 +-
CMakeLists.txt | 30 +-
algorithms/bayes_classifier.hpp | 9 +-
.../coordinate_calculation.cpp | 31 +-
.../coordinate_calculation.hpp | 46 +-
algorithms/douglas_peucker.cpp | 4 +-
algorithms/graph_compressor.cpp | 188 +++
.../graph_compressor.hpp | 40 +-
algorithms/object_encoder.hpp | 2 +-
algorithms/{tiny_components.hpp => tarjan_scc.hpp} | 69 +-
algorithms/trip_brute_force.hpp | 106 ++
algorithms/trip_farthest_insertion.hpp | 215 ++++
algorithms/trip_nearest_neighbour.hpp | 122 ++
.../header.hpp => algorithms/trip_tabu_search.hpp | 50 +-
appveyor-build.bat | 97 +-
appveyor.yml | 6 +-
build-local.bat | 30 +-
cmake/CPackDebianConfig.cmake | 2 +-
cmake/FindOSMPBF.cmake | 54 -
cmake/FingerPrint-Config.cmake | 22 +-
contractor/contractor.hpp | 68 +-
contractor/contractor_options.cpp | 7 +-
contractor/contractor_options.hpp | 7 +
contractor/edge_based_graph_factory.cpp | 390 ++----
contractor/edge_based_graph_factory.hpp | 51 +-
contractor/processing_chain.cpp | 283 ++--
contractor/processing_chain.hpp | 40 +-
contractor/speed_profile.hpp | 16 +
data_structures/binary_heap.hpp | 11 +-
.../compressed_edge_container.cpp | 30 +-
.../compressed_edge_container.hpp | 16 +-
data_structures/coordinate.cpp | 2 +-
data_structures/deallocating_vector.hpp | 77 +-
data_structures/dynamic_graph.hpp | 7 +-
data_structures/edge_based_node.hpp | 2 +
data_structures/hidden_markov_model.hpp | 32 +-
data_structures/hilbert_value.cpp | 2 +-
data_structures/import_edge.cpp | 5 +-
data_structures/import_edge.hpp | 2 -
.../matrix_graph_wrapper.hpp | 53 +-
data_structures/node_based_graph.hpp | 196 +--
data_structures/phantom_node.hpp | 8 +-
data_structures/query_edge.hpp | 2 +-
data_structures/raster_source.cpp | 178 +++
data_structures/raster_source.hpp | 175 +++
data_structures/rectangle.hpp | 2 +-
data_structures/restriction_map.hpp | 2 +-
data_structures/route_parameters.cpp | 4 +-
data_structures/search_engine.hpp | 3 +
data_structures/segment_information.hpp | 15 +-
data_structures/shared_memory_factory.hpp | 2 +-
data_structures/static_graph.hpp | 5 +-
data_structures/static_rtree.hpp | 91 +-
datastore.cpp | 47 +-
descriptors/description_factory.cpp | 2 +-
descriptors/descriptor_base.hpp | 2 +-
descriptors/json_descriptor.hpp | 53 +-
docker/Dockerfile | 21 +
docker/README | 6 +
docker/build-image.sh | 9 +
docker/run-clang.sh | 11 +
docker/run-gcc.sh | 11 +
docker/test.sh | 22 +
extractor/extraction_containers.cpp | 109 +-
extractor/extraction_containers.hpp | 7 +-
extractor/extraction_way.hpp | 2 -
extractor/extractor.cpp | 21 +-
extractor/extractor.hpp | 3 +-
extractor/extractor_callbacks.cpp | 12 +-
extractor/internal_extractor_edge.hpp | 40 +-
extractor/lat | 0
extractor/restriction_parser.cpp | 30 +-
extractor/scripting_environment.cpp | 27 +-
extractor/source_coordinate.lat | 0
features/bicycle/barrier.feature | 1 +
features/bicycle/bridge.feature | 2 +-
features/car/access.feature | 16 +-
features/car/barrier.feature | 8 +
features/car/bridge.feature | 4 +-
features/car/ferry.feature | 4 +-
features/car/maxspeed.feature | 7 +-
features/car/restrictions.feature | 48 +
features/foot/barrier.feature | 1 +
features/options/prepare/help.feature | 9 +-
features/raster/extract.feature | 18 +
features/raster/weights.feature | 78 ++
features/step_definitions/data.rb | 10 +-
features/step_definitions/matching.rb | 167 +++
features/step_definitions/routing.rb | 2 +-
features/step_definitions/{matching.rb => trip.rb} | 73 +-
features/support/data.rb | 2 +-
features/support/env.rb | 3 +-
features/support/match.rb | 2 +-
features/support/trip.rb | 14 +
features/testbot/compression.feature | 4 +-
features/testbot/matching.feature | 1 +
features/testbot/matching_turns.feature | 82 ++
features/testbot/mode.feature | 16 +-
features/testbot/post.feature | 1 +
features/testbot/trip.feature | 86 ++
include/osrm/json_container.hpp | 2 +-
include/osrm/libosrm_config.hpp | 7 +-
include/osrm/route_parameters.hpp | 4 +-
library/osrm_impl.cpp | 2 +
plugins/match.hpp | 99 +-
plugins/trip.hpp | 353 +++++
plugins/viaroute.hpp | 19 +-
profiles/bicycle.lua | 13 +-
profiles/car.lua | 51 +-
profiles/examples/postgis.lua | 15 +-
profiles/foot.lua | 13 +-
profiles/rasterbot-interp.lua | 46 +
profiles/rasterbot.lua | 46 +
profiles/testbot.lua | 4 +-
routed.cpp | 4 +-
routing_algorithms/direct_shortest_path.hpp | 248 ++++
routing_algorithms/map_matching.hpp | 89 +-
routing_algorithms/routing_base.hpp | 2 +-
server/api_grammar.hpp | 4 +-
server/connection.cpp | 1 -
server/connection.hpp | 1 +
server/data_structures/datafacade_base.hpp | 6 +-
server/data_structures/internal_datafacade.hpp | 55 +-
server/data_structures/shared_datafacade.hpp | 34 +-
server/data_structures/shared_datatype.hpp | 45 +-
server/http/header.hpp | 2 +-
test/rastersource.asc | 5 +
third_party/libosmium/.travis.yml | 79 +-
third_party/libosmium/CHANGELOG.md | 86 +-
third_party/libosmium/CMakeLists.txt | 63 +-
third_party/libosmium/EXTERNAL_LICENSES.txt | 233 ++++
third_party/libosmium/README.md | 4 +
third_party/libosmium/appveyor.yml | 63 +-
third_party/libosmium/benchmarks/CMakeLists.txt | 1 +
.../benchmarks/osmium_benchmark_count.cpp | 9 +-
.../benchmarks/osmium_benchmark_count_tag.cpp | 7 +-
.../benchmarks/osmium_benchmark_index_map.cpp | 2 -
.../osmium_benchmark_static_vs_dynamic_index.cpp | 1 -
.../benchmarks/osmium_benchmark_write_pbf.cpp | 34 +
.../benchmarks/run_benchmark_write_pbf.sh | 28 +
third_party/libosmium/cmake/FindOSMPBF.cmake | 50 -
third_party/libosmium/cmake/FindOsmium.cmake | 10 +-
third_party/libosmium/cmake/iwyu.sh | 4 +-
third_party/libosmium/doc/CMakeLists.txt | 2 -
third_party/libosmium/doc/Doxyfile.in | 2 +-
third_party/libosmium/doc/README.md | 2 +-
.../libosmium/examples/osmium_area_test.cpp | 2 -
third_party/libosmium/examples/osmium_convert.cpp | 1 -
third_party/libosmium/examples/osmium_count.cpp | 9 +-
.../examples/osmium_create_node_cache.cpp | 5 +-
third_party/libosmium/examples/osmium_debug.cpp | 2 -
third_party/libosmium/examples/osmium_read.cpp | 2 -
third_party/libosmium/examples/osmium_serdump.cpp | 5 +-
third_party/libosmium/examples/osmium_toogr.cpp | 2 -
third_party/libosmium/examples/osmium_toogr2.cpp | 2 -
.../libosmium/examples/osmium_toogr2_exp.cpp | 2 -
.../libosmium/examples/osmium_use_node_cache.cpp | 5 +-
.../libosmium/include/boost_unicode_iterator.hpp | 776 -----------
third_party/libosmium/include/mmap_for_windows.hpp | 103 --
.../libosmium/include/osmium/area/assembler.hpp | 18 +-
.../include/osmium/area/multipolygon_collector.hpp | 25 +-
.../libosmium/include/osmium/builder/builder.hpp | 24 +-
.../include/osmium/builder/osm_object_builder.hpp | 53 +-
.../libosmium/include/osmium/geom/factory.hpp | 162 ++-
third_party/libosmium/include/osmium/geom/geos.hpp | 84 +-
.../include/osmium/geom/mercator_projection.hpp | 1 +
.../include/osmium/geom/rapid_geojson.hpp | 190 +++
third_party/libosmium/include/osmium/geom/tile.hpp | 101 ++
third_party/libosmium/include/osmium/geom/wkb.hpp | 10 +-
.../mmap_vector_anon.hpp => bool_vector.hpp} | 59 +-
.../osmium/index/detail/create_map_with_fd.hpp | 2 -
.../osmium/index/detail/mmap_vector_anon.hpp | 21 +-
.../osmium/index/detail/mmap_vector_base.hpp | 84 +-
.../osmium/index/detail/mmap_vector_file.hpp | 29 +-
.../include/osmium/index/detail/typed_mmap.hpp | 229 ----
.../include/osmium/index/detail/vector_map.hpp | 10 +-
.../osmium/index/detail/vector_multimap.hpp | 34 +
.../libosmium/include/osmium/index/index.hpp | 2 +-
third_party/libosmium/include/osmium/index/map.hpp | 16 +-
.../include/osmium/index/map/dense_mmap_array.hpp | 2 +-
.../include/osmium/index/map/sparse_mem_map.hpp | 2 +-
.../libosmium/include/osmium/io/any_input.hpp | 4 +-
.../libosmium/include/osmium/io/any_output.hpp | 5 +-
.../include/osmium/io/bzip2_compression.hpp | 5 +
.../libosmium/include/osmium/io/compression.hpp | 5 +
.../osmium/io/{pbf_output.hpp => debug_output.hpp} | 18 +-
.../osmium/io/detail/debug_output_format.hpp | 482 +++++++
.../include/osmium/io/detail/opl_output_format.hpp | 75 +-
.../libosmium/include/osmium/io/detail/pbf.hpp | 54 +-
.../include/osmium/io/detail/pbf_decoder.hpp | 760 +++++++++++
.../include/osmium/io/detail/pbf_input_format.hpp | 93 +-
.../include/osmium/io/detail/pbf_output_format.hpp | 1083 +++++-----------
.../include/osmium/io/detail/pbf_parser.hpp | 455 -------
.../include/osmium/io/detail/pbf_stringtable.hpp | 218 ----
.../include/osmium/io/detail/protobuf_tags.hpp | 170 +++
.../include/osmium/io/detail/read_write.hpp | 2 +-
.../include/osmium/io/detail/string_table.hpp | 250 ++++
.../include/osmium/io/detail/xml_input_format.hpp | 37 +-
.../include/osmium/io/detail/xml_output_format.hpp | 60 +-
.../libosmium/include/osmium/io/detail/zlib.hpp | 15 +-
third_party/libosmium/include/osmium/io/file.hpp | 68 +-
.../libosmium/include/osmium/io/file_format.hpp | 8 +-
.../include/osmium/io/gzip_compression.hpp | 5 +
.../libosmium/include/osmium/io/pbf_input.hpp | 1 -
.../libosmium/include/osmium/io/pbf_output.hpp | 1 -
.../libosmium/include/osmium/memory/buffer.hpp | 21 +-
.../libosmium/include/osmium/memory/collection.hpp | 1 -
.../libosmium/include/osmium/memory/item.hpp | 1 -
.../libosmium/include/osmium/osm/changeset.hpp | 2 +-
third_party/libosmium/include/osmium/osm/crc.hpp | 223 ++++
.../libosmium/include/osmium/osm/diff_object.hpp | 29 +-
.../libosmium/include/osmium/osm/entity.hpp | 1 +
.../libosmium/include/osmium/osm/item_type.hpp | 20 +
.../libosmium/include/osmium/osm/node_ref.hpp | 2 +-
.../libosmium/include/osmium/osm/object.hpp | 1 +
.../libosmium/include/osmium/osm/relation.hpp | 5 +
.../libosmium/include/osmium/osm/timestamp.hpp | 12 +-
third_party/libosmium/include/osmium/osm/types.hpp | 21 -
.../include/osmium/osm/types_from_string.hpp | 116 ++
.../include/osmium/relations/collector.hpp | 2 +-
.../libosmium/include/osmium/thread/pool.hpp | 1 +
.../libosmium/include/osmium/thread/queue.hpp | 31 +-
.../libosmium/include/osmium/thread/util.hpp | 2 +-
.../libosmium/include/osmium/util/data_file.hpp | 194 +++
.../libosmium/include/osmium/util/delta.hpp | 147 +++
.../osmium/{io/pbf_input.hpp => util/endian.hpp} | 26 +-
third_party/libosmium/include/osmium/util/file.hpp | 119 ++
.../include/osmium/util/memory_mapping.hpp | 750 +++++++++++
.../osmium/{osm/entity.hpp => util/minmax.hpp} | 91 +-
.../libosmium/include/osmium/util/string.hpp | 42 +-
.../libosmium/include/protozero/byteswap.hpp | 49 +
.../libosmium/include/protozero/exception.hpp | 68 +
.../libosmium/include/protozero/pbf_builder.hpp | 111 ++
.../libosmium/include/protozero/pbf_message.hpp | 50 +
.../libosmium/include/protozero/pbf_reader.hpp | 1059 +++++++++++++++
.../libosmium/include/protozero/pbf_types.hpp | 49 +
.../libosmium/include/protozero/pbf_writer.hpp | 664 ++++++++++
third_party/libosmium/include/protozero/varint.hpp | 136 ++
.../include/{osmium/io/pbf_input.hpp => utf8.h} | 29 +-
third_party/libosmium/include/utf8/checked.h | 327 +++++
third_party/libosmium/include/utf8/core.h | 329 +++++
third_party/libosmium/include/utf8/unchecked.h | 228 ++++
third_party/libosmium/scripts/travis_install.sh | 20 +
third_party/libosmium/scripts/travis_script.sh | 29 +
third_party/libosmium/test/CMakeLists.txt | 17 +-
.../test/data-tests/testdata-testcases.cpp | 2 -
.../libosmium/test/data-tests/testdata-xml.cpp | 120 +-
third_party/libosmium/test/include/catch.hpp | 1355 +++++++++++++-------
third_party/libosmium/test/include/catch_orig.hpp | 1347 ++++++++++++-------
third_party/libosmium/test/t/basic/helper.hpp | 32 +-
third_party/libosmium/test/t/basic/test_box.cpp | 7 +
.../libosmium/test/t/basic/test_changeset.cpp | 12 +-
third_party/libosmium/test/t/basic/test_crc.cpp | 49 +
third_party/libosmium/test/t/basic/test_node.cpp | 8 +
.../libosmium/test/t/basic/test_relation.cpp | 11 +-
.../libosmium/test/t/basic/test_timestamp.cpp | 4 +
.../test/t/basic/test_types_from_string.cpp | 90 ++
third_party/libosmium/test/t/basic/test_way.cpp | 10 +-
.../libosmium/test/t/buffer/test_buffer_purge.cpp | 14 +-
.../libosmium/test/t/geom/test_exception.cpp | 16 +
third_party/libosmium/test/t/geom/test_geos.cpp | 35 +-
.../libosmium/test/t/geom/test_projection.cpp | 18 +
third_party/libosmium/test/t/geom/test_tile.cpp | 93 ++
.../libosmium/test/t/geom/test_tile_data.hpp | 475 +++++++
third_party/libosmium/test/t/geom/test_wkt.cpp | 8 +
.../libosmium/test/t/index/test_typed_mmap.cpp | 76 --
.../test/t/index/test_typed_mmap_grow.cpp | 34 -
.../libosmium/test/t/io/test_file_formats.cpp | 24 +
.../libosmium/test/t/io/test_string_table.cpp | 94 ++
.../libosmium/test/t/tags/test_tag_list.cpp | 126 +-
third_party/libosmium/test/t/thread/test_pool.cpp | 1 -
.../libosmium/test/t/util/test_data_file.cpp | 81 ++
third_party/libosmium/test/t/util/test_delta.cpp | 68 +
third_party/libosmium/test/t/util/test_file.cpp | 69 +
.../libosmium/test/t/util/test_memory_mapping.cpp | 419 ++++++
third_party/libosmium/test/t/util/test_minmax.cpp | 68 +
third_party/libosmium/test/t/util/test_string.cpp | 11 +
tools/components.cpp | 29 +-
typedefs.h | 1 +
unit_tests/algorithms/geometry_string.cpp | 2 +-
unit_tests/algorithms/graph_compressor.cpp | 213 +++
unit_tests/data_structures/binary_heap.cpp | 2 +
.../data_structures/compressed_edge_container.cpp | 87 ++
unit_tests/data_structures/coordinate.cpp | 2 +-
unit_tests/data_structures/dynamic_graph.cpp | 4 +-
unit_tests/data_structures/raster_source.cpp | 110 ++
unit_tests/data_structures/static_graph.cpp | 4 +-
unit_tests/data_structures/static_rtree.cpp | 2 +-
unit_tests/fixtures/raster_data.asc | 10 +
update_depdendencies.sh | 21 +
util/datastore_options.hpp | 12 +-
util/dist_table_wrapper.hpp | 88 ++
util/graph_utils.hpp | 94 ++
util/json_renderer.hpp | 34 +-
util/matching_debug_info.hpp | 10 +-
util/osrm_exception.hpp | 5 +-
util/routed_options.hpp | 4 +-
util/string_util.hpp | 3 +-
util/xml_renderer.hpp | 21 +-
299 files changed, 16567 insertions(+), 5796 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
