From aa46411283927236a03c06933aba329ea7fbae20 Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Wed, 16 Nov 2011 07:18:45 +0300
Subject: [PATCH] Fix bug with proto rules generation (I forgot about pathtext
 rule).

---
 indexer/classificator.cpp | 8 ++++++++
 indexer/drawing_rules.cpp | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/indexer/classificator.cpp b/indexer/classificator.cpp
index b7ff913e43..e40345cdb5 100644
--- a/indexer/classificator.cpp
+++ b/indexer/classificator.cpp
@@ -292,7 +292,11 @@ namespace
     {
       static const int visible[3][drule::count_of_rules] = {
         {0, 0, 1, 1, 1, 0, 0},   // fpoint
+  #ifdef USE_PROTO_STYLES
+        {1, 0, 0, 1, 0, 0, 0},   // fline
+  #else
         {1, 0, 0, 0, 0, 1, 0},   // fline
+  #endif
         {1, 1, 1, 1, 0, 0, 0}    // farea
       };
 
@@ -412,7 +416,11 @@ bool ClassifObject::IsDrawableLike(FeatureGeoType ft) const
 
   static const int visible[3][drule::count_of_rules] = {
     {0, 0, 1, 1, 1, 0, 0},   // fpoint
+  #ifdef USE_PROTO_STYLES
+    {1, 0, 0, 1, 0, 0, 0},   // fline
+  #else
     {1, 0, 0, 0, 0, 1, 0},   // fline
+  #endif
     {0, 1, 0, 0, 0, 0, 0}    // farea (!!! key difference with GetSuitable !!!)
   };
 
diff --git a/indexer/drawing_rules.cpp b/indexer/drawing_rules.cpp
index 3b39fb2c9f..979b676f2b 100644
--- a/indexer/drawing_rules.cpp
+++ b/indexer/drawing_rules.cpp
@@ -1202,7 +1202,7 @@ namespace
         for (size_t i = 0; i < keys.size(); ++i)
         {
           // skip unnecessary trash
-          if (keys[i].m_type > circle)
+          if (keys[i].m_type == waymarker)
             continue;
 
           if (pDE == 0 || pDE->scale() != keys[i].m_scale)
@@ -1227,6 +1227,7 @@ namespace
             Convert(pRule, keys[i].m_priority, pDE->mutable_symbol());
             break;
           case caption:
+          case pathtext:
             Convert(pRule, keys[i].m_priority, pDE->mutable_caption());
             break;
           case circle: