[feature] Put m_metaDeserializer into SharedLoadInfo.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
This commit is contained in:
Viktor Govako
2025-06-24 23:53:01 -03:00
committed by Konstantin Pastbin
parent 6beabb2fe1
commit 588028c9eb
13 changed files with 80 additions and 70 deletions

View File

@@ -1,5 +1,6 @@
#pragma once
#include "indexer/feature_data.hpp"
#include "indexer/metadata_serdes.hpp"
#include "geometry/point2d.hpp"
#include "geometry/rect2d.hpp"
@@ -34,8 +35,7 @@ class FeatureType
public:
using GeometryOffsets = buffer_vector<uint32_t, feature::DataHeader::kMaxScalesCount>;
FeatureType(feature::SharedLoadInfo const * loadInfo, std::vector<uint8_t> && buffer,
indexer::MetadataDeserializer * metadataDeserializer);
FeatureType(feature::SharedLoadInfo const * loadInfo, std::vector<uint8_t> && buffer);
static std::unique_ptr<FeatureType> CreateFromMapObject(osm::MapObject const & emo);
@@ -248,9 +248,6 @@ private:
feature::SharedLoadInfo const * m_loadInfo = nullptr;
std::vector<uint8_t> m_data;
// Pointer to shared metedata deserializer. Must be set for mwm format >= Format::v11
indexer::MetadataDeserializer * m_metadataDeserializer = nullptr;
ParsedFlags m_parsed;
Offsets m_offsets;
uint32_t m_ptsSimpMask = 0;