forked from organicmaps/organicmaps-tmp
MapsMePlugin fixes
This commit is contained in:
Lev Dragunov
Alex Zolotarev
parent
eca42a0bef
commit
b6922be526
4 changed files with 40 additions and 53 deletions
|
|
@ -10,6 +10,9 @@ project(OSRM)
|
|||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
include(CheckCXXCompilerFlag)
|
||||
include(FindPackageHandleStandardArgs)
|
||||
set(OMIM_STORAGE_PATH "../../../storage/")
|
||||
set(OMIM_DEBUG_PATH "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug")
|
||||
set(OMIM_RELEASE_PATH "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release")
|
||||
|
||||
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||
|
||||
|
|
@ -73,7 +76,7 @@ file(GLOB LibOSRMGlob Library/*.cpp)
|
|||
|
||||
file(GLOB MapsMeSources mapsme/*.cpp)
|
||||
file(GLOB MapsMeHeaders mapsme/*.h)
|
||||
file(GLOB MapsMeGenerator ../../../storage/country.cpp ../../../storage/country_decl.cpp ../../../storage/country_info.cpp)
|
||||
file(GLOB MapsMeGenerator "${OMIM_STORAGE_PATH}/country.cpp" "${OMIM_STORAGE_PATH}/country_decl.cpp" "${OMIM_STORAGE_PATH}/country_info.cpp")
|
||||
|
||||
set(
|
||||
OSRMSources
|
||||
|
|
@ -189,29 +192,29 @@ target_link_libraries(OSRM ${Boost_LIBRARIES})
|
|||
target_link_libraries(osrm-extract ${Boost_LIBRARIES})
|
||||
target_link_libraries(osrm-prepare ${Boost_LIBRARIES})
|
||||
target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM
|
||||
debug "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libcoding.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libbase.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libgeometry.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libindexer.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libjansson.a"
|
||||
general "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libcoding.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libgeometry.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libindexer.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libjansson.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libbase.a")
|
||||
debug "${OMIM_DEBUG_PATH}/libcoding.a"
|
||||
"${OMIM_DEBUG_PATH}/libbase.a"
|
||||
"${OMIM_DEBUG_PATH}/libgeometry.a"
|
||||
"${OMIM_DEBUG_PATH}/libindexer.a"
|
||||
"${OMIM_DEBUG_PATH}/libjansson.a"
|
||||
general "${OMIM_RELEASE_PATH}/libcoding.a"
|
||||
"${OMIM_RELEASE_PATH}/libgeometry.a"
|
||||
"${OMIM_RELEASE_PATH}/libindexer.a"
|
||||
"${OMIM_RELEASE_PATH}/libjansson.a"
|
||||
"${OMIM_RELEASE_PATH}/libbase.a")
|
||||
target_link_libraries(osrm-datastore ${Boost_LIBRARIES})
|
||||
|
||||
target_link_libraries(osrm-mapsme ${Boost_LIBRARIES} OSRM
|
||||
debug "${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libcoding.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libbase.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/librouting.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libindexer.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-debug/out/debug/libgeometry.a"
|
||||
general "${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libcoding.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libbase.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/librouting.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libindexer.a"
|
||||
"${CMAKE_SOURCE_DIR}/../../../../omim-build-release/out/release/libgeometry.a")
|
||||
debug "${OMIM_DEBUG_PATH}/libcoding.a"
|
||||
"${OMIM_DEBUG_PATH}/libbase.a"
|
||||
"${OMIM_DEBUG_PATH}/librouting.a"
|
||||
"${OMIM_DEBUG_PATH}/libgeometry.a"
|
||||
"${OMIM_DEBUG_PATH}/libindexer.a"
|
||||
general "${OMIM_RELEASE_PATH}/libcoding.a"
|
||||
"${OMIM_RELEASE_PATH}/libbase.a"
|
||||
"${OMIM_RELEASE_PATH}/librouting.a"
|
||||
"${OMIM_RELEASE_PATH}/libgeometry.a"
|
||||
"${OMIM_RELEASE_PATH}/libindexer.a")
|
||||
|
||||
find_package(Threads REQUIRED)
|
||||
target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT} ${OPTIONAL_OMP_LIB})
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ OSRM_impl::OSRM_impl(ServerPaths server_paths, const bool use_shared_memory)
|
|||
RegisterPlugin(new TimestampPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
|
||||
RegisterPlugin(new ViaRoutePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
|
||||
RegisterPlugin(new MapsMePlugin<BaseDataFacade<QueryEdge::EdgeData>>(
|
||||
query_data_facade, server_paths["borders"].string(), server_paths["hsgrdata"].string()));
|
||||
query_data_facade, server_paths["borders"].string(), server_paths["enodesdata"].string()));
|
||||
}
|
||||
|
||||
OSRM_impl::~OSRM_impl()
|
||||
|
|
|
|||
|
|
@ -49,26 +49,22 @@ template <class DataFacadeT> class MapsMePlugin final : public BasePlugin
|
|||
{
|
||||
auto it =
|
||||
find_if(m_regions[id].begin(), m_regions[id].end(), [&](m2::RegionD const ®ion)
|
||||
{
|
||||
if (region.Contains(m_pt))
|
||||
{
|
||||
m_res = id;
|
||||
return true;
|
||||
}
|
||||
});
|
||||
return it == m_regions[id].end();
|
||||
{ return region.Contains(m_pt);});
|
||||
if (it == m_regions[id].end())
|
||||
return true;
|
||||
m_res = id;
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
public:
|
||||
explicit MapsMePlugin(DataFacadeT *facade, std::string const &baseDir, std::string const & osrmFile)
|
||||
explicit MapsMePlugin(DataFacadeT *facade, std::string const &baseDir, std::string const & nodeDataFile)
|
||||
: m_descriptorString("mapsme"), m_facade(facade),
|
||||
m_reader(baseDir + '/' + PACKED_POLYGONS_FILE)
|
||||
{
|
||||
|
||||
if (!osrm::LoadNodeDataFromFile(osrmFile.substr(osrmFile.begin(),osrmFile.length()-5) + ".nodeData", m_nodeData))
|
||||
if (!osrm::LoadNodeDataFromFile(nodeDataFile, m_nodeData))
|
||||
{
|
||||
LOG(LCRITICAL, ("Can't load node data"));
|
||||
SimpleLogger().Write(logDEBUG) << "Can't load node data";
|
||||
return;
|
||||
}
|
||||
ReaderSource<ModelReaderPtr> src(m_reader.GetReader(PACKED_POLYGONS_INFO_TAG));
|
||||
|
|
@ -76,8 +72,6 @@ template <class DataFacadeT> class MapsMePlugin final : public BasePlugin
|
|||
m_regions.resize(m_countries.size());
|
||||
for (size_t i = 0; i < m_countries.size(); ++i)
|
||||
{
|
||||
std::vector<m2::RegionD> &rgnV = m_regions[i];
|
||||
|
||||
// load regions from file
|
||||
ReaderSource<ModelReaderPtr> src(m_reader.GetReader(strings::to_string(i)));
|
||||
|
||||
|
|
@ -87,8 +81,7 @@ template <class DataFacadeT> class MapsMePlugin final : public BasePlugin
|
|||
vector<m2::PointD> points;
|
||||
serial::LoadOuterPath(src, serial::CodingParams(), points);
|
||||
|
||||
rgnV.push_back(m2::RegionD());
|
||||
rgnV.back().Assign(points.begin(), points.end());
|
||||
m_regions[i].emplace_back(move(m2::RegionD(points.begin(), points.end())));
|
||||
}
|
||||
}
|
||||
m_searchEngine = osrm::make_unique<SearchEngine<DataFacadeT>>(facade);
|
||||
|
|
@ -138,15 +131,6 @@ template <class DataFacadeT> class MapsMePlugin final : public BasePlugin
|
|||
|
||||
for (unsigned i = 0; i < raw_route.raw_via_node_coordinates.size(); ++i)
|
||||
{
|
||||
if (checksum_OK && i < route_parameters.hints.size() &&
|
||||
!route_parameters.hints[i].empty())
|
||||
{
|
||||
ObjectEncoder::DecodeFromBase64(route_parameters.hints[i], phantom_node_vector[i]);
|
||||
if (phantom_node_vector[i].isValid(m_facade->GetNumberOfNodes()))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
}
|
||||
m_facade->FindPhantomNodeForCoordinate(raw_route.raw_via_node_coordinates[i],
|
||||
phantom_node_vector[i],
|
||||
route_parameters.zoom_level);
|
||||
|
|
@ -178,12 +162,10 @@ template <class DataFacadeT> class MapsMePlugin final : public BasePlugin
|
|||
{
|
||||
PathData const &path_data = raw_route.unpacked_path_segments[i][j];
|
||||
auto const & data = m_nodeData[path_data.node];
|
||||
auto const & startSeg = data.m_segments.front();
|
||||
FixedPointCoordinate const coord = m_facade->GetCoordinateOfNode(path_data.node);
|
||||
storage::CountryInfo info;
|
||||
LOG(LINFO, ("COORD ",startSeg.lat1, startSeg.lon1));
|
||||
m2::PointD pt =
|
||||
MercatorBounds::FromLatLon(startSeg.lat1, startSeg.lon1);
|
||||
if (data.m_segments.empty())
|
||||
continue;
|
||||
auto const & seg = data.m_segments.front();
|
||||
m2::PointD pt = MercatorBounds::FromLatLon(seg.lat1, seg.lon1);
|
||||
GetByPoint doGet(m_regions, pt);
|
||||
ForEachCountry(pt, doGet);
|
||||
|
||||
|
|
|
|||
|
|
@ -60,6 +60,8 @@ inline void populate_base_path(ServerPaths &server_paths)
|
|||
BOOST_ASSERT(server_paths.find("hsgrdata") != server_paths.end());
|
||||
server_paths["nodesdata"] = base_string + ".nodes";
|
||||
BOOST_ASSERT(server_paths.find("nodesdata") != server_paths.end());
|
||||
server_paths["enodesdata"] = base_string + ".nodeData";
|
||||
BOOST_ASSERT(server_paths.find("nodesdata") != server_paths.end());
|
||||
server_paths["edgesdata"] = base_string + ".edges";
|
||||
BOOST_ASSERT(server_paths.find("edgesdata") != server_paths.end());
|
||||
server_paths["geometries"] = base_string + ".geometry";
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue