[osrm] 02/08: Merge tag 'upstream/4.6.0'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat May 9 23:08:44 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 6ad61632e735ef81cd37de29d262d4cd615056e3
Merge: 1afd3f5 5d6067d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 9 23:32:16 2015 +0200

    Merge tag 'upstream/4.6.0'
    
    Upstream version 4.6.0

 .gitignore                                         |   23 +-
 .travis.yml                                        |   10 +-
 CMakeLists.txt                                     |  155 +-
 Gemfile                                            |    2 +-
 Include/osrm/Coordinate.h                          |  113 -
 Include/osrm/Reply.h                               |   74 -
 LICENCE.TXT                                        |    2 +-
 Server/APIGrammar.h                                |   74 -
 Server/RequestHandler.cpp                          |  143 -
 Server/RequestParser.cpp                           |  310 -
 Util/TrigonometryTables.h                          |  790 --
 Util/graph_loader.hpp                              |  325 -
 Util/range_algorithms.hpp                          |   42 -
 algorithms/bayes_classifier.hpp                    |  117 +
 algorithms/bfs_components.hpp                      |    8 +-
 algorithms/crc32_processor.hpp                     |   15 +-
 algorithms/douglas_peucker.cpp                     |   14 +-
 algorithms/douglas_peucker.hpp                     |   11 +-
 algorithms/object_encoder.hpp                      |   17 +-
 algorithms/polyline_compressor.cpp                 |   12 +-
 algorithms/polyline_compressor.hpp                 |    2 +-
 algorithms/polyline_formatter.cpp                  |   14 +-
 algorithms/polyline_formatter.hpp                  |    8 +-
 algorithms/route_name_extraction.hpp               |   65 +-
 algorithms/tiny_components.hpp                     |   64 +-
 appveyor.yml                                       |    3 -
 benchmarks/static_rtree.cpp                        |   21 +-
 cmake/FingerPrint-Config.cmake                     |    8 +-
 contractor/contractor.hpp                          |  202 +-
 contractor/edge_based_graph_factory.cpp            |  272 +-
 contractor/geometry_compressor.cpp                 |   41 +-
 contractor/geometry_compressor.hpp                 |    2 +
 contractor/processing_chain.cpp                    |   82 +-
 data_structures/Coordinate.cpp                     |  483 --
 data_structures/InputReaderFactory.h               |  123 -
 data_structures/binary_heap.hpp                    |   58 +-
 data_structures/concurrent_queue.hpp               |   16 +-
 data_structures/coordinate.cpp                     |   87 +
 data_structures/coordinate_calculation.cpp         |  268 +
 data_structures/coordinate_calculation.hpp         |   82 +
 data_structures/deallocating_vector.hpp            |   75 +-
 data_structures/dynamic_graph.hpp                  |  132 +-
 data_structures/edge_based_node.hpp                |  120 +-
 data_structures/external_memory_node.cpp           |   10 +-
 data_structures/external_memory_node.hpp           |    4 +-
 data_structures/fixed_point_number.hpp             |    2 +-
 data_structures/hidden_markov_model.hpp            |  158 +
 data_structures/hilbert_value.cpp                  |    4 +-
 data_structures/hilbert_value.hpp                  |    2 +-
 data_structures/import_edge.cpp                    |    9 +-
 data_structures/import_edge.hpp                    |    2 +-
 ...aw_route_data.hpp => internal_route_result.hpp} |   27 +-
 data_structures/lru_cache.hpp                      |    4 +-
 data_structures/node_based_graph.hpp               |   62 +-
 data_structures/node_id.hpp                        |    2 +-
 data_structures/original_edge_data.hpp             |    7 +-
 data_structures/percent.hpp                        |    4 +-
 data_structures/phantom_node.cpp                   |  114 +-
 data_structures/phantom_node.hpp                   |   59 +-
 data_structures/query_edge.hpp                     |   18 +-
 data_structures/query_node.hpp                     |    8 +-
 data_structures/range_table.hpp                    |   81 +-
 data_structures/rectangle.hpp                      |  150 +-
 data_structures/restriction.hpp                    |   16 +-
 data_structures/restriction_map.cpp                |   92 +-
 data_structures/restriction_map.hpp                |   36 +-
 data_structures/route_parameters.cpp               |   32 +-
 data_structures/search_engine.hpp                  |   14 +-
 data_structures/search_engine_data.cpp             |   38 +-
 data_structures/search_engine_data.hpp             |   14 +-
 data_structures/segment_information.hpp            |   10 +-
 data_structures/shared_memory_factory.hpp          |   55 +-
 data_structures/shared_memory_vector_wrapper.hpp   |    6 +-
 data_structures/static_graph.hpp                   |   34 +-
 data_structures/static_kdtree.hpp                  |    6 +-
 data_structures/static_rtree.hpp                   |  594 +-
 data_structures/travel_mode.hpp                    |    5 +-
 Util/git_sha.cpp.in => data_structures/tribool.hpp |   17 +-
 data_structures/turn_instructions.hpp              |   29 +-
 .../upper_bound.hpp                                |   67 +-
 data_structures/xor_fast_hash.hpp                  |   14 +-
 data_structures/xor_fast_hash_storage.hpp          |   32 +-
 datastore.cpp                                      |   35 +-
 descriptors/description_factory.cpp                |  164 +-
 descriptors/description_factory.hpp                |  144 +-
 descriptors/descriptor_base.hpp                    |   24 +-
 descriptors/gpx_descriptor.hpp                     |   38 +-
 descriptors/json_descriptor.hpp                    |  785 +-
 extract.cpp                                        |   51 +-
 extractor/extraction_containers.cpp                |  182 +-
 extractor/extraction_containers.hpp                |   20 +-
 extractor/extraction_helper_functions.hpp          |  103 +-
 extractor/extraction_node.hpp                      |    9 +-
 extractor/extraction_way.hpp                       |   23 +-
 extractor/extractor.cpp                            |  149 +-
 extractor/extractor.hpp                            |   36 +-
 extractor/extractor_callbacks.cpp                  |   94 +-
 extractor/extractor_callbacks.hpp                  |    2 +-
 extractor/extractor_options.cpp                    |   97 +-
 extractor/extractor_options.hpp                    |   18 +-
 extractor/first_and_last_segment_of_way.hpp        |    2 +-
 extractor/internal_extractor_edge.hpp              |   34 +-
 extractor/restriction_parser.cpp                   |   62 +-
 extractor/restriction_parser.hpp                   |    5 +-
 extractor/scripting_environment.cpp                |   83 +-
 extractor/scripting_environment.hpp                |    6 +-
 features/bicycle/bridge.feature                    |   47 +
 features/car/access.feature                        |    2 +
 features/car/barrier.feature                       |    1 +
 features/car/bridge.feature                        |   47 +
 features/car/ferry.feature                         |   21 +-
 features/car/maxspeed.feature                      |   20 +
 features/options/routed/help.feature               |   18 +-
 features/step_definitions/matching.rb              |   96 +
 features/support/env.rb                            |   18 +-
 features/support/launch.rb                         |    4 +-
 features/support/match.rb                          |   26 +
 features/testbot/loop.feature                      |   14 +-
 features/testbot/matching.feature                  |   55 +
 .../osrm/coordinate.hpp                            |   57 +-
 .../osrm}/json_container.hpp                       |   14 +-
 prepare.cpp => include/osrm/libosrm_config.hpp     |   41 +-
 .../osrm/route_parameters.hpp                      |   26 +-
 .../ServerPaths.h => include/osrm/server_paths.hpp |    4 +-
 Library/OSRM.h => library/osrm.hpp                 |   21 +-
 Library/OSRM_impl.cpp => library/osrm_impl.cpp     |  154 +-
 Library/OSRM_impl.h => library/osrm_impl.hpp       |   23 +-
 plugins/distance_table.hpp                         |   52 +-
 plugins/hello_world.hpp                            |   40 +-
 plugins/locate.hpp                                 |   33 +-
 plugins/match.hpp                                  |  314 +
 plugins/nearest.hpp                                |   52 +-
 plugins/plugin_base.hpp                            |   32 +-
 plugins/timestamp.hpp                              |   16 +-
 plugins/viaroute.hpp                               |   26 +-
 prepare.cpp                                        |    8 +-
 profiles/bicycle.lua                               |   22 +-
 profiles/car.lua                                   |   54 +-
 routed.cpp                                         |   43 +-
 routing_algorithms/alternative_path.hpp            |  233 +-
 routing_algorithms/many_to_many.hpp                |   25 +-
 routing_algorithms/map_matching.hpp                |  344 +
 routing_algorithms/routing_base.hpp                |  179 +-
 routing_algorithms/shortest_path.hpp               |  114 +-
 server/api_grammar.hpp                             |  101 +
 Server/Connection.cpp => server/connection.cpp     |   93 +-
 Server/Connection.h => server/connection.hpp       |   48 +-
 .../data_structures/datafacade_base.hpp            |   39 +-
 .../data_structures/internal_datafacade.hpp        |  140 +-
 .../data_structures/shared_barriers.hpp            |    8 +-
 .../data_structures/shared_datafacade.hpp          |  154 +-
 .../data_structures/shared_datatype.hpp            |  164 +-
 .../http/compression_type.hpp                      |   19 +-
 Include/osrm/Header.h => server/http/header.hpp    |   19 +-
 Server/Http/Reply.cpp => server/http/reply.cpp     |   68 +-
 Server/Http/Request.h => server/http/reply.hpp     |   43 +-
 Server/Http/Request.h => server/http/request.hpp   |   10 +-
 server/request_handler.cpp                         |  175 +
 .../RequestHandler.h => server/request_handler.hpp |   14 +-
 server/request_parser.cpp                          |  323 +
 .../RequestParser.h => server/request_parser.hpp   |   94 +-
 Server/Server.h => server/server.hpp               |   24 +-
 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 +
 .../io/xml_input.hpp => libosmium/LICENSE.txt}     |   16 -
 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 +
 .../include}/osmium/area/assembler.hpp             |    8 +-
 .../osmium/area/detail/node_ref_segment.hpp        |    2 +-
 .../include}/osmium/area/detail/proto_ring.hpp     |    4 +-
 .../include}/osmium/area/detail/segment_list.hpp   |    4 +-
 .../osmium/area/multipolygon_collector.hpp         |    4 +-
 .../include}/osmium/area/problem_reporter.hpp      |    2 +-
 .../osmium/area/problem_reporter_exception.hpp     |    2 +-
 .../include}/osmium/area/problem_reporter_ogr.hpp  |   45 +-
 .../osmium/area/problem_reporter_stream.hpp        |    2 +-
 .../include}/osmium/builder/builder.hpp            |   19 +-
 .../include}/osmium/builder/builder_helper.hpp     |    2 +-
 .../include}/osmium/builder/osm_object_builder.hpp |   17 +-
 .../include}/osmium/diff_handler.hpp               |    2 +-
 .../include}/osmium/diff_iterator.hpp              |    2 +-
 .../include}/osmium/diff_visitor.hpp               |    2 +-
 .../include}/osmium/dynamic_handler.hpp            |    2 +-
 .../include}/osmium/experimental/flex_reader.hpp   |   42 +-
 .../include}/osmium/geom/coordinates.hpp           |    2 +-
 .../include}/osmium/geom/factory.hpp               |    4 +-
 .../include}/osmium/geom/geojson.hpp               |   10 +-
 .../{ => libosmium/include}/osmium/geom/geos.hpp   |   12 +-
 .../include}/osmium/geom/haversine.hpp             |    4 +-
 .../include}/osmium/geom/mercator_projection.hpp   |    2 +-
 .../{ => libosmium/include}/osmium/geom/ogr.hpp    |   47 +-
 .../include}/osmium/geom/projection.hpp            |   28 +-
 .../include}/osmium/geom/relations.hpp             |    2 +-
 .../{ => libosmium/include}/osmium/geom/util.hpp   |    2 +-
 .../{ => libosmium/include}/osmium/geom/wkb.hpp    |   12 +-
 .../{ => libosmium/include}/osmium/geom/wkt.hpp    |    8 +-
 .../{ => libosmium/include}/osmium/handler.hpp     |    2 +-
 .../include}/osmium/handler/chain.hpp              |    2 +-
 .../include}/osmium/handler/disk_store.hpp         |    2 +-
 .../include}/osmium/handler/dump.hpp               |    4 +-
 .../osmium/handler/node_locations_for_ways.hpp     |   13 +-
 .../include}/osmium/handler/object_relations.hpp   |    2 +-
 .../osmium/index/detail/create_map_with_fd.hpp}    |   45 +-
 .../osmium/index/detail/mmap_vector_anon.hpp       |   12 +-
 .../osmium/index/detail/mmap_vector_base.hpp       |    9 +-
 .../osmium/index/detail/mmap_vector_file.hpp       |   21 +-
 .../include}/osmium/index/detail/tmpfile.hpp       |    8 +-
 .../include}/osmium/index/detail/typed_mmap.hpp    |    8 +-
 .../include/osmium/index/detail/vector_map.hpp}    |   40 +-
 .../osmium/index/detail/vector_multimap.hpp}       |   11 +-
 .../{ => libosmium/include}/osmium/index/index.hpp |    2 +-
 .../{ => libosmium/include}/osmium/index/map.hpp   |  109 +-
 .../include/osmium/index/map/all.hpp}              |   25 +-
 .../include/osmium/index/map/dense_file_array.hpp} |   24 +-
 .../include/osmium/index/map/dense_mem_array.hpp}  |   21 +-
 .../include/osmium/index/map/dense_mmap_array.hpp} |   17 +-
 .../include}/osmium/index/map/dummy.hpp            |    3 +-
 .../osmium/index/map/sparse_file_array.hpp}        |   24 +-
 .../include/osmium/index/map/sparse_mem_array.hpp} |   17 +-
 .../include/osmium/index/map/sparse_mem_map.hpp}   |   21 +-
 .../include/osmium/index/map/sparse_mem_table.hpp} |   32 +-
 .../osmium/index/map/sparse_mmap_array.hpp}        |   23 +-
 .../include}/osmium/index/multimap.hpp             |   10 +-
 .../include/osmium/index/multimap/all.hpp}         |   18 +-
 .../include}/osmium/index/multimap/hybrid.hpp      |   17 +-
 .../osmium/index/multimap/sparse_file_array.hpp}   |   12 +-
 .../osmium/index/multimap/sparse_mem_array.hpp}    |   12 +-
 .../osmium/index/multimap/sparse_mem_multimap.hpp} |   18 +-
 .../osmium/index/multimap/sparse_mmap_array.hpp}   |   12 +-
 .../include/osmium/index/node_locations_map.hpp    |   70 +
 .../include}/osmium/io/any_compression.hpp         |   11 +-
 .../include}/osmium/io/any_input.hpp               |   12 +-
 .../include}/osmium/io/any_output.hpp              |   12 +-
 .../include}/osmium/io/bzip2_compression.hpp       |  110 +-
 .../include}/osmium/io/compression.hpp             |   24 +-
 .../include}/osmium/io/detail/input_format.hpp     |    8 +-
 .../osmium/io/detail/opl_output_format.hpp         |   82 +-
 .../include}/osmium/io/detail/output_format.hpp    |    2 +-
 .../include}/osmium/io/detail/pbf.hpp              |    4 +-
 .../include}/osmium/io/detail/pbf_input_format.hpp |   52 +-
 .../osmium/io/detail/pbf_output_format.hpp         |   52 +-
 .../include}/osmium/io/detail/pbf_parser.hpp       |   46 +-
 .../include}/osmium/io/detail/pbf_stringtable.hpp  |   44 +-
 .../include}/osmium/io/detail/read_thread.hpp      |    2 +-
 .../include}/osmium/io/detail/read_write.hpp       |   10 +-
 .../include}/osmium/io/detail/write_thread.hpp     |    2 +-
 .../include}/osmium/io/detail/xml_input_format.hpp |   28 +-
 .../osmium/io/detail/xml_output_format.hpp         |  153 +-
 .../include}/osmium/io/detail/zlib.hpp             |   42 +-
 .../{ => libosmium/include}/osmium/io/error.hpp    |    3 +-
 .../{ => libosmium/include}/osmium/io/file.hpp     |    3 +-
 .../include}/osmium/io/file_compression.hpp        |    2 +-
 .../include}/osmium/io/file_format.hpp             |    2 +-
 .../include}/osmium/io/gzip_compression.hpp        |   50 +-
 .../{ => libosmium/include}/osmium/io/header.hpp   |    2 +-
 .../include}/osmium/io/input_iterator.hpp          |    3 +-
 .../include}/osmium/io/opl_output.hpp              |    2 +-
 .../include}/osmium/io/output_iterator.hpp         |   10 +-
 .../include}/osmium/io/overwrite.hpp               |    2 +-
 .../include}/osmium/io/pbf_input.hpp               |   12 +-
 .../include}/osmium/io/pbf_output.hpp              |   12 +-
 .../{ => libosmium/include}/osmium/io/reader.hpp   |   21 +-
 .../include}/osmium/io/reader_iterator.hpp         |    2 +-
 .../{ => libosmium/include}/osmium/io/writer.hpp   |    4 +-
 .../include}/osmium/io/xml_input.hpp               |   11 +-
 .../include}/osmium/io/xml_output.hpp              |   10 +-
 .../include}/osmium/memory/buffer.hpp              |   13 +-
 .../include}/osmium/memory/collection.hpp          |    3 +-
 .../{ => libosmium/include}/osmium/memory/item.hpp |    7 +-
 .../include}/osmium/memory/item_iterator.hpp       |    2 +-
 .../include}/osmium/object_pointer_collection.hpp  |    2 +-
 third_party/{ => libosmium/include}/osmium/osm.hpp |    2 +-
 .../{ => libosmium/include}/osmium/osm/area.hpp    |   41 +-
 .../{ => libosmium/include}/osmium/osm/box.hpp     |   81 +-
 .../include}/osmium/osm/changeset.hpp              |    5 +-
 .../include}/osmium/osm/diff_object.hpp            |    2 +-
 .../{ => libosmium/include}/osmium/osm/entity.hpp  |    7 +-
 .../include}/osmium/osm/entity_bits.hpp            |    8 +-
 .../include}/osmium/osm/item_type.hpp              |    2 +-
 .../include}/osmium/osm/location.hpp               |    2 +-
 .../{ => libosmium/include}/osmium/osm/node.hpp    |    2 +-
 .../include}/osmium/osm/node_ref.hpp               |    4 +-
 .../include}/osmium/osm/node_ref_list.hpp          |   97 +-
 .../{ => libosmium/include}/osmium/osm/object.hpp  |    2 +-
 .../include}/osmium/osm/object_comparisons.hpp     |    2 +-
 .../include}/osmium/osm/relation.hpp               |    4 +-
 .../{ => libosmium/include}/osmium/osm/segment.hpp |    2 +-
 .../{ => libosmium/include}/osmium/osm/tag.hpp     |    2 +-
 .../include}/osmium/osm/timestamp.hpp              |   38 +-
 .../{ => libosmium/include}/osmium/osm/types.hpp   |    2 +-
 .../include}/osmium/osm/undirected_segment.hpp     |    2 +-
 .../{ => libosmium/include}/osmium/osm/way.hpp     |    8 +-
 .../include}/osmium/relations/collector.hpp        |    6 +-
 .../osmium/relations/detail/member_meta.hpp        |    2 +-
 .../osmium/relations/detail/relation_meta.hpp      |    2 +-
 .../{ => libosmium/include}/osmium/tags/filter.hpp |   16 +-
 .../include}/osmium/tags/regex_filter.hpp          |    2 +-
 .../include}/osmium/tags/taglist.hpp               |    8 +-
 .../include}/osmium/thread/function_wrapper.hpp    |    5 +-
 .../{ => libosmium/include}/osmium/thread/pool.hpp |    8 +-
 .../include}/osmium/thread/queue.hpp               |   13 +-
 .../include}/osmium/thread/sorted_queue.hpp        |    6 +-
 .../{ => libosmium/include}/osmium/thread/util.hpp |    2 +-
 third_party/libosmium/include/osmium/util/cast.hpp |  103 +
 .../include}/osmium/util/compatibility.hpp         |    2 +-
 .../{ => libosmium/include}/osmium/util/config.hpp |    7 +-
 .../{ => libosmium/include}/osmium/util/double.hpp |    4 +-
 .../include}/osmium/util/options.hpp               |    2 +-
 .../include/osmium/util/string.hpp}                |   51 +-
 .../include}/osmium/util/verbose_output.hpp        |    4 +-
 .../{ => libosmium/include}/osmium/visitor.hpp     |    2 +-
 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 0 -> 200 bytes
 third_party/libosmium/test/t/io/data.osm.gz        |  Bin 0 -> 187 bytes
 third_party/libosmium/test/t/io/data_bzip2.txt     |    1 +
 third_party/libosmium/test/t/io/data_bzip2.txt.bz2 |  Bin 0 -> 45 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 +
 third_party/osmium/thread/checked_task.hpp         |  106 -
 third_party/osmium/thread/name.hpp                 |   61 -
 third_party/osmium/util/cast.hpp                   |   72 -
 third_party/variant/.gitignore                     |    3 +
 third_party/variant/.travis.yml                    |   22 +
 third_party/variant/Jamroot                        |   75 +
 Util/git_sha.cpp.in => third_party/variant/LICENSE |   26 +-
 third_party/variant/Makefile                       |  100 +
 third_party/variant/README.md                      |   67 +
 third_party/variant/appveyor.yml                   |   27 +
 third_party/variant/common.gypi                    |  143 +
 third_party/variant/scripts/linux.sh               |   59 +
 third_party/variant/scripts/osx.sh                 |   20 +
 third_party/variant/test/bench_variant.cpp         |  204 +
 third_party/variant/test/binary_visitor_test.cpp   |  136 +
 .../variant/test/boost_variant_hello_world.cpp     |   19 +
 third_party/variant/test/catch.hpp                 | 8683 +++++++++++++++++++
 third_party/variant/test/optional_unit.cpp         |   82 +
 .../variant/test/recursive_wrapper_test.cpp        |  132 +
 .../variant/test/reference_wrapper_test.cpp        |   74 +
 third_party/variant/test/unique_ptr_test.cpp       |  128 +
 third_party/variant/test/unit.cpp                  |  314 +
 third_party/variant/test/variant_hello_world.cpp   |   22 +
 third_party/variant/variant.gyp                    |   21 +
 third_party/variant/variant.hpp                    |  282 +-
 third_party/variant/variant_io.hpp                 |   39 +
 third_party/variant/vcbuild.bat                    |    8 +
 tools/check-hsgr.cpp                               |   22 +-
 tools/components.cpp                               |  120 +-
 tools/graph_compare.cpp                            |  199 +
 tools/io-benchmark.cpp                             |   24 +-
 tools/simpleclient.cpp                             |   93 +-
 tools/springclean.cpp                              |   12 +-
 tools/unlock_all_mutexes.cpp                       |    8 +-
 {UnitTests => unit_tests}/algorithm_tests.cpp      |    3 +-
 .../algorithms/douglas_peucker.cpp                 |   36 +-
 .../algorithms/duration_parsing.cpp                |   39 +-
 .../algorithms/string_util.cpp                     |   50 +-
 .../data_structures/binary_heap.cpp                |    2 +-
 .../data_structures/coordinate.cpp                 |   27 +-
 unit_tests/data_structures/dynamic_graph.cpp       |   96 +
 .../data_structures/range_table.cpp                |    7 +-
 .../data_structures/static_graph.cpp               |   63 +-
 .../data_structures/static_rtree.cpp               |   86 +-
 {UnitTests => unit_tests}/datastructure_tests.cpp  |    2 +-
 {Util => util}/bearing.cpp                         |   42 +-
 {Util => util}/bearing.hpp                         |   12 +-
 .../boost_filesystem_2_fix.hpp                     |    2 +-
 {Util => util}/cast.hpp                            |   17 +-
 {Util => util}/compute_angle.cpp                   |   25 +-
 {Util => util}/compute_angle.hpp                   |   13 +-
 {Util => util}/container.hpp                       |   51 +-
 .../datastore_options.hpp                          |   42 +-
 Util/git_sha.hpp => util/fingerprint.cpp           |    8 +-
 Util/FingerPrint.h => util/fingerprint.hpp         |    4 +-
 .../fingerprint_impl.hpp.in                        |    6 +-
 {Util => util}/floating_point.hpp                  |    2 +-
 {Util => util}/git_sha.cpp.in                      |    2 +-
 {Util => util}/git_sha.hpp                         |    4 +-
 util/graph_loader.hpp                              |  539 ++
 Util/IniFileUtil.h => util/ini_file.hpp            |   26 +-
 {Util => util}/integer_range.hpp                   |   26 +-
 util/iso_8601_duration_parser.hpp                  |  102 +
 {Util => util}/iterator_range.hpp                  |   37 +-
 Util/bearing.cpp => util/json_logger.hpp           |   79 +-
 {Util => util}/json_renderer.hpp                   |   25 +-
 util/json_util.hpp                                 |  103 +
 {Util => util}/lua_util.hpp                        |    2 +-
 {Util => util}/make_unique.hpp                     |   44 +-
 util/matching_debug_info.hpp                       |  155 +
 Util/MercatorUtil.h => util/mercator.cpp           |   15 +-
 Util/bearing.hpp => util/mercator.hpp              |   16 +-
 {Util => util}/osrm_exception.cpp                  |   24 +-
 {Util => util}/osrm_exception.hpp                  |    2 +-
 .../range_algorithms.hpp                           |   27 +-
 Util/ProgramOptions.h => util/routed_options.hpp   |   76 +-
 {Util => util}/simple_logger.cpp                   |   58 +-
 {Util => util}/simple_logger.hpp                   |    4 +-
 {Util => util}/std_hash.hpp                        |   23 +-
 {Util => util}/string_util.hpp                     |   54 +-
 {Util => util}/timing_util.hpp                     |   36 +-
 util/trigonometry_table.hpp                        |  448 +
 {Util => util}/xml_renderer.hpp                    |   36 +-
 509 files changed, 52877 insertions(+), 7892 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