Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortatiana-kondakova <tatiana.kondakova@gmail.com>2018-01-29 16:36:12 +0300
committermpimenov <mpimenov@users.noreply.github.com>2018-01-30 13:30:27 +0300
commitff52dcc7a3197beb633ee7d7d1b574a34bf93156 (patch)
tree057706635aefce545e0e9046d166dd861e4071b0 /indexer/feature_loader_base.cpp
parentf3edb952b972d51031371d1c45ce2e8c85e47535 (diff)
Remove GeoIndex 2011 format support
Diffstat (limited to 'indexer/feature_loader_base.cpp')
-rw-r--r--indexer/feature_loader_base.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/indexer/feature_loader_base.cpp b/indexer/feature_loader_base.cpp
index eb7fd69a91..6abe4de1d4 100644
--- a/indexer/feature_loader_base.cpp
+++ b/indexer/feature_loader_base.cpp
@@ -2,8 +2,6 @@
#include "indexer/feature_loader.hpp"
#include "indexer/feature_impl.hpp"
-#include "indexer/old/feature_loader_101.hpp"
-
#include "defines.hpp"
#include "coding/byte_stream.hpp"
@@ -24,7 +22,7 @@ SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const &
SharedLoadInfo::~SharedLoadInfo()
{
- delete m_pLoader;
+ delete m_loader;
}
SharedLoadInfo::TReader SharedLoadInfo::GetDataReader() const
@@ -59,10 +57,8 @@ SharedLoadInfo::TReader SharedLoadInfo::GetTrianglesReader(int ind) const
void SharedLoadInfo::CreateLoader()
{
- if (m_header.GetFormat() == version::Format::v1)
- m_pLoader = new old_101::feature::LoaderImpl(*this);
- else
- m_pLoader = new LoaderCurrent(*this);
+ CHECK_NOT_EQUAL(m_header.GetFormat(), version::Format::v1, ("Old maps format is not supported"));
+ m_loader = new LoaderCurrent(*this);
}
////////////////////////////////////////////////////////////////////////////////////////////