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

[editor] Review fixes.

Browse source
This commit is contained in:
Alex Zolotarev 2016-01-19 16:59:56 +03:00 • committed by Sergey Yershov
parent 16cbd51453
commit 9adc5bbcc3
11 changed files with 60 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
base/base_tests/range_iterator_test.cpp
View file

@ -10,28 +10,28 @@ UNIT_TEST(RangeIterator)
{
vector<int> result;
for (auto const i : Range(5))
for (auto const i : UpTo(5))
result.push_back(i);
TEST_EQUAL(result, (vector<int>{0, 1, 2, 3, 4}), ());
}
{
vector<int> result;
for (auto const i : Range(2, 5))
for (auto const i : UpTo(2, 5))
result.push_back(i);
TEST_EQUAL(result, (vector<int>{2, 3, 4}), ());
}
{
vector<int> result;
for (auto const i : ReverseRange(5))
for (auto const i : DownTo(5))
result.push_back(i);
TEST_EQUAL(result, (vector<int>{4, 3, 2, 1, 0}), ());
}
{
vector<int> result;
for (auto const i : ReverseRange(2, 5))
for (auto const i : DownTo(2, 5))
result.push_back(i);
TEST_EQUAL(result, (vector<int>{4, 3, 2}), ());
}

10
base/collection_cast.hpp
View file

@ -9,11 +9,11 @@ namespace details
template <typename T>
struct ValueType
{
using type = typename std::remove_reference<T>::type::value_type;
using TType = typename std::remove_reference<T>::type::value_type;
};
template <typename T>
using ValueTypeT = typename ValueType<T>::type;
using TValueType = typename ValueType<T>::TType;
} // namespace details
// Use this function to cast one collection to annother.
@ -21,9 +21,9 @@ using ValueTypeT = typename ValueType<T>::type;
// More examples:
// auto const mySet = collection_cast<set>("aaabcccd");
// auto const myMap = collection_cast<map>(vector<pair<int, int>>{{1, 2}, {3, 4}});
template <template<typename ... Args> class To, typename From>
auto collection_cast(From && from) -> To<details::ValueTypeT<From>>
template <template<typename ... TArgs> class TTo, typename TFrom>
auto collection_cast(TFrom && from) -> TTo<details::TValueType<TFrom>>
{
return To<details::ValueTypeT<From>>(begin(from), end(from));
return TTo<details::TValueType<TFrom>>(begin(from), end(from));
}
} // namespace my

8
base/range_iterator.hpp
View file

@ -67,28 +67,28 @@ struct RangeWrapper
// Use this helper to iterate through 0 to `to'.
template <typename TCounter>
RangeWrapper<TCounter, true> Range(TCounter const to)
RangeWrapper<TCounter, true> UpTo(TCounter const to)
{
return {{}, to};
}
// Use this helper to iterate through `from' to `to'.
template <typename TCounter>
RangeWrapper<TCounter, true> Range(TCounter const from, TCounter const to)
RangeWrapper<TCounter, true> UpTo(TCounter const from, TCounter const to)
{
return {from, to};
}
// Use this helper to iterate through `from' to 0.
template <typename TCounter>
RangeWrapper<TCounter, false> ReverseRange(TCounter const from)
RangeWrapper<TCounter, false> DownTo(TCounter const from)
{
return {from, {}};
}
// Use this helper to iterate through `from' to `to'.
template <typename TCounter>
RangeWrapper<TCounter, false> ReverseRange(TCounter const from, TCounter const to)
RangeWrapper<TCounter, false> DownTo(TCounter const from, TCounter const to)
{
return {to, from};
}

16
editor/osm_auth.cpp
View file

@ -30,7 +30,7 @@ inline bool IsKeySecretValid(TKeySecret const & t)
return !(t.first.empty() || t.second.empty());
}
string findAuthenticityToken(string const & body)
string FindAuthenticityToken(string const & body)
{
auto pos = body.find("name=\"authenticity_token\"");
if (pos == string::npos)
@ -44,7 +44,7 @@ string findAuthenticityToken(string const & body)
return end == string::npos ? string() : body.substr(start, end - start);
}
string buildPostRequest(map<string, string> const & params)
string BuildPostRequest(map<string, string> const & params)
{
string result;
for (auto it = params.begin(); it != params.end(); ++it)
@ -57,7 +57,7 @@ string buildPostRequest(map<string, string> const & params)
}
// Trying to determine whether it's a login page.
bool isLoggedIn(string const & contents)
bool IsLoggedIn(string const & contents)
{
return contents.find("<form id=\"login_form\"") == string::npos;
}
@ -106,7 +106,7 @@ OsmOAuth::AuthResult OsmOAuth::FetchSessionId(OsmOAuth::SessionID & sid) const
if (request.error_code() != 200)
return AuthResult::ServerError;
sid.m_cookies = request.combined_cookies();
sid.m_token = findAuthenticityToken(request.server_response());
sid.m_token = FindAuthenticityToken(request.server_response());
return !sid.m_cookies.empty() && !sid.m_token.empty() ? AuthResult::OK : AuthResult::FailCookie;
}
@ -132,7 +132,7 @@ OsmOAuth::AuthResult OsmOAuth::LoginUserPassword(string const & login, string co
params["commit"] = "Login";
params["authenticity_token"] = sid.m_token;
HTTPClientPlatformWrapper request(m_baseUrl + "/login");
request.set_body_data(buildPostRequest(params), "application/x-www-form-urlencoded");
request.set_body_data(BuildPostRequest(params), "application/x-www-form-urlencoded");
request.set_cookies(sid.m_cookies);
if (!request.RunHTTPRequest())
return AuthResult::NetworkError;
@ -141,7 +141,7 @@ OsmOAuth::AuthResult OsmOAuth::LoginUserPassword(string const & login, string co
if (!request.was_redirected())
return AuthResult::FailLogin;
// Since we don't know whether the request was redirected or not, we need to check page contents.
return isLoggedIn(request.server_response()) ? AuthResult::OK : AuthResult::FailLogin;
return IsLoggedIn(request.server_response()) ? AuthResult::OK : AuthResult::FailLogin;
}
// Signs a user in using a facebook token.
@ -156,7 +156,7 @@ OsmOAuth::AuthResult OsmOAuth::LoginSocial(string const & callbackPart, string c
return AuthResult::ServerError;
if (!request.was_redirected())
return AuthResult::FailLogin;
return isLoggedIn(request.server_response()) ? AuthResult::OK : AuthResult::FailLogin;
return IsLoggedIn(request.server_response()) ? AuthResult::OK : AuthResult::FailLogin;
}
// Fakes a buttons press, so a user accepts requested permissions.
@ -172,7 +172,7 @@ string OsmOAuth::SendAuthRequest(string const & requestTokenKey, SessionID const
params["allow_write_notes"] = "yes";
params["commit"] = "Save changes";
HTTPClientPlatformWrapper request(m_baseUrl + "/oauth/authorize");
request.set_body_data(buildPostRequest(params), "application/x-www-form-urlencoded");
request.set_body_data(BuildPostRequest(params), "application/x-www-form-urlencoded");
request.set_cookies(sid.m_cookies);
if (!request.RunHTTPRequest())

10
editor/server_api.cpp
View file

@ -33,7 +33,7 @@ bool ServerApi06::CreateChangeSet(TKeyValueTags const & kvTags, uint64_t & outCh
stream << "</changeset>\n"
"</osm>\n";
OsmOAuth::Response const response = m_auth.Request("/changeset/create", "PUT", move(stream.str()));
OsmOAuth::Response const response = m_auth.Request("/changeset/create", "PUT", stream.str());
if (response.first == OsmOAuth::ResponseCode::OK)
{
if (strings::to_uint64(response.second, outChangeSetId))
@ -48,7 +48,7 @@ bool ServerApi06::CreateChangeSet(TKeyValueTags const & kvTags, uint64_t & outCh
bool ServerApi06::CreateNode(string const & nodeXml, uint64_t & outCreatedNodeId) const
{
OsmOAuth::Response const response = m_auth.Request("/node/create", "PUT", move(nodeXml));
OsmOAuth::Response const response = m_auth.Request("/node/create", "PUT", nodeXml);
if (response.first == OsmOAuth::ResponseCode::OK)
{
if (strings::to_uint64(response.second, outCreatedNodeId))
@ -63,7 +63,7 @@ bool ServerApi06::CreateNode(string const & nodeXml, uint64_t & outCreatedNodeId
bool ServerApi06::ModifyNode(string const & nodeXml, uint64_t nodeId) const
{
OsmOAuth::Response const response = m_auth.Request("/node/" + strings::to_string(nodeId), "PUT", move(nodeXml));
OsmOAuth::Response const response = m_auth.Request("/node/" + strings::to_string(nodeId), "PUT", nodeXml);
if (response.first == OsmOAuth::ResponseCode::OK)
return true;
@ -73,7 +73,7 @@ bool ServerApi06::ModifyNode(string const & nodeXml, uint64_t nodeId) const
ServerApi06::DeleteResult ServerApi06::DeleteNode(string const & nodeXml, uint64_t nodeId) const
{
OsmOAuth::Response const response = m_auth.Request("/node/" + strings::to_string(nodeId), "DELETE", move(nodeXml));
OsmOAuth::Response const response = m_auth.Request("/node/" + strings::to_string(nodeId), "DELETE", nodeXml);
if (response.first == OsmOAuth::ResponseCode::OK)
return DeleteResult::ESuccessfullyDeleted;
else if (static_cast<int>(response.first) >= 400)
@ -105,7 +105,7 @@ OsmOAuth::Response ServerApi06::GetXmlFeaturesInRect(m2::RectD const & latLonRec
using strings::to_string_dac;
// Digits After Comma.
static constexpr double const kDAC = 7;
static constexpr double kDAC = 7;
m2::PointD const lb = latLonRect.LeftBottom();
m2::PointD const rt = latLonRect.RightTop();
string const url = "/map?bbox=" + to_string_dac(lb.x, kDAC) + ',' + to_string_dac(lb.y, kDAC) + ',' +

5
editor/ui2oh.cpp
View file

@ -1,5 +1,7 @@
#include "editor/ui2oh.hpp"
#include "base/assert.hpp"
#include "std/algorithm.hpp"
#include "std/array.hpp"
#include "std/string.hpp"
@ -97,8 +99,10 @@ using TWeekdays = vector<osmoh::Weekday>;
vector<TWeekdays> SplitIntoIntervals(editor::ui::TOpeningDays const & days)
{
ASSERT_GREATER(days.size(), 0, ("At least one day must present."));
vector<TWeekdays> result;
auto const & noInversionDays = RemoveInversion(days);
ASSERT(!noInversionDays.empty(), ());
auto previous = *begin(noInversionDays);
result.push_back({previous});
@ -156,6 +160,7 @@ namespace editor
{
osmoh::OpeningHours MakeOpeningHours(ui::TimeTableSet const & tts)
{
ASSERT_GREATER(tts.Size(), 0, ("At least one time table must present."));
osmoh::TRuleSequences rule;
for (auto const & tt : tts)
{

2
indexer/feature.cpp
View file

@ -77,7 +77,7 @@ void FeatureType::ApplyPatch(editor::XMLFeature const & xml)
// m_params.rank =
m_bCommonParsed = true;
for (auto const i : my::Range(1u, static_cast<uint32_t>(feature::Metadata::FMD_COUNT)))
for (auto const i : my::UpTo(1u, static_cast<uint32_t>(feature::Metadata::FMD_COUNT)))
{
auto const type = static_cast<feature::Metadata::EType>(i);
auto const attributeName = DebugPrint(type);

2
indexer/feature_algo.cpp
View file

@ -198,4 +198,4 @@ double GetMinDistanceMeters(FeatureType const & ft, m2::PointD const & pt)
return GetMinDistanceMeters(ft, pt, FeatureType::BEST_GEOMETRY);
}
} // namespace feature
} // namespace feature

2
indexer/feature_algo.hpp
View file

@ -13,4 +13,4 @@ m2::PointD GetCenter(FeatureType const & f);
double GetMinDistanceMeters(FeatureType const & ft, m2::PointD const & pt, int scale);
double GetMinDistanceMeters(FeatureType const & ft, m2::PointD const & pt);
} // namespace feature
} // namespace feature

50
indexer/osm_editor.cpp
View file

@ -31,6 +31,8 @@ using feature::EGeomType;
using feature::Metadata;
using editor::XMLFeature;
namespace
{
constexpr char const * kEditorXMLFileName = "edits.xml";
constexpr char const * kXmlRootNode = "mapsme";
constexpr char const * kXmlMwmNode = "mwm";
@ -44,13 +46,6 @@ constexpr char const * kUploaded = "Uploaded";
constexpr char const * kDeletedFromOSMServer = "Deleted from OSM by someone";
constexpr char const * kNeedsRetry = "Needs Retry";
namespace osm
{
// TODO(AlexZ): Normalize osm multivalue strings for correct merging
// (e.g. insert/remove spaces after ';' delimeter);
namespace
{
string GetEditorFilePath() { return GetPlatform().WritablePathForFile(kEditorXMLFileName); }
// TODO(mgsergio): Replace hard-coded value with reading from file.
/// type:string -> description:pair<fields:vector<???>, editName:bool, editAddr:bool>
@ -61,16 +56,16 @@ using TEditableFields = vector<EType>;
struct TypeDescription
{
TypeDescription(TEditableFields const & fields, bool const name, bool const address) :
fields(fields),
name(name),
address(address)
m_fields(fields),
m_name(name),
m_address(address)
{
}
TEditableFields const fields;
bool const name;
TEditableFields const m_fields;
bool const m_name;
// Address == true implies Street, House Number, Phone, Fax, Opening Hours, Website, EMail, Postcode.
bool const address;
bool const m_address;
};
static unordered_map<string, TypeDescription> const gEditableTypes = {
@ -213,6 +208,11 @@ uint32_t MigrateFeatureIndex(XMLFeature const & /*xml*/)
} // namespace
namespace osm
{
// TODO(AlexZ): Normalize osm multivalue strings for correct merging
// (e.g. insert/remove spaces after ';' delimeter);
Editor & Editor::Instance()
{
static Editor instance;
@ -372,12 +372,12 @@ Editor::FeatureStatus Editor::GetFeatureStatus(MwmSet::MwmId const & mwmId, uint
if (m_features.empty())
return FeatureStatus::Untouched;
auto const mwmMatched = m_features.find(mwmId);
if (mwmMatched == m_features.end())
auto const matchedMwm = m_features.find(mwmId);
if (matchedMwm == m_features.end())
return FeatureStatus::Untouched;
auto const matchedIndex = mwmMatched->second.find(index);
if (matchedIndex == mwmMatched->second.end())
auto const matchedIndex = matchedMwm->second.find(index);
if (matchedIndex == matchedMwm->second.end())
return FeatureStatus::Untouched;
return matchedIndex->second.m_status;
@ -474,12 +474,12 @@ void Editor::ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
bool Editor::GetEditedFeature(MwmSet::MwmId const & mwmId, uint32_t index, FeatureType & outFeature) const
{
auto const mwmMatched = m_features.find(mwmId);
if (mwmMatched == m_features.end())
auto const matchedMwm = m_features.find(mwmId);
if (matchedMwm == m_features.end())
return false;
auto const matchedIndex = mwmMatched->second.find(index);
if (matchedIndex == mwmMatched->second.end())
auto const matchedIndex = matchedMwm->second.find(index);
if (matchedIndex == matchedMwm->second.end())
return false;
// TODO(AlexZ): Should we process deleted/created features as well?
@ -498,10 +498,10 @@ vector<Metadata::EType> Editor::EditableMetadataForType(FeatureType const & feat
auto const * desc = GetTypeDescription(type);
if (desc)
{
for (auto field : desc->fields)
for (auto field : desc->m_fields)
fields.insert(field);
// If address is editable, many metadata fields are editable too.
if (desc->address)
if (desc->m_address)
{
fields.insert(EType::FMD_EMAIL);
fields.insert(EType::FMD_OPEN_HOURS);
@ -524,7 +524,7 @@ bool Editor::IsNameEditable(FeatureType const & feature) const
for (auto type : types)
{
auto const * typeDesc = GetTypeDescription(type);
if (typeDesc && typeDesc->name)
if (typeDesc && typeDesc->m_name)
return true;
}
return false;
@ -540,7 +540,7 @@ bool Editor::IsAddressEditable(FeatureType const & feature) const
if (isBuilding.HasTypeValue(type))
return true;
auto const * typeDesc = GetTypeDescription(type);
if (typeDesc && typeDesc->address)
if (typeDesc && typeDesc->m_address)
return true;
}
return false;

2
indexer/osm_editor.hpp
View file

@ -47,11 +47,11 @@ public:
void LoadMapEdits();
using TFeatureIDFunctor = function<void(FeatureID const &)>;
using TFeatureTypeFunctor = function<void(FeatureType &)>;
void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
TFeatureIDFunctor const & f,
m2::RectD const & rect,
uint32_t scale);
using TFeatureTypeFunctor = function<void(FeatureType &)>;
void ForEachFeatureInMwmRectAndScale(MwmSet::MwmId const & id,
TFeatureTypeFunctor const & f,
m2::RectD const & rect,