Changeset 574

Timestamp:

12/17/07 09:21:04 (3 years ago)

Author:

artem

Message:

Applied patches from Martijn van Oosterhout:

1. The first allows the user to add a <FileSource?
name="foo">/home/bar/baz/</FileSource> to the beginning of the file
and then in any of the symbolisers you can say:

<FooSymboliser? base="foo" name="bridge">
It it will refer to the file /home/bar/baz/bridge.

2. The second allows you to create Datasource templates at the top
level, which can be used later in the actual layers like so:
<Map>

<Datasource name="db">

<Paramaeter name="host">/tmp</Parameter>

</Datasource>
<Layer name="lay">

<Datasource base="db">

<Parameter name="table">points</Parameter>

</Datasource>

</Layer>

</Map>

And the host parameter will be used in the layer.

3. The third adds the "base" parameter to the raster and shape input
plugins. All it does is specify a path to prefix to the filename prior
to using it. Together with the above feature it allows things like:
<Map>

<Datasource name="shapes">

<Paramaeter name="base">/home/foo/shapes</Parameter>

</Datasource>
<Layer name="lay">

<Datasource base="shapes">

<Parameter name="file">places</Parameter>

</Datasource>

</Layer>

</Map>

And it will use the shapefile /home/foo/shapes/places

Location:

trunk

Files:

• plugins/input/raster/raster_datasource.cpp (modified) (1 diff)
• plugins/input/shape/shape.cpp (modified) (1 diff)
• src/load_map.cpp (modified) (12 diffs)

trunk/plugins/input/raster/raster_datasource.cpp

@@ -52 +52 @@
  
    boost::optional<std::string> file=params.get<std::string>("file");
+   boost::optional<std::string> base=params.get<std::string>("base");
    if (!file) throw datasource_exception("missing <file> parameter ");
-   filename_ = *file;
+   if (base)
+      filename_ = *base + "/" + *file;
+   else
+      filename_ = *file;
    format_=*params.get<std::string>("format","tiff");
    boost::optional<double> lox = params.get<double>("lox");

trunk/plugins/input/shape/shape.cpp

@@ -42 +42 @@
    : datasource (params),
      type_(datasource::Vector),
-     shape_name_(*params_.get<std::string>("file","")),
      file_length_(0),
      indexed_(false),
      desc_(*params.get<std::string>("type"), *params.get<std::string>("encoding","utf-8"))
 {
+   boost::optional<std::string> base = params.get<std::string>("base");
+   if (base)
+      shape_name_ = *base + "/" + *params_.get<std::string>("file","");
+   else
+      shape_name_ = *params_.get<std::string>("file","");
    try
    {  

trunk/src/load_map.cpp

@@ -83 +83 @@
          
          bool strict_;
+         std::map<std::string,parameters> datasource_templates_;
          freetype_engine font_engine_;
          face_manager<freetype_engine> font_manager_;
+         std::map<std::string,std::string> file_sources_;
     };
 
@@ -144 +146 @@
                     parse_layer(map, v.second );
                 }
-                else if (v.first != "<xmlcomment>" &&
-                        v.first != "<xmlattr>")
-                {
-                    throw config_error(std::string("Unknown child node in 'Map'. ") +
-                            "Expected 'Style' or 'Layer' but got '" + v.first + "'");
-                }
-            }
-        }
-        catch (const boost::property_tree::ptree_bad_path &)
-        {
-            throw config_error("Not a map file. Node 'Map' not found.");
-        }
-    }
-
-    void map_parser::parse_style( Map & map, ptree const & sty )
-    {
-        string name("<missing name>");
-        try
-        {
-            name = get_attr<string>(sty, "name");
-            feature_type_style style;
-
-            ptree::const_iterator ruleIter = sty.begin();
-            ptree::const_iterator endRule = sty.end();
-
-            for (; ruleIter!=endRule; ++ruleIter)    
-            {
-                ptree::value_type const& rule_tag = *ruleIter;
-                if (rule_tag.first == "Rule")
-                {
-                    parse_rule( style, rule_tag.second );
-                }
-                else if (rule_tag.first != "<xmlcomment>" &&
-                        rule_tag.first != "<xmlattr>" )
-                {
-                    throw config_error(std::string("Unknown child node in 'Style'.") +
-                            "Expected 'Rule' but got '" + rule_tag.first + "'");
-                }
-            }
-
-            map.insert_style(name, style);
-
-        } catch (const config_error & ex) {
-            if ( ! name.empty() ) {
-                ex.append_context(string("in style '") + name + "'");
-            }
-            throw;
-        }
-    }
-
-    void map_parser::parse_layer( Map & map, ptree const & lay )
-    {
-        std::string name;
-        try
-        {
-            name = get_attr(lay, "name", string("Unnamed"));
-            // XXX if no projection is given inherit from map? [DS]
-            std::string srs = get_attr(lay, "srs", map.srs());
-
-            Layer lyr(name, srs);
-
-            optional<boolean> status = get_opt_attr<boolean>(lay, "status");
-            if (status)
-            {
-                lyr.setActive( * status );
-            }
-
-            optional<boolean> clear_cache =
-                get_opt_attr<boolean>(lay, "clear_label_cache");
-            if (clear_cache)
-            {
-                lyr.set_clear_label_cache( * clear_cache );
-            }
-
-
-            ptree::const_iterator itr2 = lay.begin();
-            ptree::const_iterator end2 = lay.end();
-
-            for(; itr2 != end2; ++itr2)
-            {
-                ptree::value_type const& child = *itr2;
-
-                if (child.first == "StyleName")
-                {
-                    // TODO check references [DS]
-                    lyr.add_style(child.second.data());
-                }
-                else if (child.first == "Datasource")
-                {
+                else if (v.first == "FileSource")
+                {
+                  std::string name = get_attr<string>( v.second, "name");
+                  std::string value = get_own<string>( v.second, "");
+                  file_sources_[name] = value;
+                }
+                else if (v.first == "Datasource")
+                {
+                    std::string name = get_attr(v.second, "name", string("Unnamed"));
                     parameters params;
-                    ptree::const_iterator paramIter = child.second.begin();
-                    ptree::const_iterator endParam = child.second.end();
+                    ptree::const_iterator paramIter = v.second.begin();
+                    ptree::const_iterator endParam = v.second.end();
                     for (; paramIter != endParam; ++paramIter)
                     {
@@ -247 +169 @@
                             params[name] = value; 
                         }
-                        else
+                        else if( paramIter->first != "<xmlattr>" )
+                        {
+                            throw config_error(std::string("Unknown child node in ") +
+                                    "'Datasource'. Expected 'Parameter' but got '" +
+                                    paramIter->first + "'");
+                        }
+                    }
+                    datasource_templates_[name] = params;
+                }
+                else if (v.first != "<xmlcomment>" &&
+                        v.first != "<xmlattr>")
+                {
+                    throw config_error(std::string("Unknown child node in 'Map'. ") +
+                            "Expected 'Style' or 'Layer' but got '" + v.first + "'");
+                }
+            }
+        }
+        catch (const boost::property_tree::ptree_bad_path &)
+        {
+            throw config_error("Not a map file. Node 'Map' not found.");
+        }
+    }
+
+    void map_parser::parse_style( Map & map, ptree const & sty )
+    {
+        string name("<missing name>");
+        try
+        {
+            name = get_attr<string>(sty, "name");
+            feature_type_style style;
+
+            ptree::const_iterator ruleIter = sty.begin();
+            ptree::const_iterator endRule = sty.end();
+
+            for (; ruleIter!=endRule; ++ruleIter)    
+            {
+                ptree::value_type const& rule_tag = *ruleIter;
+                if (rule_tag.first == "Rule")
+                {
+                    parse_rule( style, rule_tag.second );
+                }
+                else if (rule_tag.first != "<xmlcomment>" &&
+                        rule_tag.first != "<xmlattr>" )
+                {
+                    throw config_error(std::string("Unknown child node in 'Style'.") +
+                            "Expected 'Rule' but got '" + rule_tag.first + "'");
+                }
+            }
+
+            map.insert_style(name, style);
+
+        } catch (const config_error & ex) {
+            if ( ! name.empty() ) {
+                ex.append_context(string("in style '") + name + "'");
+            }
+            throw;
+        }
+    }
+
+    void map_parser::parse_layer( Map & map, ptree const & lay )
+    {
+        std::string name;
+        try
+        {
+            name = get_attr(lay, "name", string("Unnamed"));
+            // XXX if no projection is given inherit from map? [DS]
+            std::string srs = get_attr(lay, "srs", map.srs());
+
+            Layer lyr(name, srs);
+
+            optional<boolean> status = get_opt_attr<boolean>(lay, "status");
+            if (status)
+            {
+                lyr.setActive( * status );
+            }
+
+            optional<boolean> clear_cache =
+                get_opt_attr<boolean>(lay, "clear_label_cache");
+            if (clear_cache)
+            {
+                lyr.set_clear_label_cache( * clear_cache );
+            }
+
+
+            ptree::const_iterator itr2 = lay.begin();
+            ptree::const_iterator end2 = lay.end();
+
+            for(; itr2 != end2; ++itr2)
+            {
+                ptree::value_type const& child = *itr2;
+
+                if (child.first == "StyleName")
+                {
+                    // TODO check references [DS]
+                    lyr.add_style(child.second.data());
+                }
+                else if (child.first == "Datasource")
+                {
+                    parameters params;
+                    optional<std::string> base = get_opt_attr<std::string>( child.second, "base" );
+                    if( base )
+                    {
+                       std::map<std::string,parameters>::const_iterator base_itr = datasource_templates_.find(*base);
+                       if (base_itr!=datasource_templates_.end())
+                          params = base_itr->second;
+                    }   
+                    
+                    ptree::const_iterator paramIter = child.second.begin();
+                    ptree::const_iterator endParam = child.second.end();
+                    for (; paramIter != endParam; ++paramIter)
+                    {
+                        ptree const& param = paramIter->second;
+
+                        if (paramIter->first == "Parameter")
+                        {
+                            std::string name = get_attr<string>(param, "name");
+                            std::string value = get_own<string>( param,
+                                    "datasource parameter");
+                            params[name] = value; 
+                        }
+                        else if( paramIter->first != "<xmlattr>" )
                         {
                             throw config_error(std::string("Unknown child node in ") +
@@ -401 +443 @@
         {
             optional<std::string> file =  get_opt_attr<string>(sym, "file");
+            optional<std::string> base =  get_opt_attr<string>(sym, "base");
             optional<std::string> type =  get_opt_attr<string>(sym, "type"); 
             optional<boolean> allow_overlap = 
@@ -412 +455 @@
                 try
                 {
-                    point_symbolizer symbol(*file,*type,*width,*height);
-                    if (allow_overlap)
-                    {
-                        symbol.set_allow_overlap( * allow_overlap );
-                    }
-                    rule.append(symbol);
+                   if( base )
+                   {
+                      std::map<std::string,std::string>::const_iterator itr = file_sources_.find(*base);
+                      if (itr!=file_sources_.end())
+                      {
+                         *file = itr->second + "/" + *file;
+                      }
+                   }
+                   point_symbolizer symbol(*file,*type,*width,*height);
+                   if (allow_overlap)
+                   {
+                      symbol.set_allow_overlap( * allow_overlap );
+                   }
+                   rule.append(symbol);
                 }
                 catch (ImageReaderException const & ex )
@@ -461 +512 @@
         {
             std::string file = get_attr<string>(sym, "file");
+            optional<std::string> base = get_opt_attr<string>(sym, "base");
             std::string type = get_attr<string>(sym, "type"); 
             unsigned width = get_attr<unsigned>(sym, "width");
@@ -467 +519 @@
             try
             {
-                rule.append(line_pattern_symbolizer(file,type,width,height));
+               if( base )
+               {
+                   std::map<std::string,std::string>::const_iterator itr = file_sources_.find(*base);
+                   if (itr!=file_sources_.end())
+                   {
+                      file = itr->second + "/" + file;
+                   }
+               }
+               rule.append(line_pattern_symbolizer(file,type,width,height));
             }
             catch (ImageReaderException const & ex )
@@ -496 +556 @@
         {
             std::string file = get_attr<string>(sym, "file");
+            optional<std::string> base = get_opt_attr<string>(sym, "base");
             std::string type = get_attr<string>(sym, "type"); 
             unsigned width = get_attr<unsigned>(sym, "width");
@@ -502 +563 @@
             try
             {
+                if( base )
+                {
+                   std::map<std::string,std::string>::iterator itr = file_sources_.find(*base);
+                   if (itr!=file_sources_.end())
+                   {
+                      file = itr->second + "/" + file;
+                   }
+                }
                 rule.append(polygon_pattern_symbolizer(file,type,width,height)); 
             }
@@ -632 +701 @@
 
             std::string image_file = get_attr<string>(sym, "file");
+            optional<std::string> base = get_opt_attr<string>(sym, "base");
             std::string type = get_attr<string>(sym, "type");
             unsigned width =  get_attr<unsigned>(sym, "width");
@@ -638 +708 @@
             try
             {
+                if( base )
+                {
+                    std::map<std::string,std::string>::const_iterator itr = file_sources_.find(*base);
+                    if (itr!=file_sources_.end())
+                    {
+                       image_file = itr->second + "/" + image_file;
+                    }
+                }
                 shield_symbolizer shield_symbol(name,face_name,size,fill,
-                        image_file,type,width,height);
-
+                                                image_file,type,width,height);
+                
                 // minimum distance between labels
                 optional<unsigned> min_distance = 
@@ -652 +730 @@
             catch (ImageReaderException const & ex )
             {
-                    string msg("Failed to load image file '" + image_file +
+               string msg("Failed to load image file '" + image_file +
                             "': " + ex.what());
-                if (strict_)
-                {
-                    throw config_error(msg);
-                }
-                else
-                {
-                    clog << "### WARNING: " << msg << endl;
-                }
-            }
-
+               if (strict_)
+               {
+                  throw config_error(msg);
+               }
+               else
+               {
+                  clog << "### WARNING: " << msg << endl;
+               }
+            }
+            
         }
         catch (const config_error & ex)