Merge branch 'textplacement-rename' into python-textplacement

bindings/python/mapnik_expression.cpp

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

bindings/python/mapnik_rule.cpp

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

demo/c++/rundemo.cpp

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

include/mapnik/building_symbolizer.hpp

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

include/mapnik/config_error.hpp

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

include/mapnik/expression.hpp

@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_FILTER_FACTORY_HPP
-#define MAPNIK_FILTER_FACTORY_HPP
+#ifndef MAPNIK_EXPRESSION_HPP
+#define MAPNIK_EXPRESSION_HPP
 
 // mapnik
 #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

include/mapnik/formating/base.hpp

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

include/mapnik/polygon_symbolizer.hpp

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

include/mapnik/rule.hpp

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

include/mapnik/text_properties.hpp

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

src/build.py

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

src/deepcopy.cpp

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

src/expression.cpp

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

src/load_map.cpp

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

src/text_processing.cpp

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

tests/cpp_tests/svg_renderer_tests/path_element_test.cpp

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