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

[editor] Fixed bug with editable opening hours and contacts for anonymous buildings.

Browse source
This commit is contained in:
Alex Zolotarev 2016-02-18 12:55:29 +03:00 • committed by Sergey Yershov
parent 8e5ede48ea
commit 1881b431bc
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
indexer/osm_editor.cpp
View file

@ -638,11 +638,6 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
editable.m_metadata.push_back(field);
}
}
// Buildings are processed separately.
// TODO(mgsergio): Activate this code by XML config variable.
if (ftypes::IsBuildingChecker::Instance()(feature))
editable.m_address = true;
// If address is editable, many metadata fields are editable too.
if (editable.m_address)
{
@ -655,6 +650,15 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
editable.m_metadata.push_back(EType::FMD_POSTCODE);
}
// Buildings are processed separately.
// Please note that only house number, street and post code should be editable for buildings.
// TODO(mgsergio): Activate this code by XML config variable.
if (ftypes::IsBuildingChecker::Instance()(feature))
{
editable.m_address = true;
editable.m_metadata.push_back(EType::FMD_POSTCODE);
}
// Avoid possible duplicates.
my::SortUnique(editable.m_metadata);
return editable;

1
indexer/osm_editor.hpp
View file

@ -22,6 +22,7 @@ namespace osm
struct EditableProperties
{
bool m_name = false;
/// If true, enables editing of house number, street address and post code.
bool m_address = false;
vector<feature::Metadata::EType> m_metadata;
bool IsEditable() const { return m_name || m_address || !m_metadata.empty(); }