Changeset 725 for trunk

Timestamp:

07/29/08 19:21:39 (4 months ago)

Author:

tom

Message:

Add support for font sets on shield sumbolizers.

Location:

trunk

Files:

• include/mapnik/shield_symbolizer.hpp (modified) (1 diff)
• src/load_map.cpp (modified) (2 diffs)
• src/shield_symbolizer.cpp (modified) (1 diff)

trunk/include/mapnik/shield_symbolizer.hpp

@@ -44 +44 @@
                       std::string const& type,
                       unsigned width,unsigned height);
-    
+    shield_symbolizer(std::string const& name,
+                      unsigned size,
+                      Color const& fill, 
+                      std::string const& file,
+                      std::string const& type,
+                      unsigned width,unsigned height);
   };
 }

trunk/src/load_map.cpp

@@ -801 +801 @@
         {
             std::string name =  get_attr<string>(sym, "name");
-            std::string face_name =  get_attr<string>(sym, "face_name");
+
+            optional<std::string> face_name =
+                 get_opt_attr<std::string>(sym, "face_name");
+
+            optional<std::string> fontset_name =
+                 get_opt_attr<std::string>(sym, "fontset_name");
+
             unsigned size = get_attr(sym, "size", 10U);
             Color fill = get_attr(sym, "fill", Color(0,0,0));
@@ -821 +827 @@
                     }
                 }
-                shield_symbolizer shield_symbol(name,face_name,size,fill,
+                shield_symbolizer shield_symbol(name,size,fill,
                                                 image_file,type,width,height);
-                
+
+                if (fontset_name && face_name)
+                {
+                    throw config_error(std::string("Can't have both face_name and fontset_name"));
+                }
+                else if (fontset_name)
+                {
+                    std::map<std::string,FontSet>::const_iterator itr = fontsets_.find(*fontset_name);
+                    if (itr != fontsets_.end())
+                    {
+                        shield_symbol.set_fontset(itr->second);                
+                    }
+                }
+                else if (face_name)
+                {
+                    shield_symbol.set_face_name(*face_name);                
+                }
+                else
+                {
+                    throw config_error(std::string("Must have face_name or fontset_name"));
+                }
+
                 // minimum distance between labels
                 optional<unsigned> min_distance = 

trunk/src/shield_symbolizer.cpp

@@ -47 +47 @@
     {
     }
+
+    shield_symbolizer::shield_symbolizer(
+                          std::string const& name,
+                          unsigned size,
+                          Color const& fill, 
+                          std::string const& file,
+                          std::string const& type,
+                          unsigned width,unsigned height)
+        : text_symbolizer(name, size, fill),
+          symbolizer_with_image( file, type, width, height )
+    {
+    }
 }