symbol cache: use iterator

Author: talaj

include/mapnik/symbol_cache.hpp

@@ -46,12 +46,15 @@ class symbol_cache : util::noncopyable
         box_type box;
     };
 
+    using container_type = std::map<std::string, symbol>;
+    using iterator = container_type::const_iterator;
+
     void insert(std::string const & key, box_type const & value);
-    symbol const& get(std::string const & key) const;
-    bool contains(std::string const & key) const;
+    iterator end() const;
+    iterator get(std::string const & key) const;
 
 private:
-    std::map<std::string, symbol> items;
+    container_type items;
 };
 
 }

src/symbol_cache.cpp

@@ -31,14 +31,14 @@ void symbol_cache::insert(std::string const & key, box_type const & box)
     items.emplace(key, box);
 }
 
-symbol_cache::symbol const& symbol_cache::get(std::string const & key) const
+symbol_cache::iterator symbol_cache::end() const
 {
-    return items.at(key);
+    return items.end();
 }
 
-bool symbol_cache::contains(std::string const & key) const
+symbol_cache::iterator symbol_cache::get(std::string const & key) const
 {
-    return items.find(key) != items.end();
+    return items.find(key);
 }
 
 }

src/text/placements/angle.cpp

@@ -98,16 +98,15 @@ text_placement_info_ptr text_placements_angle::get_placement_info(double scale_f
     {
         std::string anchor_key = util::apply_visitor(extract_value<std::string>(feature, vars),
             static_cast<symbolizer_base::value_type>(*anchor_key_));
-
-        if (sc.contains(anchor_key))
+        symbol_cache::iterator sym = sc.get(anchor_key);
+        if (sym == sc.end())
         {
-            symbol_cache::symbol const& sym = sc.get(anchor_key);
-            return std::make_shared<text_placement_info_angle>(this,
-                feature, vars, scale_factor, angle, tolerance, step, sym.box, list_placement_info);
+            return std::make_shared<text_placement_info_dummy>(this, scale_factor, 1);
         }
         else
         {
-            return std::make_shared<text_placement_info_dummy>(this, scale_factor, 1);
+            return std::make_shared<text_placement_info_angle>(this,
+                feature, vars, scale_factor, angle, tolerance, step, sym->second.box, list_placement_info);
         }
     }
 

src/text/placements/simple.cpp

@@ -169,17 +169,16 @@ text_placement_info_ptr text_placements_simple::get_placement_info(double scale_
     if (anchor_key_)
     {
         std::string evaluated_anchor_key = util::apply_visitor(extract_value<std::string>(feature, vars), static_cast<symbolizer_base::value_type>(*anchor_key_));
-
-        if (sc.contains(evaluated_anchor_key))
+        symbol_cache::iterator sym = sc.get(evaluated_anchor_key);
+        if (sym == sc.end())
         {
-            symbol_cache::symbol const& sym = sc.get(evaluated_anchor_key);
-            // Add 0.5 to ensure boxes won't intersect.
-            dx += sym.box.width() / 2.0 + .5;
-            dy += sym.box.height() / 2.0 + .5;
+            return std::make_shared<text_placement_info_dummy>(this, scale_factor, 1);
         }
         else
         {
-            return std::make_shared<text_placement_info_dummy>(this, scale_factor, 1);
+            // Add 0.5 to ensure boxes won't intersect.
+            dx += sym->second.box.width() / 2.0 + .5;
+            dy += sym->second.box.height() / 2.0 + .5;
         }
     }