From bd48f5485ffba1355dd4d6a72cda6d7bcfe88f47 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 3 Mar 2016 09:59:02 +0300 Subject: [PATCH] Changed signature of CreateMapObject. --- map/framework.cpp | 4 ++-- map/framework.hpp | 4 ++-- qt/draw_widget.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/map/framework.cpp b/map/framework.cpp index f0ba67a53c..ad87bd9135 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -2304,9 +2304,9 @@ bool Framework::ParseEditorDebugCommand(search::SearchParams const & params) return false; } -bool Framework::CreateMapObjectAtViewportCenter(uint32_t const featureType, osm::EditableMapObject & emo) const +bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const featureType, + osm::EditableMapObject & emo) const { - m2::PointD const mercator = GetViewportCenter(); MwmSet::MwmId const mwmId = m_model.GetIndex().GetMwmIdByCountryFile( platform::CountryFile(m_infoGetter->GetRegionCountryId(mercator))); if (!mwmId.IsAlive()) diff --git a/map/framework.hpp b/map/framework.hpp index e1625c1a78..a8184bc3c9 100644 --- a/map/framework.hpp +++ b/map/framework.hpp @@ -613,8 +613,8 @@ public: /// @name Editor interface. //@{ /// Initializes feature for Create Object UI. - /// @returns false in case when viewport center is in the ocean or mwm is not downloaded. - bool CreateMapObjectAtViewportCenter(uint32_t const featureType, osm::EditableMapObject & emo) const; + /// @returns false in case when coordinate is in the ocean or mwm is not downloaded. + bool CreateMapObject(m2::PointD const & mercator, uint32_t const featureType, osm::EditableMapObject & emo) const; /// @returns false if feature is invalid or can't be edited. bool GetEditableMapObject(FeatureID const & fid, osm:: EditableMapObject & emo) const; osm::Editor::SaveResult SaveEditedMapObject(osm:: EditableMapObject const & emo) const; diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 6aafff96c7..882c8d5191 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -489,7 +489,7 @@ void DrawWidget::CreateFeature() if (dlg.exec() == QDialog::Accepted) { osm::EditableMapObject emo; - if (m_framework->CreateMapObjectAtViewportCenter(dlg.GetSelectedType(), emo)) + if (m_framework->CreateMapObject(m_framework->GetViewportCenter(), dlg.GetSelectedType(), emo)) { EditorDialog dlg(this, emo); int const result = dlg.exec();