Merge pull request #1334 from vissarion/fix/extensions

Fix extensions
boostorg · Nov 4, 2024 · 74b7900 · 74b7900
2 parents 60ad3bd + a666d63
commit 74b7900
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 601 deletions.
diff --git a/extensions/example/gis/Jamfile b/extensions/example/gis/Jamfile
@@ -16,4 +16,3 @@ project boost-geometry-extensions-gis-examples
 
 
 build-project latlong ;
-build-project projections ;
diff --git a/extensions/example/gis/latlong/Jamfile b/extensions/example/gis/latlong/Jamfile
@@ -13,5 +13,5 @@ project boost-geometry-example-extensions-gis-projections
     : # requirements
     ;
 
-exe distance_example : distance_example.cpp ;
-exe point_ll_example : point_ll_example.cpp ;
+#exe distance_example : distance_example.cpp ;
+#exe point_ll_example : point_ll_example.cpp ;
diff --git a/extensions/example/gis/latlong/distance_example.cpp b/extensions/example/gis/latlong/distance_example.cpp
@@ -18,10 +18,10 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/strategies/spherical/distance_cross_track.hpp>
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
-#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
-#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
-#include <boost/geometry/extensions/gis/projections/parameters.hpp>
+//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
+//#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
+//#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
+//#include <boost/geometry/extensions/gis/projections/parameters.hpp>
 
 // BSG 28-10-2010
 // TODO: clear up this test

diff --git a/extensions/example/gis/latlong/point_ll_example.cpp b/extensions/example/gis/latlong/point_ll_example.cpp
@@ -60,7 +60,7 @@ int main()
     using namespace boost::geometry;
 
     typedef model::ll::point<degree> latlon_point;
-    
+
     latlon_point paris;
 
     // Assign coordinates to the latlong point, using the methods lat and lon
@@ -115,7 +115,7 @@ int main()
 
     // Other way round: have Amsterdam and go 430 km to the south (i.e. first calculate direction)
     double tc = get_course(amsterdam, paris);
-    std::cout << "Course: " << (tc * boost::geometry::math::r2d) << std::endl;
+    std::cout << "Course: " << (tc * boost::geometry::math::r2d<double>()) << std::endl;
 
     latlon_point paris_calculated;
     point_at_distance(amsterdam, 430 * 1000.0, tc, average_earth_radius, paris_calculated);

diff --git a/extensions/example/gis/projections/Jamfile b/extensions/example/gis/projections/Jamfile
diff --git a/extensions/example/gis/projections/p01_projection_example.cpp b/extensions/example/gis/projections/p01_projection_example.cpp
diff --git a/extensions/example/gis/projections/p02_projfactory_example.cpp b/extensions/example/gis/projections/p02_projfactory_example.cpp
diff --git a/extensions/example/gis/projections/p03_projmap_example.cpp b/extensions/example/gis/projections/p03_projmap_example.cpp