From 370e81d73eebb8d2550e5af36265b4fea12ab094 Mon Sep 17 00:00:00 2001 From: Darafei Praliaskouski Date: Sat, 11 May 2013 19:41:21 +0300 Subject: [PATCH] [map] check for point styles for polygons --- map/feature_styler.cpp | 6 ++++++ map/feature_styler.hpp | 1 + 2 files changed, 7 insertions(+) diff --git a/map/feature_styler.cpp b/map/feature_styler.cpp index a394248439..4c99efe7a6 100644 --- a/map/feature_styler.cpp +++ b/map/feature_styler.cpp @@ -65,6 +65,7 @@ namespace di return; m_hasLineStyles = false; + m_hasPointStyles = false; m_geometryType = type.first; m_isCoastline = type.second; @@ -142,6 +143,11 @@ namespace di if (keys[i].m_type == drule::symbol) hasIcon = true; + if ((keys[i].m_type == drule::caption && !m_primaryText.empty()) + || (keys[i].m_type == drule::symbol) + || (keys[i].m_type == drule::circle)) + m_hasPointStyles = true; + if ((keys[i].m_type == drule::caption) || (keys[i].m_type == drule::symbol) || (keys[i].m_type == drule::circle) diff --git a/map/feature_styler.hpp b/map/feature_styler.hpp index 469fe51211..2a544d2023 100644 --- a/map/feature_styler.hpp +++ b/map/feature_styler.hpp @@ -50,6 +50,7 @@ namespace di bool m_isCoastline; bool m_hasLineStyles; + bool m_hasPointStyles; bool m_hasPathText; int m_geometryType;