AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Added in-memory storing intermediate point data

Browse source
This commit is contained in:
Sergey Yershov 2015-02-10 13:48:36 +03:00 • committed by Alex Zolotarev
parent 9372d0a8ca
commit 97f8478f77
3 changed files with 76 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
generator/data_generator.cpp
View file

@ -92,13 +92,13 @@ bool GenerateImpl(string const & dir, string const & osmFileName = string())
bool GenerateToFile(string const & dir, string const & nodeStorage, string const & osmFileName)
{
if (nodeStorage == "raw")
return GenerateImpl<RawFilePointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
return GenerateImpl<RawFileShortPointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
else if (nodeStorage == "map")
return GenerateImpl<MapFileShortPointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
else if (nodeStorage == "sqlite")
return GenerateImpl<SQLitePointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
else if (nodeStorage == "mem")
return GenerateImpl<RawFileShortPointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
return GenerateImpl<RawMemShortPointStorage<BasePointStorage::MODE_WRITE>>(dir, osmFileName);
else
CHECK(nodeStorage.empty(), ("Incorrect node_storage type:", nodeStorage));
return false;

4
generator/feature_generator.cpp
View file

@ -429,13 +429,13 @@ bool GenerateImpl(GenerateInfo & info, string const & osmFileName = string())
bool GenerateFeatures(GenerateInfo & info, string const & nodeStorage, string const & osmFileName)
{
if (nodeStorage == "raw")
return GenerateImpl<RawFilePointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
return GenerateImpl<RawFileShortPointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
else if (nodeStorage == "map")
return GenerateImpl<MapFileShortPointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
else if (nodeStorage == "sqlite")
return GenerateImpl<SQLitePointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
else if (nodeStorage == "mem")
return GenerateImpl<RawFileShortPointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
return GenerateImpl<RawMemShortPointStorage<BasePointStorage::MODE_READ>>(info, osmFileName);
else
CHECK(nodeStorage.empty(), ("Incorrect node_storage type:", nodeStorage));
return false;

72
generator/point_storage.hpp
View file

@ -311,6 +311,78 @@ public:
};
template < BasePointStorage::EStorageMode ModeT >
class RawMemShortPointStorage : public BasePointStorage
{
typename std::conditional<ModeT, FileWriter, FileReader>::type m_file;
double const m_precision = 10000000;
vector<ShortLatLon> m_data;
public:
RawMemShortPointStorage(string const & name)
: BasePointStorage(name, 1000)
, m_file(name)
, m_data((size_t)0xFFFFFFFF)
{
InitStorage(EnableIf<ModeT>());
}
~RawMemShortPointStorage()
{
DoneStorage(EnableIf<ModeT>());
}
void InitStorage(EnableIf<MODE_WRITE>) {}
void InitStorage(EnableIf<MODE_READ>)
{
m_file.Read(0, m_data.data(), m_data.size());
}
void DoneStorage(EnableIf<MODE_WRITE>)
{
m_file.Write(m_data.data(), m_data.size());
}
void DoneStorage(EnableIf<MODE_READ>) {}
template <bool T = (ModeT == BasePointStorage::MODE_WRITE)>
typename std::enable_if<T, void>::type AddPoint(uint64_t id, double lat, double lng)
{
int64_t const lat64 = lat * m_precision;
int64_t const lng64 = lng * m_precision;
ShortLatLon & ll = m_data[id];
ll.lat = static_cast<int32_t>(lat64);
ll.lon = static_cast<int32_t>(lng64);
CHECK_EQUAL(static_cast<int64_t>(ll.lat), lat64, ("Latitude is out of 32bit boundary!"));
CHECK_EQUAL(static_cast<int64_t>(ll.lon), lng64, ("Longtitude is out of 32bit boundary!"));
m_progress.Inc();
}
template <bool T = (ModeT == BasePointStorage::MODE_READ)>
typename std::enable_if<T, bool>::type GetPoint(uint64_t id, double & lat, double & lng) const
{
ShortLatLon const & ll = m_data[id];
// assume that valid coordinate is not (0, 0)
if (ll.lat != 0.0 || ll.lon != 0.0)
{
lat = static_cast<double>(ll.lat) / m_precision;
lng = static_cast<double>(ll.lon) / m_precision;
return true;
}
else
{
LOG(LERROR, ("Node with id = ", id, " not found!"));
return false;
}
}
};
template < BasePointStorage::EStorageMode ModeT >
class MapFilePointStorage : public BasePointStorage
{