[Boost-commit] svn:boost r77208 - in trunk/libs/geometry: example_extensions/gis/latlong test_extensions/gis/latlong test_extensions/gis/projections

Subject: [Boost-commit] svn:boost r77208 - in trunk/libs/geometry: example_extensions/gis/latlong test_extensions/gis/latlong test_extensions/gis/projections
From: barend.gehrels_at_[hidden]
Date: 2012-03-04 06:19:07

Author: barendgehrels
Date: 2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
New Revision: 77208
URL: http://svn.boost.org/trac/boost/changeset/77208

Log:
[geometry] updates tests/examples for: "namespace projection is renamed projections to avoid clash with class projection. Suggested by Krzysztof Czainski"
Text files modified: 
   trunk/libs/geometry/example_extensions/gis/latlong/distance_example.cpp |     8 ++++----                                
   trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp             |     2 +-                                      
   trunk/libs/geometry/test_extensions/gis/projections/projection.cpp      |     4 ++--                                    
   trunk/libs/geometry/test_extensions/gis/projections/projection_epsg.cpp |     4 ++--                                    
   trunk/libs/geometry/test_extensions/gis/projections/projections.cpp     |    12 ++++++------                            
   5 files changed, 15 insertions(+), 15 deletions(-)

Modified: trunk/libs/geometry/example_extensions/gis/latlong/distance_example.cpp
==============================================================================
--- trunk/libs/geometry/example_extensions/gis/latlong/distance_example.cpp	(original)
+++ trunk/libs/geometry/example_extensions/gis/latlong/distance_example.cpp	2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
@@ -61,12 +61,12 @@
     transform(city3, city3_rad);
 
     /*
-    projection::sterea_ellipsoid<model::ll::point<radian>, xy_point> proj
-        (projection::init(
+    projections::sterea_ellipsoid<model::ll::point<radian>, xy_point> proj
+        (projections::init(
         "+lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m"));
     */
-    projection::laea_ellipsoid<model::ll::point<radian>, xy_point> proj
-        (projection::init(
+    projections::laea_ellipsoid<model::ll::point<radian>, xy_point> proj
+        (projections::init(
         " +lat_0=52 +lon_0=10 +x_0=4321000 +y_0=3210000 +ellps=GRS80 +units=m"));
 
 

Modified: trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp	(original)
+++ trunk/libs/geometry/test_extensions/gis/latlong/area_ll.cpp	2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
@@ -70,7 +70,7 @@
 
 
     // For checking calculated area, use the Dutch projection (RD), this is EPSG code 28992
-    bg::projection::sterea_ellipsoid<LL, XY> dutch_prj(bg::projection::init(28992));
+    bg::projections::sterea_ellipsoid<LL, XY> dutch_prj(bg::projections::init(28992));
 
     // Add them in clockwise direction
     bg::model::polygon<LL> randstad;

Modified: trunk/libs/geometry/test_extensions/gis/projections/projection.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/projections/projection.cpp	(original)
+++ trunk/libs/geometry/test_extensions/gis/projections/projection.cpp	2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
@@ -42,7 +42,7 @@
               typename bg::coordinate_type<P2>::type y,
               std::string const& parameters)
 {
-    bg::projection::parameters par = bg::projection::detail::pj_init_plus(parameters);
+    bg::projections::parameters par = bg::projections::detail::pj_init_plus(parameters);
     Prj prj(par);
 
     P1 ll;
@@ -63,7 +63,7 @@
     typedef bg::model::ll::point<bg::degree, coord_type> point_type;
 
     // aea
-    test_one<bg::projection::aea_ellipsoid<point_type, P>, point_type, P>
+    test_one<bg::projections::aea_ellipsoid<point_type, P>, point_type, P>
         (4.897000, 52.371000, 334609.583974, 5218502.503686,
          "+proj=aea +ellps=WGS84 +units=m +lat_1=55 +lat_2=65");
 }

Modified: trunk/libs/geometry/test_extensions/gis/projections/projection_epsg.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/projections/projection_epsg.cpp	(original)
+++ trunk/libs/geometry/test_extensions/gis/projections/projection_epsg.cpp	2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
@@ -44,8 +44,8 @@
 {
     typedef typename bg::coordinate_type<P2>::type coord_type;
 
-    typedef bg::projection::epsg_traits<E, P1, P2> epsg_traits;
-    bg::projection::parameters par = bg::projection::detail::pj_init_plus(epsg_traits::par());
+    typedef bg::projections::epsg_traits<E, P1, P2> epsg_traits;
+    bg::projections::parameters par = bg::projections::detail::pj_init_plus(epsg_traits::par());
 
     typedef typename epsg_traits::type prj_type;
     prj_type prj(par);

Modified: trunk/libs/geometry/test_extensions/gis/projections/projections.cpp
==============================================================================
--- trunk/libs/geometry/test_extensions/gis/projections/projections.cpp	(original)
+++ trunk/libs/geometry/test_extensions/gis/projections/projections.cpp	2012-03-04 06:19:06 EST (Sun, 04 Mar 2012)
@@ -70,10 +70,10 @@
     ll.lon(lon);
     ll.lat(lat);
 
-    bg::projection::parameters params = bg::projection::detail::pj_init_plus(parameters);
-    bg::projection::factory<lonlat_type, P, bg::projection::parameters> pf;
+    bg::projections::parameters params = bg::projections::detail::pj_init_plus(parameters);
+    bg::projections::factory<lonlat_type, P, bg::projections::parameters> pf;
 
-    boost::shared_ptr<bg::projection::projection<lonlat_type, P> > prj(pf.create_new(params));
+    boost::shared_ptr<bg::projections::projection<lonlat_type, P> > prj(pf.create_new(params));
 
     P xy;
     prj->forward(ll, xy);
@@ -98,10 +98,10 @@
     bg::set<0>(xy, x);
     bg::set<1>(xy, y);
 
-    bg::projection::parameters params = bg::projection::detail::pj_init_plus(parameters);
-    bg::projection::factory<lonlat_type, P, bg::projection::parameters> pf;
+    bg::projections::parameters params = bg::projections::detail::pj_init_plus(parameters);
+    bg::projections::factory<lonlat_type, P, bg::projections::parameters> pf;
 
-    boost::shared_ptr<bg::projection::projection<lonlat_type, P> > prj(pf.create_new(params));
+    boost::shared_ptr<bg::projections::projection<lonlat_type, P> > prj(pf.create_new(params));
 
     lonlat_type ll;
     prj->inverse(xy, ll);