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:
authorygorshenin <mipt.vi002@gmail.com>2016-09-01 14:20:26 +0300
committerGitHub <noreply@github.com>2016-09-01 14:20:26 +0300
commita43c309fc7adfbd853133debc712a86be3d149f9 (patch)
tree9b3e08849f05753677e1cbc55391f91b3e864c6c /indexer/osm_editor.cpp
parentba6e995c4cf0033bd1eef6fc525ca4806af25d81 (diff)
parent908ad603ad1f5b6c8b048a8d4a788ca80954019e (diff)
Merge pull request #4160 from milchakov/MAPSME-882_web_config
[editor] Mapsme 882 web config
Diffstat (limited to 'indexer/osm_editor.cpp')
-rw-r--r--indexer/osm_editor.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp
index 808da533e9..96f230ae09 100644
--- a/indexer/osm_editor.cpp
+++ b/indexer/osm_editor.cpp
@@ -137,7 +137,8 @@ namespace osm
// (e.g. insert/remove spaces after ';' delimeter);
Editor::Editor()
- : m_notes(editor::Notes::MakeNotes())
+ : m_configLoader(m_config)
+ , m_notes(editor::Notes::MakeNotes())
, m_storage(make_unique<editor::LocalStorage>())
{}
@@ -700,7 +701,7 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
EditableProperties Editor::GetEditablePropertiesForTypes(feature::TypesHolder const & types) const
{
editor::TypeAggregatedDescription desc;
- if (m_config.GetTypeDescription(types.ToObjectNames(), desc))
+ if (m_config.Get()->GetTypeDescription(types.ToObjectNames(), desc))
return {desc.GetEditableFields(), desc.IsNameEditable(), desc.IsAddressEditable()};
return {};
}
@@ -1061,7 +1062,7 @@ Editor::Stats Editor::GetStats() const
NewFeatureCategories Editor::GetNewFeatureCategories() const
{
- return NewFeatureCategories(m_config);
+ return NewFeatureCategories(*(m_config.Get()));
}
FeatureID Editor::GenerateNewFeatureId(MwmSet::MwmId const & id)