diff --git a/doc/doxy/Doxyfile b/doc/doxy/Doxyfile index f9e1c2286..22d7a0a3b 100644 --- a/doc/doxy/Doxyfile +++ b/doc/doxy/Doxyfile @@ -99,8 +99,8 @@ ALIASES = qbk{1}="\xmlonly \1 \endxmlonly" \ 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" \ diff --git a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp index 93d43d856..8a52a0956 100644 --- a/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp +++ b/doc/doxy/doxygen_input/sourcecode/doxygen_4.cpp @@ -70,7 +70,7 @@ void read_wkt(std::string const& filename, std::vector& tuples, Box& box) Tuple tuple(geometry, name); tuples.push_back(tuple); - boost::geometry::expand(box, boost::geometry::make_envelope(geometry)); + boost::geometry::expand(box, boost::geometry::return_envelope(geometry)); } } } diff --git a/doc/doxy/doxygen_output/html/doxygen.css b/doc/doxy/doxygen_output/html/doxygen.css index d6aaf2804..74445fe1f 100644 --- a/doc/doxy/doxygen_output/html/doxygen.css +++ b/doc/doxy/doxygen_output/html/doxygen.css @@ -8,10 +8,15 @@ body, table, div, p, dl { /* @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 @@ h3.version { } 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 @@ div.navtab { /* @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.qindex { 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.elRef { } a.code { - color: #3030f0; + color: #4665A2; } a.codeRef { - color: #3030f0; + color: #4665A2; } /* @end */ @@ -138,8 +143,8 @@ dl.el { } 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 @@ div.ah { 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 @@ div.groupText { 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 @@ div.center img { border: 0px; } +address.footer { + text-align: right; + padding-right: 12px; +} + img.footer { border: 0px; vertical-align: middle; @@ -270,6 +294,7 @@ span.vhdllogic { /* @end */ +/* .search { color: #003399; font-weight: bold; @@ -286,6 +311,7 @@ input.search { font-weight: normal; background-color: #e8eef2; } +*/ td.tiny { font-size: 75%; @@ -294,18 +320,18 @@ td.tiny { .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 @@ hr.footer { /* @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 @@ hr.footer { } .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 @@ hr.footer { .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 @@ hr.footer { } .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 @@ hr.footer { 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 @@ hr.footer { .ftvtree { font-family: sans-serif; - margin: 0.5em; + margin: 0px; } /* these are for tree view when used as main index */ @@ -443,6 +517,7 @@ hr.footer { .directory { font-size: 9pt; font-weight: bold; + margin: 5px; } .directory h3 { @@ -520,9 +595,13 @@ proper pixel height of your image. /* @end */ +div.dynheader { + margin-top: 8px; +} + address { font-style: normal; - color: #333; + color: #2A3D61; } table.doxtable { @@ -530,12 +609,12 @@ table.doxtable { } 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 @@ table.doxtable th { 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; +} + diff --git a/doc/doxy/doxygen_output/html/doxygen.png b/doc/doxy/doxygen_output/html/doxygen.png index f0a274bba..635ed52fc 100644 Binary files a/doc/doxy/doxygen_output/html/doxygen.png and b/doc/doxy/doxygen_output/html/doxygen.png differ diff --git a/doc/doxy/doxygen_output/html/tabs.css b/doc/doxy/doxygen_output/html/tabs.css index a44416341..21920562a 100644 --- a/doc/doxy/doxygen_output/html/tabs.css +++ b/doc/doxy/doxygen_output/html/tabs.css @@ -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; +.tabs, .tabs2, .tabs3 { + background-image: url('tab_b.png'); + width: 100%; + z-index: 101; + font-size: 13px; } -DIV.tabs UL -{ - margin : 0px; - padding-left : 10px; - list-style : none; +.tabs2 { + font-size: 10px; +} +.tabs3 { + font-size: 9px; } -DIV.tabs LI, DIV.tabs FORM -{ - display : inline; - margin : 0px; - padding : 0px; +.tablist { + margin: 0; + padding: 0; + display: table; } -DIV.tabs FORM -{ - float : right; +.tablist li { + float: left; + display: table-cell; + background-image: url('tab_b.png'); + line-height: 36px; + list-style: none; } -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; +.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 A:hover -{ - background-position: 100% -150px; +.tabs3 .tablist a { + padding: 0 10px; } -DIV.tabs A:link, DIV.tabs A:visited, -DIV.tabs A:active, DIV.tabs A:hover -{ - color: #1A419D; +.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.tabs SPAN -{ - float : left; - display : block; - background : url("tab_l.gif") no-repeat left top; - padding : 5px 9px; - white-space : nowrap; -} - -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; -} - -DIV.tabs LI.current A -{ - background-position: 100% -150px; - border-width : 0px; -} - -DIV.tabs LI.current SPAN -{ - background-position: 0% -150px; - padding-bottom : 6px; -} - -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); } diff --git a/doc/imports.qbk b/doc/imports.qbk index 9fd4f2aff..a40b9cca7 100644 --- a/doc/imports.qbk +++ b/doc/imports.qbk @@ -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] diff --git a/doc/src/examples/algorithms/Jamfile.v2 b/doc/src/examples/algorithms/Jamfile.v2 index 5a223a06b..7f3da6c3f 100644 --- a/doc/src/examples/algorithms/Jamfile.v2 +++ b/doc/src/examples/algorithms/Jamfile.v2 @@ -50,6 +50,5 @@ exe length : length.cpp ; 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 ; diff --git a/doc/src/examples/algorithms/create_svg_overlay.hpp b/doc/src/examples/algorithms/create_svg_overlay.hpp index dfcccf0d6..f44dd56e9 100644 --- a/doc/src/examples/algorithms/create_svg_overlay.hpp +++ b/doc/src/examples/algorithms/create_svg_overlay.hpp @@ -35,7 +35,7 @@ void create_svg(std::string const& filename, Geometry const& a, Geometry const& 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(g), out.str(), + mapper.text(boost::geometry::return_centroid(g), out.str(), "fill:rgb(0,0,0);font-family:Arial;font-size:10px"); } } diff --git a/doc/src/examples/algorithms/make_envelope.cpp b/doc/src/examples/algorithms/return_envelope.cpp similarity index 76% rename from doc/src/examples/algorithms/make_envelope.cpp rename to doc/src/examples/algorithms/return_envelope.cpp index 8be4e9d81..5775d9f53 100644 --- a/doc/src/examples/algorithms/make_envelope.cpp +++ b/doc/src/examples/algorithms/return_envelope.cpp @@ -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 @@ -37,24 +37,24 @@ int main() typedef boost::geometry::model::box box; std::cout - << "make_envelope:" - << boost::geometry::dsv(boost::geometry::make_envelope(ring)) + << "return_envelope:" + << boost::geometry::dsv(boost::geometry::return_envelope(ring)) << std::endl; - /*<-*/ create_svg("make_envelope.svg", ring, boost::geometry::make_envelope(ring)); /*->*/ + /*<-*/ create_svg("return_envelope.svg", ring, boost::geometry::return_envelope(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] ] */ //] diff --git a/doc/src/examples/algorithms/simplify_inserter.cpp b/doc/src/examples/algorithms/simplify_insert.cpp similarity index 100% rename from doc/src/examples/algorithms/simplify_inserter.cpp rename to doc/src/examples/algorithms/simplify_insert.cpp diff --git a/doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp b/doc/src/examples/algorithms/simplify_insert_with_strategy.cpp similarity index 100% rename from doc/src/examples/algorithms/simplify_inserter_with_strategy.cpp rename to doc/src/examples/algorithms/simplify_insert_with_strategy.cpp diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp index da4ec7dcf..17d368409 100644 --- a/example/07_a_graph_route_example.cpp +++ b/example/07_a_graph_route_example.cpp @@ -70,7 +70,7 @@ void read_wkt(std::string const& filename, std::vector& tuples, Box& box) Tuple tuple(geometry, name); tuples.push_back(tuple); - boost::geometry::expand(box, boost::geometry::make_envelope(geometry)); + boost::geometry::expand(box, boost::geometry::return_envelope(geometry)); } } } diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp index 14a91f8e8..e6a64983c 100644 --- a/example/07_b_graph_route_example.cpp +++ b/example/07_b_graph_route_example.cpp @@ -74,7 +74,7 @@ void read_wkt(std::string const& filename, std::vector& tuples, Box& box) Tuple tuple(geometry, name); tuples.push_back(tuple); - boost::geometry::expand(box, boost::geometry::make_envelope(geometry)); + boost::geometry::expand(box, boost::geometry::return_envelope(geometry)); } } } diff --git a/example/c06_custom_polygon_example.cpp b/example/c06_custom_polygon_example.cpp index 8bc8e4388..e036af9ae 100644 --- a/example/c06_custom_polygon_example.cpp +++ b/example/c06_custom_polygon_example.cpp @@ -133,7 +133,7 @@ int main() 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(p1)) << std::endl; + << boost::geometry::dsv(boost::geometry::return_centroid(p1)) << std::endl; return 0; } diff --git a/example/extensions/gis/projections/p03_projmap_example.cpp b/example/extensions/gis/projections/p03_projmap_example.cpp index eed656411..c60b0f59a 100644 --- a/example/extensions/gis/projections/p03_projmap_example.cpp +++ b/example/extensions/gis/projections/p03_projmap_example.cpp @@ -79,7 +79,7 @@ void read_wkt_and_project_and_write_svg(std::string const& wkt_filename, if (transform(*it, xy_polygon, projection)) { // Update bbox with box of this projected polygon - expand(bbox, make_envelope >(xy_polygon)); + expand(bbox, return_envelope >(xy_polygon)); // Add projected polygon xy_polygons.push_back(xy_polygon); diff --git a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp index 9b82aec7c..2faf60adc 100644 --- a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp +++ b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp @@ -123,7 +123,7 @@ inline void read_wkt(std::string const& filename, std::vector& geometr Geometry geometry; boost::geometry::read_wkt(line, geometry); geometries.push_back(geometry); - boost::geometry::expand(box, boost::geometry::make_envelope(geometry)); + boost::geometry::expand(box, boost::geometry::return_envelope(geometry)); } } } diff --git a/example/with_external_libs/x06_qt_world_mapper.cpp b/example/with_external_libs/x06_qt_world_mapper.cpp index f9bf43c65..8b71bd4d5 100644 --- a/example/with_external_libs/x06_qt_world_mapper.cpp +++ b/example/with_external_libs/x06_qt_world_mapper.cpp @@ -136,7 +136,7 @@ inline void read_wkt(std::string const& filename, std::vector& geometr Geometry geometry; boost::geometry::read_wkt(line, geometry); geometries.push_back(geometry); - boost::geometry::expand(box, boost::geometry::make_envelope(geometry)); + boost::geometry::expand(box, boost::geometry::return_envelope(geometry)); } } } diff --git a/test/algorithms/difference.cpp b/test/algorithms/difference.cpp index 7aa8f0d8a..ea25608d9 100644 --- a/test/algorithms/difference.cpp +++ b/test/algorithms/difference.cpp @@ -16,7 +16,11 @@ #include #include + #include +#include +#include + #include #include diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp index 71344b7ee..b97b5d717 100644 --- a/test/algorithms/intersection.cpp +++ b/test/algorithms/intersection.cpp @@ -322,7 +322,7 @@ void test_pointer_version() typedef bg::model::linestring > output_type; std::vector clip; - bg::intersection_inserter(box, ln, std::back_inserter(clip)); + bg::detail::intersection::intersection_insert(box, ln, std::back_inserter(clip)); double length = 0; int n = 0; diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp index 0b33c55de..de9e84279 100644 --- a/test/algorithms/overlay/assemble.cpp +++ b/test/algorithms/overlay/assemble.cpp @@ -39,10 +39,10 @@ inline void test_assemble(std::string const& id, Geometry const& p, Geometry con { std::vector u, i, d1, d2; - bg::union_inserter(p, q, std::back_inserter(u)); - bg::intersection_inserter(p, q, std::back_inserter(i)); - bg::difference_inserter(p, q, std::back_inserter(d1)); - bg::difference_inserter(q, p, std::back_inserter(d2)); + bg::detail::union_::union_insert(p, q, std::back_inserter(u)); + bg::detail::intersection::intersection_insert(p, q, std::back_inserter(i)); + bg::detail::difference::difference_insert(p, q, std::back_inserter(d1)); + bg::detail::difference::difference_insert(q, p, std::back_inserter(d2)); if (operation == 'i') { diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp index 759db9540..ac3d66f81 100644 --- a/test/algorithms/overlay/robustness/recursive_polygons.cpp +++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp @@ -105,7 +105,7 @@ bool test_recursive_boxes(MultiPolygon& result, int& index, } MultiPolygon mp; - bg::union_inserter + bg::detail::union_::union_insert < polygon >(p, q, std::back_inserter(mp)); diff --git a/test/algorithms/overlay/robustness/star_comb.hpp b/test/algorithms/overlay/robustness/star_comb.hpp index 2b0fe3282..049f024e2 100644 --- a/test/algorithms/overlay/robustness/star_comb.hpp +++ b/test/algorithms/overlay/robustness/star_comb.hpp @@ -63,7 +63,7 @@ inline void make_star(Polygon& polygon, AddFunctor functor, template void ccw_pushback(Vector& vector, double x, double y, int) { - vector.push_back(boost::make_tuple(x, y)); + vector.push_back(boost::make_tuple(x, y)); } template diff --git a/test/algorithms/test_convex_hull.hpp b/test/algorithms/test_convex_hull.hpp index bd054fb63..1d2737d89 100644 --- a/test/algorithms/test_convex_hull.hpp +++ b/test/algorithms/test_convex_hull.hpp @@ -68,7 +68,7 @@ void test_geometry_order(std::string const& wkt, > 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 @@ void test_geometry_order(std::string const& wkt, // 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); } diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/test_difference.hpp index 9dbb2dc73..f7234baa0 100644 --- a/test/algorithms/test_difference.hpp +++ b/test/algorithms/test_difference.hpp @@ -19,7 +19,6 @@ #include #include #include -#include #include #include @@ -90,11 +89,11 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2, array_with_one_empty_geometry.push_back(OutputType()); if (sym) { - boost::copy(array_with_one_empty_geometry, bg::sym_difference_inserter(g1, g2, std::back_inserter(inserted))); + boost::copy(array_with_one_empty_geometry, bg::detail::sym_difference::sym_difference_insert(g1, g2, std::back_inserter(inserted))); } else { - boost::copy(array_with_one_empty_geometry, bg::difference_inserter(g1, g2, std::back_inserter(inserted))); + boost::copy(array_with_one_empty_geometry, bg::detail::difference::difference_insert(g1, g2, std::back_inserter(inserted))); } BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1); diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp index fabdfc86f..ff1ef18b2 100644 --- a/test/algorithms/test_intersection.hpp +++ b/test/algorithms/test_intersection.hpp @@ -66,7 +66,7 @@ typename bg::area_result::type test_intersection(std::string const& caseid, bg::intersection(g1, g2, out); } std::vector clip; - bg::intersection_inserter(g1, g2, std::back_inserter(clip), strategy()); + bg::detail::intersection::intersection_insert(g1, g2, std::back_inserter(clip), strategy()); typename bg::area_result::type length_or_area = 0; diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp index 560a9b684..1317e0c93 100644 --- a/test/algorithms/test_simplify.hpp +++ b/test/algorithms/test_simplify.hpp @@ -30,7 +30,7 @@ struct test_inserter 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; diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp index 4bacd642a..7f09cfd74 100644 --- a/test/algorithms/test_union.hpp +++ b/test/algorithms/test_union.hpp @@ -66,7 +66,7 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2, // Test if inserter returns output-iterator (using Boost.Range copy) std::vector inserted, array_with_one_empty_geometry; array_with_one_empty_geometry.push_back(OutputType()); - boost::copy(array_with_one_empty_geometry, bg::union_inserter(g1, g2, std::back_inserter(inserted))); + boost::copy(array_with_one_empty_geometry, bg::detail::union_::union_insert(g1, g2, std::back_inserter(inserted))); typename bg::area_result::type area_inserted = 0; for (typename std::vector::iterator it = inserted.begin(); diff --git a/test/extensions/algorithms/buffer/test_buffer.hpp b/test/extensions/algorithms/buffer/test_buffer.hpp index 0b4c36ee2..a950c886d 100644 --- a/test/extensions/algorithms/buffer/test_buffer.hpp +++ b/test/extensions/algorithms/buffer/test_buffer.hpp @@ -162,12 +162,12 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, { if (sections_buffered_unioned.empty()) { - bg::union_inserter(geometry, p, std::back_inserter(sections_buffered_unioned)); + bg::detail::union_::union_insert(geometry, p, std::back_inserter(sections_buffered_unioned)); } else if (boost::size(sections_buffered_unioned) == 1) { std::vector step; - bg::union_inserter(sections_buffered_unioned.front(), p, std::back_inserter(step)); + bg::detail::union_::union_insert(sections_buffered_unioned.front(), p, std::back_inserter(step)); step.swap(sections_buffered_unioned); } else @@ -175,7 +175,7 @@ void test_buffer(std::string const& caseid, Geometry const& geometry, std::cout << "nyi" << std::endl; BOOST_FOREACH(GeometryOut const& sbu, sections_buffered_unioned) { - bg::union_inserter(p, sbu, sections_buffered_unioned); + bg::detail::union_::union_insert(p, sbu, sections_buffered_unioned); } } } diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/multi/algorithms/multi_convex_hull.cpp index 30190c201..28f8ee99b 100644 --- a/test/multi/algorithms/multi_convex_hull.cpp +++ b/test/multi/algorithms/multi_convex_hull.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/test/multi/algorithms/multi_difference.cpp b/test/multi/algorithms/multi_difference.cpp index 92f709a1c..024259164 100644 --- a/test/multi/algorithms/multi_difference.cpp +++ b/test/multi/algorithms/multi_difference.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include // only for testing #77 #include diff --git a/test/multi/algorithms/multi_union.cpp b/test/multi/algorithms/multi_union.cpp index c92753b11..1675acf10 100644 --- a/test/multi/algorithms/multi_union.cpp +++ b/test/multi/algorithms/multi_union.cpp @@ -14,7 +14,8 @@ #include #include -#include +#include +#include #include #include diff --git a/test/strategies/segment_intersection.cpp b/test/strategies/segment_intersection.cpp index b35d95cb4..5ff14bcf8 100644 --- a/test/strategies/segment_intersection.cpp +++ b/test/strategies/segment_intersection.cpp @@ -213,7 +213,7 @@ static void test_segment_intersection(int caseno, // Now use generic intersection. std::vector

out; - bg::intersection_inserter

(s12, s34, std::back_inserter(out)); + bg::detail::intersection::intersection_insert

(s12, s34, std::back_inserter(out)); BOOST_CHECK_EQUAL(boost::size(out), expected_count);