diff options
author | Lev Dragunov <l.dragunov@corp.mail.ru> | 2015-05-14 11:58:38 +0300 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:47:25 +0300 |
commit | 2b460584b2439299b01db7525cf4da73ba1a12be (patch) | |
tree | 97ca5b2002cac9bee99497238b373effff602a1e /3party/osrm | |
parent | 7a1a96696c030cf00579ac00476301b356735436 (diff) |
PR fixes
Diffstat (limited to '3party/osrm')
-rw-r--r-- | 3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp | 20 | ||||
-rwxr-xr-x | 3party/osrm/osrm-backend/util/fingerprint_impl.hpp | 103 | ||||
-rwxr-xr-x | 3party/osrm/osrm-backend/util/git_sha.cpp | 31 |
3 files changed, 5 insertions, 149 deletions
diff --git a/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp b/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp index 5513c3c0c9..ac06f125e4 100644 --- a/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp +++ b/3party/osrm/osrm-backend/plugins/MapsMePlugin.hpp @@ -10,7 +10,6 @@ #include "../../../../indexer/mercator.hpp" #include "../../../../storage/country_decl.hpp" #include "../../../../storage/country_polygon.hpp" -#include "../../../../base/logging.hpp" #include "../algorithms/object_encoder.hpp" #include "../data_structures/search_engine.hpp" @@ -121,7 +120,6 @@ public: if (m_facade->IncrementalFindPhantomNodeForCoordinate(route_parameters.coordinates[i], phantom_node_vector, 1)) { - LOG(LINFO, ("FOUND", route_parameters.coordinates[i], phantom_node_vector)); BOOST_ASSERT(!phantom_node_vector.empty()); phantom_node_pair_list[i].first = phantom_node_vector.front(); if (phantom_node_vector.size() > 1) @@ -168,8 +166,6 @@ public: swap_phantom_from_big_cc_into_front); } - LOG(LINFO, ("A")); - InternalRouteResult raw_route; auto build_phantom_pairs = [&raw_route](const phantom_node_pair &first_pair, const phantom_node_pair &second_pair) @@ -178,18 +174,14 @@ public: PhantomNodes{first_pair.first, second_pair.first}); }; - LOG(LINFO, ("B")); osrm::for_each_pair(phantom_node_pair_list, build_phantom_pairs); - LOG(LINFO, ("B1", raw_route.segment_end_coordinates.front())); m_searchEngine->alternative_path(raw_route.segment_end_coordinates.front(), raw_route); - LOG(LINFO, ("B2")); if (INVALID_EDGE_WEIGHT == raw_route.shortest_path_length) { SimpleLogger().Write(logDEBUG) << "Error occurred, single path not found"; } - LOG(LINFO, ("C")); // Get mwm names vector<pair<string, m2::PointD>> usedMwms; @@ -212,7 +204,11 @@ public: } } - auto const it = std::unique(usedMwms.begin(), usedMwms.end(), [&](pair<string, m2::PointD> const & a, pair<string, m2::PointD> const & b) {return a.first == b.first;}); + auto const it = std::unique(usedMwms.begin(), usedMwms.end(), [&] + (pair<string, m2::PointD> const & a, pair<string, m2::PointD> const & b) + { + return a.first == b.first; + }); usedMwms.erase(it, usedMwms.end()); osrm::json::Array json_array; @@ -226,11 +222,6 @@ public: } reply.values["used_mwms"] = json_array; - //std::unique_ptr<BaseDescriptor<DataFacadeT>> descriptor = osrm::make_unique<JSONDescriptor<DataFacadeT>>(facade); - //descriptor->SetConfig(route_parameters); - //descriptor->Run(raw_route, rely); - - //JSON::render(reply.content, json_object); return 200; } @@ -243,4 +234,3 @@ public: FilesContainerR m_reader; osrm::NodeDataVectorT m_nodeData; }; - diff --git a/3party/osrm/osrm-backend/util/fingerprint_impl.hpp b/3party/osrm/osrm-backend/util/fingerprint_impl.hpp deleted file mode 100755 index e9097e4735..0000000000 --- a/3party/osrm/osrm-backend/util/fingerprint_impl.hpp +++ /dev/null @@ -1,103 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM, Dennis Luxen, others -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#include "osrm_exception.hpp" - -#include <boost/uuid/name_generator.hpp> - -#include <cstring> - -#include <algorithm> -#include <string> - -#define HAS64BITS 0 -#define MD5PREPARE "b04b5d82a15a1f412e3dd3f8d054b0cc" -#define MD5RTREE "4cd15b5a6ae32818b38ba5ad0b7fa18a" -#define MD5GRAPH "f4a42ddc44689019e1794b4db9809de1" -#define MD5OBJECTS "2782e122d4052c4ba1dd8ca62fac930d" - -FingerPrint::FingerPrint() : magic_number(1297240911) -{ - md5_prepare[32] = md5_tree[32] = md5_graph[32] = md5_objects[32] = '\0'; - - boost::uuids::name_generator gen(named_uuid); - std::string temp_string; - - std::memcpy(md5_prepare, MD5PREPARE, strlen(MD5PREPARE)); - temp_string += md5_prepare; - std::memcpy(md5_tree, MD5RTREE, 32); - temp_string += md5_tree; - std::memcpy(md5_graph, MD5GRAPH, 32); - temp_string += md5_graph; - std::memcpy(md5_objects, MD5OBJECTS, 32); - temp_string += md5_objects; - - named_uuid = gen(temp_string); - has_64_bits = HAS64BITS; -} - -FingerPrint::~FingerPrint() {} - -const boost::uuids::uuid &FingerPrint::GetFingerPrint() const { return named_uuid; } - -bool FingerPrint::IsMagicNumberOK() const { return 1297240911 == magic_number; } - -bool FingerPrint::TestGraphUtil(const FingerPrint &other) const -{ - if (!other.IsMagicNumberOK()) - { - throw osrm::exception("hsgr input file misses magic number. Check or reprocess the file"); - } - return std::equal(md5_graph, md5_graph + 32, other.md5_graph); -} - -bool FingerPrint::TestPrepare(const FingerPrint &other) const -{ - if (!other.IsMagicNumberOK()) - { - throw osrm::exception("osrm input file misses magic number. Check or reprocess the file"); - } - return std::equal(md5_prepare, md5_prepare + 32, other.md5_prepare); -} - -bool FingerPrint::TestRTree(const FingerPrint &other) const -{ - if (!other.IsMagicNumberOK()) - { - throw osrm::exception("r-tree input file misses magic number. Check or reprocess the file"); - } - return std::equal(md5_tree, md5_tree + 32, other.md5_tree); -} - -bool FingerPrint::TestQueryObjects(const FingerPrint &other) const -{ - if (!other.IsMagicNumberOK()) - { - throw osrm::exception("missing magic number. Check or reprocess the file"); - } - return std::equal(md5_objects, md5_objects + 32, other.md5_objects); -} diff --git a/3party/osrm/osrm-backend/util/git_sha.cpp b/3party/osrm/osrm-backend/util/git_sha.cpp deleted file mode 100755 index 64f9fec271..0000000000 --- a/3party/osrm/osrm-backend/util/git_sha.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - -Copyright (c) 2015, Project OSRM contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -Redistributions of source code must retain the above copyright notice, this list -of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this -list of conditions and the following disclaimer in the documentation and/or -other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ - -#include "git_sha.hpp" - -#define GIT_DESCRIPTION "android-431-210-g6ea7ced" -char g_GIT_DESCRIPTION[] = GIT_DESCRIPTION; |