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

Move formating::node.

Browse source
This commit is contained in:
Hermann Kraus 2012-02-12 02:01:25 +01:00
parent 3b2767f167
commit e2c75c5eef
2 changed files with 49 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
include/mapnik/formating/base.hpp Normal file
View file

@ -0,0 +1,48 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2012 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef BASE_HPP
#define BASE_HPP
#include <mapnik/feature.hpp>
#include <mapnik/filter_factory.hpp>
#include <boost/property_tree/ptree.hpp>
namespace mapnik {
typedef std::set<expression_ptr> expression_set;
namespace formating {
class node;
typedef boost::shared_ptr<node> node_ptr;
class node
{
public:
virtual ~node() {}
virtual void to_xml(boost::property_tree::ptree &xml) const;
static node_ptr from_xml(boost::property_tree::ptree const& xml);
virtual void apply(char_properties const& p, Feature const& feature, processed_text &output) const = 0;
virtual void add_expressions(expression_set &output) const;
};
} //ns formating
} //ns mapnik
#endif // BASE_HPP

13
include/mapnik/text_processing.hpp
View file

@ -42,7 +42,7 @@ namespace mapnik
class processed_text;
struct char_properties;
typedef std::set<expression_ptr> expression_set;
enum label_placement_enum {
POINT_PLACEMENT,
@ -97,17 +97,6 @@ enum text_transform
DEFINE_ENUM( text_transform_e, text_transform );
namespace formating {
class node;
typedef boost::shared_ptr<node> node_ptr;
class node
{
public:
virtual ~node() {}
virtual void to_xml(boost::property_tree::ptree &xml) const;
static node_ptr from_xml(boost::property_tree::ptree const& xml);
virtual void apply(char_properties const& p, Feature const& feature, processed_text &output) const = 0;
virtual void add_expressions(expression_set &output) const;
};
class list_node: public node {
public: