This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository osrm.

commit 89f35d7bb755ed110710b649bd9a302515f4fcfb
Merge: 80e6fd6 4afb219
Author: Andreas Tille <ti...@debian.org>
Date:   Thu Jul 10 16:43:58 2014 +0200

    Merge tag 'upstream/0.4.2'
    
    Upstream version 0.4.2

 .clang-format                                      |   54 +
 .gitignore                                         |   12 +-
 .travis.yml                                        |   54 +
 AUTHORS.TXT                                        |   11 -
 Algorithms/BFSComponentExplorer.h                  |  148 ++
 Algorithms/Bresenham.h                             |   49 -
 Algorithms/CRC32.cpp                               |   85 --
 Algorithms/CRC32.h                                 |   45 -
 Algorithms/DouglasPeucker.cpp                      |  183 +++
 Algorithms/DouglasPeucker.h                        |  149 +-
 Algorithms/ExtractRouteNames.h                     |  169 +++
 Algorithms/IteratorBasedCRC32.h                    |  185 ++-
 Algorithms/ObjectToBase64.h                        |  100 +-
 Algorithms/PolylineCompressor.cpp                  |  118 ++
 Algorithms/PolylineCompressor.h                    |  151 +-
 Algorithms/StronglyConnectedComponents.h           |  628 ++++----
 CMakeLists.txt                                     |  344 ++++-
 Contractor/ContractionCleanup.h                    |  261 ----
 Contractor/Contractor.h                            | 1313 ++++++++++-------
 Contractor/EdgeBasedGraphFactory.cpp               | 1049 ++++++++-----
 Contractor/EdgeBasedGraphFactory.h                 |  234 ++-
 Contractor/GeometryCompressor.cpp                  |  227 +++
 Contractor/GeometryCompressor.h                    |   65 +
 Contractor/TemporaryStorage.cpp                    |  226 +--
 Contractor/TemporaryStorage.h                      |  165 +--
 DataStructures/BinaryHeap.h                        |  340 +++--
 DataStructures/ConcurrentQueue.h                   |  120 +-
 DataStructures/Coordinate.cpp                      |  446 ++++++
 DataStructures/Coordinate.h                        |  108 --
 DataStructures/DeallocatingVector.h                |  487 +++---
 DataStructures/DynamicGraph.h                      |  443 +++---
 DataStructures/EdgeBasedNode.h                     |   90 ++
 DataStructures/GridEdge.h                          |   82 --
 DataStructures/HashTable.h                         |  125 +-
 DataStructures/HilbertValue.cpp                    |  100 ++
 DataStructures/HilbertValue.h                      |  104 +-
 DataStructures/ImportEdge.cpp                      |  107 ++
 DataStructures/ImportEdge.h                        |  218 ++-
 DataStructures/ImportNode.cpp                      |   64 +
 DataStructures/ImportNode.h                        |   71 +-
 DataStructures/InputReaderFactory.h                |  127 +-
 DataStructures/JSONContainer.h                     |  237 +++
 DataStructures/LRUCache.h                          |   87 +-
 DataStructures/MercatorUtil.h                      |   38 -
 DataStructures/NNGrid.h                            |  602 --------
 DataStructures/NodeBasedGraph.h                    |  166 +++
 DataStructures/NodeCoords.h                        |   69 -
 DataStructures/NodeInformationHelpDesk.h           |  159 --
 DataStructures/OriginalEdgeData.h                  |   60 +
 DataStructures/Percent.h                           |  127 +-
 DataStructures/PhantomNodes.h                      |  225 ++-
 DataStructures/QueryEdge.h                         |   94 +-
 DataStructures/QueryNode.h                         |   85 ++
 DataStructures/RangeTable.h                        |  231 +++
 DataStructures/RawRouteData.h                      |   80 +
 DataStructures/Restriction.h                       |  155 +-
 DataStructures/RestrictionMap.cpp                  |  224 +++
 DataStructures/RestrictionMap.h                    |  126 ++
 DataStructures/RouteParameters.cpp                 |   89 ++
 DataStructures/SearchEngine.cpp                    |   89 --
 DataStructures/SearchEngine.h                      |   96 +-
 DataStructures/SearchEngineData.cpp                |  105 +-
 DataStructures/SearchEngineData.h                  |   79 +-
 DataStructures/SegmentInformation.h                |   92 +-
 DataStructures/SharedMemoryFactory.h               |  370 +++++
 DataStructures/SharedMemoryVectorWrapper.h         |  156 ++
 DataStructures/SimpleStack.h                       |   71 -
 DataStructures/StaticGraph.h                       |  279 ++--
 DataStructures/StaticKDTree.h                      |  245 +--
 DataStructures/StaticRTree.h                       | 1557 +++++++++++---------
 DataStructures/TimingUtil.h                        |   50 -
 DataStructures/TurnInstructions.h                  |  132 +-
 DataStructures/XORFastHash.h                       |   84 +-
 DataStructures/XORFastHashStorage.h                |  107 +-
 Descriptors/BaseDescriptor.h                       |   94 +-
 Descriptors/DescriptionFactory.cpp                 |  253 +---
 Descriptors/DescriptionFactory.h                   |  233 ++-
 Descriptors/GPXDescriptor.h                        |  141 +-
 Descriptors/JSONDescriptor.h                       |  777 +++++-----
 Extractor/BaseParser.cpp                           |  187 +--
 Extractor/BaseParser.h                             |   82 +-
 Extractor/ExtractionContainers.cpp                 |  566 ++++---
 Extractor/ExtractionContainers.h                   |   96 +-
 Extractor/ExtractionHelperFunctions.h              |  122 +-
 Extractor/ExtractionWay.h                          |   79 +
 Extractor/ExtractorCallbacks.cpp                   |  255 ++--
 Extractor/ExtractorCallbacks.h                     |   86 +-
 Extractor/ExtractorStructs.h                       |  260 +---
 Extractor/InternalExtractorEdge.h                  |  120 ++
 Extractor/PBFParser.cpp                            | 1056 +++++++------
 Extractor/PBFParser.h                              |  119 +-
 Extractor/ScriptingEnvironment.cpp                 |  195 +--
 Extractor/ScriptingEnvironment.h                   |   70 +-
 Extractor/XMLParser.cpp                            |  583 ++++----
 Extractor/XMLParser.h                              |   68 +-
 Gemfile.lock                                       |   30 +-
 Include/osrm/Coordinate.h                          |  105 ++
 Include/osrm/Header.h                              |   53 +
 Include/osrm/Reply.h                               |   74 +
 Include/osrm/RouteParameters.h                     |   83 ++
 Include/osrm/ServerPaths.h                         |   38 +
 LICENCE.TXT                                        |  683 +--------
 Library/OSRM.h                                     |   52 +
 Library/OSRM_impl.cpp                              |  167 +++
 Library/OSRM_impl.h                                |   65 +
 Plugins/BasePlugin.h                               |   63 +-
 Plugins/DistanceTablePlugin.h                      |  146 ++
 Plugins/HelloWorldPlugin.h                         |  135 +-
 Plugins/LocatePlugin.h                             |  152 +-
 Plugins/NearestPlugin.h                            |  171 +--
 Plugins/PluginMapFactory.h                         |   34 -
 Plugins/RawRouteData.h                             |   45 -
 Plugins/RouteParameters.h                          |  107 --
 Plugins/TimestampPlugin.h                          |  106 +-
 Plugins/ViaRoutePlugin.h                           |  397 +++--
 README.TXT => README.md                            |   17 +-
 Rakefile                                           |   62 +-
 RoutingAlgorithms/AlternativePathRouting.h         | 1129 +++++++++-----
 RoutingAlgorithms/BasicRoutingInterface.h          |  512 +++++--
 RoutingAlgorithms/ManyToManyRouting.h              |  264 ++++
 RoutingAlgorithms/ShortestPathRouting.h            |  399 +++--
 Server/APIGrammar.h                                |   54 +-
 Server/BasicDatastructures.h                       |  157 --
 Server/Connection.cpp                              |  174 +++
 Server/Connection.h                                |  247 ++--
 Server/DataStructures/BaseDataFacade.h             |  125 ++
 Server/DataStructures/InternalDataFacade.h         |  430 ++++++
 Server/DataStructures/QueryObjectsStorage.cpp      |  100 --
 Server/DataStructures/QueryObjectsStorage.h        |   47 -
 Server/DataStructures/SharedBarriers.h             |   60 +
 Server/DataStructures/SharedDataFacade.h           |  398 +++++
 Server/DataStructures/SharedDataType.h             |  190 +++
 Server/Http/CompressionType.h                      |   41 +
 Server/Http/Reply.cpp                              |  123 ++
 Server/Http/Request.h                              |   48 +
 Server/RequestHandler.cpp                          |  142 ++
 Server/RequestHandler.h                            |  138 +-
 Server/RequestParser.cpp                           |  306 ++++
 Server/RequestParser.h                             |  345 +----
 Server/Server.h                                    |  166 ++-
 Server/ServerConfiguration.h                       |   28 -
 Server/ServerFactory.h                             |  107 +-
 Tools/componentAnalysis.cpp                        |  102 --
 Tools/components.cpp                               |  136 ++
 Tools/io-benchmark.cpp                             |  348 +++++
 Tools/simpleclient.cpp                             |  131 ++
 Tools/unlock_all_mutexes.cpp                       |   52 +
 Util/Azimuth.h                                     |   79 +-
 Util/BaseConfiguration.h                           |  107 --
 Util/BoostFileSystemFix.h                          |  147 ++
 Util/ComputeAngle.h                                |   57 +
 Util/ContainerUtils.h                              |   71 +-
 Util/DataStoreOptions.h                            |  284 ++++
 Util/FingerPrint.cpp.in                            |  106 ++
 Util/FingerPrint.h                                 |   60 +
 Util/GitDescription.cpp.in                         |   29 +
 Util/GitDescription.h                              |   33 +
 Util/GraphLoader.h                                 |  533 +++----
 Util/IniFileUtil.h                                 |   49 +
 Util/InputFileUtil.h                               |   46 -
 Util/LinuxStackTrace.h                             |  156 --
 Util/LuaUtil.h                                     |   81 +-
 Util/MachineInfo.h                                 |  109 +-
 Util/MercatorUtil.h                                |   43 +
 Util/OSRMException.h                               |   46 +
 Util/OpenMPWrapper.h                               |   34 -
 Util/ProgramOptions.h                              |  270 ++++
 Util/SimpleLogger.h                                |  158 ++
 Util/StdHashExtensions.h                           |   73 +
 Util/StringUtil.h                                  |  353 +++--
 Util/TimingUtil.h                                  |   39 +
 Util/TrigonometryTables.h                          |  790 ++++++++++
 appveyor.yml                                       |   67 +
 cmake/CheckCXXCompilerFlag.cmake                   |   29 +
 cmake/FindLua52.cmake                              |   82 ++
 cmake/FindLuaJIT.cmake                             |   93 ++
 cmake/FindLuabind.cmake                            |    4 +-
 cmake/FindSTXXL.cmake                              |    2 +-
 cmake/FindTBB.cmake                                |  283 ++++
 cmake/FingerPrint-Config.cmake                     |   10 +
 cmake/GetGitRevisionDescription.cmake.in           |   38 +
 cmake/cmake_options_script.py                      |   45 +
 cmake/pkgconfig.in                                 |   11 +
 config/cucumber.yml                                |    8 +-
 contractor.ini                                     |    1 -
 createHierarchy.cpp                                |  276 ----
 datastore.cpp                                      |  575 ++++++++
 extractor.cpp                                      |  339 +++--
 extractor.ini                                      |    2 -
 features/bicycle/access.feature                    |  322 ++--
 features/bicycle/access_node.feature               |  116 +-
 features/bicycle/area.feature                      |  186 +--
 features/bicycle/barrier.feature                   |   68 +-
 features/bicycle/cycleway.feature                  |  150 +-
 features/bicycle/destination.feature               |  134 +-
 features/bicycle/ferry.feature                     |  120 +-
 features/bicycle/maxspeed.feature                  |  130 +-
 features/bicycle/mode.feature                      |  146 +-
 features/bicycle/names.feature                     |   66 +-
 features/bicycle/oneway.feature                    |  252 ++--
 features/bicycle/pushing.feature                   |  200 +--
 features/bicycle/ref.feature                       |   76 +-
 features/bicycle/restrictions.feature              |  574 ++++----
 features/bicycle/roundabout.feature                |   30 +
 features/bicycle/stop_area.feature                 |   58 +-
 features/bicycle/surface.feature                   |   40 +
 features/bicycle/train.feature                     |   70 +-
 features/bicycle/turn_penalty.feature              |   42 +-
 features/bicycle/way.feature                       |   73 +-
 features/car/access.feature                        |  266 ++--
 features/car/barrier.feature                       |   66 +-
 features/car/destination.feature                   |  134 +-
 features/car/ferry.feature                         |   48 +-
 features/car/maxspeed.feature                      |  113 +-
 features/car/names.feature                         |   56 +-
 features/car/oneway.feature                        |  132 +-
 features/car/restrictions.feature                  |  561 +++----
 features/car/roundabout.feature                    |   30 +
 features/car/shuttle_train.feature                 |   52 +-
 features/car/speed.feature                         |   24 +
 features/car/way.feature                           |   58 +-
 features/foot/access.feature                       |   95 ++
 features/foot/access_node.feature                  |   50 +
 features/foot/area.feature                         |  103 ++
 features/foot/barrier.feature                      |   39 +
 features/foot/ferry.feature                        |   63 +
 features/foot/maxspeed.feature                     |   31 +-
 features/foot/names.feature                        |   33 +
 features/foot/oneway.feature                       |  110 +-
 features/foot/ref.feature                          |   41 +
 features/foot/restrictions.feature                 |  288 ++++
 features/foot/roundabout.feature                   |   34 +
 features/foot/surface.feature                      |   15 +
 features/foot/way.feature                          |   56 +-
 features/investigate/weird.feature                 |   42 -
 features/locate/locate.feature                     |  197 +++
 features/nearest/pick.feature                      |  128 +-
 features/nearest/projection.feature                |  184 +--
 features/options/extract/files.feature             |   30 +
 features/options/extract/help.feature              |   47 +
 features/options/extract/invalid.feature           |   12 +
 features/options/extract/version.feature           |   22 +
 features/options/prepare/files.feature             |   30 +
 features/options/prepare/help.feature              |   50 +
 features/options/prepare/invalid.feature           |   12 +
 features/options/prepare/version.feature           |   22 +
 features/options/routed/files.feature              |   27 +
 features/options/routed/help.feature               |   77 +
 features/options/routed/invalid.feature            |   19 +
 features/options/routed/version.feature            |   22 +
 features/step_definitions/data.rb                  |   59 +-
 .../step_definitions/{nearest.rb => locate.rb}     |   22 +-
 features/step_definitions/nearest.rb               |   12 +-
 features/step_definitions/options.rb               |   49 +
 features/step_definitions/requests.rb              |   25 +-
 features/step_definitions/routability.rb           |   99 +-
 features/step_definitions/routing.rb               |  153 +-
 features/stress/launch.feature                     |  102 +-
 features/support/config.rb                         |   18 -
 features/support/cucumber.rb                       |    6 +-
 features/support/data.rb                           |  160 +-
 features/support/env.rb                            |   41 +-
 features/support/exceptions.rb                     |   17 +-
 features/support/file.rb                           |   42 +-
 features/support/fuzzy.rb                          |   20 +-
 features/support/hash.rb                           |   16 +-
 features/support/hooks.rb                          |   21 +-
 features/support/launch.rb                         |   44 +-
 features/support/{nearest.rb => locate.rb}         |    8 +-
 features/support/log.rb                            |   35 +-
 features/support/nearest.rb                        |    2 +-
 features/support/osm_parser.rb                     |   18 +-
 features/support/route.rb                          |  129 +-
 features/support/run.rb                            |   18 +
 features/testbot/bad.feature                       |  144 +-
 features/testbot/basic.feature                     |  519 ++++---
 features/testbot/bearing.feature                   |  348 +++--
 features/testbot/bearing_param.feature             |  170 +--
 features/testbot/bug.feature                       |   23 -
 features/testbot/bugs.feature                      |    5 +
 features/testbot/distance.feature                  |  452 +++---
 features/testbot/duration.feature                  |   66 +-
 features/testbot/example.feature                   |   59 +-
 features/testbot/fastest.feature                   |   62 +-
 features/testbot/ferry.feature                     |  332 ++---
 features/testbot/fixed.feature                     |   26 +
 features/testbot/geometry.feature                  |   30 +
 features/testbot/graph.feature                     |   37 +-
 features/testbot/impedance.feature                 |  161 +-
 features/testbot/loop.feature                      |   78 +
 features/testbot/maxspeed.feature                  |   65 +-
 features/testbot/mode.feature                      |   40 +-
 features/testbot/oneway.feature                    |   44 +
 features/testbot/opposite.feature                  |   32 +-
 features/testbot/origin.feature                    |  128 +-
 features/testbot/overlap.feature                   |   39 +
 features/testbot/penalty.feature                   |  332 ++---
 features/testbot/planetary.feature                 |  168 +--
 features/testbot/projection.feature                |   38 +
 features/testbot/protobuffer.feature               |  156 ++
 features/testbot/roundabout.feature                |   76 +
 features/testbot/routes.feature                    |   58 +-
 features/testbot/snap.feature                      |  306 ++--
 features/testbot/speed.feature                     |   31 +
 features/testbot/status.feature                    |   67 +
 features/testbot/time.feature                      |  448 +++---
 features/testbot/turns.feature                     |  220 +--
 features/testbot/utf.feature                       |   34 +-
 features/testbot/via.feature                       |  124 +-
 features/timestamp/timestamp.feature               |   19 +-
 prepare.cpp                                        |  523 +++++++
 profile.lua                                        |    1 +
 profiles/bicycle.lua                               |  575 ++++----
 profiles/car.lua                                   |  289 ++--
 profiles/examples/postgis.lua                      |   82 ++
 profiles/foot.lua                                  |  312 ++--
 profiles/testbot.lua                               |  181 +--
 routed.cpp                                         |  270 ++--
 server.ini                                         |   11 -
 test/contractor.ini                                |    1 -
 test/extractor.ini                                 |    1 -
 typedefs.h                                         |   82 +-
 win/createHierarchy.vcproj                         |  459 ------
 win/extractor.vcproj                               |  532 -------
 win/getopt.c                                       | 1260 ----------------
 win/getopt.h                                       |  189 ---
 win/osrm.sln                                       |   29 -
 win/osrm.vsprops                                   |   39 -
 win/routed.vcproj                                  |  459 ------
 win/unistd.h                                       |   30 -
 330 files changed, 31598 insertions(+), 21819 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/osrm.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to