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

Merge pull request #3355 from mgsergio/mark-as-deleted

Browse source 
[editor] Mark as deleted
This commit is contained in:
mpimenov 2016-06-03 16:39:33 +04:00
commit 4d09cea1bc
17 changed files with 103 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -405,16 +405,16 @@ 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)
{
Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
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)
{
Editor::Instance().CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment));
g_framework->NativeFramework()->CreateNote(g_editableMapObject.GetLatLon(), g_editableMapObject.GetID(),
osm::Editor::NoteProblemType::PlaceDoesNotExist, jni::ToNativeString(env, comment));
}
JNIEXPORT void JNICALL
@ -528,7 +528,7 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass cl
JNIEXPORT jint JNICALL
Java_com_mapswithme_maps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz)
{
return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index));
return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID()));
}
JNIEXPORT jboolean JNICALL

7
android/src/com/mapswithme/maps/editor/Editor.java
View file

@ -26,13 +26,14 @@ public final class Editor
{
// Should correspond to core osm::FeatureStatus.
@Retention(RetentionPolicy.SOURCE)
@IntDef({UNTOUCHED, DELETED, MODIFIED, CREATED})
@IntDef({UNTOUCHED, DELETED, OBSOLETE, MODIFIED, CREATED})
public @interface FeatureStatus {}
public static final int UNTOUCHED = 0;
public static final int DELETED = 1;
public static final int MODIFIED = 2;
public static final int CREATED = 3;
public static final int OBSOLETE = 2;
public static final int MODIFIED = 3;
public static final int CREATED = 4;
private static final AppBackgroundTracker.OnTransitionListener sOsmUploader = new AppBackgroundTracker.OnTransitionListener()
{

4
android/src/com/mapswithme/maps/editor/EditorFragment.java
View file

@ -431,6 +431,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
break;
case Editor.DELETED:
throw new IllegalStateException("Can't delete already deleted feature.");
case Editor.OBSOLETE:
throw new IllegalStateException("Obsolete objects cannot be reverted.");
}
}
@ -455,6 +457,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
break;
case Editor.DELETED:
throw new IllegalStateException("Can't delete already deleted feature.");
case Editor.OBSOLETE:
throw new IllegalStateException("Obsolete objects cannot be reverted.");
}
}

3
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -687,7 +687,8 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
else
{
UiUtils.showIf(Editor.nativeIsFeatureEditable(), mEditPlace);
UiUtils.showIf(Framework.nativeIsActiveObjectABuilding(), mAddOrganisation);
UiUtils.showIf(Framework.nativeIsActiveObjectABuilding() &&
Editor.nativeGetMapObjectStatus() != Editor.OBSOLETE, mAddOrganisation);
UiUtils.showIf(Framework.nativeCanAddPlaceFromPlacePage(), mAddPlace);
}

10
drape_frontend/apply_feature_functors.cpp
View file

@ -269,7 +269,7 @@ ApplyPointFeature::ApplyPointFeature(TInsertShapeFn const & insertShape, Feature
, m_hasPoint(false)
, m_hasArea(false)
, m_createdByEditor(false)
, m_deletedInEditor(false)
, m_obsoleteInEditor(false)
, m_symbolDepth(dp::minDepth)
, m_circleDepth(dp::minDepth)
, m_symbolRule(nullptr)
@ -279,10 +279,12 @@ ApplyPointFeature::ApplyPointFeature(TInsertShapeFn const & insertShape, Feature
void ApplyPointFeature::operator()(m2::PointD const & point, bool hasArea)
{
auto const & editor = osm::Editor::Instance();
m_hasPoint = true;
m_hasArea = hasArea;
m_createdByEditor = osm::Editor::IsCreatedFeature(m_id);
m_deletedInEditor = false; //TODO: implement
auto const featureStatus = editor.GetFeatureStatus(m_id);
m_createdByEditor = featureStatus == osm::Editor::FeatureStatus::Created;
m_obsoleteInEditor = featureStatus == osm::Editor::FeatureStatus::Obsolete;
m_centerPoint = point;
}
@ -378,7 +380,7 @@ void ApplyPointFeature::Finish()
params.m_posZ = m_posZ;
params.m_hasArea = m_hasArea;
params.m_createdByEditor = m_createdByEditor;
params.m_deletedInEditor = m_deletedInEditor;
params.m_obsoleteInEditor = m_obsoleteInEditor;
m_insertShape(make_unique_dp<PoiSymbolShape>(m_centerPoint, params));
}
}

2
drape_frontend/apply_feature_functors.hpp
View file

@ -80,7 +80,7 @@ private:
bool m_hasPoint;
bool m_hasArea;
bool m_createdByEditor;
bool m_deletedInEditor;
bool m_obsoleteInEditor;
double m_symbolDepth;
double m_circleDepth;
SymbolRuleProto const * m_symbolRule;

4
drape_frontend/poi_symbol_shape.cpp
View file

@ -117,7 +117,7 @@ void PoiSymbolShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManag
handle->SetPivotZ(m_params.m_posZ);
handle->SetExtendingSize(m_params.m_extendingSize);
if (m_params.m_deletedInEditor)
if (m_params.m_obsoleteInEditor)
{
dp::TextureManager::ColorRegion maskColorRegion;
textures->GetColorRegion(kDeletedColorMask, maskColorRegion);
@ -134,7 +134,7 @@ uint64_t PoiSymbolShape::GetOverlayPriority() const
// Set up maximum priority for shapes which created by user in the editor.
if (m_params.m_createdByEditor)
return dp::kPriorityMaskAll;
// Set up minimal priority for shapes which belong to areas.
if (m_params.m_hasArea)
return 0;

2
drape_frontend/shape_view_params.hpp
View file

@ -29,7 +29,7 @@ struct PoiSymbolViewParams : CommonViewParams
float m_posZ = 0.0f;
bool m_hasArea = false;
bool m_createdByEditor = false;
bool m_deletedInEditor = false;
bool m_obsoleteInEditor = false;
};
struct CircleViewParams : CommonViewParams

8
editor/editor_tests/user_stats_test.cpp
View file

@ -9,7 +9,7 @@ namespace editor
namespace
{
auto constexpr kEditorTestDir = "editor-tests";
auto constexpr kUserName = "Vladimir BI";
auto constexpr kUserName = "Vladimir BI"; // TODO(mgsergio, Zverik): Make a test user account.
UNIT_TEST(UserStatsLoader_Smoke)
{
@ -31,9 +31,6 @@ UNIT_TEST(UserStatsLoader_Smoke)
int32_t rank, changesCount;
TEST(userStats.GetRank(rank), ());
TEST(userStats.GetChangesCount(changesCount), ());
TEST_GREATER_OR_EQUAL(rank, 5800, ());
TEST_EQUAL(changesCount, 2, ());
}
// This test checks if user stats info was stored in setting.
@ -48,9 +45,6 @@ UNIT_TEST(UserStatsLoader_Smoke)
int32_t rank, changesCount;
TEST(userStats.GetRank(rank), ());
TEST(userStats.GetChangesCount(changesCount), ());
TEST_GREATER_OR_EQUAL(rank, 5800, ());
TEST_EQUAL(changesCount, 2, ());
}
}
} // namespace

4
indexer/index.hpp
View file

@ -116,7 +116,9 @@ private:
FeatureType feature;
switch (m_editor.GetFeatureStatus(mwmID, index))
{
case osm::Editor::FeatureStatus::Deleted: return;
case osm::Editor::FeatureStatus::Deleted:
case osm::Editor::FeatureStatus::Obsolete:
return;
case osm::Editor::FeatureStatus::Modified:
VERIFY(m_editor.GetEditedFeature(mwmID, index, feature), ());
m_f(feature);

40
indexer/osm_editor.cpp
View file

@ -55,6 +55,7 @@ constexpr char const * kXmlMwmNode = "mwm";
constexpr char const * kDeleteSection = "delete";
constexpr char const * kModifySection = "modify";
constexpr char const * kCreateSection = "create";
constexpr char const * kObsoleteSection = "obsolete";
/// We store edited streets in OSM-compatible way.
constexpr char const * kAddrStreetTag = "addr:street";
@ -165,13 +166,14 @@ void Editor::LoadMapEdits()
}
}
array<pair<FeatureStatus, char const *>, 3> const sections =
array<pair<FeatureStatus, char const *>, 4> const sections =
{{
{FeatureStatus::Deleted, kDeleteSection},
{FeatureStatus::Modified, kModifySection},
{FeatureStatus::Obsolete, kObsoleteSection},
{FeatureStatus::Created, kCreateSection}
}};
int deleted = 0, modified = 0, created = 0;
int deleted = 0, obsolete = 0, modified = 0, created = 0;
bool needRewriteEdits = false;
@ -230,6 +232,7 @@ void Editor::LoadMapEdits()
{
case FeatureStatus::Deleted: ++deleted; break;
case FeatureStatus::Modified: ++modified; break;
case FeatureStatus::Obsolete: ++obsolete; break;
case FeatureStatus::Created: ++created; break;
case FeatureStatus::Untouched: ASSERT(false, ()); continue;
}
@ -253,7 +256,8 @@ void Editor::LoadMapEdits()
// Save edits with new indexes and mwm version to avoid another migration on next startup.
if (needRewriteEdits)
Save(GetEditorFilePath());
LOG(LINFO, ("Loaded", modified, "modified,", created, "created and", deleted, "deleted features."));
LOG(LINFO, ("Loaded", modified, "modified,",
created, "created,", deleted, "deleted and", obsolete, "obsolete features."));
}
bool Editor::Save(string const & fullFilePath) const
@ -280,6 +284,7 @@ bool Editor::Save(string const & fullFilePath) const
xml_node deleted = mwmNode.append_child(kDeleteSection);
xml_node modified = mwmNode.append_child(kModifySection);
xml_node created = mwmNode.append_child(kCreateSection);
xml_node obsolete = mwmNode.append_child(kObsoleteSection);
for (auto const & index : mwm.second)
{
FeatureTypeInfo const & fti = index.second;
@ -303,6 +308,7 @@ bool Editor::Save(string const & fullFilePath) const
case FeatureStatus::Deleted: VERIFY(xf.AttachToParentNode(deleted), ()); break;
case FeatureStatus::Modified: VERIFY(xf.AttachToParentNode(modified), ()); break;
case FeatureStatus::Created: VERIFY(xf.AttachToParentNode(created), ()); break;
case FeatureStatus::Obsolete: VERIFY(xf.AttachToParentNode(obsolete), ()); break;
case FeatureStatus::Untouched: CHECK(false, ("Not edited features shouldn't be here."));
}
}
@ -404,6 +410,8 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
FeatureTypeInfo fti;
auto const featureStatus = GetFeatureStatus(fid.m_mwmId, fid.m_index);
ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Obsolete, ("Obsolete feature cannot be modified."));
bool const wasCreatedByUser = IsCreatedFeature(fid);
if (wasCreatedByUser && featureStatus == FeatureStatus::Untouched)
{
@ -412,7 +420,7 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
}
else
{
ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Unexpected feature status"));
ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Unexpected feature status."));
fti.m_feature = featureStatus == FeatureStatus::Untouched
? *m_getOriginalFeatureFn(fid)
@ -571,6 +579,9 @@ EditableProperties Editor::GetEditableProperties(FeatureType const & feature) co
if (!version::IsSingleMwm(feature.GetID().m_mwmId.GetInfo()->m_version.GetVersion()))
return {};
if (GetFeatureStatus(feature.GetID()) == FeatureStatus::Obsolete)
return {};
// TODO(mgsergio): Check if feature is in the area where editing is disabled in the config.
auto editableProperties = GetEditablePropertiesForTypes(feature::TypesHolder(feature));
@ -675,7 +686,7 @@ void Editor::UploadChanges(string const & key, string const & secret, TChangeset
switch (fti.m_status)
{
case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
case FeatureStatus::Obsolete: continue; // Obsolete features will be deleted by OSMers.
case FeatureStatus::Created:
{
XMLFeature feature = fti.m_feature.ToXML(true);
@ -893,6 +904,23 @@ void Editor::Invalidate()
m_invalidateFn();
}
void Editor::MarkFeatureAsObsolete(FeatureID const & fid)
{
auto const featureStatus = GetFeatureStatus(fid);
ASSERT(featureStatus == FeatureStatus::Untouched ||
featureStatus == FeatureStatus::Modified,
("Only untouched and modified features can be made obsolete"));
auto & fti = m_features[fid.m_mwmId][fid.m_index];
// If a feature was modified we can drop all changes since it's now obsolete.
fti.m_feature = *m_getOriginalFeatureFn(fid);
fti.m_status = FeatureStatus::Obsolete;
fti.m_modificationTimestamp = time(nullptr);
Save(GetEditorFilePath());
Invalidate();
}
Editor::Stats Editor::GetStats() const
{
Stats stats;
@ -966,6 +994,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
sstr << kPlaceDoesNotExistMessage;
if (!note.empty())
sstr << " User comments: \"" << note << '\"';
MarkFeatureAsObsolete(fid);
break;
case NoteProblemType::General:
sstr << note;
@ -988,6 +1017,7 @@ string DebugPrint(Editor::FeatureStatus fs)
{
case Editor::FeatureStatus::Untouched: return "Untouched";
case Editor::FeatureStatus::Deleted: return "Deleted";
case Editor::FeatureStatus::Obsolete: return "Obsolete";
case Editor::FeatureStatus::Modified: return "Modified";
case Editor::FeatureStatus::Created: return "Created";
};

7
indexer/osm_editor.hpp
View file

@ -48,6 +48,7 @@ public:
{
Untouched,
Deleted,
Obsolete, // The feature is obsolete when is marked for deletion via note.
Modified,
Created
};
@ -157,6 +158,9 @@ public:
};
Stats GetStats() const;
// Don't use this function to determine if a feature in editor was created.
// Use GetFeatureStatus(fid) instead. This function is used when a feature is
// not yet saved and we have to know if it was modified or created.
static bool IsCreatedFeature(FeatureID const & fid);
private:
@ -167,6 +171,9 @@ private:
/// Notify framework that something has changed and should be redisplayed.
void Invalidate();
// Saves a feature in internal storage with FeatureStatus::Obsolete status.
void MarkFeatureAsObsolete(FeatureID const & fid);
FeatureID GenerateNewFeatureId(MwmSet::MwmId const & id);
EditableProperties GetEditablePropertiesForTypes(feature::TypesHolder const & types) const;

7
iphone/Maps/Classes/Editor/MWMEditorViewController.mm
View file

@ -309,7 +309,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
noteInfo[kStatLat] = @(latLon.lat);
noteInfo[kStatLon] = @(latLon.lon);
[Statistics logEvent:kStatEditorProblemReport withParameters:noteInfo];
osm::Editor::Instance().CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General ,self.note.UTF8String);
f.CreateNote(latLon, featureID, osm::Editor::NoteProblemType::General, self.note.UTF8String);
}
switch (f.SaveEditedMapObject(m_mapObject))
@ -670,6 +670,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
case osm::Editor::FeatureStatus::Untouched:
return L(@"editor_place_doesnt_exist");
case osm::Editor::FeatureStatus::Deleted:
case osm::Editor::FeatureStatus::Obsolete: // TODO(Vlad): Either make a valid button or disable it.
NSAssert(false, @"Incorrect feature status!");
return L(@"editor_place_doesnt_exist");
case osm::Editor::FeatureStatus::Modified:
@ -893,7 +894,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
- (void)tryToChangeInvalidStateForCell:(MWMEditorTextTableViewCell *)cell
{
[self.tableView beginUpdates];
NSIndexPath * indexPath = [self.tableView indexPathForCell:cell];
[self.invalidCells removeObject:indexPath];
@ -996,7 +997,7 @@ void registerCellsForTableView(vector<MWMPlacePageCellType> const & cells, UITab
kStatEditorMWMVersion : @(fid.GetMwmVersion()),
kStatProblem : @(osm::Editor::kPlaceDoesNotExistMessage),
kStatLat : @(latLon.lat), kStatLon : @(latLon.lon)}];
osm::Editor::Instance().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist, additional);
GetFramework().CreateNote(latLon, fid, osm::Editor::NoteProblemType::PlaceDoesNotExist, additional);
[self backTap];
[self showDropDown];
}];

4
iphone/Maps/Classes/MWMPlacePageEntity.mm
View file

@ -6,6 +6,8 @@
#include "Framework.h"
#include "indexer/osm_editor.hpp"
#include "platform/measurement_utils.hpp"
#include "platform/mwm_version.hpp"
@ -146,7 +148,7 @@ void initFieldsMap(BOOL isBooking)
- (NSString *)getCellValue:(MWMPlacePageCellType)cellType
{
auto const s = MapsAppDelegate.theApp.mapViewController.controlsManager.navigationState;
BOOL const editOrAddAreAvailable = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion()) && s == MWMNavigationDashboardStateHidden && !self.isBooking;
BOOL const editOrAddAreAvailable = version::IsSingleMwm(GetFramework().Storage().GetCurrentDataVersion()) && s == MWMNavigationDashboardStateHidden && m_info.IsEditable();
switch (cellType)
{
case MWMPlacePageCellTypeName:

26
map/framework.cpp
View file

@ -733,17 +733,21 @@ void Framework::FillPointInfo(m2::PointD const & mercator, string const & custom
void Framework::FillInfoFromFeatureType(FeatureType const & ft, place_page::Info & info) const
{
auto const featureStatus = osm::Editor::Instance().GetFeatureStatus(ft.GetID());
ASSERT_NOT_EQUAL(featureStatus, osm::Editor::FeatureStatus::Deleted,
("Deleted features cannot be selected from UI."));
info.SetFromFeatureType(ft);
info.m_isEditable = osm::Editor::Instance().GetEditableProperties(ft).IsEditable();
info.m_localizedWifiString = m_stringsBundle.GetString("wifi");
info.m_localizedRatingString = m_stringsBundle.GetString("place_page_booking_rating");
if (ftypes::IsAddressObjectChecker::Instance()(ft))
info.m_address = GetAddressInfoAtPoint(feature::GetCenter(ft)).FormatHouseAndStreet();
if (ftypes::IsBookingChecker::Instance()(ft))
info.m_isSponsoredHotel = true;
info.m_isEditable = featureStatus != osm::Editor::FeatureStatus::Obsolete &&
!info.IsSponsoredHotel();
info.m_localizedWifiString = m_stringsBundle.GetString("wifi");
info.m_localizedRatingString = m_stringsBundle.GetString("place_page_booking_rating");
}
void Framework::FillApiMarkInfo(ApiMarkPoint const & api, place_page::Info & info) const
@ -1753,7 +1757,7 @@ bool Framework::ShowMapForURL(string const & url)
if (result != FAILED)
{
// Always hide current map selection.
DeactivateMapSelection(true);
DeactivateMapSelection(true /* notifyUI */);
// set viewport and stop follow mode if any
StopLocationFollow();
@ -1996,7 +2000,7 @@ void Framework::OnTapEvent(df::TapInfo const & tapInfo)
alohalytics::Stats::Instance().LogEvent(somethingWasAlreadySelected ? "$DelectMapObject" : "$EmptyTapOnMap");
// UI is always notified even if empty map is tapped,
// because empty tap event switches on/off full screen map view mode.
DeactivateMapSelection(true);
DeactivateMapSelection(true /* notifyUI */);
}
}
@ -2896,9 +2900,17 @@ bool Framework::RollBackChanges(FeatureID const & fid)
if (rolledBack)
{
if (status == osm::Editor::FeatureStatus::Created)
DeactivateMapSelection(true);
DeactivateMapSelection(true /* notifyUI */);
else
UpdatePlacePageInfoForCurrentSelection();
}
return rolledBack;
}
void Framework::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
osm::Editor::NoteProblemType const type, string const & note)
{
osm::Editor::Instance().CreateNote(latLon, fid, type, note);
if (type == osm::Editor::NoteProblemType::PlaceDoesNotExist)
DeactivateMapSelection(true /* notifyUI */);
}

3
map/framework.hpp
View file

@ -654,6 +654,9 @@ 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);
//@}
private:

4
search/mwm_context.cpp
View file

@ -21,7 +21,9 @@ bool MwmContext::GetFeature(uint32_t index, FeatureType & ft) const
{
switch (GetEditedStatus(index))
{
case osm::Editor::FeatureStatus::Deleted: return false;
case osm::Editor::FeatureStatus::Deleted:
case osm::Editor::FeatureStatus::Obsolete:
return false;
case osm::Editor::FeatureStatus::Modified:
case osm::Editor::FeatureStatus::Created:
VERIFY(osm::Editor::Instance().GetEditedFeature(GetId(), index, ft), ());