Make features as deleted when place doesn't exist is sent.

4 files changed, 9 insertions, 8 deletions

diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp
index 5689b85fd4..1c23b108e7 100644
--- a/drape_frontend/apply_feature_functors.cpp
+++ b/drape_frontend/apply_feature_functors.cpp
@@ -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,11 @@ 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
+  m_createdByEditor = editor.GetFeatureStatus(m_id) == osm::Editor::FeatureStatus::Created;
+  m_obsoleteInEditor = editor.GetFeatureStatus(m_id) == osm::Editor::FeatureStatus::Obsolete;
   m_centerPoint = point;
 }
 
@@ -378,7 +379,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));
   }
 }
diff --git a/drape_frontend/apply_feature_functors.hpp b/drape_frontend/apply_feature_functors.hpp
index ba7ae590da..b2edc079bd 100644
--- a/drape_frontend/apply_feature_functors.hpp
+++ b/drape_frontend/apply_feature_functors.hpp
@@ -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;
diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp
index 0ef9b12d41..4e796950bb 100644
--- a/drape_frontend/poi_symbol_shape.cpp
+++ b/drape_frontend/poi_symbol_shape.cpp
@@ -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;
diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp
index 56c791bc6b..be8eea5fd8 100644
--- a/drape_frontend/shape_view_params.hpp
+++ b/drape_frontend/shape_view_params.hpp
@@ -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