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

[editor] notes reformatting

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-05-11 19:20:24 +03:00 • committed by r.kuznetsov
parent d25221d52a
commit 9cd7f4f8fa
7 changed files with 49 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/jni/com/mapswithme/maps/editor/Editor.cpp
View file

@ -444,16 +444,17 @@ Java_com_mapswithme_maps_editor_Editor_nativeCreateMapObject(JNIEnv *, jclass, j
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
{
g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
g_framework->NativeFramework()->CreateNote(
g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
}
// static void nativePlaceDoesNotExist(String comment);
JNIEXPORT void JNICALL
Java_com_mapswithme_maps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment)
{
g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment));
g_framework->NativeFramework()->CreateNote(g_editableMapObject,
osm::Editor::NoteProblemType::PlaceDoesNotExist,
jni::ToNativeString(env, comment));
}
JNIEXPORT void JNICALL

12
indexer/indexer_tests/osm_editor_test.cpp
View file

@ -655,7 +655,10 @@ void EditorTest::HaveMapEditsOrNotesToUploadTest()
ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
{
using NoteType = osm::Editor::NoteProblemType;
editor.CreateNote({1.0, 1.0}, ft.GetID(), NoteType::PlaceDoesNotExist, "exploded");
feature::TypesHolder typesHolder;
string defaultName;
editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist,
"exploded");
});
TEST(editor.HaveMapEditsOrNotesToUpload(), ());
@ -828,13 +831,18 @@ void EditorTest::CreateNoteTest()
{
platform::tests_support::ScopedFile sf("test_notes.xml");
editor.m_notes = Notes::MakeNotes(sf.GetFullPath(), true);
editor.CreateNote(pos, fId, noteType, "with comment");
feature::TypesHolder holder;
holder.Assign(classif().GetTypeByPath({"amenity", "restaurant"}));
string defaultName = "Test name";
editor.CreateNote(pos, fId, holder, defaultName, noteType, "with comment");
auto notes = editor.m_notes->GetNotes();
TEST_EQUAL(notes.size(), 1, ());
TEST(notes.front().m_point.EqualDxDy(pos, 1e-10), ());
TEST_NOT_EQUAL(notes.front().m_note.find("with comment"), string::npos, ());
TEST_NOT_EQUAL(notes.front().m_note.find("OSM data version"), string::npos, ());
TEST_NOT_EQUAL(notes.front().m_note.find("restaurant"), string::npos, ());
TEST_NOT_EQUAL(notes.front().m_note.find("Test name"), string::npos, ());
};
ForEachCafeAtPoint(m_index, m2::PointD(1.0, 1.0), [&editor, &createAndCheckNote](FeatureType & ft)

33
indexer/osm_editor.cpp
View file

@ -1073,6 +1073,7 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmSet::Mwm
}
void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
feature::TypesHolder const & holder, string const & defaultName,
NoteProblemType const type, string const & note)
{
auto const version = GetMwmCreationTimeByMwmId(fid.m_mwmId);
@ -1080,13 +1081,32 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
ostringstream sstr;
auto canCreate = true;
sstr << "User\'s comment: ";
if (note.empty())
sstr << "- ;" << endl;
else
sstr << note << ';' << endl;
sstr << "Poi name: ";
if (defaultName.empty())
sstr << "- ;" << endl;
else
sstr << defaultName << ';' << endl;
sstr << "Poi types: ";
for (auto const & type : holder.ToObjectNames())
{
sstr << type << ' ';
}
sstr << ';' << endl;
sstr << "OSM data version: " << stringVersion << ';' << endl;
switch (type)
{
case NoteProblemType::PlaceDoesNotExist:
{
sstr << kPlaceDoesNotExistMessage;
if (!note.empty())
sstr << " User comments: \"" << note << '\"';
sstr << kPlaceDoesNotExistMessage << endl;
auto const isCreated = GetFeatureStatus(fid) == FeatureStatus::Created;
auto const createdAndUploaded = (isCreated && IsFeatureUploaded(fid.m_mwmId, fid.m_index));
CHECK(!isCreated || createdAndUploaded, ());
@ -1098,13 +1118,8 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
break;
}
case NoteProblemType::General:
{
sstr << note;
break;
}
case NoteProblemType::General: break;
}
sstr << " (OSM data version: " << stringVersion << ')';
if (canCreate)
m_notes->CreateNote(latLon, sstr.str());

1
indexer/osm_editor.hpp
View file

@ -180,6 +180,7 @@ public:
};
void CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
feature::TypesHolder const & holder, string const & defaultName,
NoteProblemType const type, string const & note);
void UploadNotes(string const & key, string const & secret);

4
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -282,7 +282,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
noteInfo[kStatProblem] = self.note;
CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon];
[Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo atLocation:location];
f.CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General, self.note.UTF8String);
f.CreateNote(m_mapObject, osm::Editor::NoteProblemType::General, self.note.UTF8String);
}
switch (f.SaveEditedMapObject(m_mapObject))
@ -968,7 +968,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage)
}
atLocation:location];
GetFramework().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist,
GetFramework().CreateNote(m_mapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
additional);
[self backTap];
[self showDropDown];

8
map/framework.cpp
View file

@ -3441,7 +3441,8 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
if (shouldNotify)
{
// TODO @mgsergio fill with correct NoteProblemType
editor.CreateNote(issueLatLon, emo.GetID(), osm::Editor::NoteProblemType::General,
editor.CreateNote(emo.GetLatLon(), emo.GetID(), emo.GetTypes(), emo.GetDefaultName(),
osm::Editor::NoteProblemType::General,
"The address on this POI is different from the building address."
" It is either a user's mistake, or an issue in the data. Please"
" check this and fix if needed. (This note was created automatically"
@ -3482,10 +3483,11 @@ bool Framework::RollBackChanges(FeatureID const & fid)
return rolledBack;
}
void Framework::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
void Framework::CreateNote(osm::MapObject const & mapObject,
osm::Editor::NoteProblemType const type, string const & note)
{
osm::Editor::Instance().CreateNote(latLon, fid, type, note);
osm::Editor::Instance().CreateNote(mapObject.GetLatLon(), mapObject.GetID(), mapObject.GetTypes(),
mapObject.GetDefaultName(), type, note);
if (type == osm::Editor::NoteProblemType::PlaceDoesNotExist)
DeactivateMapSelection(true /* notifyUI */);
}

4
map/framework.hpp
View file

@ -870,8 +870,8 @@ public:
void DeleteFeature(FeatureID const & fid) const;
osm::NewFeatureCategories GetEditorCategories() const;
bool RollBackChanges(FeatureID const & fid);
void CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
osm::Editor::NoteProblemType const type, string const & note);
void CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type,
string const & note);
//@}