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

remove uneeded default args to projection ctor (also fixes msvc linking)

Browse source
This commit is contained in:
Dane Springmeyer 2013-02-20 10:47:55 -08:00
parent b359a89616
commit a8599d7c61
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bindings/python/mapnik_projection.cpp
View file

@ -89,13 +89,10 @@ void export_projection ()
{ {
using namespace boost::python; using namespace boost::python;
class_<projection>("Projection", "Represents a map projection.",init<optional<std::string const&> >( class_<projection>("Projection", "Represents a map projection.",init<std::string const&>(
(arg("proj4_string")), (arg("proj4_string")),
"Constructs a new projection from its PROJ.4 string representation.\n" "Constructs a new projection from its PROJ.4 string representation.\n"
"\n" "\n"
"The parameterless version of this constructor is equivalent to\n"
" Projection('+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs')\n"
"\n"
"The constructor will throw a RuntimeError in case the projection\n" "The constructor will throw a RuntimeError in case the projection\n"
"cannot be initialized.\n" "cannot be initialized.\n"
) )

2
include/mapnik/projection.hpp
View file

@ -48,7 +48,7 @@ class MAPNIK_DECL projection
friend class proj_transform; friend class proj_transform;
public: public:
explicit projection(std::string const& params = MAPNIK_LONGLAT_PROJ, projection(std::string const& params,
bool defer_proj_init = false); bool defer_proj_init = false);
projection(projection const& rhs); projection(projection const& rhs);
~projection(); ~projection();

9
tests/cpp_tests/geometry_converters_test.cpp
View file

@ -7,6 +7,7 @@
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_factory.hpp> #include <mapnik/wkt/wkt_factory.hpp>
#include <mapnik/well_known_srs.hpp>
#if BOOST_VERSION >= 104700 #if BOOST_VERSION >= 104700
#include <mapnik/util/geometry_to_wkb.hpp> #include <mapnik/util/geometry_to_wkb.hpp>
@ -46,8 +47,8 @@ boost::optional<std::string> linestring_bbox_clipping(mapnik::box2d<double> bbox
{ {
using namespace mapnik; using namespace mapnik;
agg::trans_affine tr; agg::trans_affine tr;
projection src; projection src(MAPNIK_LONGLAT_PROJ);
projection dst; projection dst(MAPNIK_LONGLAT_PROJ);
proj_transform prj_trans(src,dst); proj_transform prj_trans(src,dst);
line_symbolizer sym; line_symbolizer sym;
CoordTransform t(bbox.width(),bbox.height(), bbox); CoordTransform t(bbox.width(),bbox.height(), bbox);
@ -86,8 +87,8 @@ boost::optional<std::string> polygon_bbox_clipping(mapnik::box2d<double> bbox,
{ {
using namespace mapnik; using namespace mapnik;
agg::trans_affine tr; agg::trans_affine tr;
projection src; projection src(MAPNIK_LONGLAT_PROJ);
projection dst; projection dst(MAPNIK_LONGLAT_PROJ);
proj_transform prj_trans(src,dst); proj_transform prj_trans(src,dst);
polygon_symbolizer sym; polygon_symbolizer sym;
CoordTransform t(bbox.width(),bbox.height(), bbox); CoordTransform t(bbox.width(),bbox.height(), bbox);