|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r70825 - in trunk/libs/geometry: doc doc/doxy doc/doxy/doxygen_input/sourcecode doc/doxy/doxygen_output/html doc/src/examples/algorithms example example/extensions/gis/projections example/with_external_libs test/algorithms test/algorithms/overlay test/algorithms/overlay/robustness test/extensions/algorithms/buffer test/multi/algorithms test/strategies
From: barend.gehrels_at_[hidden]
Date: 2011-04-01 12:54:12
Author: barendgehrels
Date: 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
New Revision: 70825
URL: http://svn.boost.org/trac/boost/changeset/70825
Log:
Reflect changes on make/inserter
Added:
trunk/libs/geometry/doc/src/examples/algorithms/return_envelope.cpp
- copied, changed from r70779, /trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp
trunk/libs/geometry/doc/src/examples/algorithms/simplify_insert.cpp
- copied unchanged from r70779, /trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter.cpp
trunk/libs/geometry/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp
- copied unchanged from r70779, /trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp
Removed:
trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp
trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter.cpp
trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp
Binary files modified:
trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.png
Text files modified:
trunk/libs/geometry/doc/doxy/Doxyfile | 4
trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp | 2
trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css | 380 +++++++++++++++++++++++++++++++++++----
trunk/libs/geometry/doc/doxy/doxygen_output/html/tabs.css | 132 ++++---------
trunk/libs/geometry/doc/imports.qbk | 4
trunk/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 | 3
trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp | 2
trunk/libs/geometry/doc/src/examples/algorithms/return_envelope.cpp | 14
trunk/libs/geometry/example/07_a_graph_route_example.cpp | 2
trunk/libs/geometry/example/07_b_graph_route_example.cpp | 2
trunk/libs/geometry/example/c06_custom_polygon_example.cpp | 2
trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp | 2
trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp | 2
trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp | 2
trunk/libs/geometry/test/algorithms/difference.cpp | 4
trunk/libs/geometry/test/algorithms/intersection.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/assemble.cpp | 8
trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp | 2
trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.hpp | 2
trunk/libs/geometry/test/algorithms/test_convex_hull.hpp | 4
trunk/libs/geometry/test/algorithms/test_difference.hpp | 5
trunk/libs/geometry/test/algorithms/test_intersection.hpp | 2
trunk/libs/geometry/test/algorithms/test_simplify.hpp | 2
trunk/libs/geometry/test/algorithms/test_union.hpp | 2
trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp | 6
trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp | 2
trunk/libs/geometry/test/multi/algorithms/multi_union.cpp | 3
trunk/libs/geometry/test/strategies/segment_intersection.cpp | 2
29 files changed, 423 insertions(+), 178 deletions(-)
Modified: trunk/libs/geometry/doc/doxy/Doxyfile
==============================================================================
--- trunk/libs/geometry/doc/doxy/Doxyfile (original)
+++ trunk/libs/geometry/doc/doxy/Doxyfile 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -99,8 +99,8 @@
details_macro_getset="The get/set version registers get and set methods separately and can be used for classes with protected member variables and get/set methods to change coordinates" \
details_default_strategy="It uses the default strategy, based on the coordinate system of the geometry." \
details_strategy_reasons="Reasons to specify a strategy include: use another coordinate system for calculations; construct the strategy beforehand (e.g. with the radius of the Earth); select a strategy when there are more than one available for a calculation." \
- details_make{1}="This version with the make_ prefix returns the \1, and a template parameter must therefore be specified in the call." \
- details_inserter{1}="This version with the _inserter suffix outputs the \1 to an output iterator, and a template parameter must therefore be specified in the call." \
+ details_return{1}="This version with the return_ prefix returns the \1, and a template parameter must therefore be specified in the call." \
+ details_insert{1}="This version with the _insert suffix outputs the \1 to an output iterator, and a template parameter must therefore be specified in the call." \
details_get_set="The free functions [*get] and [*set] are two of the most important functions of Boost.Geometry, both within the library, as also for the library user. With these two functions you normally get and set coordinate values from and for a point, box, segment or sphere." \
details_make="Boost.Geometry uses concepts for all its geometries. It does not rely on constructors. The "make" functions are object generators creating geometries. There are overloads, currently with two or three coordinate values or ranges, to construct geometry instances" \
return_calc{1}="The calculated \1" \
Modified: trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -70,7 +70,7 @@
Tuple tuple(geometry, name);
tuples.push_back(tuple);
- boost::geometry::expand(box, boost::geometry::make_envelope<Box>(geometry));
+ boost::geometry::expand(box, boost::geometry::return_envelope<Box>(geometry));
}
}
}
Modified: trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.css 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -8,10 +8,15 @@
/* @group Heading Levels */
h1 {
- text-align: center;
font-size: 150%;
}
+.title {
+ font-size: 150%;
+ font-weight: bold;
+ margin: 10px 2px;
+}
+
h2 {
font-size: 120%;
}
@@ -64,8 +69,8 @@
}
div.qindex, div.navtab{
- background-color: #e8eef2;
- border: 1px solid #84b0c7;
+ background-color: #EBEFF6;
+ border: 1px solid #A3B4D7;
text-align: center;
margin: 2px;
padding: 2px;
@@ -83,13 +88,13 @@
/* @group Link Styling */
a {
- color: #153788;
+ color: #3D578C;
font-weight: normal;
text-decoration: none;
}
.contents a:visited {
- color: #1b77c5;
+ color: #4665A2;
}
a:hover {
@@ -102,9 +107,9 @@
a.qindexHL {
font-weight: bold;
- background-color: #6666cc;
+ background-color: #9CAFD4;
color: #ffffff;
- border: 1px double #9295C2;
+ border: 1px double #869DCA;
}
.contents a.qindexHL:visited {
@@ -119,11 +124,11 @@
}
a.code {
- color: #3030f0;
+ color: #4665A2;
}
a.codeRef {
- color: #3030f0;
+ color: #4665A2;
}
/* @end */
@@ -138,8 +143,8 @@
}
pre.fragment {
- border: 1px solid #CCCCCC;
- background-color: #f5f5f5;
+ border: 1px solid #C4CFE5;
+ background-color: #FBFCFD;
padding: 4px 6px;
margin: 4px 8px 4px 2px;
overflow: auto;
@@ -153,13 +158,22 @@
font-weight: bold;
color: #ffffff;
margin-bottom: 3px;
- margin-top: 3px
+ margin-top: 3px;
+ padding: 0.2em;
+ border: solid thin #333;
+ border-radius: 0.5em;
+ -webkit-border-radius: .5em;
+ -moz-border-radius: .5em;
+ box-shadow: 2px 2px 3px #999;
+ -webkit-box-shadow: 2px 2px 3px #999;
+ -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
+ background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#000),color-stop(0.3, #444));
+ background-image: -moz-linear-gradient(center top, #eee 0%, #444 40%, #000);
}
div.groupHeader {
margin-left: 16px;
margin-top: 12px;
- margin-bottom: 6px;
font-weight: bold;
}
@@ -171,27 +185,32 @@
body {
background: white;
color: black;
- margin-right: 20px;
- margin-left: 20px;
+ margin: 0;
+}
+
+div.contents {
+ margin-top: 10px;
+ margin-left: 10px;
+ margin-right: 5px;
}
td.indexkey {
- background-color: #e8eef2;
+ background-color: #EBEFF6;
font-weight: bold;
- border: 1px solid #CCCCCC;
+ border: 1px solid #C4CFE5;
margin: 2px 0px 2px 0;
padding: 2px 10px;
}
td.indexvalue {
- background-color: #e8eef2;
- border: 1px solid #CCCCCC;
+ background-color: #EBEFF6;
+ border: 1px solid #C4CFE5;
padding: 2px 10px;
margin: 2px 0px;
}
tr.memlist {
- background-color: #f0f0f0;
+ background-color: #EEF1F7;
}
p.formulaDsp {
@@ -217,6 +236,11 @@
border: 0px;
}
+address.footer {
+ text-align: right;
+ padding-right: 12px;
+}
+
img.footer {
border: 0px;
vertical-align: middle;
@@ -270,6 +294,7 @@
/* @end */
+/*
.search {
color: #003399;
font-weight: bold;
@@ -286,6 +311,7 @@
font-weight: normal;
background-color: #e8eef2;
}
+*/
td.tiny {
font-size: 75%;
@@ -294,18 +320,18 @@
.dirtab {
padding: 4px;
border-collapse: collapse;
- border: 1px solid #84b0c7;
+ border: 1px solid #A3B4D7;
}
th.dirtab {
- background: #e8eef2;
+ background: #EBEFF6;
font-weight: bold;
}
hr {
height: 0px;
border: none;
- border-top: 1px solid #666;
+ border-top: 1px solid #4A6AAA;
}
hr.footer {
@@ -314,10 +340,15 @@
/* @group Member Descriptions */
+table.memberdecls {
+ border-spacing: 0px;
+ padding: 0px;
+}
+
.mdescLeft, .mdescRight,
.memItemLeft, .memItemRight,
.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
- background-color: #FAFAFA;
+ background-color: #F9FAFC;
border: none;
margin: 4px;
padding: 1px 0 0 8px;
@@ -329,15 +360,19 @@
}
.memItemLeft, .memItemRight, .memTemplParams {
- border-top: 1px solid #ccc;
+ border-top: 1px solid #C4CFE5;
}
.memItemLeft, .memTemplItemLeft {
white-space: nowrap;
}
+.memItemRight {
+ width: 100%;
+}
+
.memTemplParams {
- color: #606060;
+ color: #4665A2;
white-space: nowrap;
}
@@ -349,23 +384,28 @@
.memtemplate {
font-size: 80%;
- color: #606060;
+ color: #4665A2;
font-weight: normal;
- margin-left: 3px;
+ margin-left: 9px;
}
.memnav {
- background-color: #e8eef2;
- border: 1px solid #84b0c7;
+ background-color: #EBEFF6;
+ border: 1px solid #A3B4D7;
text-align: center;
margin: 2px;
margin-right: 15px;
padding: 2px;
}
+.mempage {
+ width: 100%;
+}
+
.memitem {
padding: 0;
margin-bottom: 10px;
+ margin-right: 5px;
}
.memname {
@@ -375,40 +415,52 @@
}
.memproto {
- border-top: 1px solid #84b0c7;
- border-left: 1px solid #84b0c7;
- border-right: 1px solid #84b0c7;
- padding: 0;
- background-color: #d5e1e8;
+ border-top: 1px solid #A8B8D9;
+ border-left: 1px solid #A8B8D9;
+ border-right: 1px solid #A8B8D9;
+ padding: 6px 0px 6px 0px;
+ color: #253555;
font-weight: bold;
+ text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+ /* opera specific markup */
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+ border-top-right-radius: 8px;
+ border-top-left-radius: 8px;
/* firefox specific markup */
- background-image: -moz-linear-gradient(rgba(228, 233, 245, 1.0) 0%, rgba(193, 205, 232, 1.0) 100%);
-moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-moz-border-radius-topright: 8px;
-moz-border-radius-topleft: 8px;
/* webkit specific markup */
- background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(228, 233, 245, 1.0)), to(rgba(193, 205, 232, 1.0)));
-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-webkit-border-top-right-radius: 8px;
-webkit-border-top-left-radius: 8px;
+ background-image:url('nav_f.png');
+ background-repeat:repeat-x;
+ background-color: #E2E8F2;
}
.memdoc {
- border-bottom: 1px solid #84b0c7;
- border-left: 1px solid #84b0c7;
- border-right: 1px solid #84b0c7;
+ border-bottom: 1px solid #A8B8D9;
+ border-left: 1px solid #A8B8D9;
+ border-right: 1px solid #A8B8D9;
padding: 2px 5px;
- background-color: #eef3f5;
+ background-color: #FBFCFD;
border-top-width: 0;
+ /* opera specific markup */
+ border-bottom-left-radius: 8px;
+ border-bottom-right-radius: 8px;
+ box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
/* firefox specific markup */
-moz-border-radius-bottomleft: 8px;
-moz-border-radius-bottomright: 8px;
-moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+ background-image: -moz-linear-gradient(center top, #FFFFFF 0%, #FFFFFF 60%, #F7F8FB 95%, #EEF1F7);
/* webkit specific markup */
-webkit-border-bottom-left-radius: 8px;
-webkit-border-bottom-right-radius: 8px;
-webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+ background-image: -webkit-gradient(linear,center top,center bottom,from(#FFFFFF), color-stop(0.6,#FFFFFF), color-stop(0.60,#FFFFFF), color-stop(0.95,#F7F8FB), to(#EEF1F7));
}
.paramkey {
@@ -427,6 +479,28 @@
font-style: normal;
}
+.params, .retval, .exception, .tparams {
+ border-spacing: 6px 2px;
+}
+
+.params .paramname, .retval .paramname {
+ font-weight: bold;
+ vertical-align: top;
+}
+
+.params .paramtype {
+ font-style: italic;
+ vertical-align: top;
+}
+
+.params .paramdir {
+ font-family: "courier new",courier,monospace;
+ vertical-align: top;
+}
+
+
+
+
/* @end */
/* @group Directory (tree) */
@@ -435,7 +509,7 @@
.ftvtree {
font-family: sans-serif;
- margin: 0.5em;
+ margin: 0px;
}
/* these are for tree view when used as main index */
@@ -443,6 +517,7 @@
.directory {
font-size: 9pt;
font-weight: bold;
+ margin: 5px;
}
.directory h3 {
@@ -520,9 +595,13 @@
/* @end */
+div.dynheader {
+ margin-top: 8px;
+}
+
address {
font-style: normal;
- color: #333;
+ color: #2A3D61;
}
table.doxtable {
@@ -530,12 +609,12 @@
}
table.doxtable td, table.doxtable th {
- border: 1px solid #153788;
+ border: 1px solid #2D4068;
padding: 3px 7px 2px;
}
table.doxtable th {
- background-color: #254798;
+ background-color: #374F7F;
color: #FFFFFF;
font-size: 110%;
padding-bottom: 4px;
@@ -543,3 +622,214 @@
text-align:left;
}
+.tabsearch {
+ top: 0px;
+ left: 10px;
+ height: 36px;
+ background-image: url('tab_b.png');
+ z-index: 101;
+ overflow: hidden;
+ font-size: 13px;
+}
+
+.navpath ul
+{
+ font-size: 11px;
+ background-image:url('tab_b.png');
+ background-repeat:repeat-x;
+ height:30px;
+ line-height:30px;
+ color:#8AA0CC;
+ border:solid 1px #C2CDE4;
+ overflow:hidden;
+ margin:0px;
+ padding:0px;
+}
+
+.navpath li
+{
+ list-style-type:none;
+ float:left;
+ padding-left:10px;
+ padding-right:15px;
+ background-image:url('bc_s.png');
+ background-repeat:no-repeat;
+ background-position:right;
+ color:#364D7C;
+}
+
+.navpath li.navelem a
+{
+ height:32px;
+ display:block;
+ text-decoration: none;
+ outline: none;
+}
+
+.navpath li.navelem a:hover
+{
+ color:#6884BD;
+}
+
+.navpath li.footer
+{
+ list-style-type:none;
+ float:right;
+ padding-left:10px;
+ padding-right:15px;
+ background-image:none;
+ background-repeat:no-repeat;
+ background-position:right;
+ color:#364D7C;
+ font-size: 8pt;
+}
+
+
+div.summary
+{
+ float: right;
+ font-size: 8pt;
+ padding-right: 5px;
+ width: 50%;
+ text-align: right;
+}
+
+div.summary a
+{
+ white-space: nowrap;
+}
+
+div.ingroups
+{
+ font-size: 8pt;
+ padding-left: 5px;
+ width: 50%;
+ text-align: left;
+}
+
+div.ingroups a
+{
+ white-space: nowrap;
+}
+
+div.header
+{
+ background-image:url('nav_h.png');
+ background-repeat:repeat-x;
+ background-color: #F9FAFC;
+ margin: 0px;
+ border-bottom: 1px solid #C4CFE5;
+}
+
+div.headertitle
+{
+ padding: 5px 5px 5px 10px;
+}
+
+dl
+{
+ padding: 0 0 0 10px;
+}
+
+dl.note, dl.warning, dl.attention, dl.pre, dl.post, dl.invariant, dl.deprecated, dl.todo, dl.test, dl.bug
+{
+ border-left:4px solid;
+ padding: 0 0 0 6px;
+}
+
+dl.note
+{
+ border-color: #D0C000;
+}
+
+dl.warning, dl.attention
+{
+ border-color: #FF0000;
+}
+
+dl.pre, dl.post, dl.invariant
+{
+ border-color: #00D000;
+}
+
+dl.deprecated
+{
+ border-color: #505050;
+}
+
+dl.todo
+{
+ border-color: #00C0E0;
+}
+
+dl.test
+{
+ border-color: #3030E0;
+}
+
+dl.bug
+{
+ border-color: #C08050;
+}
+
+#projectlogo
+{
+ text-align: center;
+ vertical-align: bottom;
+ border-collapse: separate;
+}
+
+#projectlogo img
+{
+ border: 0px none;
+}
+
+#projectname
+{
+ font: 300% Tahoma, Arial,sans-serif;
+ margin: 0px;
+ padding: 2px 0px;
+}
+
+#projectbrief
+{
+ font: 120% Tahoma, Arial,sans-serif;
+ margin: 0px;
+ padding: 0px;
+}
+
+#projectnumber
+{
+ font: 50% Tahoma, Arial,sans-serif;
+ margin: 0px;
+ padding: 0px;
+}
+
+#titlearea
+{
+ padding: 0px;
+ margin: 0px;
+ width: 100%;
+ border-bottom: 1px solid #5373B4;
+}
+
+.image
+{
+ text-align: center;
+}
+
+.dotgraph
+{
+ text-align: center;
+}
+
+.mscgraph
+{
+ text-align: center;
+}
+
+.caption
+{
+ font-weight: bold;
+}
+
Modified: trunk/libs/geometry/doc/doxy/doxygen_output/html/doxygen.png
==============================================================================
Binary files. No diff available.
Modified: trunk/libs/geometry/doc/doxy/doxygen_output/html/tabs.css
==============================================================================
--- trunk/libs/geometry/doc/doxy/doxygen_output/html/tabs.css (original)
+++ trunk/libs/geometry/doc/doxy/doxygen_output/html/tabs.css 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -1,105 +1,59 @@
-/* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */
-
-DIV.tabs
-{
- float : left;
- width : 100%;
- background : url("tab_b.gif") repeat-x bottom;
- margin-bottom : 4px;
-}
-
-DIV.tabs UL
-{
- margin : 0px;
- padding-left : 10px;
- list-style : none;
-}
-
-DIV.tabs LI, DIV.tabs FORM
-{
- display : inline;
- margin : 0px;
- padding : 0px;
-}
-
-DIV.tabs FORM
-{
- float : right;
+.tabs, .tabs2, .tabs3 {
+ background-image: url('tab_b.png');
+ width: 100%;
+ z-index: 101;
+ font-size: 13px;
}
-DIV.tabs A
-{
- float : left;
- background : url("tab_r.gif") no-repeat right top;
- border-bottom : 1px solid #84B0C7;
- font-size : 80%;
- font-weight : bold;
- text-decoration : none;
+.tabs2 {
+ font-size: 10px;
}
-
-DIV.tabs A:hover
-{
- background-position: 100% -150px;
+.tabs3 {
+ font-size: 9px;
}
-DIV.tabs A:link, DIV.tabs A:visited,
-DIV.tabs A:active, DIV.tabs A:hover
-{
- color: #1A419D;
+.tablist {
+ margin: 0;
+ padding: 0;
+ display: table;
}
-DIV.tabs SPAN
-{
- float : left;
- display : block;
- background : url("tab_l.gif") no-repeat left top;
- padding : 5px 9px;
- white-space : nowrap;
+.tablist li {
+ float: left;
+ display: table-cell;
+ background-image: url('tab_b.png');
+ line-height: 36px;
+ list-style: none;
}
-DIV.tabs #MSearchBox
-{
- float : right;
- display : inline;
- font-size : 1em;
-}
-
-DIV.tabs TD
-{
- font-size : 80%;
- font-weight : bold;
- text-decoration : none;
-}
-
-
-
-/* Commented Backslash Hack hides rule from IE5-Mac \*/
-DIV.tabs SPAN {float : none;}
-/* End IE5-Mac hack */
-
-DIV.tabs A:hover SPAN
-{
- background-position: 0% -150px;
+.tablist a {
+ display: block;
+ padding: 0 20px;
+ font-weight: bold;
+ background-image:url('tab_s.png');
+ background-repeat:no-repeat;
+ background-position:right;
+ color: #283A5D;
+ text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
+ text-decoration: none;
+ outline: none;
}
-DIV.tabs LI.current A
-{
- background-position: 100% -150px;
- border-width : 0px;
+.tabs3 .tablist a {
+ padding: 0 10px;
}
-DIV.tabs LI.current SPAN
-{
- background-position: 0% -150px;
- padding-bottom : 6px;
+.tablist a:hover {
+ background-image: url('tab_h.png');
+ background-repeat:repeat-x;
+ color: #fff;
+ text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
+ text-decoration: none;
}
-DIV.navpath
-{
- background : none;
- border : none;
- border-bottom : 1px solid #84B0C7;
- text-align : center;
- margin : 2px;
- padding : 2px;
+.tablist li.current a {
+ background-image: url('tab_a.png');
+ background-repeat:repeat-x;
+ color: #fff;
+ text-shadow: 0px 1px 1px rgba(0, 0, 0, 1.0);
}
Modified: trunk/libs/geometry/doc/imports.qbk
==============================================================================
--- trunk/libs/geometry/doc/imports.qbk (original)
+++ trunk/libs/geometry/doc/imports.qbk 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -24,7 +24,6 @@
[import src/examples/algorithms/centroid.cpp]
[import src/examples/algorithms/distance.cpp]
[import src/examples/algorithms/difference.cpp]
-[import src/examples/algorithms/difference_inserter.cpp]
[import src/examples/algorithms/envelope.cpp]
[import src/examples/algorithms/for_each_point.cpp]
[import src/examples/algorithms/for_each_point_const.cpp]
@@ -33,7 +32,6 @@
[import src/examples/algorithms/length_with_strategy.cpp]
[import src/examples/algorithms/make_2d_point.cpp]
[import src/examples/algorithms/make_3d_point.cpp]
-[import src/examples/algorithms/make_envelope.cpp]
[import src/examples/algorithms/make_inverse.cpp]
[import src/examples/algorithms/make_with_range.cpp]
[import src/examples/algorithms/intersection_ls_ls_point.cpp]
@@ -43,8 +41,8 @@
[import src/examples/algorithms/num_geometries.cpp]
[import src/examples/algorithms/num_interior_rings.cpp]
[import src/examples/algorithms/num_points.cpp]
+[import src/examples/algorithms/return_envelope.cpp]
[import src/examples/algorithms/simplify.cpp]
-[import src/examples/algorithms/simplify_inserter.cpp]
[import src/examples/algorithms/sym_difference.cpp]
[import src/examples/algorithms/union.cpp]
[import src/examples/algorithms/within.cpp]
Modified: trunk/libs/geometry/doc/src/examples/algorithms/Jamfile.v2
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/Jamfile.v2 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -50,6 +50,5 @@
exe length_with_strategy : length_with_strategy.cpp ;
exe simplify : length.cpp ;
-exe simplify_inserter : simplify_inserter.cpp ;
-exe within : within.cpp ;
\ No newline at end of file
+exe within : within.cpp ;
Modified: trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/create_svg_overlay.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -35,7 +35,7 @@
mapper.map(g, "opacity:0.8;fill:none;stroke:rgb(255,128,0);stroke-width:4;stroke-dasharray:1,7;stroke-linecap:round");
std::ostringstream out;
out << i++;
- mapper.text(boost::geometry::make_centroid<point_type>(g), out.str(),
+ mapper.text(boost::geometry::return_centroid<point_type>(g), out.str(),
"fill:rgb(0,0,0);font-family:Arial;font-size:10px");
}
}
Deleted: trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
+++ (empty file)
@@ -1,61 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// QuickBook Example
-
-// Copyright (c) 2011 Barend Gehrels, 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)
-
-//[make_envelope
-//` Shows how to return the envelope of a ring
-
-#include <iostream>
-
-
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/geometries/geometries.hpp>
-
-#include <boost/assign.hpp>
-
-/*<-*/ #include "create_svg_two.hpp" /*->*/
-
-int main()
-{
- using namespace boost::assign;
-
- typedef boost::geometry::model::d2::point_xy<double> point;
-
- boost::geometry::model::ring<point> ring;
- ring +=
- point(4.0, -0.5), point(3.5, 1.0),
- point(2.0, 1.5), point(3.5, 2.0),
- point(4.0, 3.5), point(4.5, 2.0),
- point(6.0, 1.5), point(4.5, 1.0),
- point(4.0, -0.5);
-
- typedef boost::geometry::model::box<point> box;
-
- std::cout
- << "make_envelope:"
- << boost::geometry::dsv(boost::geometry::make_envelope<box>(ring))
- << std::endl;
-
- /*<-*/ create_svg("make_envelope.svg", ring, boost::geometry::make_envelope<box>(ring)); /*->*/
- return 0;
-}
-
-//]
-
-
-//[make_envelope_output
-/*`
-Output:
-[pre
-make_envelope:((2, -0.5), (6, 3.5))
-
-[$img/algorithms/make_envelope.png]
-]
-*/
-//]
-
Copied: trunk/libs/geometry/doc/src/examples/algorithms/return_envelope.cpp (from r70779, /trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp)
==============================================================================
--- /trunk/libs/geometry/doc/src/examples/algorithms/make_envelope.cpp (original)
+++ trunk/libs/geometry/doc/src/examples/algorithms/return_envelope.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -7,7 +7,7 @@
// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-//[make_envelope
+//[return_envelope
//` Shows how to return the envelope of a ring
#include <iostream>
@@ -37,24 +37,24 @@
typedef boost::geometry::model::box<point> box;
std::cout
- << "make_envelope:"
- << boost::geometry::dsv(boost::geometry::make_envelope<box>(ring))
+ << "return_envelope:"
+ << boost::geometry::dsv(boost::geometry::return_envelope<box>(ring))
<< std::endl;
- /*<-*/ create_svg("make_envelope.svg", ring, boost::geometry::make_envelope<box>(ring)); /*->*/
+ /*<-*/ create_svg("return_envelope.svg", ring, boost::geometry::return_envelope<box>(ring)); /*->*/
return 0;
}
//]
-//[make_envelope_output
+//[return_envelope_output
/*`
Output:
[pre
-make_envelope:((2, -0.5), (6, 3.5))
+return_envelope:((2, -0.5), (6, 3.5))
-[$img/algorithms/make_envelope.png]
+[$img/algorithms/return_envelope.png]
]
*/
//]
Deleted: trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
+++ (empty file)
@@ -1,49 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// QuickBook Example
-
-// Copyright (c) 2011 Barend Gehrels, 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)
-
-//[simplify_inserter
-//` Simplify a linestring using a back inserter
-
-#include <iostream>
-#include <boost/geometry/geometry.hpp>
-
-int main()
-{
- typedef boost::geometry::model::d2::point_xy<double> P;
- typedef boost::geometry::model::linestring<P> L;
-
- L line;
- line.push_back(P(1.1, 1.1));
- line.push_back(P(2.5, 2.1));
- line.push_back(P(3.1, 3.1));
- line.push_back(P(4.9, 1.1));
- line.push_back(P(3.1, 1.9));
-
- L simplified;
- boost::geometry::simplify_inserter(line, std::back_inserter(simplified), 0.5);
-
- std::cout
- << " original: " << boost::geometry::dsv(line) << std::endl
- << "simplified: " << boost::geometry::dsv(simplified) << std::endl;
-
- return 0;
-}
-
-//]
-
-
-//[simplify_inserter_output
-/*`
-Output:
-[pre
- original: ((1.1, 1.1), (2.5, 2.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-simplified: ((1.1, 1.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-]
-*/
-//]
Deleted: trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp
==============================================================================
--- trunk/libs/geometry/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
+++ (empty file)
@@ -1,72 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-// QuickBook Example
-
-// Copyright (c) 2011 Barend Gehrels, 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)
-
-//[simplify_inserter
-//` Simplify a linestring using an output iterator
-
-#include <iostream>
-#include <boost/geometry/geometry.hpp>
-#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
-#include <boost/geometry/domains/gis/io/wkt/stream_wkt.hpp>
-
-
-
-int main()
-{
- typedef boost::geometry::model::d2::point_xy<double> P;
- typedef boost::geometry::model::linestring<P> L;
-
- L line;
- boost::geometry::read_wkt("linestring(1.1 1.1, 2.5 2.1, 3.1 3.1, 4.9 1.1, 3.1 1.9)", line);
-
- typedef boost::geometry::strategy::distance::projected_point<P, P> DS;
- typedef boost::geometry::strategy::simplify::douglas_peucker<P, DS> simplification;
-
- L simplified;
- boost::geometry::simplify_inserter(line, std::back_inserter(simplified), 0.5, simplification()); //std::ostream_iterator<P>(std::cout, "\n"), 0.5);//);
- //std::cout << simplified[0];
- //boost::geometry::simplify_inserter(line, std::ostream_iterator<P>(std::cout, "\n"), 0.5);//, simplification());
-
- std::ostream_iterator<P> out(std::cout, "\n");
- std::copy(simplified.begin(), simplified.end(), out);
-
- std::cout
- << " original: " << boost::geometry::dsv(line) << std::endl
- << "simplified: " << boost::geometry::dsv(simplified) << std::endl;
-
- return 0;
-}
-
-//]
-
-
-//[simplify_inserter_output
-/*`
-Output:
-[pre
-simplify_inserter: 16
-simplify_inserter: 0.339837
-]
-*/
-//]
-/*
-OUTPUT
-POINT(1.1 1.1) original: ((1.1, 1.1), (2.5, 2.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-simplified: ((1.1, 1.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-*/
-/*
-OUTPUT
-POINT(1.1 1.1) original: ((1.1, 1.1), (2.5, 2.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-simplified: ((1.1, 1.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-*/
-/*
-OUTPUT
-POINT(1.1 1.1) original: ((1.1, 1.1), (2.5, 2.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-simplified: ((1.1, 1.1), (3.1, 3.1), (4.9, 1.1), (3.1, 1.9))
-*/
Modified: trunk/libs/geometry/example/07_a_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_a_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_a_graph_route_example.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -70,7 +70,7 @@
Tuple tuple(geometry, name);
tuples.push_back(tuple);
- boost::geometry::expand(box, boost::geometry::make_envelope<Box>(geometry));
+ boost::geometry::expand(box, boost::geometry::return_envelope<Box>(geometry));
}
}
}
Modified: trunk/libs/geometry/example/07_b_graph_route_example.cpp
==============================================================================
--- trunk/libs/geometry/example/07_b_graph_route_example.cpp (original)
+++ trunk/libs/geometry/example/07_b_graph_route_example.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -74,7 +74,7 @@
Tuple tuple(geometry, name);
tuples.push_back(tuple);
- boost::geometry::expand(box, boost::geometry::make_envelope<Box>(geometry));
+ boost::geometry::expand(box, boost::geometry::return_envelope<Box>(geometry));
}
}
}
Modified: trunk/libs/geometry/example/c06_custom_polygon_example.cpp
==============================================================================
--- trunk/libs/geometry/example/c06_custom_polygon_example.cpp (original)
+++ trunk/libs/geometry/example/c06_custom_polygon_example.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -133,7 +133,7 @@
std::cout << "Perimeter of " << p1.name << ": "
<< boost::geometry::perimeter(p1) << std::endl;
std::cout << "Centroid of " << p1.name << ": "
- << boost::geometry::dsv(boost::geometry::make_centroid<my_point>(p1)) << std::endl;
+ << boost::geometry::dsv(boost::geometry::return_centroid<my_point>(p1)) << std::endl;
return 0;
}
Modified: trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp
==============================================================================
--- trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp (original)
+++ trunk/libs/geometry/example/extensions/gis/projections/p03_projmap_example.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -79,7 +79,7 @@
if (transform(*it, xy_polygon, projection))
{
// Update bbox with box of this projected polygon
- expand(bbox, make_envelope<model::box<point_xy> >(xy_polygon));
+ expand(bbox, return_envelope<model::box<point_xy> >(xy_polygon));
// Add projected polygon
xy_polygons.push_back(xy_polygon);
Modified: trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x04_wxwidgets_world_mapper.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -123,7 +123,7 @@
Geometry geometry;
boost::geometry::read_wkt(line, geometry);
geometries.push_back(geometry);
- boost::geometry::expand(box, boost::geometry::make_envelope<Box>(geometry));
+ boost::geometry::expand(box, boost::geometry::return_envelope<Box>(geometry));
}
}
}
Modified: trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp
==============================================================================
--- trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp (original)
+++ trunk/libs/geometry/example/with_external_libs/x06_qt_world_mapper.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -136,7 +136,7 @@
Geometry geometry;
boost::geometry::read_wkt(line, geometry);
geometries.push_back(geometry);
- boost::geometry::expand(box, boost::geometry::make_envelope<Box>(geometry));
+ boost::geometry::expand(box, boost::geometry::return_envelope<Box>(geometry));
}
}
}
Modified: trunk/libs/geometry/test/algorithms/difference.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/difference.cpp (original)
+++ trunk/libs/geometry/test/algorithms/difference.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -16,7 +16,11 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/algorithms/perimeter.hpp>
+
#include <boost/geometry/multi/algorithms/correct.hpp>
+#include <boost/geometry/multi/algorithms/intersection.hpp>
+#include <boost/geometry/multi/algorithms/within.hpp>
+
#include <boost/geometry/extensions/gis/io/wkb/read_wkb.hpp>
#include <boost/geometry/extensions/gis/io/wkb/utility.hpp>
Modified: trunk/libs/geometry/test/algorithms/intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/intersection.cpp (original)
+++ trunk/libs/geometry/test/algorithms/intersection.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -322,7 +322,7 @@
typedef bg::model::linestring<bg::model::d2::point_xy<double> > output_type;
std::vector<output_type> clip;
- bg::intersection_inserter<output_type>(box, ln, std::back_inserter(clip));
+ bg::detail::intersection::intersection_insert<output_type>(box, ln, std::back_inserter(clip));
double length = 0;
int n = 0;
Modified: trunk/libs/geometry/test/algorithms/overlay/assemble.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/assemble.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/assemble.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -39,10 +39,10 @@
{
std::vector<Geometry> u, i, d1, d2;
- bg::union_inserter<Geometry>(p, q, std::back_inserter(u));
- bg::intersection_inserter<Geometry>(p, q, std::back_inserter(i));
- bg::difference_inserter<Geometry>(p, q, std::back_inserter(d1));
- bg::difference_inserter<Geometry>(q, p, std::back_inserter(d2));
+ bg::detail::union_::union_insert<Geometry>(p, q, std::back_inserter(u));
+ bg::detail::intersection::intersection_insert<Geometry>(p, q, std::back_inserter(i));
+ bg::detail::difference::difference_insert<Geometry>(p, q, std::back_inserter(d1));
+ bg::detail::difference::difference_insert<Geometry>(q, p, std::back_inserter(d2));
if (operation == 'i')
{
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/recursive_polygons.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -105,7 +105,7 @@
}
MultiPolygon mp;
- bg::union_inserter
+ bg::detail::union_::union_insert
<
polygon
>(p, q, std::back_inserter(mp));
Modified: trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.hpp (original)
+++ trunk/libs/geometry/test/algorithms/overlay/robustness/star_comb.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -63,7 +63,7 @@
template <typename Vector>
void ccw_pushback(Vector& vector, double x, double y, int)
{
- vector.push_back(boost::make_tuple<double, double>(x, y));
+ vector.push_back(boost::make_tuple(x, y));
}
template <typename Polygon, typename AddFunctor>
Modified: trunk/libs/geometry/test/algorithms/test_convex_hull.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_convex_hull.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_convex_hull.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -68,7 +68,7 @@
> hull;
// Test version with output iterator
- bg::convex_hull_inserter(geometry, std::back_inserter(hull.outer()));
+ bg::detail::convex_hull::convex_hull_insert(geometry, std::back_inserter(hull.outer()));
test_convex_hull(geometry, hull,
size_original, size_hull, expected_area, ! Clockwise);
@@ -94,7 +94,7 @@
// Test version with output iterator and strategy
bg::clear(hull);
- bg::convex_hull_inserter(geometry, std::back_inserter(hull.outer()), graham);
+ bg::detail::convex_hull::convex_hull_insert(geometry, std::back_inserter(hull.outer()), graham);
test_convex_hull(geometry, hull, size_original, size_hull, expected_area, ! Clockwise);
}
Modified: trunk/libs/geometry/test/algorithms/test_difference.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_difference.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_difference.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -19,7 +19,6 @@
#include <boost/geometry/algorithms/correct.hpp>
#include <boost/geometry/algorithms/difference.hpp>
#include <boost/geometry/algorithms/sym_difference.hpp>
-#include <boost/geometry/multi/algorithms/difference.hpp>
#include <boost/geometry/algorithms/area.hpp>
#include <boost/geometry/algorithms/num_points.hpp>
@@ -90,11 +89,11 @@
array_with_one_empty_geometry.push_back(OutputType());
if (sym)
{
- boost::copy(array_with_one_empty_geometry, bg::sym_difference_inserter<OutputType>(g1, g2, std::back_inserter(inserted)));
+ boost::copy(array_with_one_empty_geometry, bg::detail::sym_difference::sym_difference_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
}
else
{
- boost::copy(array_with_one_empty_geometry, bg::difference_inserter<OutputType>(g1, g2, std::back_inserter(inserted)));
+ boost::copy(array_with_one_empty_geometry, bg::detail::difference::difference_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
}
BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1);
Modified: trunk/libs/geometry/test/algorithms/test_intersection.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_intersection.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_intersection.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -66,7 +66,7 @@
bg::intersection(g1, g2, out);
}
std::vector<OutputType> clip;
- bg::intersection_inserter<OutputType>(g1, g2, std::back_inserter(clip), strategy());
+ bg::detail::intersection::intersection_insert<OutputType>(g1, g2, std::back_inserter(clip), strategy());
typename bg::area_result<G1>::type length_or_area = 0;
Modified: trunk/libs/geometry/test/algorithms/test_simplify.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_simplify.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_simplify.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -30,7 +30,7 @@
static void apply(Geometry& geometry, std::string const& expected, double distance)
{
Geometry simplified;
- bg::simplify_inserter(geometry,
+ bg::detail::simplify::simplify_insert(geometry,
std::back_inserter(simplified), distance);
std::ostringstream out;
Modified: trunk/libs/geometry/test/algorithms/test_union.hpp
==============================================================================
--- trunk/libs/geometry/test/algorithms/test_union.hpp (original)
+++ trunk/libs/geometry/test/algorithms/test_union.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -66,7 +66,7 @@
// Test if inserter returns output-iterator (using Boost.Range copy)
std::vector<OutputType> inserted, array_with_one_empty_geometry;
array_with_one_empty_geometry.push_back(OutputType());
- boost::copy(array_with_one_empty_geometry, bg::union_inserter<OutputType>(g1, g2, std::back_inserter(inserted)));
+ boost::copy(array_with_one_empty_geometry, bg::detail::union_::union_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
typename bg::area_result<G1>::type area_inserted = 0;
for (typename std::vector<OutputType>::iterator it = inserted.begin();
Modified: trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp
==============================================================================
--- trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp (original)
+++ trunk/libs/geometry/test/extensions/algorithms/buffer/test_buffer.hpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -162,12 +162,12 @@
{
if (sections_buffered_unioned.empty())
{
- bg::union_inserter<GeometryOut>(geometry, p, std::back_inserter(sections_buffered_unioned));
+ bg::detail::union_::union_insert<GeometryOut>(geometry, p, std::back_inserter(sections_buffered_unioned));
}
else if (boost::size(sections_buffered_unioned) == 1)
{
std::vector<GeometryOut> step;
- bg::union_inserter<GeometryOut>(sections_buffered_unioned.front(), p, std::back_inserter(step));
+ bg::detail::union_::union_insert<GeometryOut>(sections_buffered_unioned.front(), p, std::back_inserter(step));
step.swap(sections_buffered_unioned);
}
else
@@ -175,7 +175,7 @@
std::cout << "nyi" << std::endl;
BOOST_FOREACH(GeometryOut const& sbu, sections_buffered_unioned)
{
- bg::union_inserter<GeometryOut>(p, sbu, sections_buffered_unioned);
+ bg::detail::union_::union_insert<GeometryOut>(p, sbu, sections_buffered_unioned);
}
}
}
Modified: trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_convex_hull.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -22,7 +22,7 @@
#include <boost/geometry/multi/iterators/range_type.hpp>
#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/multi/algorithms/convex_hull.hpp>
+#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
#include <boost/geometry/domains/gis/io/wkt/wkt.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_difference.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -16,7 +16,7 @@
#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
#include <boost/geometry/multi/algorithms/correct.hpp>
-#include <boost/geometry/multi/algorithms/difference.hpp>
+#include <boost/geometry/multi/algorithms/intersection.hpp>
#include <boost/geometry/multi/algorithms/within.hpp> // only for testing #77
#include <boost/geometry/multi/geometries/multi_point.hpp>
Modified: trunk/libs/geometry/test/multi/algorithms/multi_union.cpp
==============================================================================
--- trunk/libs/geometry/test/multi/algorithms/multi_union.cpp (original)
+++ trunk/libs/geometry/test/multi/algorithms/multi_union.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -14,7 +14,8 @@
#include <multi/algorithms/overlay/multi_overlay_cases.hpp>
#include <boost/geometry/multi/algorithms/correct.hpp>
-#include <boost/geometry/multi/algorithms/union.hpp>
+#include <boost/geometry/multi/algorithms/intersection.hpp>
+#include <boost/geometry/multi/algorithms/within.hpp>
#include <boost/geometry/multi/geometries/multi_linestring.hpp>
#include <boost/geometry/multi/geometries/multi_polygon.hpp>
Modified: trunk/libs/geometry/test/strategies/segment_intersection.cpp
==============================================================================
--- trunk/libs/geometry/test/strategies/segment_intersection.cpp (original)
+++ trunk/libs/geometry/test/strategies/segment_intersection.cpp 2011-04-01 12:54:09 EDT (Fri, 01 Apr 2011)
@@ -213,7 +213,7 @@
// Now use generic intersection.
std::vector<P> out;
- bg::intersection_inserter<P>(s12, s34, std::back_inserter(out));
+ bg::detail::intersection::intersection_insert<P>(s12, s34, std::back_inserter(out));
BOOST_CHECK_EQUAL(boost::size(out), expected_count);
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