|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r66813 - in sandbox/geometry/libs/geometry/example: . contrib contrib/gd-2.0.35 extensions/gis extensions/gis/io/shapelib extensions/gis/io/shapelib/contrib/shapelib-1.3.0b2 extensions/gis/latlong extensions/gis/projections
From: barend.gehrels_at_[hidden]
Date: 2010-11-28 08:42:50
Author: barendgehrels
Date: 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
New Revision: 66813
URL: http://svn.boost.org/trac/boost/changeset/66813
Log:
Major update:
Adaptions to examples with respect to new namespace model
Adaptions to examples using external libraries (gd, soci, shapelib)
Updates property sheets to boost 1.45.0
Added:
sandbox/geometry/libs/geometry/example/contrib/
sandbox/geometry/libs/geometry/example/contrib/gd-2.0.35/
sandbox/geometry/libs/geometry/example/contrib/gd-2.0.35/boost_geometry_readme.txt (contents, props changed)
sandbox/geometry/libs/geometry/example/extensions/gis/gd.vsprops (contents, props changed)
sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.sln (contents, props changed)
sandbox/geometry/libs/geometry/example/extensions/gis/shapelib.vsprops (contents, props changed)
sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.sln (contents, props changed)
sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.sln (contents, props changed)
sandbox/geometry/libs/geometry/example/postgresql.vsprops (contents, props changed)
sandbox/geometry/libs/geometry/example/soci.vsprops (contents, props changed)
Removed:
sandbox/geometry/libs/geometry/example/extensions/gis/shapelib_common.hpp
Text files modified:
sandbox/geometry/libs/geometry/example/01_point_example.cpp | 14 ++--
sandbox/geometry/libs/geometry/example/02_linestring_example.cpp | 50 +++++++-------
sandbox/geometry/libs/geometry/example/03_polygon_example.cpp | 38 +++++-----
sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp | 14 ++--
sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp | 8 +-
sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp | 16 ++--
sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp | 6
sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp | 6
sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp | 4
sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp | 8 +-
sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp | 4
sandbox/geometry/libs/geometry/example/c08_custom_non_std_example.cpp | 1
sandbox/geometry/libs/geometry/example/c10_custom_cs_example.cpp | 2
sandbox/geometry/libs/geometry/example/c11_custom_cs_transform_example.cpp | 6
sandbox/geometry/libs/geometry/example/extensions/gis/Jamfile.v2 | 18 -----
sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/contrib/shapelib-1.3.0b2/readme.txt | 4
sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp | 22 +++---
sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vcproj | 6
sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vsprops | 6 +
sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp | 47 ++++++++------
sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp | 24 ++++---
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp | 10 +-
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp | 12 +-
sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp | 28 ++++----
sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.cpp | 10 +-
sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.vcproj | 24 ++++++-
sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.cpp | 132 +++++++++++++++++++++++++--------------
sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.vcproj | 60 ++++++++++++++++-
sandbox/geometry/libs/geometry/example/x03_a_soci_example.vcproj | 73 ++++++++++-----------
sandbox/geometry/libs/geometry/example/x03_b_soci_example.cpp | 2
sandbox/geometry/libs/geometry/example/x03_b_soci_example.vcproj | 73 ++++++++++-----------
sandbox/geometry/libs/geometry/example/x03_c_soci_example.cpp | 2
sandbox/geometry/libs/geometry/example/x03_c_soci_example.vcproj | 73 ++++++++++-----------
sandbox/geometry/libs/geometry/example/x03_d_soci_example.cpp | 2
sandbox/geometry/libs/geometry/example/x03_d_soci_example.vcproj | 73 ++++++++++-----------
sandbox/geometry/libs/geometry/example/x04_wxwidgets_world_mapper.cpp | 31 ++++----
37 files changed, 504 insertions(+), 417 deletions(-)
Modified: sandbox/geometry/libs/geometry/example/01_point_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/01_point_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/01_point_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -22,10 +22,10 @@
// GGL contains several point types:
// 1: it's own generic type
- point<double, 2, cs::cartesian> pt1;
+ model::point<double, 2, cs::cartesian> pt1;
// 2: it's own type targetted to Cartesian (x,y) coordinates
- point_2d pt2;
+ model::point_2d pt2;
// 3: it supports Boost tuple's (by including the headerfile)
boost::tuple<double, double> pt3;
@@ -53,16 +53,16 @@
// Several ways of construction and setting point values
// 1: default, empty constructor, causing no initialization at all
- point_2d p1;
+ model::point_2d p1;
// 2: as shown above, assign
- point_2d p2;
+ model::point_2d p2;
assign(p2, 1, 1);
// 3: using "set" function
// set uses the concepts behind, such that it can be applied for
// every point-type (like assign)
- point_2d p3;
+ model::point_2d p3;
set<0>(p3, 1);
set<1>(p3, 1);
// set<2>(p3, 1); //will result in compile-error
@@ -71,11 +71,11 @@
// 3: for any point type, and other geometry objects:
// there is the "make" object generator
// (this one requires to specify the point-type).
- point_2d p4 = make<point_2d>(1,1);
+ model::point_2d p4 = make<model::point_2d>(1,1);
// 5: for the point_2d type only: constructor with two values
- point_2d p5(1,1);
+ model::point_2d p5(1,1);
// 6: for boost tuples you can of course use make_tuple
Modified: sandbox/geometry/libs/geometry/example/02_linestring_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/02_linestring_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/02_linestring_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -71,13 +71,13 @@
// Define a linestring, which is a vector of points, and add some points
// (we add them deliberately in different ways)
- linestring_2d ls;
+ model::linestring_2d ls;
// points can be created using "make" and added to a linestring using the std:: "push_back"
- ls.push_back(make<point_2d>(1.1, 1.1));
+ ls.push_back(make<model::point_2d>(1.1, 1.1));
// points can also be assigned using "assign" and added to a linestring using "append"
- point_2d lp;
+ model::point_2d lp;
assign(lp, 2.5, 2.1);
append(ls, lp);
@@ -85,7 +85,7 @@
std::cout << boost::geometry::dsv(ls) << std::endl;
// The bounding box of linestrings can be calculated
- box_2d b;
+ model::box_2d b;
envelope(ls, b);
std::cout << boost::geometry::dsv(b) << std::endl;
@@ -102,13 +102,13 @@
std::cout << "number of points 3: " << num_points(ls) << std::endl;
// The distance from a point to a linestring can be calculated
- point_2d p(1.9, 1.2);
+ model::point_2d p(1.9, 1.2);
std::cout << "distance of " << boost::geometry::dsv(p)
<< " to line: " << distance(p, ls) << std::endl;
// A linestring is a vector. However, some algorithms consider "segments",
// which are the line pieces between two points of a linestring.
- double d = distance(p, segment<point_2d >(ls.front(), ls.back()));
+ double d = distance(p, model::segment<model::point_2d >(ls.front(), ls.back()));
std::cout << "distance: " << d << std::endl;
// Add some three points more, let's do it using a classic array.
@@ -119,7 +119,7 @@
// Output as iterator-pair on a vector
{
- std::vector<point_2d> v;
+ std::vector<model::point_2d> v;
std::copy(ls.begin(), ls.end(), std::back_inserter(v));
std::cout
@@ -139,7 +139,7 @@
std::reverse(boost::begin(ls), boost::end(ls));
// The other way, using a vector instead of a linestring, is also possible
- std::vector<point_2d> pv(ls.begin(), ls.end());
+ std::vector<model::point_2d> pv(ls.begin(), ls.end());
std::cout << "length: " << length(pv) << std::endl;
// If there are double points in the line, you can use unique to remove them
@@ -148,22 +148,22 @@
// (sidenote, we have to make copies, because
// ls.push_back(ls.back()) often succeeds but
// IS dangerous and erroneous!
- point_2d last = ls.back(), first = ls.front();
+ model::point_2d last = ls.back(), first = ls.front();
ls.push_back(last);
ls.insert(ls.begin(), first);
}
std::cout << "extra duplicate points: " << boost::geometry::dsv(ls) << std::endl;
{
- linestring_2d ls_copy;
+ model::linestring_2d ls_copy;
std::unique_copy(ls.begin(), ls.end(), std::back_inserter(ls_copy),
- boost::geometry::equal_to<point_2d>());
+ boost::geometry::equal_to<model::point_2d>());
ls = ls_copy;
std::cout << "uniquecopy: " << boost::geometry::dsv(ls) << std::endl;
}
// Lines can be simplified. This removes points, but preserves the shape
- linestring_2d ls_simplified;
+ model::linestring_2d ls_simplified;
simplify(ls, ls_simplified, 0.5);
std::cout << "simplified: " << boost::geometry::dsv(ls_simplified) << std::endl;
@@ -175,39 +175,39 @@
// 4) loop is defined for geometries to visit segments
// with state apart, and to be able to break out (not shown here)
{
- linestring_2d lscopy = ls;
- std::for_each(lscopy.begin(), lscopy.end(), translate_function<point_2d>);
- for_each_point(lscopy, scale_functor<point_2d>());
- for_each_point(lscopy, translate_function<point_2d>);
+ model::linestring_2d lscopy = ls;
+ std::for_each(lscopy.begin(), lscopy.end(), translate_function<model::point_2d>);
+ for_each_point(lscopy, scale_functor<model::point_2d>());
+ for_each_point(lscopy, translate_function<model::point_2d>);
std::cout << "modified line: " << boost::geometry::dsv(lscopy) << std::endl;
}
// Lines can be clipped using a clipping box. Clipped lines are added to the output iterator
- box_2d cb(point_2d(1.5, 1.5), point_2d(4.5, 2.5));
+ model::box_2d cb(model::point_2d(1.5, 1.5), model::point_2d(4.5, 2.5));
- std::vector<linestring_2d> clipped;
- intersection_inserter<linestring_2d> (cb, ls, std::back_inserter(clipped));
+ std::vector<model::linestring_2d> clipped;
+ intersection_inserter<model::linestring_2d> (cb, ls, std::back_inserter(clipped));
// Also possible: clip-output to a vector of vectors
- std::vector<std::vector<point_2d> > vector_out;
- intersection_inserter<std::vector<point_2d> >(cb, ls, std::back_inserter(vector_out));
+ std::vector<std::vector<model::point_2d> > vector_out;
+ intersection_inserter<std::vector<model::point_2d> >(cb, ls, std::back_inserter(vector_out));
std::cout << "clipped output as vector:" << std::endl;
- for (std::vector<std::vector<point_2d> >::const_iterator it
+ for (std::vector<std::vector<model::point_2d> >::const_iterator it
= vector_out.begin(); it != vector_out.end(); ++it)
{
std::cout << boost::geometry::dsv(*it) << std::endl;
}
// Calculate the convex hull of the linestring
- polygon_2d hull;
+ model::polygon_2d hull;
convex_hull(ls, hull);
std::cout << "Convex hull:" << boost::geometry::dsv(hull) << std::endl;
// All the above assumed 2D Cartesian linestrings. 3D is possible as well
// Let's define a 3D point ourselves, this time using 'float'
- typedef point<float, 3, cs::cartesian> point_type;
- typedef linestring<point_type> line_type;
+ typedef model::point<float, 3, cs::cartesian> point_type;
+ typedef model::linestring<point_type> line_type;
line_type line3d;
line3d.push_back(make<point_type>(1,2,3));
line3d.push_back(make<point_type>(4,5,6));
Modified: sandbox/geometry/libs/geometry/example/03_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/03_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/03_polygon_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -29,7 +29,7 @@
// Define a polygon and fill the outer ring.
// In most cases you will read it from a file or database
- polygon_2d poly;
+ model::polygon_2d poly;
{
const double coor[][2] = {
{2.0, 1.3}, {2.4, 1.7}, {2.8, 1.8}, {3.4, 1.2}, {3.7, 1.6},
@@ -48,7 +48,7 @@
std::cout << dsv(poly) << std::endl;
// As with lines, bounding box of polygons can be calculated
- box_2d b;
+ model::box_2d b;
envelope(poly, b);
std::cout << dsv(b) << std::endl;
@@ -56,7 +56,7 @@
std::cout << "area: " << area(poly) << std::endl;
// And the centroid, which is the center of gravity
- point_2d cent;
+ model::point_2d cent;
centroid(poly, cent);
std::cout << "centroid: " << dsv(cent) << std::endl;
@@ -69,7 +69,7 @@
// Let's add one
{
poly.inners().resize(1);
- linear_ring<point_2d>& inner = poly.inners().back();
+ model::linear_ring<model::point_2d>& inner = poly.inners().back();
const double coor[][2] = { {4.0, 2.0}, {4.2, 1.4}, {4.8, 1.9}, {4.4, 2.2}, {4.0, 2.0} };
assign(inner, coor);
@@ -85,9 +85,9 @@
// You can test whether points are within a polygon
std::cout << "point in polygon:"
- << " p1: " << boolstr(within(make<point_2d>(3.0, 2.0), poly))
- << " p2: " << boolstr(within(make<point_2d>(3.7, 2.0), poly))
- << " p3: " << boolstr(within(make<point_2d>(4.4, 2.0), poly))
+ << " p1: " << boolstr(within(make<model::point_2d>(3.0, 2.0), poly))
+ << " p2: " << boolstr(within(make<model::point_2d>(3.7, 2.0), poly))
+ << " p3: " << boolstr(within(make<model::point_2d>(4.4, 2.0), poly))
<< std::endl;
// As with linestrings and points, you can derive from polygon to add, for example,
@@ -95,22 +95,22 @@
// We don't show this here.
// Clip the polygon using a bounding box
- box_2d cb(make<point_2d>(1.5, 1.5), make<point_2d>(4.5, 2.5));
- typedef std::vector<polygon_2d > polygon_list;
+ model::box_2d cb(make<model::point_2d>(1.5, 1.5), make<model::point_2d>(4.5, 2.5));
+ typedef std::vector<model::polygon_2d> polygon_list;
polygon_list v;
- intersection_inserter<polygon_2d>(cb, poly, std::back_inserter(v));
+ intersection(cb, poly, v);
std::cout << "Clipped output polygons" << std::endl;
for (polygon_list::const_iterator it = v.begin(); it != v.end(); ++it)
{
std::cout << dsv(*it) << std::endl;
}
- typedef multi_polygon<polygon_2d> polygon_set;
+ typedef model::multi_polygon<model::polygon_2d> polygon_set;
polygon_set ps;
- union_inserter<polygon_2d>(cb, poly, std::back_inserter(ps));
+ union_(cb, poly, ps);
- polygon_2d hull;
+ model::polygon_2d hull;
convex_hull(poly, hull);
std::cout << "Convex hull:" << dsv(hull) << std::endl;
@@ -118,14 +118,14 @@
// You don't have to use a vector, you can define a polygon with a deque
// You can specify the container for the points and for the inner rings independantly
- typedef polygon<point_2d, std::vector, std::deque> polygon_type;
+ typedef model::polygon<model::point_2d, true, true, std::deque, std::deque> polygon_type;
polygon_type poly2;
ring_type<polygon_type>::type& ring = exterior_ring(poly2);
- append(ring, make<point_2d>(2.8, 1.9));
- append(ring, make<point_2d>(2.9, 2.4));
- append(ring, make<point_2d>(3.3, 2.2));
- append(ring, make<point_2d>(3.2, 1.8));
- append(ring, make<point_2d>(2.8, 1.9));
+ append(ring, make<model::point_2d>(2.8, 1.9));
+ append(ring, make<model::point_2d>(2.9, 2.4));
+ append(ring, make<model::point_2d>(3.3, 2.2));
+ append(ring, make<model::point_2d>(3.2, 1.8));
+ append(ring, make<model::point_2d>(2.8, 1.9));
std::cout << dsv(poly2) << std::endl;
return 0;
Modified: sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/05_a_overlay_polygon_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -27,10 +27,10 @@
namespace bg = boost::geometry;
std::ofstream stream("05_a_intersection_polygon_example.svg");
- bg::svg_mapper<bg::point_2d> svg(stream, 500, 500);
+ bg::svg_mapper<bg::model::point_2d> svg(stream, 500, 500);
// Define a polygons and fill the outer rings.
- bg::polygon_2d a;
+ bg::model::polygon_2d a;
{
const double c[][2] = {
{160, 330}, {60, 260}, {20, 150}, {60, 40}, {190, 20}, {270, 130}, {260, 250}, {160, 330}
@@ -41,7 +41,7 @@
std::cout << "A: " << bg::dsv(a) << std::endl;
svg.add(a);
- bg::polygon_2d b;
+ bg::model::polygon_2d b;
{
const double c[][2] = {
{300, 330}, {190, 270}, {150, 170}, {150, 110}, {250, 30}, {380, 50}, {380, 250}, {300, 330}
@@ -57,11 +57,11 @@
// Calculate interesection(s)
- std::vector<bg::polygon_2d > intersection;
- bg::intersection<bg::polygon_2d>(a, b, intersection);
+ std::vector<bg::model::polygon_2d > intersection;
+ bg::intersection<bg::model::polygon_2d>(a, b, intersection);
std::cout << "Intersection of polygons A and B" << std::endl;
- BOOST_FOREACH(bg::polygon_2d const& polygon, intersection)
+ BOOST_FOREACH(bg::model::polygon_2d const& polygon, intersection)
{
std::cout << bg::dsv(polygon) << std::endl;
svg.map(polygon, "opacity:0.5;fill:none;stroke:rgb(255,0,0);stroke-width:6");
Modified: sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/05_b_overlay_linestring_polygon_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -27,13 +27,13 @@
namespace bg = boost::geometry;
// Define a polygons and fill the outer rings.
- bg::linestring_2d ls;
+ bg::model::linestring_2d ls;
{
const double c[][2] = { {0, 1}, {2, 5}, {5, 3} };
bg::assign(ls, c);
}
- bg::polygon_2d p;
+ bg::model::polygon_2d p;
{
const double c[][2] = { {3, 0}, {0, 3}, {4, 5}, {3, 0} };
bg::assign(p, c);
@@ -42,7 +42,7 @@
// Create SVG-mapper
std::ofstream stream("05_b_overlay_linestring_polygon_example.svg");
- bg::svg_mapper<bg::point_2d> svg(stream, 500, 500);
+ bg::svg_mapper<bg::model::point_2d> svg(stream, 500, 500);
// Determine extend by adding geometries
svg.add(p);
svg.add(ls);
@@ -52,7 +52,7 @@
// Calculate intersection points (turn points)
- typedef bg::detail::overlay::turn_info<bg::point_2d> turn_info;
+ typedef bg::detail::overlay::turn_info<bg::model::point_2d> turn_info;
std::vector<turn_info> turns;
bg::detail::get_turns::no_interrupt_policy policy;
bg::get_turns<bg::detail::overlay::assign_null_policy>(ls, p, turns, policy);
@@ -61,16 +61,16 @@
BOOST_FOREACH(turn_info const& turn, turns)
{
std::string action = "intersecting";
- if (turn.operations[0].operation
+ if (turn.operations[0].operation
== bg::detail::overlay::operation_intersection)
{
action = "entering";
}
- else if (turn.operations[0].operation
+ else if (turn.operations[0].operation
== bg::detail::overlay::operation_union)
{
action = "leaving";
-
+
}
std::cout << action << " polygon at " << bg::dsv(turn.point) << std::endl;
svg.map(turn.point, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1");
Modified: sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/06_a_transformation_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -19,17 +19,17 @@
{
using namespace boost::geometry;
- point_2d p(1, 1);
- point_2d p2;
+ model::point_2d p(1, 1);
+ model::point_2d p2;
// Example: translate a point over (5,5)
- strategy::transform::translate_transformer<point_2d, point_2d> translate(5, 5);
+ strategy::transform::translate_transformer<model::point_2d, model::point_2d> translate(5, 5);
transform(p, p2, translate);
std::cout << "transformed point " << boost::geometry::dsv(p2) << std::endl;
// Transform a polygon
- polygon_2d poly, poly2;
+ model::polygon_2d poly, poly2;
const double coor[][2] = { {0, 0}, {0, 7}, {2, 2}, {2, 0}, {0, 0} };
// note that for this syntax you have to include the two
// include files above (c_array_cartesian.hpp, std_as_linestring.hpp)
Modified: sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/06_b_transformation_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -113,36 +113,36 @@
svg_output<std::ofstream> svg(ofs, 0.5);
// G1 - create subject for affine transformations
- polygon_2d g1;
+ model::polygon_2d g1;
read_wkt("POLYGON((50 250, 400 250, 150 50, 50 250))", g1);
std::clog << "source box:\t" << boost::geometry::dsv(g1) << std::endl;
svg.put(g1, "g1");
// G1 - Translate -> G2
- translate_transformer<point_2d, point_2d> translate(0, 250);
- polygon_2d g2;
+ translate_transformer<model::point_2d, model::point_2d> translate(0, 250);
+ model::polygon_2d g2;
transform(g1, g2, translate);
std::clog << "translated:\t" << boost::geometry::dsv(g2) << std::endl;
svg.put(g2, "g2=g1.translate(0,250)");
// G2 - Scale -> G3
- scale_transformer<point_2d, point_2d> scale(0.5, 0.5);
- polygon_2d g3;
+ scale_transformer<model::point_2d, model::point_2d> scale(0.5, 0.5);
+ model::polygon_2d g3;
transform(g2, g3, scale);
std::clog << "scaled:\t" << boost::geometry::dsv(g3) << std::endl;
svg.put(g3, "g3=g2.scale(0.5,0.5)");
// G3 - Combine rotate and translate -> G4
- rotate_transformer<point_2d, point_2d, degree> rotate(45);
+ rotate_transformer<model::point_2d, model::point_2d, degree> rotate(45);
// Compose matrix for the two transformation
// Create transformer attached to the transformation matrix
- ublas_transformer<point_2d, point_2d, 2, 2>
+ ublas_transformer<model::point_2d, model::point_2d, 2, 2>
combined(boost::numeric::ublas::prod(rotate.matrix(), translate.matrix()));
//combined(rotate.matrix());
// Apply transformation to subject geometry point-by-point
- polygon_2d g4;
+ model::polygon_2d g4;
transform(g3, g4, combined);
std::clog << "rotated & translated:\t" << boost::geometry::dsv(g4) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/07_a_graph_route_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -262,12 +262,12 @@
int main()
{
// Define a point in the Geographic coordinate system
- typedef boost::geometry::point
+ typedef boost::geometry::model::point
<
double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
> point_type;
- typedef boost::geometry::linestring<point_type> line_type;
+ typedef boost::geometry::model::linestring<point_type> line_type;
// Define the graph, lateron containing the road network
typedef boost::adjacency_list
@@ -281,7 +281,7 @@
// Init a bounding box, lateron used to define SVG map
- boost::geometry::box_2d box;
+ boost::geometry::model::box_2d box;
boost::geometry::assign_inverse(box);
// Read the cities
Modified: sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/07_b_graph_route_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -248,12 +248,12 @@
int main()
{
// Define a point in the Geographic coordinate system
- typedef boost::geometry::point
+ typedef boost::geometry::model::point
<
double, 2, boost::geometry::cs::geographic<boost::geometry::degree>
> point_type;
- typedef boost::geometry::linestring<point_type> line_type;
+ typedef boost::geometry::model::linestring<point_type> line_type;
// Define the graph, lateron containing the road network
// With this, specify bundled properties for vertex and edge,
@@ -269,7 +269,7 @@
// Init a bounding box, lateron used to define SVG map
- boost::geometry::box_2d box;
+ boost::geometry::model::box_2d box;
boost::geometry::assign_inverse(box);
graph_type graph;
Modified: sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c04_a_custom_triangle_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -19,7 +19,7 @@
#include <boost/geometry/util/write_dsv.hpp>
-struct triangle : public boost::array<boost::geometry::point_xy<double>, 4>
+struct triangle : public boost::array<boost::geometry::model::point_xy<double>, 4>
{
inline void close()
{
@@ -71,7 +71,7 @@
std::cout << "Triangle: " << boost::geometry::dsv(t) << std::endl;
std::cout << "Area: " << boost::geometry::area(t) << std::endl;
- boost::geometry::point_xy<double> c;
+ boost::geometry::model::point_xy<double> c;
boost::geometry::centroid(t, c);
std::cout << "Centroid: " << boost::geometry::dsv(c) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c05_custom_point_pointer_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -86,16 +86,16 @@
std::cout << boost::geometry::length(myline) << std::endl;
- boost::geometry::box_2d cb(boost::geometry::point_2d(1.5, 1.5), boost::geometry::point_2d(4.5, 4.5));
+ boost::geometry::model::box_2d cb(boost::geometry::model::point_2d(1.5, 1.5), boost::geometry::model::point_2d(4.5, 4.5));
// This will NOT work because would need dynamicly allocating memory for point* in algorithms:
// std::vector<ln> clipped;
//boost::geometry::intersection(cb, myline, std::back_inserter(clipped));
// This works because outputs to a normal struct point, no point*
- std::vector<boost::geometry::linestring_2d> clipped;
- boost::geometry::strategy::intersection::liang_barsky<boost::geometry::box_2d, boost::geometry::point_2d> strategy;
- boost::geometry::detail::intersection::clip_range_with_box<boost::geometry::linestring_2d>(cb,
+ std::vector<boost::geometry::model::linestring_2d> clipped;
+ boost::geometry::strategy::intersection::liang_barsky<boost::geometry::model::box_2d, boost::geometry::model::point_2d> strategy;
+ boost::geometry::detail::intersection::clip_range_with_box<boost::geometry::model::linestring_2d>(cb,
myline, std::back_inserter(clipped), strategy);
Modified: sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c07_custom_ring_pointer_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -97,8 +97,8 @@
//std::vector<ring_type> unioned;
//boost::geometry::union<ring_type>(a, b, std::back_inserter(unioned));
- std::vector<boost::geometry::ring_2d> unioned;
- std::vector<boost::geometry::ring_2d> intersected;
+ std::vector<boost::geometry::model::ring_2d> unioned;
+ std::vector<boost::geometry::model::ring_2d> intersected;
// Temporarily not working
/*
Modified: sandbox/geometry/libs/geometry/example/c08_custom_non_std_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c08_custom_non_std_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c08_custom_non_std_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -62,6 +62,7 @@
// TEMPORARY:
inline void resize(int n) { points.resize(n); }
+
// Note: it IS possible to have different method names;
// however, there should (probably) be two different
// iterators then or an iterator with a specified policy).
Modified: sandbox/geometry/libs/geometry/example/c10_custom_cs_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c10_custom_cs_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c10_custom_cs_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -68,7 +68,7 @@
int main()
{
- typedef boost::geometry::point
+ typedef boost::geometry::model::point
<
double, 2, martian<boost::geometry::degree>
> mars_point;
Modified: sandbox/geometry/libs/geometry/example/c11_custom_cs_transform_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/c11_custom_cs_transform_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/c11_custom_cs_transform_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -68,8 +68,8 @@
};
// 6: Define point types using this explicitly
-typedef boost::geometry::point<double, 2, cart> point1;
-typedef boost::geometry::point<double, 2, cart_shifted5> point2;
+typedef boost::geometry::model::point<double, 2, cart> point1;
+typedef boost::geometry::model::point<double, 2, cart_shifted5> point2;
// 7: register the distance strategy
namespace boost { namespace geometry { namespace strategy { namespace distance { namespace services
@@ -110,7 +110,7 @@
std::cout << d1 << " " << d2 << std::endl;
// Transform from a to b:
- boost::geometry::point<double, 2, cart_shifted5> p1_shifted;
+ boost::geometry::model::point<double, 2, cart_shifted5> p1_shifted;
boost::geometry::transform(p1_a, p1_shifted);
Added: sandbox/geometry/libs/geometry/example/contrib/gd-2.0.35/boost_geometry_readme.txt
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/contrib/gd-2.0.35/boost_geometry_readme.txt 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,18 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+//
+// Copyright Barend Gehrels 2010, Geodan, Amsterdam, the Netherlands
+// Use, modification and distribution is subject to the Boost Software License,
+// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+
+
+Download gd from
+http://www.libgd.og/
+and extract to this folder.
+
+Nothing has to be installed.
+
+This is used in x05_gd_example.cpp
+
+
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/Jamfile.v2
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/Jamfile.v2 (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/Jamfile.v2 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -7,7 +7,7 @@
import os ;
-# Setting Shapelib and libgd paths
+# Setting Shapelib paths
# Below, example paths point to Shapelib installation by OSGeo4W package
# available at http://trac.osgeo.org/osgeo4w
switch [ os.name ]
@@ -16,9 +16,6 @@
{
lib shp : : <file>C:/OSGeo4W/lib/shapelib_i.lib ;
LIBSHP_INCLUDE = <include>C:/OSGeo4W/include ;
-
- lib gd : : <file>C:/OSGeo4W/lib/gd.lib ;
- LIBGD_INCLUDE = <include>C:/OSGeo4W/include/gd ;
}
case * :
{
@@ -26,11 +23,6 @@
<name>shp
<search>/usr/lib
<search>/usr/local/lib ;
-
- lib gd : :
- <name>gd
- <search>/usr/lib
- <search>/usr/local/lib ;
}
}
@@ -49,13 +41,5 @@
$(LIBSHP_INCLUDE)
;
-exe x02_gd_example
- : # sources and dependencies
- x02_gd_example.cpp gd shp
- : # requirements
- $(LIBGD_INCLUDE)
- $(LIBSHP_INCLUDE)
- ;
-
build-project latlong ;
build-project projections ;
Added: sandbox/geometry/libs/geometry/example/extensions/gis/gd.vsprops
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/gd.vsprops 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gd"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(GD)""
+ PreprocessorDefinitions="NONDLL"
+ />
+ <UserMacro
+ Name="GD"
+ Value="../../contrib/gd-2.0.35"
+ />
+</VisualStudioPropertySheet>
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/contrib/shapelib-1.3.0b2/readme.txt
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/contrib/shapelib-1.3.0b2/readme.txt (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/contrib/shapelib-1.3.0b2/readme.txt 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -15,9 +15,9 @@
Install at least the following files:
-- dbfopen.c
-- dbfopen.c
+- shpopen.c
- shapefil.h
+- dbfopen.c
For new shapelibs:
- safileio.c
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -47,25 +47,25 @@
int main()
{
namespace bg = boost::geometry;
- typedef bg::point<double, 2, bg::cs::cartesian> point_type;
+ typedef bg::model::point<double, 2, bg::cs::cartesian> point_type;
try
{
{
- shape_creator<bg::linear_ring<point_type> > sc("out/pol");
+ shape_creator<bg::model::linear_ring<point_type> > sc("out/pol");
sc.AddField<int>("dummy", 10);
int r = sc.AddGeomFromText("POLYGON((0 0,0 1,1 1,1 0,0 0))");
sc.WriteField(r, 0, 10);
}
{
- shape_creator<bg::polygon<point_type> > sc("out/donut");
+ shape_creator<bg::model::polygon<point_type> > sc("out/donut");
sc.AddField<int>("dummy", 10);
int r = sc.AddGeomFromText("POLYGON((0 0,0 7,4 2,2 0,0 0),(1 1,2 1,1 2,1 1))");
sc.WriteField(r, 0, 10);
}
{
- shape_creator<bg::polygon<point_type> > sc("out/donut2");
+ shape_creator<bg::model::polygon<point_type> > sc("out/donut2");
sc.AddField<int>("dummy", 10);
int r = sc.AddGeomFromText("POLYGON ((174618.3423614502 504723.43828582764, 174658.97901153564 504727.76149749756, 174655.07703399658 504763.57702636719, 174655.89733123779 504767.03034210205, 174657.70821380615 504770.11280822754, 174660.34678649902 504772.52502441406, 174663.55408477783 504774.04540252686, 174871.51212310791 504793.95350646973, 174809.82281494141 504969.10485076904, 174592.13478088379 504995.37437438965, 174596.52947998047 504954.86187744141, 174596.31950378418 504951.57875061035, 174595.33219909668 504948.68436431885, 174597.70560455322 504928.34646606445, 174618.3423614502 504723.43828582764), (174658.489402771 504823.78255462646, 174646.87094116211 504938.40633392334, 174772.98456573486 504923.18756866455, 174803.11683654785 504837.63452911377, 174658.489402771 504823.78255462646))");
sc.WriteField(r, 0, 10);
@@ -73,7 +73,7 @@
{
- shape_creator<bg::linestring<point_type> > sc("out/ls");
+ shape_creator<bg::model::linestring<point_type> > sc("out/ls");
sc.AddField<int>("dummy", 10);
int r = sc.AddGeomFromText("LINESTRING(0 0,3 3,5 4,7 1)");
sc.WriteField(r, 0, 10);
@@ -89,13 +89,13 @@
}
{
- shape_creator<bg::box<point_type> > sc("out/box");
+ shape_creator<bg::model::box<point_type> > sc("out/box");
sc.AddField<int>("dummy", 10);
int r = sc.AddGeomFromText("POLYGON((1 1,2 2))");
}
{
- shape_creator<bg::segment<point_type const> > sc("out/seg");
+ shape_creator<bg::model::segment<point_type> > sc("out/seg");
sc.AddField<short>("dummy", 10);
// This time, write to shape as geometry and not as WKT
@@ -103,28 +103,28 @@
point_type p1, p2;
bg::read_wkt("POINT(1 1)", p1);
bg::read_wkt("POINT(2 2)", p2);
- bg::segment<point_type const> s(p1, p2);
+ bg::model::segment<point_type> s(p1, p2);
int r = sc.AddShape(s);
sc.WriteField(r, 0, 10);
}
{
- shape_creator<bg::multi_point<point_type> > sc("out/mpnt");
+ shape_creator<bg::model::multi_point<point_type> > sc("out/mpnt");
sc.AddField<float>("dummy", 10);
int r = sc.AddGeomFromText("MULTIPOINT((0 0),(1 1),(5 2),(7 3))");
sc.WriteField(r, 0, 10.1f);
}
{
- shape_creator<bg::multi_linestring<bg::linestring<point_type> > > sc("out/ml");
+ shape_creator<bg::model::multi_linestring<bg::model::linestring<point_type> > > sc("out/ml");
sc.AddField<double>("dummy", 10);
int r = sc.AddGeomFromText("MULTILINESTRING((0 0,1 1,2 0,3 1),(4 4,5 3,6 5))");
sc.WriteField(r, 0, 10.2);
}
{
- shape_creator<bg::multi_polygon<bg::polygon<point_type> > > sc("out/mp");
+ shape_creator<bg::model::multi_polygon<bg::model::polygon<point_type> > > sc("out/mp");
sc.AddField<std::string>("dummy", 10);
int r = sc.AddGeomFromText("MULTIPOLYGON(((0 0,0 7,4 2,2 0,0 0),(1 1,2 1,1 2,1 1)),((10 10,10 11,11 11,11 10,10 10)))");
sc.WriteField(r, 0, "test");
Added: sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.sln
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.sln 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shapelib", "shapelib.vcproj", "{1FA2ADE2-F649-4245-951E-A8F5935E7127}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Debug|Win32.Build.0 = Debug|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.ActiveCfg = Release|Win32
+ {1FA2ADE2-F649-4245-951E-A8F5935E7127}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -168,15 +168,15 @@
Name="SHAPELIB"
>
<File
- RelativePath=".\contrib\shapelib-1.3.0b2\dbfopen.c"
+ RelativePath="$(SHAPELIB)\dbfopen.c"
>
</File>
<File
- RelativePath=".\contrib\shapelib-1.3.0b2\safileio.c"
+ RelativePath="$(SHAPELIB)\safileio.c"
>
</File>
<File
- RelativePath=".\contrib\shapelib-1.3.0b2\shpopen.c"
+ RelativePath="$(SHAPELIB)\shpopen.c"
>
</File>
</Filter>
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vsprops
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vsprops (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/io/shapelib/shapelib.vsprops 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -6,6 +6,10 @@
>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="contrib/shapelib-1.3.0b2 "
+ AdditionalIncludeDirectories="$(SHAPELIB)"
+ />
+ <UserMacro
+ Name="SHAPELIB"
+ Value=".\contrib\shapelib-1.3.0b2"
/>
</VisualStudioPropertySheet>
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/latlong/distance_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -28,33 +28,37 @@
{
using namespace boost::geometry;
- point_ll_deg a;
+ typedef model::point_ll_deg latlon_point;
+
+ latlon_point a;
// Amsterdam 52 22'23"N 4 53'32"E
a.lat(dms<north>(52, 22, 23));
a.lon(dms<east>(4, 53, 32));
// Rotterdam 51 55'51"N 4 28'45"E
- point_ll_deg r(latitude<>(dms<north>(51, 55, 51)), longitude<>(dms<east>(4, 28, 45)));
+ latlon_point r(latitude<>(dms<north>(51, 55, 51)), longitude<>(dms<east>(4, 28, 45)));
// The hague: 52 4' 48" N, 4 18' 0" E
- point_ll_deg h(longitude<>(dms<east>(4, 18, 0)), latitude<>(dms<north>(52, 4, 48)));
+ latlon_point h(longitude<>(dms<east>(4, 18, 0)), latitude<>(dms<north>(52, 4, 48)));
- point_ll_rad a_rad, r_rad, h_rad;
+ model::point_ll_rad a_rad, r_rad, h_rad;
transform(a, a_rad);
transform(r, r_rad);
transform(h, h_rad);
#ifndef NO_PROJECTION
- projection::sterea_ellipsoid<point_ll_rad, point_2d> proj(projection::init("+lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m"));
+ projection::sterea_ellipsoid<model::point_ll_rad, model::point_2d> proj
+ (projection::init(
+ "+lat_0=52.15616055555555 +lon_0=5.38763888888889 +k=0.9999079 +x_0=155000 +y_0=463000 +ellps=bessel +units=m"));
- point_2d a_rd, r_rd, h_rd;
+ model::point_2d a_rd, r_rd, h_rd;
proj.forward(a_rad, a_rd);
proj.forward(h_rad, h_rd);
proj.forward(r_rad, r_rd);
#else
- point_2d a_rd(121267, 487245);
- point_2d r_rd(92526.2, 438324);
- point_2d h_rd(80454.2, 455086);
+ model::point_2d a_rd(121267, 487245);
+ model::point_2d r_rd(92526.2, 438324);
+ model::point_2d h_rd(80454.2, 455086);
#endif
// ------------------------------------------------------------------------------------------
@@ -64,10 +68,10 @@
std::cout << "Distance Amsterdam-Rotterdam: " << std::endl;
std::cout << "haversine: " << 0.001 * distance(a, r) << " km" << std::endl;
std::cout << "haversine rad: " << 0.001 * distance(a_rad, r_rad) << " km" << std::endl;
- std::cout << "haversine other radius: " << distance(a, r, strategy::distance::haversine<point_ll_deg>(6371.0) ) << " km" << std::endl;
- std::cout << "andoyer: " << 0.001 * distance(a, r, strategy::distance::andoyer<point_ll_deg>() ) << " km" << std::endl;
- std::cout << "vincenty: " << 0.001 * distance(a, r, strategy::distance::vincenty<point_ll_deg>() ) << " km" << std::endl;
- std::cout << "vincenty rad: " << 0.001 * distance(a_rad, r_rad, strategy::distance::vincenty<point_ll_rad>() ) << " km" << std::endl;
+ std::cout << "haversine other radius: " << distance(a, r, strategy::distance::haversine<latlon_point>(6371.0) ) << " km" << std::endl;
+ std::cout << "andoyer: " << 0.001 * distance(a, r, strategy::distance::andoyer<latlon_point>() ) << " km" << std::endl;
+ std::cout << "vincenty: " << 0.001 * distance(a, r, strategy::distance::vincenty<latlon_point>() ) << " km" << std::endl;
+ std::cout << "vincenty rad: " << 0.001 * distance(a_rad, r_rad, strategy::distance::vincenty<model::point_ll_rad>() ) << " km" << std::endl;
std::cout << "RD, pythagoras: " << 0.001 * distance(a_rd, r_rd) << " km" << std::endl;
std::cout << std::endl;
@@ -79,23 +83,26 @@
// ------------------------------------------------------------------------------------------
std::cout << std::endl << "The Hague - line Amsterdam,Rotterdam" << std::endl;
- segment_2d ar_xy(a_rd, r_rd);
+ model::segment_2d ar_xy(a_rd, r_rd);
double dr = distance(h_rd, ar_xy);
std::cout << "in RD: " << 0.001 * dr << std::endl;
+ /* TO BE FIXED
+ // TODO: fix this
// Temporary fix: multiply with Earth Radius. This will be refactored.
double const er = 6378137.0;
- dr = er * distance(h, segment_ll_deg(a, r));
+ dr = er * distance(h, model::segment_ll_deg(a, r));
std::cout << "in LL: " << 0.001 * dr << std::endl;
std::cout << std::endl << "Rotterdam - line Amsterdam,the Hague" << std::endl;
- dr = distance(r_rd, segment_2d(a_rd, h_rd));
+ dr = distance(r_rd, model::segment_2d(a_rd, h_rd));
std::cout << "in RD: " << 0.001 * dr << std::endl;
- dr = er * distance(r, segment_ll_deg(a, h));
+ dr = er * distance(r, model::segment_ll_deg(a, h));
std::cout << "in LL: " << 0.001 * dr << std::endl;
std::cout << std::endl;
+ */
// ------------------------------------------------------------------------------------------
// Compilation
@@ -115,13 +122,13 @@
// Length calculations use distances internally. The lines below take automatically the default
// formulae for distance. However, you can also specify a formula explicitly.
- linestring_ll_deg line1;
+ model::linestring_ll_deg line1;
append(line1, a);
append(line1, r);
std::cout << "length: " << length(line1) << std::endl;
- std::cout << "length using Vincenty: " << length(line1, strategy::distance::vincenty<point_ll_deg>()) << std::endl;
+ std::cout << "length using Vincenty: " << length(line1, strategy::distance::vincenty<latlon_point>()) << std::endl;
- linestring_2d line2;
+ model::linestring_2d line2;
append(line2, a_rd);
append(line2, r_rd);
std::cout << "length: " << length(line2) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/latlong/point_ll_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -40,8 +40,10 @@
double distance, double tc, double radius,
P2& p2)
{
- double earth_perimeter = radius * boost::geometry::math::two_pi;
- double d = (distance / earth_perimeter) * boost::geometry::math::two_pi;
+ double const two_pi = 2.0 * boost::geometry::math::pi<double>();
+ double earth_perimeter = radius * two_pi;
+;
+ double d = (distance / earth_perimeter) * two_pi;
double const& lat1 = boost::geometry::get_as_radian<1>(p1);
double const& lon1 = boost::geometry::get_as_radian<0>(p1);
@@ -61,7 +63,9 @@
using namespace boost::geometry;
// Declare a latlong point, using doubles and degrees (= default)
- point_ll_deg paris;
+ typedef model::point_ll_deg latlon_point;
+
+ latlon_point paris;
// Assign coordinates to the latlong point, using the methods lat and lon
// Paris 48 52' 0" N, 2 19' 59" E
@@ -72,14 +76,14 @@
// Constructor using explicit latitude/longitude
// Lima 12 2' 36" S, 77 1' 42" W
- point_ll_deg lima(
+ latlon_point lima(
latitude<>(dms<south>(12, 2, 36)),
longitude<>(dms<west>(77, 1, 42)));
std::cout << "Lima: " << boost::geometry::dsv(lima) << std::endl;
// Construction with parse utiity
- point_ll_deg amsterdam = parse<point_ll_deg>("52 22'23\"N", "4 53'32\"E");
+ latlon_point amsterdam = parse<latlon_point>("52 22'23\"N", "4 53'32\"E");
std::cout << "Amsterdam: " << boost::geometry::dsv(amsterdam) << std::endl;
// Calculate the distance using the default strategy (Andoyer), and Vincenty
@@ -89,22 +93,22 @@
<< " km" << std::endl;
std::cout << "Distance Paris-Lima, Vincenty "
- << 0.001 * distance(paris, lima, strategy::distance::vincenty<point_ll_deg>())
+ << 0.001 * distance(paris, lima, strategy::distance::vincenty<latlon_point>())
<< " km" << std::endl;
// Using great circle (=haversine), this is less precise because earth is not a sphere
double const average_earth_radius = 6372795.0;
std::cout << "Distance Paris-Lima, great circle "
- << 0.001 * distance(paris, lima, strategy::distance::haversine<point_ll_deg>(average_earth_radius))
+ << 0.001 * distance(paris, lima, strategy::distance::haversine<latlon_point>(average_earth_radius))
<< " km" << std::endl;
// Convert a latlong point to radians. This might be convenient, although algorithms
// are transparent on degree/radians
- point_ll_rad paris_rad;
+ model::point_ll_rad paris_rad;
transform(paris, paris_rad);
std::cout << "Paris in radians: " << boost::geometry::dsv(paris_rad) << std::endl;
- point_ll_rad amsterdam_rad;
+ model::point_ll_rad amsterdam_rad;
transform(amsterdam, amsterdam_rad);
std::cout << "Amsterdam in radians: " << boost::geometry::dsv(amsterdam_rad) << std::endl;
@@ -117,7 +121,7 @@
double tc = get_course(amsterdam, paris);
std::cout << "Course: " << (tc * boost::geometry::math::r2d) << std::endl;
- point_ll_deg paris_calculated;
+ latlon_point paris_calculated;
point_at_distance(amsterdam, 430 * 1000.0, tc, average_earth_radius, paris_calculated);
std::cout << "Paris calculated (degree): " << boost::geometry::dsv(paris_calculated) << std::endl;
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p01_projection_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -26,13 +26,13 @@
// Construct a Robinson projection, using specified point types
// (This delivers a projection without virtual methods. Note that in p02 example
// the projection is created using a factory, which delivers a projection with virtual methods)
- projection::robin_spheroid<point_ll_deg, point_2d> prj(par);
+ projection::robin_spheroid<model::point_ll_deg, model::point_2d> prj(par);
// Define Amsterdam / Barcelona in decimal degrees / degrees/minutes
- point_ll_deg amsterdam = parse<point_ll_deg>("52.4N", "5.9E");
- point_ll_deg barcelona = parse<point_ll_deg>("41 23'N", "2 11'E");
+ model::point_ll_deg amsterdam = parse<model::point_ll_deg>("52.4N", "5.9E");
+ model::point_ll_deg barcelona = parse<model::point_ll_deg>("41 23'N", "2 11'E");
- point_2d pa, pb;
+ model::point_2d pa, pb;
// Now do the projection. "Forward" means from latlong to meters.
// (Note that a map projection might fail. This is not 'exceptional'.
@@ -47,7 +47,7 @@
// Do the inverse projection. "Inverse" means from meters to latlong
// It also might fail or might not exist, not all projections
// have their inverse implemented
- point_ll_deg a1;
+ model::point_ll_deg a1;
if (prj.inverse(pa, a1))
{
std::cout << "Amsterdam (original): " << amsterdam << std::endl
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p02_projfactory_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -28,17 +28,17 @@
// Note that this is the only difference from p01_projection_example. It constructs a projection
// with virtual methods, which can be used polymorphically. Therefore it is a pointer. For
// convenience we use a boost shared pointer here.
- projection::factory<point_ll_deg, point_2d> fac;
- boost::shared_ptr<projection::projection<point_ll_deg, point_2d> > prj(fac.create_new(par));
+ projection::factory<model::point_ll_deg, model::point_2d> fac;
+ boost::shared_ptr<projection::projection<model::point_ll_deg, model::point_2d> > prj(fac.create_new(par));
// Define Amsterdam / Barcelona in decimal degrees / degrees/minutes
- point_ll_deg amsterdam(longitude<>(5.9), latitude<>(52.4));
- point_ll_deg barcelona(
+ model::point_ll_deg amsterdam(longitude<>(5.9), latitude<>(52.4));
+ model::point_ll_deg barcelona(
latitude<>(dms<north>(41, 23)),
longitude<>(dms<east>(2, 11))
);
- point_2d pa, pb;
+ model::point_2d pa, pb;
// Do the forward projection
if (prj->forward(amsterdam, pa) && prj->forward(barcelona, pb))
@@ -49,7 +49,7 @@
std::cout << "Distance ( projected):" << distance(pa, pb) / 1000.0 << " km" << std::endl;
// Get the inverse
- point_ll_deg a1;
+ model::point_ll_deg a1;
if (prj->inverse(pa, a1))
{
std::cout << "Amsterdam (original): " << amsterdam << std::endl
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -27,7 +27,7 @@
using namespace boost::geometry;
// Declare a vector containing the world countries
- std::vector<polygon_ll_deg> ll_polygons;
+ std::vector<model::polygon_ll_deg> ll_polygons;
// Read polygons from a Well-Known Text file using the ggl parser
std::ifstream cpp_file(wkt_filename.c_str());
@@ -42,7 +42,7 @@
std::getline(cpp_file, line);
if (boost::starts_with(line, "MULTIPOLYGON"))
{
- typedef boost::geometry::multi_polygon<boost::geometry::polygon<point_ll_deg> > mp_type;
+ typedef boost::geometry::model::multi_polygon<boost::geometry::model::polygon<model::point_ll_deg> > mp_type;
mp_type mp;
boost::geometry::read_wkt(line, mp);
for (mp_type::const_iterator it = boost::begin(mp);
@@ -55,28 +55,28 @@
// Our latlong polygon collection will be projected into this vector
// (Of course it is also possible to do this while reading and have one vector)
- std::vector<polygon_2d> xy_polygons;
+ std::vector<model::polygon_2d> xy_polygons;
// Declare transformation strategy which contains a projection
projection::project_transformer
<
- point_ll_deg,
- point_2d
+ model::point_ll_deg,
+ model::point_2d
> projection(projection_parameters);
// Project the polygons, and at the same time get the bounding box (in xy)
- box_2d bbox;
+ model::box_2d bbox;
assign_inverse(bbox);
- for (std::vector<polygon_ll_deg>::const_iterator it = ll_polygons.begin();
+ for (std::vector<model::polygon_ll_deg>::const_iterator it = ll_polygons.begin();
it != ll_polygons.end();
++it)
{
- polygon_2d xy_polygon;
+ model::polygon_2d xy_polygon;
if (transform(*it, xy_polygon, projection))
{
// Update bbox with box of this projected polygon
- combine(bbox, make_envelope<box_2d>(xy_polygon));
+ combine(bbox, make_envelope<model::box_2d>(xy_polygon));
// Add projected polygon
xy_polygons.push_back(xy_polygon);
@@ -95,10 +95,10 @@
// Setup the transformation to SVG
// (alternatively this could be skipped because SVG can transform itself,
// but this example shows it like this)
- typedef boost::geometry::point_xy<int> svg_point;
+ typedef boost::geometry::model::point_xy<int> svg_point;
boost::geometry::strategy::transform::map_transformer
<
- point_2d,
+ model::point_2d,
svg_point,
true,
true
@@ -106,15 +106,15 @@
// Create the background. Because projections might reverse the world,
// so we use SVG-coordinates here
- boost::geometry::box<svg_point> box;
+ boost::geometry::model::box<svg_point> box;
boost::geometry::assign(box, 0, 0, 800, 600);
out << boost::geometry::svg(box, "fill:rgb(0,0,255)") << std::endl;
- for (std::vector<polygon_2d>::const_iterator it = xy_polygons.begin();
+ for (std::vector<model::polygon_2d>::const_iterator it = xy_polygons.begin();
it != xy_polygons.end();
++it)
{
- boost::geometry::polygon<svg_point> svg_polygon;
+ boost::geometry::model::polygon<svg_point> svg_polygon;
boost::geometry::transform(*it, svg_polygon, svg_transformer);
out << boost::geometry::svg(svg_polygon,
"fill:rgb(0,255,0);stroke:rgb(0,0,0);stroke-width:0.2")
Added: sandbox/geometry/libs/geometry/example/extensions/gis/shapelib.vsprops
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/shapelib.vsprops 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="shapelib"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(SHAPELIB)"
+ />
+ <UserMacro
+ Name="SHAPELIB"
+ Value=".\io\shapelib\contrib\shapelib-1.3.0b2"
+ />
+</VisualStudioPropertySheet>
Deleted: sandbox/geometry/libs/geometry/example/extensions/gis/shapelib_common.hpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/shapelib_common.hpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
+++ (empty file)
@@ -1,61 +0,0 @@
-#ifndef SHAPELIB_COMMON_HPP
-#define SHAPELIB_COMMON_HPP
-
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
-// Use, modification and distribution is subject to the Boost Software License,
-// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-#include "shapefil.h"
-#include <string>
-#include <vector>
-
-// A slightly different implementation of reading shapefile with shapelib.
-// See also 08_shapefile_example
-template <typename T>
-void read_shapefile(const std::string& filename, std::vector<T>& rings)
-{
- typedef typename boost::geometry::point_type<T>::type P;
-
- SHPHandle handle = SHPOpen(filename.c_str(), "rb");
- if (handle <= 0)
- {
- throw std::string("File " + filename + " not found");
- }
-
- int nShapeType, nEntities;
- double adfMinBound[4], adfMaxBound[4];
- SHPGetInfo(handle, &nEntities, &nShapeType, adfMinBound, adfMaxBound );
-
- for (int i = 0; i < nEntities; i++)
- {
- SHPObject* psShape = SHPReadObject(handle, i );
-
- if (psShape->nSHPType == SHPT_POLYGON)
- {
- // Read all polygon parts. Holes are ignored, handled as normal parts. Add them as rings
- int v = 0;
- for (int p = 0; p < psShape->nParts && v < psShape->nVertices; p++)
- {
- T ring;
- int n = p == psShape->nParts - 1 ?psShape->nVertices : psShape->panPartStart[p + 1];
- while(v < n)
- {
- P point;
- boost::geometry::assign(point, psShape->padfX[v], psShape->padfY[v]);
- ring.push_back(point);
- v++;
- }
- rings.push_back(ring);
- }
- }
-
- SHPDestroyObject( psShape );
- }
- SHPClose(handle);
-}
-
-#endif
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -84,11 +84,11 @@
{
std::string filename = "c:/data/spatial/shape/world_free/world.shp";
- std::vector<polygon_2d> polygons;
+ std::vector<model::polygon_2d> polygons;
try
{
- read_shapefile(filename, polygons, convert<polygon_2d>);
+ read_shapefile(filename, polygons, convert<model::polygon_2d>);
}
catch(const std::string& s)
{
@@ -97,9 +97,9 @@
}
// Do something with the polygons, for example simplify them
- for (std::vector<polygon_2d>::iterator it = polygons.begin(); it != polygons.end(); it++)
+ for (std::vector<model::polygon_2d>::iterator it = polygons.begin(); it != polygons.end(); it++)
{
- polygon_2d p;
+ model::polygon_2d p;
simplify(*it, p, 0.01);
std::cout << it->outer().size() << "," << p.outer().size() << std::endl;
*it = p;
@@ -107,7 +107,7 @@
std::cout << "Simplified " << polygons.size() << std::endl;
double sum = 0;
- for (std::vector<polygon_2d>::const_iterator it = polygons.begin(); it != polygons.end(); it++)
+ for (std::vector<model::polygon_2d>::const_iterator it = polygons.begin(); it != polygons.end(); it++)
{
sum += area(*it);
}
Added: sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.sln
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.sln 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x01_shapelib_example", "x01_shapelib_example.vcproj", "{92ECE1AC-1A5D-4554-A8AD-690AC266210D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Debug|Win32.Build.0 = Debug|Win32
+ {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Release|Win32.ActiveCfg = Release|Win32
+ {92ECE1AC-1A5D-4554-A8AD-690AC266210D}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x01_shapelib_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\shapelib"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;.\osgeo4w-libraries.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops;.\shapelib.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../../../../boost;./contrib/shapelib-1.2.10;$(OSGEO4W_HOME)/include"
+ AdditionalIncludeDirectories="../../../../.."
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
RuntimeLibrary="3"
@@ -96,7 +96,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\shapelib"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;.\osgeo4w-libraries.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops;.\shapelib.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -121,7 +121,7 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories="../../../../../boost;./contrib/shapelib-1.2.10;$(OSGEO4W_HOME)/include"
+ AdditionalIncludeDirectories="../../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -176,6 +176,22 @@
<References>
</References>
<Files>
+ <Filter
+ Name="SHAPELIB"
+ >
+ <File
+ RelativePath="$(SHAPELIB)\dbfopen.c"
+ >
+ </File>
+ <File
+ RelativePath="$(SHAPELIB)\safileio.c"
+ >
+ </File>
+ <File
+ RelativePath="$(SHAPELIB)\shpopen.c"
+ >
+ </File>
+ </Filter>
<File
RelativePath=".\x01_shapelib_example.cpp"
>
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -1,7 +1,6 @@
// Boost.Geometry (aka GGL, Generic Geometry Library)
//
-// Copyright Barend Gehrels 2007-2009, Geodan, Amsterdam, the Netherlands
-// Copyright Bruno Lalande 2008, 2009
+// Copyright Barend Gehrels 2007-2010, Geodan, Amsterdam, the Netherlands
// Use, modification and distribution is subject to the Boost Software License,
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
@@ -11,50 +10,83 @@
// GD is a well-known and often used graphic library to write GIF (and other formats)
// To build and run this example:
-// 1) This example uses also shapelib, see 08_shapelib_example for necessary proceudre
-// 2) download GD from http://www.libgd.org
-// 3) add 11 files mentioned below to the project or makefile
-// 4) for windows, add define NONDLL to indicate GD is not used as a DLL
-// GD FILES necessary: gd.c, gd_gd.c, gd_gif_out.c, gd_io*.c, gd_security.c, gd_topal.c, gdhelpers.c, gdtables.c
-// Alternativelly, install GD using OSGeo4W installer from http://trac.osgeo.org/osgeo4w/
-// that provides Windows binary packages
+// 1) download GD from http://www.libgd.org (currently gd-2.0.35 is assumed)
+// 2) add 11 files
+// gd.c, gd_gd.c, gd_gif_out.c, gd_io*.c, gd_security.c, gd_topal.c, gdhelpers.c, gdtables.c
+// to the project or makefile or jamfile
+// 3) for windows, add define NONDLL to indicate GD is not used as a DLL
+// (Note that steps 2 and 3 are done in the MSVC gd_example project file and property sheets)
#include <cmath>
#include <cstdio>
#include <vector>
+#include <fstream>
+#include <sstream>
+
+
+#include <boost/foreach.hpp>
+
#include <boost/geometry/geometry.hpp>
+#include <boost/geometry/multi/multi.hpp>
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/geometries/cartesian2d.hpp>
#include <boost/geometry/extensions/gis/latlong/latlong.hpp>
+#include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
+
+#include <boost/geometry/extensions/gis/io/wkt/wkt.hpp>
+
#include <gd.h>
-#include "shapelib_common.hpp"
-int main()
-{
- std::string filename = "c:/data/spatial/shape/world_free/world.shp";
+namespace bg = boost::geometry;
- // The world is measured in latlong (degrees), so latlong (point_ll_deg, ring_ll_deg) is appropriate.
- // (It is possible to change this in point_xy)
- // We ignore holes in this sample.
- // So declare a ring_ll_deg (= closed ring, polygon without holes)
- std::vector<boost::geometry::ring_ll_deg> rings;
- // Open a shapefile, for example world countries
- try
- {
- read_shapefile(filename, rings);
- }
- catch(const std::string& s)
+// ----------------------------------------------------------------------------
+// Read an ASCII file containing WKT's
+// (note this function is shared by various examples)
+// ----------------------------------------------------------------------------
+template <typename Geometry>
+inline void read_wkt(std::string const& filename, std::vector<Geometry>& geometries)
+{
+ std::ifstream cpp_file(filename.c_str());
+ if (cpp_file.is_open())
{
- std::cout << s << std::endl;
- return 1;
+ while (! cpp_file.eof() )
+ {
+ std::string line;
+ std::getline(cpp_file, line);
+ if (! line.empty())
+ {
+ Geometry geometry;
+ bg::read_wkt(line, geometry);
+ geometries.push_back(geometry);
+ }
+ }
}
+}
+
+
+int main()
+{
+ // Adapt if necessary
+ std::string filename = "../../data/world.wkt";
+
+
+ // The world is measured in latlong (degrees), so latlong (point_ll_deg) is appropriate.
+ // We ignore holes in this sample (below)
+ typedef bg::model::polygon<bg::model::point_ll_deg> polygon_type;
+ typedef bg::model::multi_polygon<polygon_type> country_type;
+
+ std::vector<country_type> countries;
+
+ // Read (for example) world countries
+ read_wkt(filename, countries);
+
// Create a GD image.
// A world map, as world.shp, is usually mapped in latitude-longitude (-180..180 and -90..90)
- // For this sample we use a very simple "transformation"
+ // For this example we use a very simple "transformation"
// mapping to 0..720 and 0..360
const double factor = 2.0;
gdImagePtr im = gdImageCreateTrueColor(int(360 * factor), int(180 * factor));
@@ -64,35 +96,39 @@
int green = gdImageColorResolve(im, 0, 255, 0);
int black = gdImageColorResolve(im, 0, 0, 0);
- // Paint background
+ // Paint background in blue
gdImageFilledRectangle(im, 0, 0, im->sx, im->sy, blue);
- // Paint all rings
- for (std::vector<boost::geometry::ring_ll_deg>::const_iterator it = rings.begin(); it != rings.end(); ++it)
+ // Paint all countries in green
+ BOOST_FOREACH(country_type const& country, countries)
{
- const boost::geometry::ring_ll_deg& ring = *it;
-
- // If wished, suppress too small polygons.
- // (Note that even in latlong, area is calculated in square meters)
- const double a = boost::geometry::area(ring);
- if (std::fabs(a) > 5000.0e6)
+ BOOST_FOREACH(polygon_type const& polygon, country)
{
- const int n = ring.size();
- gdPoint* points = new gdPoint[n];
+ // Ignore holes, so take only exterior ring
+ bg::model::ring_ll_deg const& ring = bg::exterior_ring(polygon);
- for (int i = 0; i < n; i++)
+ // If wished, suppress too small polygons.
+ // (Note that even in latlong, area is calculated in square meters)
+ double const a = bg::area(ring);
+ if (std::fabs(a) > 5000.0e6)
{
- // Translate lon/lat or x/y to GD x/y points
- points[i].x = int(factor * (boost::geometry::get<0>(ring[i]) + 180.0));
- points[i].y = im->sy - int(factor * (boost::geometry::get<1>(ring[i]) + 90.0));
- }
+ int const n = ring.size();
+ gdPoint* points = new gdPoint[n];
- // Draw the polygon...
- gdImageFilledPolygon(im, points, n, green);
- // .. and the outline...
- gdImagePolygon(im, points, n, black);
+ for (int i = 0; i < n; i++)
+ {
+ // Translate lon/lat or x/y to GD x/y points
+ points[i].x = int(factor * (bg::get<0>(ring[i]) + 180.0));
+ points[i].y = im->sy - int(factor * (bg::get<1>(ring[i]) + 90.0));
+ }
+
+ // Draw the polygon...
+ gdImageFilledPolygon(im, points, n, green);
+ // .. and the outline in black...
+ gdImagePolygon(im, points, n, black);
- delete[] points;
+ delete[] points;
+ }
}
}
Added: sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.sln
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.sln 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x02_gd_example", "x02_gd_example.vcproj", "{A73F21AC-6F32-41A9-A86C-53BD4DC84B05}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Debug|Win32.Build.0 = Debug|Win32
+ {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Release|Win32.ActiveCfg = Release|Win32
+ {A73F21AC-6F32-41A9-A86C-53BD4DC84B05}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/extensions/gis/x02_gd_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x02_gd_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;.\osgeo4w-libraries.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops;.\gd.vsprops"
CharacterSet="1"
>
<Tool
@@ -41,8 +41,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;../../../../../boost;"./contrib/shapelib-1.2.10";"./contrib/gd-2.0.35";$(OSGEO4W_HOME)/include;$(OSGEO4W_HOME)/include/gd"
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;NONDLL"
+ AdditionalIncludeDirectories="../../../../.."
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
@@ -95,7 +95,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x02_gd_example"
ConfigurationType="1"
- InheritedPropertySheets="..\..\boost.vsprops;.\osgeo4w-libraries.vsprops"
+ InheritedPropertySheets="..\..\boost.vsprops;.\gd.vsprops"
CharacterSet="1"
WholeProgramOptimization="1"
>
@@ -120,8 +120,8 @@
EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
WholeProgramOptimization="false"
- AdditionalIncludeDirectories=".;../../../../../boost;"./contrib/shapelib-1.2.10";"./contrib/gd-2.0.35";$(OSGEO4W_HOME)/include;$(OSGEO4W_HOME)/include/gd"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NONDLL"
+ AdditionalIncludeDirectories="../../../../.."
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
DebugInformationFormat="3"
@@ -174,6 +174,54 @@
<References>
</References>
<Files>
+ <Filter
+ Name="GD"
+ >
+ <File
+ RelativePath="$(GD)\gd.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_gd.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_gif_out.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_io.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_io_dp.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_io_file.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_io_ss.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_security.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gd_topal.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gdhelpers.c"
+ >
+ </File>
+ <File
+ RelativePath="$(GD)\gdtables.c"
+ >
+ </File>
+ </Filter>
<File
RelativePath=".\x02_gd_example.cpp"
>
Added: sandbox/geometry/libs/geometry/example/postgresql.vsprops
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/postgresql.vsprops 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="postgresql"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(POSTGRESQL_ROOT)/include"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libpq.lib"
+ AdditionalLibraryDirectories="$(POSTGRESQL_ROOT)/lib"
+ />
+ <UserMacro
+ Name="POSTGRESQL_ROOT"
+ Value="c:\software\PostgreSQL\8.4"
+ />
+</VisualStudioPropertySheet>
Added: sandbox/geometry/libs/geometry/example/soci.vsprops
==============================================================================
--- (empty file)
+++ sandbox/geometry/libs/geometry/example/soci.vsprops 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="soci"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=""$(SOCI_ROOT)/src/core";"$(SOCI_ROOT)/src/backends/postgresql""
+ PreprocessorDefinitions="SOCI_USE_BOOST"
+ />
+ <UserMacro
+ Name="SOCI_ROOT"
+ Value="contrib/soci-3.0.0"
+ />
+</VisualStudioPropertySheet>
Modified: sandbox/geometry/libs/geometry/example/x03_a_soci_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_a_soci_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/x03_a_soci_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)/x03_a_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
>
<Tool
@@ -41,8 +41,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
@@ -58,8 +58,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -94,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x03_a_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -115,11 +114,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
-
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -132,8 +130,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -173,7 +170,7 @@
Name="soci_postgresql"
>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -193,7 +190,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\common.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -213,7 +210,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\factory.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -233,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\row-id.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +250,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -273,7 +270,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -293,7 +290,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -313,7 +310,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -333,7 +330,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -353,7 +350,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -377,7 +374,7 @@
Name="soci_core"
>
<File
- RelativePath="contrib\soci-3.0.0\src\core\backend-loader.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -397,7 +394,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -417,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\connection-pool.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +434,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\error.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -457,7 +454,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -477,7 +474,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\once-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -497,7 +494,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\prepare-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -517,7 +514,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\procedure.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -537,7 +534,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-prepare-info.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -557,7 +554,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -577,7 +574,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\row.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -597,7 +594,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\rowid.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -617,7 +614,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -637,7 +634,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -657,7 +654,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\transaction.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -677,7 +674,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -697,7 +694,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\values.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Modified: sandbox/geometry/libs/geometry/example/x03_b_soci_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_b_soci_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/x03_b_soci_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -35,7 +35,7 @@
struct city
{
- boost::geometry::point<float, 2, boost::geometry::cs::geographic<boost::geometry::degree> > location;
+ boost::geometry::model::point<float, 2, boost::geometry::cs::geographic<boost::geometry::degree> > location;
std::string name;
};
Modified: sandbox/geometry/libs/geometry/example/x03_b_soci_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_b_soci_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/x03_b_soci_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)/x03_b_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
>
<Tool
@@ -41,8 +41,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
@@ -58,8 +58,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -94,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x03_b_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -115,11 +114,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
-
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -132,8 +130,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -173,7 +170,7 @@
Name="soci_postgresql"
>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -193,7 +190,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\common.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -213,7 +210,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\factory.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -233,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\row-id.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +250,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -273,7 +270,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -293,7 +290,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -313,7 +310,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -333,7 +330,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -353,7 +350,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -377,7 +374,7 @@
Name="soci_core"
>
<File
- RelativePath="contrib\soci-3.0.0\src\core\backend-loader.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -397,7 +394,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -417,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\connection-pool.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +434,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\error.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -457,7 +454,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -477,7 +474,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\once-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -497,7 +494,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\prepare-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -517,7 +514,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\procedure.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -537,7 +534,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-prepare-info.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -557,7 +554,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -577,7 +574,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\row.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -597,7 +594,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\rowid.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -617,7 +614,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -637,7 +634,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -657,7 +654,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\transaction.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -677,7 +674,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -697,7 +694,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\values.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Modified: sandbox/geometry/libs/geometry/example/x03_c_soci_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_c_soci_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/x03_c_soci_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -38,7 +38,7 @@
struct tree
{
int id;
- boost::geometry::point<float, 2, boost::geometry::cs::geographic<boost::geometry::degree> > location;
+ boost::geometry::model::point<float, 2, boost::geometry::cs::geographic<boost::geometry::degree> > location;
};
// conversion of row of result to user-defined type - performs WKB parsing
Modified: sandbox/geometry/libs/geometry/example/x03_c_soci_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_c_soci_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/x03_c_soci_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)/x03_c_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
>
<Tool
@@ -41,8 +41,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
@@ -58,8 +58,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -94,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x03_c_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -115,11 +114,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
-
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -132,8 +130,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -173,7 +170,7 @@
Name="soci_postgresql"
>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -193,7 +190,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\common.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -213,7 +210,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\factory.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -233,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\row-id.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +250,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -273,7 +270,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -293,7 +290,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -313,7 +310,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -333,7 +330,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -353,7 +350,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -377,7 +374,7 @@
Name="soci_core"
>
<File
- RelativePath="contrib\soci-3.0.0\src\core\backend-loader.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -397,7 +394,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -417,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\connection-pool.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +434,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\error.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -457,7 +454,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -477,7 +474,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\once-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -497,7 +494,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\prepare-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -517,7 +514,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\procedure.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -537,7 +534,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-prepare-info.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -557,7 +554,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -577,7 +574,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\row.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -597,7 +594,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\rowid.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -617,7 +614,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -637,7 +634,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -657,7 +654,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\transaction.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -677,7 +674,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -697,7 +694,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\values.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Modified: sandbox/geometry/libs/geometry/example/x03_d_soci_example.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_d_soci_example.cpp (original)
+++ sandbox/geometry/libs/geometry/example/x03_d_soci_example.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -66,7 +66,7 @@
if (!boost::geometry::hex2wkb(*it, std::back_inserter(wkb)))
throw std::runtime_error("hex2wkb translation failed");
- boost::geometry::polygon_2d parcel;
+ boost::geometry::model::polygon_2d parcel;
if (!boost::geometry::read_wkb(wkb.begin(), wkb.end(), parcel))
throw std::runtime_error("read_wkb failed");
Modified: sandbox/geometry/libs/geometry/example/x03_d_soci_example.vcproj
==============================================================================
--- sandbox/geometry/libs/geometry/example/x03_d_soci_example.vcproj (original)
+++ sandbox/geometry/libs/geometry/example/x03_d_soci_example.vcproj 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -20,7 +20,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)/x03_d_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
>
<Tool
@@ -41,8 +41,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
DebugInformationFormat="1"
@@ -58,8 +58,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
@@ -94,7 +93,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)\x03_d_soci_example"
ConfigurationType="1"
- InheritedPropertySheets=".\boost.vsprops"
+ InheritedPropertySheets=".\boost.vsprops;.\soci.vsprops;.\postgresql.vsprops"
CharacterSet="0"
WholeProgramOptimization="1"
>
@@ -115,11 +114,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="../../..;"contrib\soci-3.0.0\src\backends\postgresql";"contrib\soci-3.0.0\src\core";"c:\Program Files\PostgreSQL\8.3\include";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\include;"c:\Program Files\MySQL\MySQL Server 5.0\include""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;SOCI_USE_BOOST;BOOST_ALL_NO_LIB;_CRT_SECURE_NO_WARNINGS"
+ AdditionalIncludeDirectories=""
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_ALL_NO_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
-
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -132,8 +130,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="libpq.lib"
- AdditionalLibraryDirectories=""c:\Program Files\MySQL\MySQL Server 5.0\lib\opt";c:\oraclexe\app\oracle\product\10.2.0\server\OCI\lib\MSVC;"C:\Program Files\PostgreSQL\8.3\lib""
+ AdditionalLibraryDirectories=""
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
@@ -173,7 +170,7 @@
Name="soci_postgresql"
>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -193,7 +190,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\common.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\common.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -213,7 +210,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\factory.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\factory.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -233,7 +230,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\row-id.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\row-id.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -253,7 +250,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -273,7 +270,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -293,7 +290,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\standard-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\standard-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -313,7 +310,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -333,7 +330,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -353,7 +350,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\backends\postgresql\vector-use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\backends\postgresql\vector-use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -377,7 +374,7 @@
Name="soci_core"
>
<File
- RelativePath="contrib\soci-3.0.0\src\core\backend-loader.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\backend-loader.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -397,7 +394,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\blob.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\blob.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -417,7 +414,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\connection-pool.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\connection-pool.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -437,7 +434,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\error.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\error.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -457,7 +454,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\into-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\into-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -477,7 +474,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\once-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\once-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -497,7 +494,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\prepare-temp-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\prepare-temp-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -517,7 +514,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\procedure.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\procedure.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -537,7 +534,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-prepare-info.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-prepare-info.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -557,7 +554,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\ref-counted-statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\ref-counted-statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -577,7 +574,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\row.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\row.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -597,7 +594,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\rowid.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\rowid.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -617,7 +614,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\session.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\session.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -637,7 +634,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\statement.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\statement.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -657,7 +654,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\transaction.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\transaction.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -677,7 +674,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\use-type.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\use-type.cpp"
>
<FileConfiguration
Name="Debug|Win32"
@@ -697,7 +694,7 @@
</FileConfiguration>
</File>
<File
- RelativePath="contrib\soci-3.0.0\src\core\values.cpp"
+ RelativePath="$(SOCI_ROOT)\src\core\values.cpp"
>
<FileConfiguration
Name="Debug|Win32"
Modified: sandbox/geometry/libs/geometry/example/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- sandbox/geometry/libs/geometry/example/x04_wxwidgets_world_mapper.cpp (original)
+++ sandbox/geometry/libs/geometry/example/x04_wxwidgets_world_mapper.cpp 2010-11-28 08:42:46 EST (Sun, 28 Nov 2010)
@@ -10,9 +10,6 @@
// #define EXAMPLE_WX_USE_GRAPHICS_CONTEXT 1
-// For Boost/uBLAS:
-#define _SCL_SECURE_NO_WARNINGS 1
-
#include <fstream>
#include <sstream>
@@ -39,19 +36,21 @@
#ifdef EXAMPLE_WX_USE_GRAPHICS_CONTEXT
#include "wx/graphics.h"
+#include "wx/dcgraph.h"
#endif
-typedef boost::geometry::multi_polygon<boost::geometry::polygon_2d> country_type;
+typedef boost::geometry::model::multi_polygon
+ <boost::geometry::model::polygon_2d> country_type;
-// Adapt wxWidgets points to Boost.Geometry points such that they can be used
+// Adapt wxWidgets points to Boost.Geometry points such that they can be used
// in e.g. transformations (see below)
BOOST_GEOMETRY_REGISTER_POINT_2D(wxPoint, int, cs::cartesian, x, y)
BOOST_GEOMETRY_REGISTER_POINT_2D(wxRealPoint, double, cs::cartesian, x, y)
// wxWidgets draws using wxPoint*, so we HAVE to use that.
-// Therefore have to make a wxPoint* array
+// Therefore have to make a wxPoint* array
// 1) compatible with Boost.Geometry
// 2) compatible with Boost.Range (required by Boost.Geometry)
// 3) compatible with std::back_inserter (required by Boost.Geometry)
@@ -77,20 +76,20 @@
typedef wxPointPointerPair container_type;
- explicit back_insert_iterator(wxPointPointerPair& x)
+ explicit back_insert_iterator(wxPointPointerPair& x)
: current(boost::begin(x))
, end(boost::end(x))
{}
inline back_insert_iterator<wxPointPointerPair>&
- operator=(wxPoint const& value)
- {
+ operator=(wxPoint const& value)
+ {
// Check if not passed beyond
if (current != end)
{
- *current++ = value;
+ *current++ = value;
}
- return *this;
+ return *this;
}
// Boiler-plate
@@ -158,19 +157,19 @@
typedef boost::geometry::strategy::transform::map_transformer
<
- boost::geometry::point_2d, wxPoint,
+ boost::geometry::model::point_2d, wxPoint,
true, true
> map_transformer_type;
typedef boost::geometry::strategy::transform::inverse_transformer
<
- wxPoint, boost::geometry::point_2d
+ wxPoint, boost::geometry::model::point_2d
> inverse_transformer_type;
boost::shared_ptr<map_transformer_type> m_map_transformer;
boost::shared_ptr<inverse_transformer_type> m_inverse_transformer;
- boost::geometry::box_2d m_box;
+ boost::geometry::model::box_2d m_box;
std::vector<country_type> m_countries;
int m_focus;
@@ -260,7 +259,7 @@
m_owner->PrepareDC(dc);
// Transform the point to Lon/Lat
- bg::point_2d point;
+ bg::model::point_2d point;
bg::transform(event.GetPosition(), point, *m_inverse_transformer);
// Determine selected object
@@ -354,7 +353,7 @@
{
namespace bg = boost::geometry;
- BOOST_FOREACH(bg::polygon_2d const& poly, country)
+ BOOST_FOREACH(bg::model::polygon_2d const& poly, country)
{
// Use only outer, holes are (for the moment) ignored. This would need
// a holey-polygon compatible wx object
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk