Skip to content

Commit 7fc5895

Browse files
committed
Remove grid renderer
1 parent dea5abe commit 7fc5895

10 files changed

Lines changed: 1 addition & 1694 deletions

setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,6 @@ def _single_compile(obj):
340340
'src/mapnik_fontset.cpp',
341341
'src/mapnik_gamma_method.cpp',
342342
'src/mapnik_geometry.cpp',
343-
'src/mapnik_grid.cpp',
344-
'src/mapnik_grid_view.cpp',
345343
'src/mapnik_image.cpp',
346344
'src/mapnik_image_view.cpp',
347345
'src/mapnik_label_collision_detector.cpp',
@@ -362,7 +360,6 @@ def _single_compile(obj):
362360
'src/mapnik_symbolizer.cpp',
363361
'src/mapnik_text_placement.cpp',
364362
'src/mapnik_view_transform.cpp',
365-
'src/python_grid_utils.cpp',
366363
'src/mapnik_vector_tile.cpp',
367364
'src/mapnik_vector_tile_render.cpp',
368365
'src/mapnik_vector_tile_preview.cpp',

src/mapnik_grid.cpp

Lines changed: 0 additions & 91 deletions
This file was deleted.

src/mapnik_grid_view.cpp

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/mapnik_python.cpp

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ void export_image();
5757
void export_image_view();
5858
void export_gamma_method();
5959
void export_scaling_method();
60-
#if defined(GRID_RENDERER)
61-
void export_grid();
62-
void export_grid_view();
63-
#endif
6460
void export_map();
6561
void export_python();
6662
void export_expression();
@@ -108,9 +104,6 @@ void export_encode_parallel();
108104
#include <mapnik/save_map.hpp>
109105
#include <mapnik/scale_denominator.hpp>
110106
#include <mapnik/collision_cache.hpp>
111-
#if defined(GRID_RENDERER)
112-
#include "python_grid_utils.hpp"
113-
#endif
114107
#include "mapnik_value_converter.hpp"
115108
#include "mapnik_threads.hpp"
116109
#include "python_optional.hpp"
@@ -714,15 +707,6 @@ bool has_svg_renderer()
714707
#endif
715708
}
716709

717-
bool has_grid_renderer()
718-
{
719-
#if defined(GRID_RENDERER)
720-
return true;
721-
#else
722-
return false;
723-
#endif
724-
}
725-
726710
bool has_jpeg()
727711
{
728712
#if defined(HAVE_JPEG)
@@ -829,10 +813,6 @@ BOOST_PYTHON_MODULE(_mapnik)
829813
export_image_view();
830814
export_gamma_method();
831815
export_scaling_method();
832-
#if defined(GRID_RENDERER)
833-
export_grid();
834-
export_grid_view();
835-
#endif
836816
export_expression();
837817
export_rule();
838818
export_style();
@@ -1009,19 +989,6 @@ BOOST_PYTHON_MODULE(_mapnik)
1009989
);
1010990
#endif
1011991

1012-
#if defined(GRID_RENDERER)
1013-
def("render_layer", &mapnik::render_layer_for_grid,
1014-
(arg("map"),
1015-
arg("grid"),
1016-
arg("layer"),
1017-
arg("fields")=boost::python::list(),
1018-
arg("scale_factor")=1.0,
1019-
arg("offset_x")=0,
1020-
arg("offset_y")=0
1021-
)
1022-
);
1023-
#endif
1024-
1025992
#if defined(HAVE_CAIRO) && defined(HAVE_PYCAIRO)
1026993
def("render",&render3,
1027994
(arg("map"),
@@ -1207,7 +1174,6 @@ BOOST_PYTHON_MODULE(_mapnik)
12071174
def("has_tiff", &has_tiff, "Get tiff read/write support status");
12081175
def("has_webp", &has_webp, "Get webp read/write support status");
12091176
def("has_svg_renderer", &has_svg_renderer, "Get svg_renderer status");
1210-
def("has_grid_renderer", &has_grid_renderer, "Get grid_renderer status");
12111177
def("has_cairo", &has_cairo, "Get cairo library status");
12121178
def("has_pycairo", &has_pycairo, "Get pycairo module status");
12131179

0 commit comments

Comments
 (0)