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

[generator] Fix comment, move unused static kInvalidFeatureId to derived class.

Browse source
This commit is contained in:
tatiana-yan 2020-04-29 18:58:24 +03:00 • committed by Maksim Andrianov
parent 61dfcea7b6
commit 160899249b
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
generator/feature_generator.hpp
View file

@ -25,10 +25,7 @@ public:
static uint64_t GetCurrentPosition();
std::string const & GetFilePath() const { return m_dataFile.GetName(); }
/// \brief Serializes |f|.
/// \returns Feature id of serialized feature if |f| is serialized after the call
/// and |kInvalidFeatureId| if not.
/// \note See implementation operator() in derived class for cases when |f| cannot be
/// serialized.
/// \returns Feature id of serialized feature.
virtual uint32_t Collect(FeatureBuilder const & f);
virtual uint32_t Collect(FeatureBuilder & f)
{
@ -37,8 +34,6 @@ public:
virtual void Finish() {}
protected:
static uint32_t constexpr kInvalidFeatureId = std::numeric_limits<uint32_t>::max();
/// \return Feature offset in the file, which is used as an ID later
uint32_t WriteFeatureBase(std::vector<char> const & bytes, FeatureBuilder const & fb);
void Flush();

2
generator/feature_sorter.cpp
View file

@ -52,6 +52,8 @@ namespace feature
class FeaturesCollector2 : public FeaturesCollector
{
public:
static uint32_t constexpr kInvalidFeatureId = std::numeric_limits<uint32_t>::max();
FeaturesCollector2(string const & filename, DataHeader const & header,
RegionData const & regionData, uint32_t versionDate)
: FeaturesCollector(filename + FEATURES_FILE_TAG)