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:
authorVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-06-27 13:04:49 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-07-23 10:25:09 +0300
commitbd69eb97cb4e577f95e10e4a594b2ab4266772a5 (patch)
treec118656d0b257815d7924bda50e7b277779201b9 /indexer
parentde84454400b0c35f8556957e4945cd7f68b6c8e6 (diff)
Review fixes.
Diffstat (limited to 'indexer')
-rw-r--r--indexer/feature.hpp2
-rw-r--r--indexer/feature_altitude.hpp3
-rw-r--r--indexer/feature_loader_base.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/indexer/feature.hpp b/indexer/feature.hpp
index 108857dba1..458528b3c1 100644
--- a/indexer/feature.hpp
+++ b/indexer/feature.hpp
@@ -371,7 +371,7 @@ private:
// @TODO |m_altitudes| should be exchanged with vector<TAltitude>.
// If the vector is empty no altitude information is available for this feature.
- mutable feature::Altitudes m_altitudes;
+ feature::Altitudes m_altitudes;
mutable bool m_header2Parsed = false;
mutable bool m_pointsParsed = false;
diff --git a/indexer/feature_altitude.hpp b/indexer/feature_altitude.hpp
index 54894f0047..916e88f04b 100644
--- a/indexer/feature_altitude.hpp
+++ b/indexer/feature_altitude.hpp
@@ -2,13 +2,14 @@
#include "coding/varint.hpp"
+#include "std/limits.hpp"
#include "std/vector.hpp"
namespace feature
{
using TAltitude = int16_t;
using TAltitudeVec = vector<feature::TAltitude>;
-static TAltitude constexpr kInvalidAltitude = -32768;
+static TAltitude constexpr kInvalidAltitude = numeric_limits<TAltitude>::lowest();
struct Altitudes
{
diff --git a/indexer/feature_loader_base.cpp b/indexer/feature_loader_base.cpp
index 349ea8055e..8d13bfca02 100644
--- a/indexer/feature_loader_base.cpp
+++ b/indexer/feature_loader_base.cpp
@@ -46,7 +46,7 @@ SharedLoadInfo::TReader SharedLoadInfo::GetMetadataIndexReader() const
SharedLoadInfo::TReader SharedLoadInfo::GetAltitudeReader() const
{
- return m_cont.GetReader(ALTITUDE_TAG);
+ return m_cont.GetReader(ALTITUDE_FILE_TAG);
}
SharedLoadInfo::TReader SharedLoadInfo::GetGeometryReader(int ind) const