loading correct file with rtree leafs and not inner nodes

This commit is contained in:
Dennis Luxen 2013-09-30 15:55:29 +02:00
parent 76ee84dae8
commit 203b215093

View File

@ -162,7 +162,7 @@ private:
street_names_index_ptr, street_names_index_ptr,
data_layout->name_index_list_size data_layout->name_index_list_size
); );
m_name_begin_indices.swap(m_name_begin_indices); m_name_begin_indices.swap(name_begin_indices);
char * names_list_ptr = (char *)( char * names_list_ptr = (char *)(
shared_memory + data_layout->GetNameListOffset() shared_memory + data_layout->GetNameListOffset()
@ -180,13 +180,13 @@ public:
const boost::filesystem::path base_path const boost::filesystem::path base_path
) { ) {
//check contents of config file //check contents of config file
if ( !server_config.Holds("ramIndex") ) { if ( !server_config.Holds("fileIndex") ) {
throw OSRMException("no nodes file name in server ini"); throw OSRMException("no nodes file name in server ini");
} }
//generate paths of data files //generate paths of data files
boost::filesystem::path ram_index_path = boost::filesystem::absolute( boost::filesystem::path ram_index_path = boost::filesystem::absolute(
server_config.GetParameter("ramIndex"), server_config.GetParameter("fileIndex"),
base_path base_path
); );
@ -198,6 +198,8 @@ public:
SharedMemoryFactory::Get(DATA_1)->Ptr() SharedMemoryFactory::Get(DATA_1)->Ptr()
); );
data_layout->PrintInformation();
//load data //load data
SimpleLogger().Write() << "loading graph data"; SimpleLogger().Write() << "loading graph data";
LoadGraph(); LoadGraph();