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

Code review.

Browse source
This commit is contained in:
Sergey Magidovich 2015-12-10 13:49:28 +03:00 • committed by Sergey Yershov
parent 84811287a8
commit c03c4f1494
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/editor_tests/editor_tests.pro
View file

@ -4,10 +4,12 @@ CONFIG -= app_bundle
TEMPLATE = app
ROOT_DIR = ../..
DEPENDENCIES += editor base coding geometry opening_hours pugixml
DEPENDENCIES = editor base coding geometry opening_hours pugixml
include($$ROOT_DIR/common.pri)
QT *= core
HEADERS += \
SOURCES += \

19
editor/xml_feature.cpp
View file

@ -45,7 +45,7 @@ void ValidateNode(pugi::xml_node const & node)
{
PointFromLatLon(node);
}
catch(editor::XMLFeatureError)
catch(editor::XMLFeatureError const &)
{
throw;
}
@ -54,10 +54,11 @@ void ValidateNode(pugi::xml_node const & node)
MYTHROW(editor::XMLFeatureNoTimestampError, ("Node has no timestamp attribute"));
}
bool IsConvertable(string const & k, string const & v)
bool IsConvertible(string const & k, string const & v)
{
static unordered_set<pair<string, string>, boost::hash<pair<string, string>>> const
convertableTypePairs =
using TStringPair = pair<string, string>;
static unordered_set<TStringPair, boost::hash<TStringPair>> const
convertibleTypePairs =
{
{ "aeroway", "aerodrome" },
{ "aeroway", "airport" },
@ -189,14 +190,14 @@ bool IsConvertable(string const & k, string const & v)
{ "waterway", "waterfall" }
};
return convertableTypePairs.find(make_pair(k, v)) != end(convertableTypePairs);
return convertibleTypePairs.find(make_pair(k, v)) != end(convertibleTypePairs);
}
pair<string, string> SplitMapsmeType(string const & type)
{
vector<string> parts;
boost::split(parts, type, boost::is_any_of("|"));
// Current implementations supports only types with one pipe
// Current implementations supports only types with one pipe.
ASSERT(parts.size() == 2, ("Too many parts in type: " + type));
return make_pair(parts[0], parts[1]);
}
@ -239,8 +240,8 @@ string XMLFeature::GetType() const
{
string const key = tag.node().attribute("k").value();
string const val = tag.node().attribute("v").value();
// Handle only the first appropriate tag in first version
if (IsConvertable(key, val))
// Handle only the first appropriate tag in first version.
if (IsConvertible(key, val))
return key + '|' + val;
}
@ -250,7 +251,7 @@ string XMLFeature::GetType() const
void XMLFeature::SetType(string const & type)
{
auto const p = SplitMapsmeType(type);
if (IsConvertable(p.first, p.second))
if (IsConvertible(p.first, p.second))
SetTagValue(p.first, p.second);
}

2
omim.pro
View file

@ -160,7 +160,7 @@ SUBDIRS = 3party base coding geometry editor indexer routing search
SUBDIRS *= generator_tests
editor_tests.subdir = editor/editor_tests
editor_tests.depends = 3party base coding editor geometry
editor_tests.depends = 3party base coding geometry editor
SUBDIRS *= editor_tests
SUBDIRS *= qt_tstfrm