This is an automated email from the git hooks/post-receive script. sebastic pushed a change to branch master in repository osrm.
from 061d175 Set distribution to unstable. new 75b5a69 Imported Upstream version 4.8.0 new d95508b Merge tag 'upstream/4.8.0' new e4f408c New upstream release. new 628c9f7 Imported Upstream version 4.8.1 new 5ae6431 Merge tag 'upstream/4.8.1' new ab1d7a1 New upstream release. new 0daef52 Repack upstream tarballs to exclude embedded copy of libosmium. new 030e434 Use libosmium2-dev instead of embedded copy. new 86e52d7 Drop obsolete protobuf & osmpbf build dependencies. new 6878286 Imported Upstream version 4.8.1+ds new 809c1b6 Merge tag 'upstream/4.8.1+ds' new 30daef5 New repacked upstream release. The 12 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .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 | 47 +- 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 + .../trip_tabu_search.hpp | 57 +- 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 - .../{upper_bound.hpp => matrix_graph_wrapper.hpp} | 59 +- 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 +- debian/changelog | 9 + debian/control | 10 +- debian/copyright | 48 +- debian/patches/series | 1 + debian/patches/use-libosmium-package.patch | 16 + debian/watch | 3 +- 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 +- .gitmodules => extractor/lat | 0 extractor/restriction_parser.cpp | 30 +- extractor/scripting_environment.cpp | 27 +- .gitmodules => 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 | 6 +- 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 + features/testbot/via.feature | 25 + 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 +- scripts/bisect_cucumber.sh | 27 + 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/.gitignore | 2 - third_party/libosmium/.travis.yml | 51 - third_party/libosmium/.ycm_extra_conf.py | 48 - third_party/libosmium/CHANGELOG.md | 31 - third_party/libosmium/CMakeLists.txt | 333 - third_party/libosmium/CONTRIBUTING.md | 132 - third_party/libosmium/LICENSE.txt | 23 - third_party/libosmium/Makefile | 25 - third_party/libosmium/README.md | 104 - third_party/libosmium/appveyor.yml | 77 - third_party/libosmium/benchmarks/CMakeLists.txt | 48 - third_party/libosmium/benchmarks/README.md | 41 - third_party/libosmium/benchmarks/download_data.sh | 12 - .../benchmarks/osmium_benchmark_count.cpp | 54 - .../benchmarks/osmium_benchmark_count_tag.cpp | 55 - .../benchmarks/osmium_benchmark_index_map.cpp | 41 - .../osmium_benchmark_static_vs_dynamic_index.cpp | 136 - .../libosmium/benchmarks/run_benchmark_count.sh | 22 - .../benchmarks/run_benchmark_count_tag.sh | 22 - .../benchmarks/run_benchmark_index_map.sh | 27 - .../run_benchmark_static_vs_dynamic_index.sh | 21 - third_party/libosmium/benchmarks/run_benchmarks.sh | 15 - third_party/libosmium/benchmarks/setup.sh | 34 - third_party/libosmium/cmake/FindGem.cmake | 153 - third_party/libosmium/cmake/FindOSMPBF.cmake | 50 - third_party/libosmium/cmake/FindOsmium.cmake | 340 - third_party/libosmium/cmake/README | 3 - third_party/libosmium/cmake/build.bat | 15 - third_party/libosmium/cmake/iwyu.sh | 43 - third_party/libosmium/doc/CMakeLists.txt | 35 - third_party/libosmium/doc/Doxyfile.in | 2313 ----- third_party/libosmium/doc/README.md | 8 - third_party/libosmium/doc/doc.txt | 26 - third_party/libosmium/doc/header.html | 56 - third_party/libosmium/doc/osmium.css | 22 - third_party/libosmium/examples/CMakeLists.txt | 115 - .../libosmium/examples/osmium_area_test.cpp | 138 - third_party/libosmium/examples/osmium_convert.cpp | 112 - third_party/libosmium/examples/osmium_count.cpp | 57 - .../examples/osmium_create_node_cache.cpp | 58 - third_party/libosmium/examples/osmium_debug.cpp | 52 - third_party/libosmium/examples/osmium_index.cpp | 237 - third_party/libosmium/examples/osmium_read.cpp | 32 - third_party/libosmium/examples/osmium_serdump.cpp | 209 - third_party/libosmium/examples/osmium_toogr.cpp | 246 - third_party/libosmium/examples/osmium_toogr2.cpp | 333 - .../libosmium/examples/osmium_toogr2_exp.cpp | 307 - .../libosmium/examples/osmium_use_node_cache.cpp | 71 - .../libosmium/include/boost_unicode_iterator.hpp | 776 -- third_party/libosmium/include/mmap_for_windows.hpp | 103 - .../libosmium/include/osmium/area/assembler.hpp | 783 -- .../osmium/area/detail/node_ref_segment.hpp | 262 - .../include/osmium/area/detail/proto_ring.hpp | 274 - .../include/osmium/area/detail/segment_list.hpp | 216 - .../include/osmium/area/multipolygon_collector.hpp | 212 - .../include/osmium/area/problem_reporter.hpp | 149 - .../osmium/area/problem_reporter_exception.hpp | 96 - .../include/osmium/area/problem_reporter_ogr.hpp | 223 - .../osmium/area/problem_reporter_stream.hpp | 96 - .../libosmium/include/osmium/builder/builder.hpp | 223 - .../include/osmium/builder/builder_helper.hpp | 103 - .../include/osmium/builder/osm_object_builder.hpp | 284 - .../libosmium/include/osmium/diff_handler.hpp | 67 - .../libosmium/include/osmium/diff_iterator.hpp | 129 - .../libosmium/include/osmium/diff_visitor.hpp | 104 - .../libosmium/include/osmium/dynamic_handler.hpp | 195 - .../include/osmium/experimental/flex_reader.hpp | 129 - .../libosmium/include/osmium/geom/coordinates.hpp | 97 - .../libosmium/include/osmium/geom/factory.hpp | 328 - .../libosmium/include/osmium/geom/geojson.hpp | 154 - third_party/libosmium/include/osmium/geom/geos.hpp | 230 - .../libosmium/include/osmium/geom/haversine.hpp | 94 - .../include/osmium/geom/mercator_projection.hpp | 109 - third_party/libosmium/include/osmium/geom/ogr.hpp | 206 - .../libosmium/include/osmium/geom/projection.hpp | 167 - .../libosmium/include/osmium/geom/relations.hpp | 57 - third_party/libosmium/include/osmium/geom/util.hpp | 75 - third_party/libosmium/include/osmium/geom/wkb.hpp | 277 - third_party/libosmium/include/osmium/geom/wkt.hpp | 150 - third_party/libosmium/include/osmium/handler.hpp | 101 - .../libosmium/include/osmium/handler/chain.hpp | 128 - .../include/osmium/handler/disk_store.hpp | 111 - .../libosmium/include/osmium/handler/dump.hpp | 294 - .../osmium/handler/node_locations_for_ways.hpp | 180 - .../include/osmium/handler/object_relations.hpp | 106 - .../osmium/index/detail/create_map_with_fd.hpp | 73 - .../osmium/index/detail/mmap_vector_anon.hpp | 78 - .../osmium/index/detail/mmap_vector_base.hpp | 184 - .../osmium/index/detail/mmap_vector_file.hpp | 85 - .../include/osmium/index/detail/tmpfile.hpp | 62 - .../include/osmium/index/detail/typed_mmap.hpp | 229 - .../include/osmium/index/detail/vector_map.hpp | 238 - .../osmium/index/detail/vector_multimap.hpp | 152 - .../libosmium/include/osmium/index/index.hpp | 100 - third_party/libosmium/include/osmium/index/map.hpp | 254 - .../libosmium/include/osmium/index/map/all.hpp | 46 - .../include/osmium/index/map/dense_file_array.hpp | 67 - .../include/osmium/index/map/dense_mem_array.hpp | 57 - .../include/osmium/index/map/dense_mmap_array.hpp | 60 - .../libosmium/include/osmium/index/map/dummy.hpp | 88 - .../include/osmium/index/map/sparse_file_array.hpp | 67 - .../include/osmium/index/map/sparse_mem_array.hpp | 60 - .../include/osmium/index/map/sparse_mem_map.hpp | 115 - .../include/osmium/index/map/sparse_mem_table.hpp | 146 - .../include/osmium/index/map/sparse_mmap_array.hpp | 60 - .../libosmium/include/osmium/index/multimap.hpp | 127 - .../include/osmium/index/multimap/all.hpp | 41 - .../include/osmium/index/multimap/hybrid.hpp | 200 - .../osmium/index/multimap/sparse_file_array.hpp | 54 - .../osmium/index/multimap/sparse_mem_array.hpp | 58 - .../osmium/index/multimap/sparse_mem_multimap.hpp | 151 - .../osmium/index/multimap/sparse_mmap_array.hpp | 58 - .../include/osmium/index/node_locations_map.hpp | 70 - .../include/osmium/io/any_compression.hpp | 48 - .../libosmium/include/osmium/io/any_input.hpp | 51 - .../libosmium/include/osmium/io/any_output.hpp | 52 - .../include/osmium/io/bzip2_compression.hpp | 289 - .../libosmium/include/osmium/io/compression.hpp | 281 - .../include/osmium/io/detail/input_format.hpp | 158 - .../include/osmium/io/detail/opl_output_format.hpp | 317 - .../include/osmium/io/detail/output_format.hpp | 156 - .../libosmium/include/osmium/io/detail/pbf.hpp | 98 - .../include/osmium/io/detail/pbf_input_format.hpp | 262 - .../include/osmium/io/detail/pbf_output_format.hpp | 972 --- .../include/osmium/io/detail/pbf_parser.hpp | 455 - .../include/osmium/io/detail/pbf_stringtable.hpp | 218 - .../include/osmium/io/detail/read_thread.hpp | 106 - .../include/osmium/io/detail/read_write.hpp | 160 - .../include/osmium/io/detail/write_thread.hpp | 86 - .../include/osmium/io/detail/xml_input_format.hpp | 738 -- .../include/osmium/io/detail/xml_output_format.hpp | 484 -- .../libosmium/include/osmium/io/detail/zlib.hpp | 113 - third_party/libosmium/include/osmium/io/error.hpp | 58 - third_party/libosmium/include/osmium/io/file.hpp | 344 - .../include/osmium/io/file_compression.hpp | 72 - .../libosmium/include/osmium/io/file_format.hpp | 78 - .../include/osmium/io/gzip_compression.hpp | 246 - third_party/libosmium/include/osmium/io/header.hpp | 122 - .../libosmium/include/osmium/io/input_iterator.hpp | 140 - .../libosmium/include/osmium/io/opl_output.hpp | 39 - .../include/osmium/io/output_iterator.hpp | 124 - .../libosmium/include/osmium/io/overwrite.hpp | 52 - .../libosmium/include/osmium/io/pbf_input.hpp | 49 - .../libosmium/include/osmium/io/pbf_output.hpp | 49 - third_party/libosmium/include/osmium/io/reader.hpp | 312 - .../include/osmium/io/reader_iterator.hpp | 51 - third_party/libosmium/include/osmium/io/writer.hpp | 145 - .../libosmium/include/osmium/io/xml_input.hpp | 48 - .../libosmium/include/osmium/io/xml_output.hpp | 47 - .../libosmium/include/osmium/memory/buffer.hpp | 535 -- .../libosmium/include/osmium/memory/collection.hpp | 154 - .../libosmium/include/osmium/memory/item.hpp | 178 - .../include/osmium/memory/item_iterator.hpp | 234 - .../include/osmium/object_pointer_collection.hpp | 112 - third_party/libosmium/include/osmium/osm.hpp | 48 - third_party/libosmium/include/osmium/osm/area.hpp | 214 - third_party/libosmium/include/osmium/osm/box.hpp | 250 - .../libosmium/include/osmium/osm/changeset.hpp | 335 - .../libosmium/include/osmium/osm/diff_object.hpp | 156 - .../libosmium/include/osmium/osm/entity.hpp | 79 - .../libosmium/include/osmium/osm/entity_bits.hpp | 105 - .../libosmium/include/osmium/osm/item_type.hpp | 173 - .../libosmium/include/osmium/osm/location.hpp | 285 - third_party/libosmium/include/osmium/osm/node.hpp | 76 - .../libosmium/include/osmium/osm/node_ref.hpp | 173 - .../libosmium/include/osmium/osm/node_ref_list.hpp | 184 - .../libosmium/include/osmium/osm/object.hpp | 437 - .../include/osmium/osm/object_comparisons.hpp | 110 - .../libosmium/include/osmium/osm/relation.hpp | 189 - .../libosmium/include/osmium/osm/segment.hpp | 105 - third_party/libosmium/include/osmium/osm/tag.hpp | 140 - .../libosmium/include/osmium/osm/timestamp.hpp | 175 - third_party/libosmium/include/osmium/osm/types.hpp | 83 - .../include/osmium/osm/undirected_segment.hpp | 100 - third_party/libosmium/include/osmium/osm/way.hpp | 117 - .../include/osmium/relations/collector.hpp | 544 -- .../osmium/relations/detail/member_meta.hpp | 158 - .../osmium/relations/detail/relation_meta.hpp | 136 - .../libosmium/include/osmium/tags/filter.hpp | 162 - .../libosmium/include/osmium/tags/regex_filter.hpp | 58 - .../libosmium/include/osmium/tags/taglist.hpp | 67 - .../include/osmium/thread/function_wrapper.hpp | 111 - .../libosmium/include/osmium/thread/pool.hpp | 180 - .../libosmium/include/osmium/thread/queue.hpp | 181 - .../include/osmium/thread/sorted_queue.hpp | 159 - .../libosmium/include/osmium/thread/util.hpp | 87 - third_party/libosmium/include/osmium/util/cast.hpp | 103 - .../include/osmium/util/compatibility.hpp | 47 - .../libosmium/include/osmium/util/config.hpp | 72 - .../libosmium/include/osmium/util/double.hpp | 93 - .../libosmium/include/osmium/util/options.hpp | 155 - .../libosmium/include/osmium/util/string.hpp | 68 - .../include/osmium/util/verbose_output.hpp | 139 - third_party/libosmium/include/osmium/visitor.hpp | 255 - third_party/libosmium/osmium.imp | 11 - third_party/libosmium/test/CMakeLists.txt | 165 - third_party/libosmium/test/README | 13 - third_party/libosmium/test/data-tests/.gitignore | 1 - .../libosmium/test/data-tests/CMakeLists.txt | 118 - third_party/libosmium/test/data-tests/README.md | 10 - .../data-tests/include/check_basics_handler.hpp | 92 - .../test/data-tests/include/check_wkt_handler.hpp | 86 - .../libosmium/test/data-tests/include/common.hpp | 22 - .../test/data-tests/include/testdata-testcases.hpp | 10 - .../libosmium/test/data-tests/multipolygon.qgs | 880 -- .../data-tests/run-testdata-multipolygon.cmake | 46 - .../test/data-tests/testcases/test-100.cpp | 41 - .../test/data-tests/testcases/test-101.cpp | 43 - .../test/data-tests/testcases/test-110.cpp | 58 - .../test/data-tests/testdata-multipolygon.cpp | 291 - .../test/data-tests/testdata-overview.cpp | 197 - .../test/data-tests/testdata-testcases.cpp | 27 - .../libosmium/test/data-tests/testdata-xml.cpp | 462 - third_party/libosmium/test/include/catch.hpp | 9003 -------------------- third_party/libosmium/test/include/catch_orig.hpp | 8997 ------------------- third_party/libosmium/test/include/utils.hpp | 18 - third_party/libosmium/test/include/win_mkstemp.hpp | 42 - third_party/libosmium/test/t/area/test_area_id.cpp | 25 - .../test/t/area/test_node_ref_segment.cpp | 115 - third_party/libosmium/test/t/basic/helper.hpp | 97 - third_party/libosmium/test/t/basic/test_box.cpp | 91 - .../libosmium/test/t/basic/test_changeset.cpp | 57 - .../libosmium/test/t/basic/test_entity_bits.cpp | 31 - .../libosmium/test/t/basic/test_location.cpp | 154 - third_party/libosmium/test/t/basic/test_node.cpp | 117 - .../libosmium/test/t/basic/test_node_ref.cpp | 57 - .../test/t/basic/test_object_comparisons.cpp | 147 - .../libosmium/test/t/basic/test_relation.cpp | 60 - .../libosmium/test/t/basic/test_timestamp.cpp | 58 - third_party/libosmium/test/t/basic/test_way.cpp | 82 - .../libosmium/test/t/buffer/test_buffer_node.cpp | 135 - .../libosmium/test/t/buffer/test_buffer_purge.cpp | 186 - third_party/libosmium/test/t/geom/helper.hpp | 15 - .../test/t/geom/test_factory_with_projection.cpp | 41 - third_party/libosmium/test/t/geom/test_geojson.cpp | 236 - third_party/libosmium/test/t/geom/test_geos.cpp | 198 - .../libosmium/test/t/geom/test_geos_wkb.cpp | 156 - .../libosmium/test/t/geom/test_mercator.cpp | 37 - third_party/libosmium/test/t/geom/test_ogr.cpp | 185 - .../libosmium/test/t/geom/test_projection.cpp | 131 - third_party/libosmium/test/t/geom/test_wkb.cpp | 133 - third_party/libosmium/test/t/geom/test_wkt.cpp | 198 - .../libosmium/test/t/index/test_id_to_location.cpp | 170 - .../libosmium/test/t/index/test_typed_mmap.cpp | 76 - .../test/t/index/test_typed_mmap_grow.cpp | 34 - third_party/libosmium/test/t/io/data.osm | 4 - third_party/libosmium/test/t/io/data.osm.bz2 | Bin 200 -> 0 bytes third_party/libosmium/test/t/io/data.osm.gz | Bin 187 -> 0 bytes third_party/libosmium/test/t/io/data_bzip2.txt | 1 - third_party/libosmium/test/t/io/data_bzip2.txt.bz2 | Bin 45 -> 0 bytes third_party/libosmium/test/t/io/test_bzip2.cpp | 33 - .../libosmium/test/t/io/test_file_formats.cpp | 251 - .../libosmium/test/t/io/test_output_iterator.cpp | 37 - third_party/libosmium/test/t/io/test_reader.cpp | 117 - third_party/libosmium/test/t/tags/test_filter.cpp | 216 - .../libosmium/test/t/tags/test_operators.cpp | 61 - .../libosmium/test/t/tags/test_tag_list.cpp | 76 - third_party/libosmium/test/t/thread/test_pool.cpp | 69 - .../test/t/util/test_cast_with_assert.cpp | 89 - third_party/libosmium/test/t/util/test_double.cpp | 33 - third_party/libosmium/test/t/util/test_options.cpp | 48 - third_party/libosmium/test/t/util/test_string.cpp | 57 - third_party/libosmium/test/test_main.cpp | 2 - third_party/libosmium/test/valgrind.supp | 47 - 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 +- 421 files changed, 4578 insertions(+), 57509 deletions(-) rename {data_structures => algorithms}/coordinate_calculation.cpp (89%) rename {data_structures => algorithms}/coordinate_calculation.hpp (56%) create mode 100644 algorithms/graph_compressor.cpp copy data_structures/external_memory_node.hpp => algorithms/graph_compressor.hpp (56%) rename algorithms/{tiny_components.hpp => tarjan_scc.hpp} (74%) create mode 100644 algorithms/trip_brute_force.hpp create mode 100644 algorithms/trip_farthest_insertion.hpp create mode 100644 algorithms/trip_nearest_neighbour.hpp copy plugins/timestamp.hpp => algorithms/trip_tabu_search.hpp (61%) delete mode 100644 cmake/FindOSMPBF.cmake create mode 100644 contractor/speed_profile.hpp rename contractor/geometry_compressor.cpp => data_structures/compressed_edge_container.cpp (89%) rename contractor/geometry_compressor.hpp => data_structures/compressed_edge_container.hpp (86%) copy data_structures/{upper_bound.hpp => matrix_graph_wrapper.hpp} (55%) create mode 100644 data_structures/raster_source.cpp create mode 100644 data_structures/raster_source.hpp create mode 100644 debian/patches/series create mode 100644 debian/patches/use-libosmium-package.patch create mode 100644 docker/Dockerfile create mode 100644 docker/README create mode 100755 docker/build-image.sh create mode 100755 docker/run-clang.sh create mode 100755 docker/run-gcc.sh create mode 100755 docker/test.sh copy .gitmodules => extractor/lat (100%) copy .gitmodules => extractor/source_coordinate.lat (100%) create mode 100644 features/raster/extract.feature create mode 100644 features/raster/weights.feature copy features/step_definitions/{matching.rb => trip.rb} (51%) create mode 100644 features/support/trip.rb create mode 100644 features/testbot/matching_turns.feature create mode 100644 features/testbot/trip.feature create mode 100644 plugins/trip.hpp create mode 100644 profiles/rasterbot-interp.lua create mode 100644 profiles/rasterbot.lua create mode 100644 routing_algorithms/direct_shortest_path.hpp create mode 100755 scripts/bisect_cucumber.sh create mode 100644 test/rastersource.asc delete mode 100644 third_party/libosmium/.gitignore delete mode 100644 third_party/libosmium/.travis.yml delete mode 100644 third_party/libosmium/.ycm_extra_conf.py delete mode 100644 third_party/libosmium/CHANGELOG.md delete mode 100644 third_party/libosmium/CMakeLists.txt delete mode 100644 third_party/libosmium/CONTRIBUTING.md delete mode 100644 third_party/libosmium/LICENSE.txt delete mode 100644 third_party/libosmium/Makefile delete mode 100644 third_party/libosmium/README.md delete mode 100644 third_party/libosmium/appveyor.yml delete mode 100644 third_party/libosmium/benchmarks/CMakeLists.txt delete mode 100644 third_party/libosmium/benchmarks/README.md delete mode 100755 third_party/libosmium/benchmarks/download_data.sh delete mode 100644 third_party/libosmium/benchmarks/osmium_benchmark_count.cpp delete mode 100644 third_party/libosmium/benchmarks/osmium_benchmark_count_tag.cpp delete mode 100644 third_party/libosmium/benchmarks/osmium_benchmark_index_map.cpp delete mode 100644 third_party/libosmium/benchmarks/osmium_benchmark_static_vs_dynamic_index.cpp delete mode 100755 third_party/libosmium/benchmarks/run_benchmark_count.sh delete mode 100755 third_party/libosmium/benchmarks/run_benchmark_count_tag.sh delete mode 100755 third_party/libosmium/benchmarks/run_benchmark_index_map.sh delete mode 100755 third_party/libosmium/benchmarks/run_benchmark_static_vs_dynamic_index.sh delete mode 100755 third_party/libosmium/benchmarks/run_benchmarks.sh delete mode 100755 third_party/libosmium/benchmarks/setup.sh delete mode 100644 third_party/libosmium/cmake/FindGem.cmake delete mode 100644 third_party/libosmium/cmake/FindOSMPBF.cmake delete mode 100644 third_party/libosmium/cmake/FindOsmium.cmake delete mode 100644 third_party/libosmium/cmake/README delete mode 100644 third_party/libosmium/cmake/build.bat delete mode 100755 third_party/libosmium/cmake/iwyu.sh delete mode 100644 third_party/libosmium/doc/CMakeLists.txt delete mode 100644 third_party/libosmium/doc/Doxyfile.in delete mode 100644 third_party/libosmium/doc/README.md delete mode 100644 third_party/libosmium/doc/doc.txt delete mode 100644 third_party/libosmium/doc/header.html delete mode 100644 third_party/libosmium/doc/osmium.css delete mode 100644 third_party/libosmium/examples/CMakeLists.txt delete mode 100644 third_party/libosmium/examples/osmium_area_test.cpp delete mode 100644 third_party/libosmium/examples/osmium_convert.cpp delete mode 100644 third_party/libosmium/examples/osmium_count.cpp delete mode 100644 third_party/libosmium/examples/osmium_create_node_cache.cpp delete mode 100644 third_party/libosmium/examples/osmium_debug.cpp delete mode 100644 third_party/libosmium/examples/osmium_index.cpp delete mode 100644 third_party/libosmium/examples/osmium_read.cpp delete mode 100644 third_party/libosmium/examples/osmium_serdump.cpp delete mode 100644 third_party/libosmium/examples/osmium_toogr.cpp delete mode 100644 third_party/libosmium/examples/osmium_toogr2.cpp delete mode 100644 third_party/libosmium/examples/osmium_toogr2_exp.cpp delete mode 100644 third_party/libosmium/examples/osmium_use_node_cache.cpp delete mode 100644 third_party/libosmium/include/boost_unicode_iterator.hpp delete mode 100644 third_party/libosmium/include/mmap_for_windows.hpp delete mode 100644 third_party/libosmium/include/osmium/area/assembler.hpp delete mode 100644 third_party/libosmium/include/osmium/area/detail/node_ref_segment.hpp delete mode 100644 third_party/libosmium/include/osmium/area/detail/proto_ring.hpp delete mode 100644 third_party/libosmium/include/osmium/area/detail/segment_list.hpp delete mode 100644 third_party/libosmium/include/osmium/area/multipolygon_collector.hpp delete mode 100644 third_party/libosmium/include/osmium/area/problem_reporter.hpp delete mode 100644 third_party/libosmium/include/osmium/area/problem_reporter_exception.hpp delete mode 100644 third_party/libosmium/include/osmium/area/problem_reporter_ogr.hpp delete mode 100644 third_party/libosmium/include/osmium/area/problem_reporter_stream.hpp delete mode 100644 third_party/libosmium/include/osmium/builder/builder.hpp delete mode 100644 third_party/libosmium/include/osmium/builder/builder_helper.hpp delete mode 100644 third_party/libosmium/include/osmium/builder/osm_object_builder.hpp delete mode 100644 third_party/libosmium/include/osmium/diff_handler.hpp delete mode 100644 third_party/libosmium/include/osmium/diff_iterator.hpp delete mode 100644 third_party/libosmium/include/osmium/diff_visitor.hpp delete mode 100644 third_party/libosmium/include/osmium/dynamic_handler.hpp delete mode 100644 third_party/libosmium/include/osmium/experimental/flex_reader.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/coordinates.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/factory.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/geojson.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/geos.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/haversine.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/mercator_projection.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/ogr.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/projection.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/relations.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/util.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/wkb.hpp delete mode 100644 third_party/libosmium/include/osmium/geom/wkt.hpp delete mode 100644 third_party/libosmium/include/osmium/handler.hpp delete mode 100644 third_party/libosmium/include/osmium/handler/chain.hpp delete mode 100644 third_party/libosmium/include/osmium/handler/disk_store.hpp delete mode 100644 third_party/libosmium/include/osmium/handler/dump.hpp delete mode 100644 third_party/libosmium/include/osmium/handler/node_locations_for_ways.hpp delete mode 100644 third_party/libosmium/include/osmium/handler/object_relations.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/create_map_with_fd.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/mmap_vector_anon.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/mmap_vector_base.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/mmap_vector_file.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/tmpfile.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/typed_mmap.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/vector_map.hpp delete mode 100644 third_party/libosmium/include/osmium/index/detail/vector_multimap.hpp delete mode 100644 third_party/libosmium/include/osmium/index/index.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/all.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/dense_file_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/dense_mem_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/dense_mmap_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/dummy.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/sparse_file_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/sparse_mem_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/sparse_mem_map.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/sparse_mem_table.hpp delete mode 100644 third_party/libosmium/include/osmium/index/map/sparse_mmap_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/all.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/hybrid.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/sparse_file_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/sparse_mem_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/sparse_mem_multimap.hpp delete mode 100644 third_party/libosmium/include/osmium/index/multimap/sparse_mmap_array.hpp delete mode 100644 third_party/libosmium/include/osmium/index/node_locations_map.hpp delete mode 100644 third_party/libosmium/include/osmium/io/any_compression.hpp delete mode 100644 third_party/libosmium/include/osmium/io/any_input.hpp delete mode 100644 third_party/libosmium/include/osmium/io/any_output.hpp delete mode 100644 third_party/libosmium/include/osmium/io/bzip2_compression.hpp delete mode 100644 third_party/libosmium/include/osmium/io/compression.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/input_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/opl_output_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/output_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/pbf.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/pbf_input_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/pbf_output_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/pbf_parser.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/pbf_stringtable.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/read_thread.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/read_write.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/write_thread.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/xml_input_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/xml_output_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/detail/zlib.hpp delete mode 100644 third_party/libosmium/include/osmium/io/error.hpp delete mode 100644 third_party/libosmium/include/osmium/io/file.hpp delete mode 100644 third_party/libosmium/include/osmium/io/file_compression.hpp delete mode 100644 third_party/libosmium/include/osmium/io/file_format.hpp delete mode 100644 third_party/libosmium/include/osmium/io/gzip_compression.hpp delete mode 100644 third_party/libosmium/include/osmium/io/header.hpp delete mode 100644 third_party/libosmium/include/osmium/io/input_iterator.hpp delete mode 100644 third_party/libosmium/include/osmium/io/opl_output.hpp delete mode 100644 third_party/libosmium/include/osmium/io/output_iterator.hpp delete mode 100644 third_party/libosmium/include/osmium/io/overwrite.hpp delete mode 100644 third_party/libosmium/include/osmium/io/pbf_input.hpp delete mode 100644 third_party/libosmium/include/osmium/io/pbf_output.hpp delete mode 100644 third_party/libosmium/include/osmium/io/reader.hpp delete mode 100644 third_party/libosmium/include/osmium/io/reader_iterator.hpp delete mode 100644 third_party/libosmium/include/osmium/io/writer.hpp delete mode 100644 third_party/libosmium/include/osmium/io/xml_input.hpp delete mode 100644 third_party/libosmium/include/osmium/io/xml_output.hpp delete mode 100644 third_party/libosmium/include/osmium/memory/buffer.hpp delete mode 100644 third_party/libosmium/include/osmium/memory/collection.hpp delete mode 100644 third_party/libosmium/include/osmium/memory/item.hpp delete mode 100644 third_party/libosmium/include/osmium/memory/item_iterator.hpp delete mode 100644 third_party/libosmium/include/osmium/object_pointer_collection.hpp delete mode 100644 third_party/libosmium/include/osmium/osm.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/area.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/box.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/changeset.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/diff_object.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/entity.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/entity_bits.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/item_type.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/location.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/node.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/node_ref.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/node_ref_list.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/object.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/object_comparisons.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/relation.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/segment.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/tag.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/timestamp.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/types.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/undirected_segment.hpp delete mode 100644 third_party/libosmium/include/osmium/osm/way.hpp delete mode 100644 third_party/libosmium/include/osmium/relations/collector.hpp delete mode 100644 third_party/libosmium/include/osmium/relations/detail/member_meta.hpp delete mode 100644 third_party/libosmium/include/osmium/relations/detail/relation_meta.hpp delete mode 100644 third_party/libosmium/include/osmium/tags/filter.hpp delete mode 100644 third_party/libosmium/include/osmium/tags/regex_filter.hpp delete mode 100644 third_party/libosmium/include/osmium/tags/taglist.hpp delete mode 100644 third_party/libosmium/include/osmium/thread/function_wrapper.hpp delete mode 100644 third_party/libosmium/include/osmium/thread/pool.hpp delete mode 100644 third_party/libosmium/include/osmium/thread/queue.hpp delete mode 100644 third_party/libosmium/include/osmium/thread/sorted_queue.hpp delete mode 100644 third_party/libosmium/include/osmium/thread/util.hpp delete mode 100644 third_party/libosmium/include/osmium/util/cast.hpp delete mode 100644 third_party/libosmium/include/osmium/util/compatibility.hpp delete mode 100644 third_party/libosmium/include/osmium/util/config.hpp delete mode 100644 third_party/libosmium/include/osmium/util/double.hpp delete mode 100644 third_party/libosmium/include/osmium/util/options.hpp delete mode 100644 third_party/libosmium/include/osmium/util/string.hpp delete mode 100644 third_party/libosmium/include/osmium/util/verbose_output.hpp delete mode 100644 third_party/libosmium/include/osmium/visitor.hpp delete mode 100644 third_party/libosmium/osmium.imp delete mode 100644 third_party/libosmium/test/CMakeLists.txt delete mode 100644 third_party/libosmium/test/README delete mode 100644 third_party/libosmium/test/data-tests/.gitignore delete mode 100644 third_party/libosmium/test/data-tests/CMakeLists.txt delete mode 100644 third_party/libosmium/test/data-tests/README.md delete mode 100644 third_party/libosmium/test/data-tests/include/check_basics_handler.hpp delete mode 100644 third_party/libosmium/test/data-tests/include/check_wkt_handler.hpp delete mode 100644 third_party/libosmium/test/data-tests/include/common.hpp delete mode 100644 third_party/libosmium/test/data-tests/include/testdata-testcases.hpp delete mode 100644 third_party/libosmium/test/data-tests/multipolygon.qgs delete mode 100644 third_party/libosmium/test/data-tests/run-testdata-multipolygon.cmake delete mode 100644 third_party/libosmium/test/data-tests/testcases/test-100.cpp delete mode 100644 third_party/libosmium/test/data-tests/testcases/test-101.cpp delete mode 100644 third_party/libosmium/test/data-tests/testcases/test-110.cpp delete mode 100644 third_party/libosmium/test/data-tests/testdata-multipolygon.cpp delete mode 100644 third_party/libosmium/test/data-tests/testdata-overview.cpp delete mode 100644 third_party/libosmium/test/data-tests/testdata-testcases.cpp delete mode 100644 third_party/libosmium/test/data-tests/testdata-xml.cpp delete mode 100644 third_party/libosmium/test/include/catch.hpp delete mode 100644 third_party/libosmium/test/include/catch_orig.hpp delete mode 100644 third_party/libosmium/test/include/utils.hpp delete mode 100644 third_party/libosmium/test/include/win_mkstemp.hpp delete mode 100644 third_party/libosmium/test/t/area/test_area_id.cpp delete mode 100644 third_party/libosmium/test/t/area/test_node_ref_segment.cpp delete mode 100644 third_party/libosmium/test/t/basic/helper.hpp delete mode 100644 third_party/libosmium/test/t/basic/test_box.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_changeset.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_entity_bits.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_location.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_node.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_node_ref.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_object_comparisons.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_relation.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_timestamp.cpp delete mode 100644 third_party/libosmium/test/t/basic/test_way.cpp delete mode 100644 third_party/libosmium/test/t/buffer/test_buffer_node.cpp delete mode 100644 third_party/libosmium/test/t/buffer/test_buffer_purge.cpp delete mode 100644 third_party/libosmium/test/t/geom/helper.hpp delete mode 100644 third_party/libosmium/test/t/geom/test_factory_with_projection.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_geojson.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_geos.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_geos_wkb.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_mercator.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_ogr.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_projection.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_wkb.cpp delete mode 100644 third_party/libosmium/test/t/geom/test_wkt.cpp delete mode 100644 third_party/libosmium/test/t/index/test_id_to_location.cpp delete mode 100644 third_party/libosmium/test/t/index/test_typed_mmap.cpp delete mode 100644 third_party/libosmium/test/t/index/test_typed_mmap_grow.cpp delete mode 100644 third_party/libosmium/test/t/io/data.osm delete mode 100644 third_party/libosmium/test/t/io/data.osm.bz2 delete mode 100644 third_party/libosmium/test/t/io/data.osm.gz delete mode 100644 third_party/libosmium/test/t/io/data_bzip2.txt delete mode 100644 third_party/libosmium/test/t/io/data_bzip2.txt.bz2 delete mode 100644 third_party/libosmium/test/t/io/test_bzip2.cpp delete mode 100644 third_party/libosmium/test/t/io/test_file_formats.cpp delete mode 100644 third_party/libosmium/test/t/io/test_output_iterator.cpp delete mode 100644 third_party/libosmium/test/t/io/test_reader.cpp delete mode 100644 third_party/libosmium/test/t/tags/test_filter.cpp delete mode 100644 third_party/libosmium/test/t/tags/test_operators.cpp delete mode 100644 third_party/libosmium/test/t/tags/test_tag_list.cpp delete mode 100644 third_party/libosmium/test/t/thread/test_pool.cpp delete mode 100644 third_party/libosmium/test/t/util/test_cast_with_assert.cpp delete mode 100644 third_party/libosmium/test/t/util/test_double.cpp delete mode 100644 third_party/libosmium/test/t/util/test_options.cpp delete mode 100644 third_party/libosmium/test/t/util/test_string.cpp delete mode 100644 third_party/libosmium/test/test_main.cpp delete mode 100644 third_party/libosmium/test/valgrind.supp create mode 100644 unit_tests/algorithms/graph_compressor.cpp create mode 100644 unit_tests/data_structures/compressed_edge_container.cpp create mode 100644 unit_tests/data_structures/raster_source.cpp create mode 100644 unit_tests/fixtures/raster_data.asc create mode 100755 update_depdendencies.sh create mode 100644 util/dist_table_wrapper.hpp create mode 100644 util/graph_utils.hpp -- 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