@@ -48,7 +48,7 @@ struct proj_transform_pickle_suite : boost::python::pickle_suite
4848 getinitargs (const proj_transform& p)
4949 {
5050 using namespace boost ::python;
51- return boost::python::make_tuple (p.source (),p. dest ());
51+ return boost::python::make_tuple (p.definition ());
5252 }
5353};
5454
@@ -62,7 +62,7 @@ mapnik::coord2d forward_transform_c(mapnik::proj_transform& t, mapnik::coord2d c
6262 if (!t.forward (x,y,z)) {
6363 std::ostringstream s;
6464 s << " Failed to forward project "
65- << " from " << t. source (). params () << " to: " << t. dest (). params ();
65+ << t. definition ();
6666 throw std::runtime_error (s.str ());
6767 }
6868 return mapnik::coord2d (x,y);
@@ -76,7 +76,7 @@ mapnik::coord2d backward_transform_c(mapnik::proj_transform& t, mapnik::coord2d
7676 if (!t.backward (x,y,z)) {
7777 std::ostringstream s;
7878 s << " Failed to back project "
79- << " from " << t. dest (). params () << " to: " << t. source (). params ();
79+ << t. definition ();
8080 throw std::runtime_error (s.str ());
8181 }
8282 return mapnik::coord2d (x,y);
@@ -88,7 +88,7 @@ mapnik::box2d<double> forward_transform_env(mapnik::proj_transform& t, mapnik::b
8888 if (!t.forward (new_box)) {
8989 std::ostringstream s;
9090 s << " Failed to forward project "
91- << " from " << t. source (). params () << " to: " << t. dest (). params ();
91+ << t. definition ();
9292 throw std::runtime_error (s.str ());
9393 }
9494 return new_box;
@@ -100,7 +100,7 @@ mapnik::box2d<double> backward_transform_env(mapnik::proj_transform& t, mapnik::
100100 if (!t.backward (new_box)){
101101 std::ostringstream s;
102102 s << " Failed to back project "
103- << " from " << t. dest (). params () << " to: " << t. source (). params ();
103+ << t. definition ();
104104 throw std::runtime_error (s.str ());
105105 }
106106 return new_box;
@@ -112,7 +112,7 @@ mapnik::box2d<double> forward_transform_env_p(mapnik::proj_transform& t, mapnik:
112112 if (!t.forward (new_box,points)) {
113113 std::ostringstream s;
114114 s << " Failed to forward project "
115- << " from " << t. source (). params () << " to: " << t. dest (). params ();
115+ << t. definition ();
116116 throw std::runtime_error (s.str ());
117117 }
118118 return new_box;
@@ -124,7 +124,7 @@ mapnik::box2d<double> backward_transform_env_p(mapnik::proj_transform& t, mapnik
124124 if (!t.backward (new_box,points)){
125125 std::ostringstream s;
126126 s << " Failed to back project "
127- << " from " << t. dest (). params () << " to: " << t. source (). params ();
127+ << t. definition ();
128128 throw std::runtime_error (s.str ());
129129 }
130130 return new_box;
@@ -136,14 +136,15 @@ void export_proj_transform ()
136136{
137137 using namespace boost ::python;
138138
139- class_<proj_transform, boost::noncopyable>(" ProjTransform" , init< projection const &, projection const & >())
139+ class_<proj_transform, boost::noncopyable>(" ProjTransform" , init<projection const &, projection const &>())
140140 .def_pickle (proj_transform_pickle_suite ())
141141 .def (" forward" , forward_transform_c)
142142 .def (" backward" ,backward_transform_c)
143143 .def (" forward" , forward_transform_env)
144144 .def (" backward" ,backward_transform_env)
145145 .def (" forward" , forward_transform_env_p)
146146 .def (" backward" ,backward_transform_env_p)
147+ .def (" definition" ,&proj_transform::definition)
147148 ;
148149
149150}
0 commit comments