[Boost-commit] svn:boost r77213 - in trunk/boost/geometry/extensions/gis/projections: . impl

Subject: [Boost-commit] svn:boost r77213 - in trunk/boost/geometry/extensions/gis/projections: . impl
From: barend.gehrels_at_[hidden]
Date: 2012-03-04 07:35:51

Author: barendgehrels
Date: 2012-03-04 07:35:50 EST (Sun, 04 Mar 2012)
New Revision: 77213
URL: http://svn.boost.org/trac/boost/changeset/77213

Log:
[geometry] fixed extensions project_transformer
Text files modified: 
   trunk/boost/geometry/extensions/gis/projections/impl/base_static.hpp    |     3 +++                                     
   trunk/boost/geometry/extensions/gis/projections/project_transformer.hpp |     6 +++---                                  
   trunk/boost/geometry/extensions/gis/projections/projection.hpp          |     4 ++++                                    
   3 files changed, 10 insertions(+), 3 deletions(-)

Modified: trunk/boost/geometry/extensions/gis/projections/impl/base_static.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/impl/base_static.hpp	(original)
+++ trunk/boost/geometry/extensions/gis/projections/impl/base_static.hpp	2012-03-04 07:35:50 EST (Sun, 04 Mar 2012)
@@ -34,6 +34,9 @@
 {
 public:
 
+    typedef LL geographic_point_type; ///< latlong point type
+    typedef XY cartesian_point_type;  ///< xy point type
+
     inline base_t_f(Prj const& prj, P const& params)
         : m_par(params), m_prj(prj)
     {}

Modified: trunk/boost/geometry/extensions/gis/projections/project_transformer.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/project_transformer.hpp	(original)
+++ trunk/boost/geometry/extensions/gis/projections/project_transformer.hpp	2012-03-04 07:35:50 EST (Sun, 04 Mar 2012)
@@ -13,7 +13,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
 #include <boost/geometry/extensions/gis/projections/factory.hpp>
 #include <boost/geometry/extensions/gis/projections/parameters.hpp>
 
@@ -52,8 +52,8 @@
     {
         // Latlong (LatLong -> Cartesian) will be projected, rest will be copied.
         // So first copy third or higher dimensions
-        geometry::detail::convert::point_to_point<LatLong, Cartesian, 2,
-                geometry::dimension<Cartesian>::value> ::copy(p1, p2);
+        geometry::detail::conversion::point_to_point<LatLong, Cartesian, 2,
+                geometry::dimension<Cartesian>::value> ::apply(p1, p2);
         return m_prj->forward(p1, p2);
     }
 

Modified: trunk/boost/geometry/extensions/gis/projections/projection.hpp
==============================================================================
--- trunk/boost/geometry/extensions/gis/projections/projection.hpp	(original)
+++ trunk/boost/geometry/extensions/gis/projections/projection.hpp	2012-03-04 07:35:50 EST (Sun, 04 Mar 2012)
@@ -35,6 +35,10 @@
         typedef double XY_T;
 
     public :
+
+        typedef LL geographic_point_type; ///< latlong point type
+        typedef XY cartesian_point_type;  ///< xy point type
+
         /// Forward projection, from Latitude-Longitude to Cartesian
         virtual bool forward(LL const& lp, XY& xy) const = 0;