Moved properties of area outline into map style

drape_frontend/apply_feature_functors.cpp

@@ -506,11 +506,10 @@ void ApplyPointFeature::Finish()
 
 ApplyAreaFeature::ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureID const & id,
                                    bool isBuilding, float minPosZ, float posZ, int minVisibleScale,
-                                   uint8_t rank, bool generateOutline, CaptionDescription const & captions)
+                                   uint8_t rank, CaptionDescription const & captions)
   : TBase(tileKey, insertShape, id, minVisibleScale, rank, captions, posZ)
   , m_minPosZ(minPosZ)
   , m_isBuilding(isBuilding)
-  , m_generateOutline(generateOutline)
 {}
 
 void ApplyAreaFeature::operator()(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
@@ -679,7 +678,11 @@ void ApplyAreaFeature::ProcessRule(Stylist::TRuleWrapper const & rule)
     BuildingOutline outline;
     if (m_isBuilding)
     {
-      outline.m_generateOutline = m_generateOutline;
+      outline.m_generateOutline = areaRule->has_border() &&
+                                  areaRule->color() != areaRule->border().color() &&
+                                  areaRule->border().width() > 0.0;
+      if (outline.m_generateOutline)
+        params.m_outlineColor = ToDrapeColor(areaRule->border().color());
       bool const calculateNormals = m_posZ > 0.0;
       CalculateBuildingOutline(calculateNormals, outline);
       params.m_is3D = !outline.m_indices.empty() && calculateNormals;

drape_frontend/apply_feature_functors.hpp

@@ -103,7 +103,7 @@ class ApplyAreaFeature : public ApplyPointFeature
 public:
   ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureID const & id,
                    bool isBuilding, float minPosZ, float posZ, int minVisibleScale,
-                   uint8_t rank, bool generateOutline, CaptionDescription const & captions);
+                   uint8_t rank, CaptionDescription const & captions);
 
   using TBase::operator ();
 
@@ -128,7 +128,6 @@ private:
 
   float const m_minPosZ;
   bool const m_isBuilding;
-  bool const m_generateOutline;
 };
 
 class ApplyLineFeature : public BaseApplyFeature

drape_frontend/area_shape.cpp

@@ -14,14 +14,6 @@
 
 #include "std/algorithm.hpp"
 
-namespace
-{
-
-float const kLightOutlineColorFactor = 0.8;
-float const kDarkOutlineColorFactor = 1.4;
-
-} // namespace
-
 namespace df
 {
 
@@ -34,19 +26,21 @@ AreaShape::AreaShape(vector<m2::PointD> && triangleList, BuildingOutline && buil
 
 void AreaShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures) const
 {
-  auto const style = GetStyleReader().GetCurrentStyle();
-  float const colorFactor = (style == MapStyleDark) ? kDarkOutlineColorFactor : kLightOutlineColorFactor;
-
   dp::TextureManager::ColorRegion region;
   textures->GetColorRegion(m_params.m_color, region);
-  dp::TextureManager::ColorRegion outlineRegion;
-  textures->GetColorRegion(m_params.m_color * colorFactor, outlineRegion);
-  ASSERT_EQUAL(region.GetTexture(), outlineRegion.GetTexture(), ());
+  m2::PointD outlineUv(0.0, 0.0);
+  if (m_buildingOutline.m_generateOutline)
+  {
+    dp::TextureManager::ColorRegion outlineRegion;
+    textures->GetColorRegion(m_params.m_outlineColor, outlineRegion);
+    ASSERT_EQUAL(region.GetTexture(), outlineRegion.GetTexture(), ());
+    outlineUv = outlineRegion.GetTexRect().Center();
+  }
 
   if (m_params.m_is3D)
-    DrawArea3D(batcher, region.GetTexRect().Center(), outlineRegion.GetTexRect().Center(), region.GetTexture());
+    DrawArea3D(batcher, region.GetTexRect().Center(), outlineUv, region.GetTexture());
   else
-    DrawArea(batcher, region.GetTexRect().Center(), outlineRegion.GetTexRect().Center(), region.GetTexture());
+    DrawArea(batcher, region.GetTexRect().Center(), outlineUv, region.GetTexture());
 }
 
 void AreaShape::DrawArea(ref_ptr<dp::Batcher> batcher, m2::PointD const & colorUv, m2::PointD const & outlineUv,

drape_frontend/rule_drawer.cpp

@@ -29,8 +29,6 @@
 
 namespace
 {
-int constexpr kOutlineMinZoomLevel = 16;
-
 // The first zoom level in kAverageSegmentsCount.
 int constexpr kFirstZoomInAverageSegments = 10;
 //                                             10     11    12     13    14    15    16    17    18   19
@@ -300,10 +298,9 @@ void RuleDrawer::operator()(FeatureType const & f)
     if (applyPointStyle || is3dBuilding)
       minVisibleScale = feature::GetMinDrawableScale(f);
 
-    bool const generateOutline = (zoomLevel >= kOutlineMinZoomLevel);
     ApplyAreaFeature apply(m_context->GetTileKey(), insertShape, f.GetID(),
                            isBuilding, areaMinHeight, areaHeight, minVisibleScale,
-                           f.GetRank(), generateOutline, s.GetCaptionDescription());
+                           f.GetRank(),  s.GetCaptionDescription());
     f.ForEachTriangle(apply, zoomLevel);
     apply.SetHotelData(ExtractHotelData(f));
     if (applyPointStyle)

drape_frontend/shape_view_params.hpp

@@ -39,6 +39,7 @@ struct PoiSymbolViewParams : CommonViewParams
 struct AreaViewParams : CommonViewParams
 {
   dp::Color m_color;
+  dp::Color m_outlineColor = dp::Color::Transparent();
   float m_minPosZ = 0.0f;
   float m_posZ = 0.0f;
   bool m_is3D = false;