sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reuse path_expression_grammar - finishes and closes #1028

Browse source
This commit is contained in:
Dane Springmeyer 2012-04-06 16:50:11 -07:00
parent b21d8a9957
commit 19f5f77417
7 changed files with 59 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/mapnik/parse_path.hpp
View file

@ -43,8 +43,13 @@ namespace mapnik {
typedef boost::variant<std::string, attribute> path_component;
typedef std::vector<path_component> path_expression;
typedef boost::shared_ptr<path_expression> path_expression_ptr;
template <typename Iterator> struct path_expression_grammar;
MAPNIK_DECL path_expression_ptr parse_path(std::string const & str);
MAPNIK_DECL bool parse_path_from_string(path_expression_ptr const& path,
std::string const & str,
path_expression_grammar<std::string::const_iterator> const& g);
template <typename T>
struct path_processor

1
include/mapnik/path_expression_grammar.hpp
View file

@ -60,6 +60,7 @@ namespace standard_wide = boost::spirit::standard_wide;
using standard_wide::space_type;
using standard_wide::space;
typedef boost::variant<std::string, attribute> path_component;
template <typename Iterator>
struct path_expression_grammar : qi::grammar<Iterator, std::vector<path_component>(), space_type>

5
include/mapnik/xml_node.hpp
View file

@ -119,6 +119,11 @@ public:
std::string get_text() const;
xml_tree const& get_tree() const
{
return tree_;
}
template <typename T>
T get_value() const;
private:

2
include/mapnik/xml_tree.hpp
View file

@ -25,6 +25,7 @@
//mapnik
#include <mapnik/xml_node.hpp>
#include <mapnik/expression_grammar.hpp>
#include <mapnik/path_expression_grammar.hpp>
// boost
#include <boost/format.hpp>
@ -55,6 +56,7 @@ private:
public:
mapnik::css_color_grammar<std::string::const_iterator> color_grammar;
mapnik::expression_grammar<std::string::const_iterator> expr_grammar;
path_expression_grammar<std::string::const_iterator> path_expr_grammar;
};
} //ns mapnik

38
src/load_map.cpp
View file

@ -782,7 +782,13 @@ void map_parser::parse_point_symbolizer(rule & rule, xml_node const & sym)
*file = ensure_relative_to_xml(file);
symbol.set_filename(parse_path(*file));
path_expression_ptr expr(boost::make_shared<path_expression>());
if (!parse_path_from_string(expr, *file, sym.get_tree().path_expr_grammar))
{
throw mapnik::config_error("Failed to parse path_expression '" + *file + "'");
}
symbol.set_filename(expr);
if (transform_wkt)
{
@ -865,7 +871,13 @@ void map_parser::parse_markers_symbolizer(rule & rule, xml_node const& sym)
}
}
markers_symbolizer symbol(parse_path(filename));
path_expression_ptr expr(boost::make_shared<path_expression>());
if (!parse_path_from_string(expr, filename, sym.get_tree().path_expr_grammar))
{
throw mapnik::config_error("Failed to parse path_expression '" + filename + "'");
}
markers_symbolizer symbol(expr);
optional<float> opacity = sym.get_opt_attr<float>("opacity");
if (opacity) symbol.set_opacity(*opacity);
@ -961,8 +973,12 @@ void map_parser::parse_line_pattern_symbolizer(rule & rule, xml_node const & sym
}
file = ensure_relative_to_xml(file);
line_pattern_symbolizer symbol(parse_path(file));
path_expression_ptr expr(boost::make_shared<path_expression>());
if (!parse_path_from_string(expr, file, sym.get_tree().path_expr_grammar))
{
throw mapnik::config_error("Failed to parse path_expression '" + file + "'");
}
line_pattern_symbolizer symbol(expr);
parse_metawriter_in_symbolizer(symbol, sym);
rule.append(symbol);
@ -1009,7 +1025,12 @@ void map_parser::parse_polygon_pattern_symbolizer(rule & rule,
file = ensure_relative_to_xml(file);
polygon_pattern_symbolizer symbol(parse_path(file));
path_expression_ptr expr(boost::make_shared<path_expression>());
if (!parse_path_from_string(expr, file, sym.get_tree().path_expr_grammar))
{
throw mapnik::config_error("Failed to parse path_expression '" + file + "'");
}
polygon_pattern_symbolizer symbol(expr);
// pattern alignment
pattern_alignment_e p_alignment = sym.get_attr<pattern_alignment_e>("alignment",LOCAL_ALIGNMENT);
@ -1159,7 +1180,12 @@ void map_parser::parse_shield_symbolizer(rule & rule, xml_node const& sym)
}
image_file = ensure_relative_to_xml(image_file);
shield_symbol.set_filename(parse_path(image_file));
path_expression_ptr expr(boost::make_shared<path_expression>());
if (!parse_path_from_string(expr, image_file, sym.get_tree().path_expr_grammar))
{
throw mapnik::config_error("Failed to parse path_expression '" + image_file + "'");
}
shield_symbol.set_filename(expr);
}
catch (image_reader_exception const & ex)
{

13
src/parse_path.cpp
View file

@ -29,7 +29,7 @@ namespace mapnik {
path_expression_ptr parse_path(std::string const & str)
{
path_expression_ptr path = boost::make_shared<path_expression>() ;
path_expression_ptr path = boost::make_shared<path_expression>();
path_expression_grammar<std::string::const_iterator> g;
std::string::const_iterator itr = str.begin();
@ -44,4 +44,15 @@ path_expression_ptr parse_path(std::string const & str)
throw std::runtime_error("Failed to parse path expression");
}
}
bool parse_path_from_string(path_expression_ptr const& path,
std::string const & str,
path_expression_grammar<std::string::const_iterator> const& g)
{
std::string::const_iterator itr = str.begin();
std::string::const_iterator end = str.end();
bool r = qi::phrase_parse(itr, end, g, space, *path);
return (r && itr==end);
}
}

3
src/xml_tree.cpp
View file

@ -171,7 +171,8 @@ xml_tree::xml_tree(std::string const& encoding)
file_(),
tr_(encoding),
color_grammar(),
expr_grammar(tr_)
expr_grammar(tr_),
path_expr_grammar()
{
node_.set_processed(true); //root node is always processed
}