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>2017-10-27 15:23:39 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2017-10-27 16:04:18 +0300
commit04681c216d8d197fdec4dfdf0e805e5774dbfc93 (patch)
treed6480d06a7b3880a81afcec5983ceb67b8cf32cc
parent021ba8bfd63a0825ba8d57276f039a3e7b0e710e (diff)
Review fixes.
-rw-r--r--generator/transit_generator.cpp2
-rw-r--r--generator/transit_generator.hpp2
-rw-r--r--routing_common/transit_types.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index 3ff587d94e..aa826dee02 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -197,7 +197,7 @@ void DeserializerFromJson::operator()(m2::PointD & p, char const * name)
else
item = my::GetJSONObligatoryField(m_node, name);
- CHECK(json_is_object(item), ("Item is not a json object(dictionary). name:", name));
+ CHECK(json_is_object(item), ("Item is not a json object:", name));
FromJSONObject(item, "x", p.x);
FromJSONObject(item, "y", p.y);
}
diff --git a/generator/transit_generator.hpp b/generator/transit_generator.hpp
index 686f6b690d..13232881ca 100644
--- a/generator/transit_generator.hpp
+++ b/generator/transit_generator.hpp
@@ -66,7 +66,7 @@ public:
{
json_t * dictNode = my::GetJSONOptionalField(m_node, name);
if (dictNode == nullptr)
- return; // No the node in json.
+ return; // No such field in json.
DeserializerFromJson dict(dictNode, m_osmIdToFeatureIds);
t.Visit(dict);
diff --git a/routing_common/transit_types.cpp b/routing_common/transit_types.cpp
index 5410e7a4ce..b6127ccae3 100644
--- a/routing_common/transit_types.cpp
+++ b/routing_common/transit_types.cpp
@@ -239,7 +239,7 @@ Line::Line(LineId id, std::string const & number, std::string const & title,
bool Line::IsEqualForTesting(Line const & line) const
{
return m_id == line.m_id && m_number == line.m_number && m_title == line.m_title &&
- m_color == line.m_color && m_type == line.m_type && m_networkId == line.m_networkId &&
+ m_type == line.m_type && m_color == line.m_color && m_networkId == line.m_networkId &&
m_stopIds == line.m_stopIds;
}