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

Merge branch 'textplacement-rename' into python-textplacement

Browse source
This commit is contained in:
Hermann Kraus 2012-02-12 13:57:51 +01:00
commit 2b5274c21b
16 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/mapnik_expression.cpp
View file

@ -24,7 +24,7 @@
#include <boost/python.hpp> #include <boost/python.hpp>
// mapnik // mapnik
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/expression_string.hpp> #include <mapnik/expression_string.hpp>
#include <mapnik/expression_evaluator.hpp> #include <mapnik/expression_evaluator.hpp>
#include <mapnik/parse_path.hpp> #include <mapnik/parse_path.hpp>

2
bindings/python/mapnik_rule.cpp
View file

@ -27,7 +27,7 @@
#include <boost/python/suite/indexing/vector_indexing_suite.hpp> #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
#include <mapnik/rule.hpp> #include <mapnik/rule.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/expression_string.hpp> #include <mapnik/expression_string.hpp>
using mapnik::rule; using mapnik::rule;

3
demo/c++/rundemo.cpp
View file

@ -19,13 +19,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* *
*****************************************************************************/ *****************************************************************************/
// $Id$
#include <mapnik/map.hpp> #include <mapnik/map.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/agg_renderer.hpp> #include <mapnik/agg_renderer.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/color_factory.hpp> #include <mapnik/color_factory.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/config_error.hpp> #include <mapnik/config_error.hpp>

2
include/mapnik/building_symbolizer.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
namespace mapnik namespace mapnik
{ {

2
include/mapnik/config_error.hpp
View file

@ -37,7 +37,7 @@ public:
what_( what ) what_( what )
{ {
} }
virtual ~config_error() throw() {}; virtual ~config_error() throw() {}
virtual const char * what() const throw() virtual const char * what() const throw()
{ {

6
include/mapnik/filter_factory.hpp → include/mapnik/expression.hpp
View file

@ -20,8 +20,8 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef MAPNIK_FILTER_FACTORY_HPP #ifndef MAPNIK_EXPRESSION_HPP
#define MAPNIK_FILTER_FACTORY_HPP #define MAPNIK_EXPRESSION_HPP
// mapnik // mapnik
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
@ -40,4 +40,4 @@ MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt);
} }
#endif // MAPNIK_FILTER_FACTORY_HPP #endif // MAPNIK_EXPRESSION_HPP

2
include/mapnik/formating/base.hpp
View file

@ -24,7 +24,7 @@
// mapnik // mapnik
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
// stl // stl
#include <set> #include <set>

1
include/mapnik/polygon_symbolizer.hpp
View file

@ -26,7 +26,6 @@
// mapnik // mapnik
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/filter_factory.hpp>
#include <mapnik/enumeration.hpp> #include <mapnik/enumeration.hpp>
#include <mapnik/gamma_method.hpp> #include <mapnik/gamma_method.hpp>

2
include/mapnik/rule.hpp
View file

@ -35,7 +35,7 @@
#include <mapnik/text_symbolizer.hpp> #include <mapnik/text_symbolizer.hpp>
#include <mapnik/markers_symbolizer.hpp> #include <mapnik/markers_symbolizer.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/expression_string.hpp> #include <mapnik/expression_string.hpp>
// boost // boost

2
include/mapnik/text_properties.hpp
View file

@ -26,7 +26,7 @@
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/font_set.hpp> #include <mapnik/font_set.hpp>
#include <mapnik/enumeration.hpp> #include <mapnik/enumeration.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/formating/base.hpp> #include <mapnik/formating/base.hpp>
// stl // stl

2
src/build.py
View file

@ -109,7 +109,7 @@ source = Split(
datasource_cache.cpp datasource_cache.cpp
deepcopy.cpp deepcopy.cpp
expression_string.cpp expression_string.cpp
filter_factory.cpp expression.cpp
feature_kv_iterator.cpp feature_kv_iterator.cpp
feature_type_style.cpp feature_type_style.cpp
font_engine_freetype.cpp font_engine_freetype.cpp

1
src/deepcopy.cpp
View file

@ -28,7 +28,6 @@
#include <mapnik/rule.hpp> #include <mapnik/rule.hpp>
#include <mapnik/symbolizer.hpp> #include <mapnik/symbolizer.hpp>
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/filter_factory.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/util/deepcopy.hpp> #include <mapnik/util/deepcopy.hpp>

6
src/filter_factory.cpp → src/expression.cpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
//$Id$ //$Id$
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/expression_grammar.hpp> #include <mapnik/expression_grammar.hpp>
#include <mapnik/config_error.hpp> #include <mapnik/config_error.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
@ -32,7 +32,7 @@
namespace mapnik namespace mapnik
{ {
class filter_factory class expression_factory
{ {
public: public:
static expression_ptr compile(std::string const& str,transcoder const& tr) static expression_ptr compile(std::string const& str,transcoder const& tr)
@ -58,7 +58,7 @@ public:
expression_ptr parse_expression (std::string const& wkt,std::string const& encoding) expression_ptr parse_expression (std::string const& wkt,std::string const& encoding)
{ {
transcoder tr(encoding); transcoder tr(encoding);
return filter_factory::compile(wkt,tr); return expression_factory::compile(wkt,tr);
} }
expression_ptr parse_expression (std::string const& wkt) expression_ptr parse_expression (std::string const& wkt)

2
src/load_map.cpp
View file

@ -39,7 +39,7 @@
#include <mapnik/libxml2_loader.hpp> #include <mapnik/libxml2_loader.hpp>
#endif #endif
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/parse_path.hpp> #include <mapnik/parse_path.hpp>
#include <mapnik/raster_colorizer.hpp> #include <mapnik/raster_colorizer.hpp>

1
src/text_processing.cpp
View file

@ -26,7 +26,6 @@
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/expression_evaluator.hpp> #include <mapnik/expression_evaluator.hpp>
#include <mapnik/filter_factory.hpp>
#include <mapnik/expression_string.hpp> #include <mapnik/expression_string.hpp>
#include <mapnik/ptree_helpers.hpp> #include <mapnik/ptree_helpers.hpp>

2
tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
View file

@ -14,7 +14,7 @@
#include <mapnik/svg_renderer.hpp> #include <mapnik/svg_renderer.hpp>
#include <mapnik/datasource_cache.hpp> #include <mapnik/datasource_cache.hpp>
#include <mapnik/font_engine_freetype.hpp> #include <mapnik/font_engine_freetype.hpp>
#include <mapnik/filter_factory.hpp> #include <mapnik/expression.hpp>
#include <mapnik/color_factory.hpp> #include <mapnik/color_factory.hpp>
// stl // stl