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

[editor] getting rid of osm::Editor::OriginalFeatureHasDeaultName method

Browse source
This commit is contained in:
Arsentiy Milchakov 2018-03-01 16:06:16 +03:00 • committed by Aleksandr Zatsepin
parent 65c404f0dc
commit 953ff937f3
6 changed files with 0 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
indexer/indexer_tests/osm_editor_test.cpp
View file

@ -332,47 +332,6 @@ void EditorTest::GetEditedFeatureStreetTest()
});
}
void EditorTest::OriginalFeatureHasDefaultNameTest()
{
auto & editor = osm::Editor::Instance();
auto const mwmId = ConstructTestMwm([](TestMwmBuilder & builder)
{
TestCafe cafe(m2::PointD(1.0, 1.0), "London Cafe", "en");
TestCafe unnamedCafe(m2::PointD(2.0, 2.0), "", "en");
TestCafe secondUnnamedCafe(m2::PointD(3.0, 3.0), "", "en");
builder.Add(cafe);
builder.Add(unnamedCafe);
builder.Add(secondUnnamedCafe);
});
ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
{
TEST(editor.OriginalFeatureHasDefaultName(ft.GetID()), ());
});
ForEachCafeAtPoint(m_index, m2::PointD(2.0, 2.0), [&editor](FeatureType & ft)
{
TEST(!editor.OriginalFeatureHasDefaultName(ft.GetID()), ());
});
ForEachCafeAtPoint(m_index, m2::PointD(3.0, 3.0), [&editor](FeatureType & ft)
{
osm::EditableMapObject emo;
FillEditableMapObject(editor, ft, emo);
StringUtf8Multilang names;
names.AddString(StringUtf8Multilang::GetLangIndex("en"), "Eng name");
names.AddString(StringUtf8Multilang::GetLangIndex("default"), "Default name");
emo.SetName(names);
TEST_EQUAL(editor.SaveEditedFeature(emo), osm::Editor::SaveResult::SavedSuccessfully, ());
TEST(!editor.OriginalFeatureHasDefaultName(ft.GetID()), ());
});
}
void EditorTest::GetFeatureStatusTest()
{
auto & editor = osm::Editor::Instance();
@ -1073,11 +1032,6 @@ UNIT_CLASS_TEST(EditorTest, GetFeatureTypeInfoTest)
EditorTest::GetFeatureTypeInfoTest();
}
UNIT_CLASS_TEST(EditorTest, OriginalFeatureHasDefaultNameTest)
{
EditorTest::OriginalFeatureHasDefaultNameTest();
}
UNIT_CLASS_TEST(EditorTest, SetIndexTest)
{
EditorTest::SetIndexTest();

1
indexer/indexer_tests/osm_editor_test.hpp
View file

@ -25,7 +25,6 @@ public:
void GetEditedFeatureTest();
void SetIndexTest();
void GetEditedFeatureStreetTest();
void OriginalFeatureHasDefaultNameTest();
void GetFeatureStatusTest();
void IsFeatureUploadedTest();
void DeleteFeatureTest();

18
indexer/osm_editor.cpp
View file

@ -371,24 +371,6 @@ bool Editor::IsCreatedFeature(FeatureID const & fid)
return feature::FakeFeatureIds::IsEditorCreatedFeature(fid.m_index);
}
bool Editor::OriginalFeatureHasDefaultName(FeatureID const & fid) const
{
if (IsCreatedFeature(fid))
return false;
auto const originalFeaturePtr = GetOriginalFeature(fid);
if (!originalFeaturePtr)
{
LOG(LERROR, ("A feature with id", fid, "cannot be loaded."));
alohalytics::LogEvent("Editor_MissingFeature_Error");
return false;
}
auto const & names = originalFeaturePtr->GetNames();
return names.HasString(StringUtf8Multilang::kDefaultCode);
}
/// Several cases should be handled while saving changes:
/// 1) a feature is not in editor's cache
/// I. a feature was created

1
indexer/osm_editor.hpp
View file

@ -199,7 +199,6 @@ public:
// not yet saved and we have to know if it was modified or created.
static bool IsCreatedFeature(FeatureID const & fid);
// Returns true if the original feature has default name.
bool OriginalFeatureHasDefaultName(FeatureID const & fid) const;
private:
// TODO(AlexZ): Synchronize Save call/make it on a separate thread.

5
map/framework.cpp
View file

@ -3023,11 +3023,6 @@ void Framework::CreateNote(osm::MapObject const & mapObject,
DeactivateMapSelection(true /* notifyUI */);
}
bool Framework::OriginalFeatureHasDefaultName(FeatureID const & fid) const
{
return osm::Editor::Instance().OriginalFeatureHasDefaultName(fid);
}
storage::TCountriesVec Framework::GetTopmostCountries(ms::LatLon const & latlon) const
{
m2::PointD const point = MercatorBounds::FromLatLon(latlon);

1
map/framework.hpp
View file

@ -808,7 +808,6 @@ private:
//@}
public:
bool OriginalFeatureHasDefaultName(FeatureID const & fid) const;
storage::TCountriesVec GetTopmostCountries(ms::LatLon const & latlon) const;
private: