diff options
author | tatiana-yan <tatiana.kondakova@gmail.com> | 2018-07-09 11:11:05 +0300 |
---|---|---|
committer | Maksim Andrianov <maksimandrianov1@gmail.com> | 2018-07-09 14:02:48 +0300 |
commit | c49409b14554a3e9f34642274105d6c3cc9ce2b4 (patch) | |
tree | 0b11430740edd67e2c2b60c8b0a36d30b76316e9 /editor | |
parent | 2e96ce5efa5bc60347c2d430bf7c1893c32b094d (diff) |
[generator] Set mwm bounds rect to rect around region borders, not features which cross region border.
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_tests/osm_editor_test.hpp | 2 | ||||
-rw-r--r-- | editor/osm_editor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_tests/osm_editor_test.hpp b/editor/editor_tests/osm_editor_test.hpp index a0c7829bd5..724eb8241a 100644 --- a/editor/editor_tests/osm_editor_test.hpp +++ b/editor/editor_tests/osm_editor_test.hpp @@ -69,7 +69,7 @@ private: auto const & info = id.GetInfo(); if (info) - m_infoGetter.AddCountry(storage::CountryDef(name, info->m_limitRect)); + m_infoGetter.AddCountry(storage::CountryDef(name, info->m_bordersRect)); CHECK(id.IsAlive(), ()); diff --git a/editor/osm_editor.cpp b/editor/osm_editor.cpp index f6a5421727..544eedb6bf 100644 --- a/editor/osm_editor.cpp +++ b/editor/osm_editor.cpp @@ -1004,7 +1004,7 @@ FeatureID Editor::GenerateNewFeatureId(MwmSet::MwmId const & id) const bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::MwmId const & id, EditableMapObject & outFeature) { ASSERT(id.IsAlive(), ("Please check that feature is created in valid MWM file before calling this method.")); - if (!id.GetInfo()->m_limitRect.IsPointInside(mercator)) + if (!id.GetInfo()->m_bordersRect.IsPointInside(mercator)) { LOG(LERROR, ("Attempt to create a feature outside of the MWM's bounding box.")); return false; |