[osrm] 02/13: Merge tag 'upstream/4.5.0'
Christopher Baines
cbaines-guest at moszumanska.debian.org
Sat Apr 4 16:04:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
cbaines-guest pushed a commit to branch master
in repository osrm.
commit 33ba05ce1638b0313ade3ebe73b980af6efb836d
Merge: 3e5d282 6042646
Author: Christopher Baines <mail at cbaines.net>
Date: Sat Apr 4 14:09:47 2015 +0100
Merge tag 'upstream/4.5.0'
Upstream version 4.5.0
.gitignore | 7 +-
.travis.yml | 18 +-
Algorithms/BFSComponentExplorer.h | 148 ----
Algorithms/ObjectToBase64.h | 99 ---
Algorithms/StronglyConnectedComponents.h | 447 ----------
CMakeLists.txt | 194 +++--
Contractor/TemporaryStorage.cpp | 172 ----
Contractor/TemporaryStorage.h | 96 ---
DataStructures/DeallocatingVector.h | 401 ---------
DataStructures/NodeBasedGraph.h | 166 ----
DataStructures/PhantomNodes.h | 173 ----
Descriptors/GPXDescriptor.h | 100 ---
Docs/webclient.txt | 3 -
Extractor/BaseParser.cpp | 139 ---
Extractor/BaseParser.h | 67 --
Extractor/ExtractionWay.h | 79 --
Extractor/ExtractorCallbacks.cpp | 171 ----
Extractor/ExtractorStructs.h | 114 ---
Extractor/PBFParser.cpp | 664 ---------------
Extractor/PBFParser.h | 103 ---
Extractor/ScriptingEnvironment.cpp | 121 ---
Extractor/XMLParser.cpp | 353 --------
Extractor/XMLParser.h | 54 --
Include/osrm/Coordinate.h | 34 +-
Include/osrm/Header.h | 2 +-
Include/osrm/RouteParameters.h | 9 +
Library/OSRM.h | 6 +-
Library/OSRM_impl.cpp | 40 +-
Library/OSRM_impl.h | 11 +-
Plugins/ViaRoutePlugin.h | 173 ----
README.md | 7 +-
Rakefile | 9 +-
Server/APIGrammar.h | 9 +-
Server/Connection.cpp | 4 +-
Server/Connection.h | 4 +-
Server/DataStructures/BaseDataFacade.h | 41 +-
Server/DataStructures/InternalDataFacade.h | 155 ++--
Server/DataStructures/SharedDataFacade.h | 171 ++--
Server/DataStructures/SharedDataType.h | 15 +-
Server/Http/CompressionType.h | 2 +-
Server/Http/Reply.cpp | 7 +-
Server/RequestHandler.cpp | 31 +-
Server/RequestHandler.h | 2 +-
Server/RequestParser.cpp | 28 +-
Server/RequestParser.h | 4 +-
Server/Server.h | 31 +-
Server/ServerFactory.h | 49 --
Tools/components.cpp | 136 ---
UnitTests/Algorithms/DouglasPeuckerTest.cpp | 109 +++
.../algorithm_tests.cpp | 12 +-
UnitTests/data_structures/BinaryHeapTest.cpp | 178 ++++
UnitTests/data_structures/RangeTableTest.cpp | 131 +++
UnitTests/data_structures/StaticGraphTest.cpp | 191 +++++
UnitTests/data_structures/StaticRTreeTest.cpp | 488 +++++++++++
.../datastructure_tests.cpp | 11 +-
Util/Azimuth.h | 73 --
Util/BoostFileSystemFix.h | 17 +-
Util/DataStoreOptions.h | 31 +-
Util/FingerPrint.h | 1 -
Util/MercatorUtil.h | 8 +-
Util/ProgramOptions.h | 197 +++--
Util/SimpleLogger.h | 158 ----
Util/StringUtil.h | 318 -------
Util/TimingUtil.h | 39 -
Util/{MachineInfo.h => bearing.cpp} | 54 +-
Util/{GitDescription.h => bearing.hpp} | 13 +-
Util/cast.hpp | 188 ++++
Util/{ComputeAngle.h => compute_angle.cpp} | 20 +-
Library/OSRM.h => Util/compute_angle.hpp | 31 +-
Util/{ContainerUtils.h => container.hpp} | 57 +-
Util/{FingerPrint.cpp.in => finger_print.cpp.in} | 15 +-
Library/OSRM.h => Util/floating_point.hpp | 32 +-
Util/{GitDescription.cpp.in => git_sha.cpp.in} | 4 +-
Util/{GitDescription.h => git_sha.hpp} | 8 +-
Util/{GraphLoader.h => graph_loader.hpp} | 95 ++-
.../SearchEngine.h => Util/integer_range.hpp | 54 +-
.../HashTable.h => Util/iterator_range.hpp | 80 +-
.../JSONContainer.h => Util/json_renderer.hpp | 111 +--
Util/{LuaUtil.h => lua_util.hpp} | 8 +-
.../ScriptingEnvironment.h => Util/make_unique.hpp | 39 +-
Include/osrm/Header.h => Util/osrm_exception.cpp | 38 +-
Util/{OSRMException.h => osrm_exception.hpp} | 25 +-
Util/range_algorithms.hpp | 42 +
Util/simple_logger.cpp | 135 +++
Server/RequestHandler.h => Util/simple_logger.hpp | 55 +-
Util/{StdHashExtensions.h => std_hash.hpp} | 18 +-
Util/string_util.hpp | 150 ++++
Util/timing_util.hpp | 80 ++
Util/xml_renderer.hpp | 140 +++
algorithms/bfs_components.hpp | 174 ++++
.../crc32_processor.hpp | 118 +--
.../douglas_peucker.cpp | 97 +--
.../douglas_peucker.hpp | 38 +-
algorithms/object_encoder.hpp | 94 ++
.../polyline_compressor.cpp | 70 +-
.../polyline_compressor.hpp | 10 +-
.../polyline_formatter.cpp | 50 +-
.../polyline_formatter.hpp | 18 +-
.../route_name_extraction.hpp | 6 +-
algorithms/tiny_components.hpp | 253 ++++++
appveyor.yml | 15 +-
benchmarks/static_rtree.cpp | 189 +++++
cmake/CPackDebianConfig.cmake | 44 +
cmake/FindDebArch.cmake | 19 +
cmake/FingerPrint-Config.cmake | 6 +-
cmake/check_luabind.cmake | 40 +
cmake/postinst.in | 2 +
.../Contractor.h => contractor/contractor.hpp | 224 +++--
.../edge_based_graph_factory.cpp | 315 +++----
.../edge_based_graph_factory.hpp | 44 +-
.../geometry_compressor.cpp | 20 +-
.../geometry_compressor.hpp | 14 +-
contractor/processing_chain.cpp | 581 +++++++++++++
contractor/processing_chain.hpp | 95 +++
{DataStructures => data_structures}/Coordinate.cpp | 111 ++-
.../InputReaderFactory.h | 0
.../binary_heap.hpp | 7 +-
.../concurrent_queue.hpp | 10 +-
data_structures/deallocating_vector.hpp | 313 +++++++
.../dynamic_graph.hpp | 167 ++--
.../edge_based_node.hpp | 57 +-
.../external_memory_node.cpp | 30 +-
.../external_memory_node.hpp | 28 +-
data_structures/fixed_point_number.hpp | 216 +++++
.../hilbert_value.cpp | 4 +-
.../hilbert_value.hpp | 8 +-
.../import_edge.cpp | 10 +-
.../import_edge.hpp | 15 +-
.../json_container.hpp | 89 +-
.../LRUCache.h => data_structures/lru_cache.hpp | 8 +-
data_structures/node_based_graph.hpp | 271 ++++++
.../node_id.hpp | 24 +-
.../original_edge_data.hpp | 20 +-
.../Percent.h => data_structures/percent.hpp | 10 +-
data_structures/phantom_node.cpp | 124 +++
data_structures/phantom_node.hpp | 129 +++
.../QueryEdge.h => data_structures/query_edge.hpp | 25 +-
.../QueryNode.h => data_structures/query_node.hpp | 36 +-
.../range_table.hpp | 51 +-
.../raw_route_data.hpp | 36 +-
data_structures/rectangle.hpp | 199 +++++
.../restriction.hpp | 84 +-
.../restriction_map.cpp | 131 +--
.../restriction_map.hpp | 97 ++-
.../route_parameters.cpp | 30 +-
.../search_engine.hpp | 16 +-
.../search_engine_data.cpp | 4 +-
.../search_engine_data.hpp | 14 +-
.../segment_information.hpp | 22 +-
.../shared_memory_factory.hpp | 25 +-
.../shared_memory_vector_wrapper.hpp | 18 +-
.../static_graph.hpp | 79 +-
.../static_kdtree.hpp | 8 +-
.../static_rtree.hpp | 501 +++++++----
.../travel_mode.hpp | 23 +-
.../turn_instructions.hpp | 10 +-
.../xor_fast_hash.hpp | 10 +-
.../xor_fast_hash_storage.hpp | 16 +-
datastore.cpp | 196 ++---
.../description_factory.cpp | 71 +-
.../description_factory.hpp | 55 +-
.../descriptor_base.hpp | 40 +-
descriptors/gpx_descriptor.hpp | 92 ++
.../json_descriptor.hpp | 120 +--
Server/Http/CompressionType.h => extract.cpp | 27 +-
extractor.cpp | 286 -------
.../extraction_containers.cpp | 100 ++-
.../extraction_containers.hpp | 29 +-
.../extraction_helper_functions.hpp | 25 +-
.../extraction_node.hpp | 26 +-
extractor/extraction_way.hpp | 120 +++
extractor/extractor.cpp | 268 ++++++
extractor/extractor.hpp | 13 +
extractor/extractor_callbacks.cpp | 223 +++++
.../extractor_callbacks.hpp | 23 +-
extractor/extractor_options.cpp | 167 ++++
.../extractor_options.hpp | 40 +-
extractor/first_and_last_segment_of_way.hpp | 88 ++
.../internal_extractor_edge.hpp | 32 +-
extractor/restriction_parser.cpp | 241 ++++++
.../restriction_parser.hpp | 38 +-
extractor/scripting_environment.cpp | 146 ++++
.../scripting_environment.hpp | 19 +-
features/bicycle/mode.feature | 228 +++--
features/bicycle/pushing.feature | 26 +-
features/car/ferry.feature | 37 +-
features/car/link.feature | 111 +++
features/car/maxspeed.feature | 52 +-
features/car/restrictions.feature | 69 ++
features/car/speed.feature | 28 +-
features/car/surface.feature | 141 +++
features/foot/ferry.feature | 18 +-
features/options/extract/files.feature | 6 +-
features/options/prepare/files.feature | 6 +-
features/options/routed/files.feature | 13 +-
features/step_definitions/data.rb | 16 +
features/step_definitions/distance_matrix.rb | 56 ++
features/step_definitions/locate.rb | 2 +-
features/step_definitions/nearest.rb | 2 +-
features/step_definitions/options.rb | 26 +-
features/step_definitions/requests.rb | 34 +-
features/step_definitions/routability.rb | 10 +-
features/step_definitions/routing.rb | 16 +-
features/step_definitions/timestamp.rb | 4 +-
features/support/data.rb | 78 +-
features/support/env.rb | 34 +-
features/support/exceptions.rb | 6 +
features/support/hash.rb | 26 +-
features/support/hooks.rb | 6 +-
features/support/launch.rb | 168 ++--
features/support/log.rb | 6 +-
features/support/route.rb | 5 +
features/support/run.rb | 20 +-
features/testbot/bad.feature | 2 +-
features/testbot/basic.feature | 2 +-
features/testbot/bearing.feature | 2 +-
features/testbot/bearing_param.feature | 2 +-
features/testbot/compression.feature | 22 +
features/testbot/datastore.feature | 31 +
features/testbot/distance.feature | 52 +-
features/testbot/distance_matrix.feature | 102 +++
features/testbot/fastest.feature | 2 +-
features/testbot/geometry.feature | 2 +-
features/testbot/graph.feature | 21 +-
features/testbot/load.feature | 63 ++
features/testbot/loop.feature | 8 +-
features/testbot/mode.feature | 227 ++++-
features/testbot/oneway.feature | 64 +-
features/testbot/origin.feature | 2 +-
features/testbot/penalty.feature | 2 +-
features/testbot/planetary.feature | 2 +-
features/testbot/projection.feature | 2 +-
features/testbot/protobuffer.feature | 2 +-
features/testbot/snap.feature | 2 +-
features/testbot/status.feature | 2 +-
features/testbot/time.feature | 2 +-
features/testbot/turns.feature | 2 +-
features/testbot/utf.feature | 2 +-
features/testbot/uturn.feature | 69 ++
features/testbot/via.feature | 24 +-
.../distance_table.hpp | 71 +-
.../HelloWorldPlugin.h => plugins/hello_world.hpp | 34 +-
Plugins/LocatePlugin.h => plugins/locate.hpp | 23 +-
Plugins/NearestPlugin.h => plugins/nearest.hpp | 70 +-
Plugins/BasePlugin.h => plugins/plugin_base.hpp | 16 +-
Plugins/TimestampPlugin.h => plugins/timestamp.hpp | 14 +-
plugins/viaroute.hpp | 190 +++++
prepare.cpp | 476 +----------
profiles/bicycle.lua | 263 +++---
profiles/car.lua | 340 +++++---
profiles/examples/postgis.lua | 4 +-
profiles/foot.lua | 128 +--
profiles/lib/access.lua | 6 +-
profiles/lib/maxspeed.lua | 17 +
profiles/testbot.lua | 76 +-
routed.cpp | 45 +-
.../alternative_path.hpp | 198 +++--
.../many_to_many.hpp | 18 +-
.../routing_base.hpp | 118 +--
.../shortest_path.hpp | 115 +--
taginfo.json | 84 ++
third_party/osmium/area/assembler.hpp | 783 +++++++++++++++++
.../osmium/area/detail/node_ref_segment.hpp | 262 ++++++
third_party/osmium/area/detail/proto_ring.hpp | 274 ++++++
third_party/osmium/area/detail/segment_list.hpp | 216 +++++
third_party/osmium/area/multipolygon_collector.hpp | 212 +++++
third_party/osmium/area/problem_reporter.hpp | 149 ++++
.../osmium/area/problem_reporter_exception.hpp | 96 +++
third_party/osmium/area/problem_reporter_ogr.hpp | 206 +++++
.../osmium/area/problem_reporter_stream.hpp | 96 +++
third_party/osmium/builder/builder.hpp | 220 +++++
third_party/osmium/builder/builder_helper.hpp | 103 +++
third_party/osmium/builder/osm_object_builder.hpp | 283 ++++++
third_party/osmium/config/constexpr.hpp | 43 +
third_party/osmium/diff_handler.hpp | 67 ++
third_party/osmium/diff_iterator.hpp | 129 +++
third_party/osmium/diff_visitor.hpp | 104 +++
third_party/osmium/dynamic_handler.hpp | 195 +++++
third_party/osmium/experimental/flex_reader.hpp | 131 +++
third_party/osmium/geom/coordinates.hpp | 97 +++
third_party/osmium/geom/factory.hpp | 328 +++++++
third_party/osmium/geom/geojson.hpp | 152 ++++
third_party/osmium/geom/geos.hpp | 224 +++++
third_party/osmium/geom/haversine.hpp | 94 ++
third_party/osmium/geom/mercator_projection.hpp | 109 +++
third_party/osmium/geom/ogr.hpp | 179 ++++
third_party/osmium/geom/projection.hpp | 159 ++++
third_party/osmium/geom/relations.hpp | 57 ++
third_party/osmium/geom/util.hpp | 75 ++
third_party/osmium/geom/wkb.hpp | 279 ++++++
third_party/osmium/geom/wkt.hpp | 148 ++++
third_party/osmium/handler.hpp | 101 +++
third_party/osmium/handler/chain.hpp | 128 +++
third_party/osmium/handler/disk_store.hpp | 111 +++
third_party/osmium/handler/dump.hpp | 294 +++++++
.../osmium/handler/node_locations_for_ways.hpp | 177 ++++
third_party/osmium/handler/object_relations.hpp | 106 +++
.../osmium/index/detail/mmap_vector_anon.hpp | 78 ++
.../osmium/index/detail/mmap_vector_base.hpp | 183 ++++
.../osmium/index/detail/mmap_vector_file.hpp | 82 ++
third_party/osmium/index/detail/tmpfile.hpp | 62 ++
third_party/osmium/index/detail/typed_mmap.hpp | 229 +++++
third_party/osmium/index/index.hpp | 100 +++
third_party/osmium/index/map.hpp | 155 ++++
third_party/osmium/index/map/dummy.hpp | 87 ++
third_party/osmium/index/map/mmap_vector_anon.hpp | 61 ++
third_party/osmium/index/map/mmap_vector_file.hpp | 57 ++
third_party/osmium/index/map/sparse_table.hpp | 140 +++
third_party/osmium/index/map/stl_map.hpp | 112 +++
third_party/osmium/index/map/stl_vector.hpp | 61 ++
third_party/osmium/index/map/vector.hpp | 208 +++++
third_party/osmium/index/multimap.hpp | 129 +++
third_party/osmium/index/multimap/hybrid.hpp | 199 +++++
.../osmium/index/multimap/mmap_vector_anon.hpp | 58 ++
.../osmium/index/multimap/mmap_vector_file.hpp | 54 ++
third_party/osmium/index/multimap/stl_multimap.hpp | 151 ++++
third_party/osmium/index/multimap/stl_vector.hpp | 58 ++
third_party/osmium/index/multimap/vector.hpp | 151 ++++
third_party/osmium/io/any_compression.hpp | 39 +
third_party/osmium/io/any_input.hpp | 41 +
third_party/osmium/io/any_output.hpp | 42 +
third_party/osmium/io/bzip2_compression.hpp | 277 ++++++
third_party/osmium/io/compression.hpp | 279 ++++++
third_party/osmium/io/detail/input_format.hpp | 160 ++++
third_party/osmium/io/detail/opl_output_format.hpp | 315 +++++++
third_party/osmium/io/detail/output_format.hpp | 156 ++++
third_party/osmium/io/detail/pbf.hpp | 100 +++
third_party/osmium/io/detail/pbf_input_format.hpp | 240 ++++++
third_party/osmium/io/detail/pbf_output_format.hpp | 944 +++++++++++++++++++++
third_party/osmium/io/detail/pbf_parser.hpp | 449 ++++++++++
third_party/osmium/io/detail/pbf_stringtable.hpp | 204 +++++
third_party/osmium/io/detail/read_thread.hpp | 106 +++
third_party/osmium/io/detail/read_write.hpp | 156 ++++
third_party/osmium/io/detail/write_thread.hpp | 86 ++
third_party/osmium/io/detail/xml_input_format.hpp | 726 ++++++++++++++++
third_party/osmium/io/detail/xml_output_format.hpp | 481 +++++++++++
third_party/osmium/io/detail/zlib.hpp | 99 +++
third_party/osmium/io/error.hpp | 57 ++
third_party/osmium/io/file.hpp | 343 ++++++++
third_party/osmium/io/file_compression.hpp | 72 ++
third_party/osmium/io/file_format.hpp | 78 ++
third_party/osmium/io/gzip_compression.hpp | 238 ++++++
third_party/osmium/io/header.hpp | 122 +++
third_party/osmium/io/input_iterator.hpp | 139 +++
third_party/osmium/io/opl_output.hpp | 39 +
third_party/osmium/io/output_iterator.hpp | 116 +++
third_party/osmium/io/overwrite.hpp | 52 ++
third_party/osmium/io/pbf_input.hpp | 39 +
third_party/osmium/io/pbf_output.hpp | 39 +
third_party/osmium/io/reader.hpp | 303 +++++++
third_party/osmium/io/reader_iterator.hpp | 51 ++
third_party/osmium/io/writer.hpp | 145 ++++
third_party/osmium/io/xml_input.hpp | 39 +
third_party/osmium/io/xml_output.hpp | 39 +
third_party/osmium/memory/buffer.hpp | 534 ++++++++++++
third_party/osmium/memory/collection.hpp | 153 ++++
third_party/osmium/memory/item.hpp | 179 ++++
third_party/osmium/memory/item_iterator.hpp | 234 +++++
third_party/osmium/object_pointer_collection.hpp | 112 +++
third_party/osmium/osm.hpp | 48 ++
third_party/osmium/osm/area.hpp | 193 +++++
third_party/osmium/osm/box.hpp | 207 +++++
third_party/osmium/osm/changeset.hpp | 336 ++++++++
third_party/osmium/osm/diff_object.hpp | 156 ++++
third_party/osmium/osm/entity.hpp | 74 ++
third_party/osmium/osm/entity_bits.hpp | 99 +++
third_party/osmium/osm/item_type.hpp | 173 ++++
third_party/osmium/osm/location.hpp | 285 +++++++
third_party/osmium/osm/node.hpp | 76 ++
third_party/osmium/osm/node_ref.hpp | 173 ++++
third_party/osmium/osm/node_ref_list.hpp | 135 +++
third_party/osmium/osm/object.hpp | 437 ++++++++++
third_party/osmium/osm/object_comparisons.hpp | 110 +++
third_party/osmium/osm/relation.hpp | 189 +++++
third_party/osmium/osm/segment.hpp | 105 +++
third_party/osmium/osm/tag.hpp | 140 +++
third_party/osmium/osm/timestamp.hpp | 169 ++++
third_party/osmium/osm/types.hpp | 83 ++
third_party/osmium/osm/undirected_segment.hpp | 100 +++
third_party/osmium/osm/way.hpp | 115 +++
third_party/osmium/relations/collector.hpp | 544 ++++++++++++
.../osmium/relations/detail/member_meta.hpp | 158 ++++
.../osmium/relations/detail/relation_meta.hpp | 136 +++
third_party/osmium/tags/filter.hpp | 148 ++++
third_party/osmium/tags/regex_filter.hpp | 58 ++
third_party/osmium/tags/taglist.hpp | 67 ++
third_party/osmium/thread/checked_task.hpp | 106 +++
third_party/osmium/thread/function_wrapper.hpp | 110 +++
third_party/osmium/thread/name.hpp | 61 ++
third_party/osmium/thread/pool.hpp | 180 ++++
third_party/osmium/thread/queue.hpp | 178 ++++
third_party/osmium/thread/sorted_queue.hpp | 159 ++++
third_party/osmium/thread/util.hpp | 87 ++
third_party/osmium/util/cast.hpp | 72 ++
third_party/osmium/util/compatibility.hpp | 47 +
third_party/osmium/util/config.hpp | 73 ++
third_party/osmium/util/double.hpp | 91 ++
third_party/osmium/util/options.hpp | 155 ++++
third_party/osmium/util/verbose_output.hpp | 139 +++
third_party/osmium/visitor.hpp | 255 ++++++
third_party/variant/optional.hpp | 69 ++
third_party/variant/recursive_wrapper.hpp | 127 +++
third_party/variant/variant.hpp | 740 ++++++++++++++++
{Tools => tools}/.gitignore | 0
tools/check-hsgr.cpp | 112 +++
tools/components.cpp | 293 +++++++
{Tools => tools}/io-benchmark.cpp | 112 +--
{Tools => tools}/simpleclient.cpp | 30 +-
tools/springclean.cpp | 102 +++
{Tools => tools}/unlock_all_mutexes.cpp | 9 +-
typedefs.h | 16 +-
411 files changed, 36356 insertions(+), 9007 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