Skip to content

Commit 74b7900

Browse files
authored
Merge pull request #1334 from vissarion/fix/extensions
Fix extensions
2 parents 60ad3bd + a666d63 commit 74b7900

File tree

14 files changed

+19
-601
lines changed

14 files changed

+19
-601
lines changed

extensions/example/gis/Jamfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ project boost-geometry-extensions-gis-examples
1616

1717

1818
build-project latlong ;
19-
build-project projections ;

extensions/example/gis/latlong/Jamfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ project boost-geometry-example-extensions-gis-projections
1313
: # requirements
1414
;
1515

16-
exe distance_example : distance_example.cpp ;
17-
exe point_ll_example : point_ll_example.cpp ;
16+
#exe distance_example : distance_example.cpp ;
17+
#exe point_ll_example : point_ll_example.cpp ;

extensions/example/gis/latlong/distance_example.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
#include <boost/geometry/geometries/point_xy.hpp>
1919
#include <boost/geometry/strategies/spherical/distance_cross_track.hpp>
2020
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
21-
#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
22-
#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
23-
#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
24-
#include <boost/geometry/extensions/gis/projections/parameters.hpp>
21+
//#include <boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp>
22+
//#include <boost/geometry/extensions/gis/projections/proj/sterea.hpp>
23+
//#include <boost/geometry/extensions/gis/projections/proj/laea.hpp>
24+
//#include <boost/geometry/extensions/gis/projections/parameters.hpp>
2525

2626
// BSG 28-10-2010
2727
// TODO: clear up this test

extensions/example/gis/latlong/point_ll_example.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ int main()
6060
using namespace boost::geometry;
6161

6262
typedef model::ll::point<degree> latlon_point;
63-
63+
6464
latlon_point paris;
6565

6666
// Assign coordinates to the latlong point, using the methods lat and lon
@@ -115,7 +115,7 @@ int main()
115115

116116
// Other way round: have Amsterdam and go 430 km to the south (i.e. first calculate direction)
117117
double tc = get_course(amsterdam, paris);
118-
std::cout << "Course: " << (tc * boost::geometry::math::r2d) << std::endl;
118+
std::cout << "Course: " << (tc * boost::geometry::math::r2d<double>()) << std::endl;
119119

120120
latlon_point paris_calculated;
121121
point_at_distance(amsterdam, 430 * 1000.0, tc, average_earth_radius, paris_calculated);

extensions/example/gis/projections/Jamfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

extensions/example/gis/projections/p01_projection_example.cpp

Lines changed: 0 additions & 62 deletions
This file was deleted.

extensions/example/gis/projections/p02_projfactory_example.cpp

Lines changed: 0 additions & 64 deletions
This file was deleted.

extensions/example/gis/projections/p03_projmap_example.cpp

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)