diff options
| author | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-08-31 18:27:16 +0300 |
|---|---|---|
| committer | Arsentiy Milchakov <a.milchakov@corp.mail.ru> | 2016-08-31 18:27:16 +0300 |
| commit | 97f9878607fb15f406d3b52b2f06ca8ecbe4915a (patch) | |
| tree | 9853b6922f09488092c8cbb0b396bb3b9bcfb0b2 /indexer/osm_editor.cpp | |
| parent | 39103b30cf1fcb94801d6725f60897c85df45304 (diff) | |
editor web config
Diffstat (limited to 'indexer/osm_editor.cpp')
| -rw-r--r-- | indexer/osm_editor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indexer/osm_editor.cpp b/indexer/osm_editor.cpp index 30a324770a..e09870dd3b 100644 --- a/indexer/osm_editor.cpp +++ b/indexer/osm_editor.cpp @@ -138,7 +138,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>()) {} @@ -701,7 +702,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 {}; } @@ -1062,7 +1063,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) |