diff --git a/Jamfile.v2 b/Jamfile.v2
new file mode 100644
index 000000000..4f318205e
--- /dev/null
+++ b/Jamfile.v2
@@ -0,0 +1,22 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+#
+# 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)
+
+project boost-geometry
+    :
+    requirements
+        <include>../../boost/geometry/extensions/contrib/ttmath
+        <toolset>msvc:<asynch-exceptions>on
+    ;
+
+build-project test ;
+build-project example ;
+build-project doc/src/examples ;
+build-project extensions ;
+build-project index ;
diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 1deb3fd94..924d4786f 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -8,18 +8,15 @@
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 # http://www.boost.org/LICENSE_1_0.txt)
 
-
 project geometry/doc ;
 
 # Auto-index, experimental. Commented otherwise does not build without.
 #using auto-index ; 
-
 using quickbook ;
 
 path-constant here : . ;
 path-constant images_location : html ;
 
-
 boostbook geometry 
     : geometry.qbk
     : <dependency>Jamfile.v2
@@ -43,3 +40,4 @@ boostbook geometry
 
 install pdfinstall : geometry/<format>pdf : <location>. <name>geometry.pdf <install-type>PDF ;
 explicit pdfinstall ;
+
diff --git a/doc/compiling.qbk b/doc/compiling.qbk
index f549fabd0..01c99fb74 100644
--- a/doc/compiling.qbk
+++ b/doc/compiling.qbk
@@ -49,7 +49,8 @@ compilers:
   * gcc 4.2.1 [/reported by Trunk report May 8, 2011]
   * gcc 3.4.6 [/reported by Trunk report March 26, 2011]
 * clang
-  * clang x.x [/reported by Trunk report March 26, 2011]
+  * clang 3.3 [/reported by mloskot on October, 2013]
+  * clang 3.2 [/reported by Trunk report March 26, 2011]
 * darwin
   * darwin 4.0.1 [/reported by Trunk report March 26, 2011]
   * darwin 4.4 [/reported by Trunk report March 26, 2011]
@@ -86,17 +87,24 @@ Another often used header is `geometries.hpp`:
 
     #include <boost/geometry/geometries/geometries.hpp>
 
-This includes definitions of all provided geometry types: point, 
-linestring, polygon, ring, box. The file `geometries.hpp` is not included in 
+This includes definitions of all provided geometry types:
+
+* point, 
+* linestring,
+* polygon,
+* ring,
+* multi_point,
+* multi_linestring,
+* multi_polygon,
+* box,
+* segment.
+
+The file `geometries.hpp` is not included in 
 the `geometry.hpp` headerfile because users should be given the liberty to use 
 their own geometries and not the provided ones. However, for the 
 __boost_geometry__ users who want to use the provided geometries it is useful 
 to include.
 
-For users using multi-geometries:
-
-    #include <boost/geometry/multi/geometries/multi_geometries.hpp>
-
 [heading Advanced Includes]
 
 Users who have their own geometries and want to use algorithms from 
diff --git a/doc/doxy/Doxyfile b/doc/doxy/Doxyfile
index 2cd86526b..e3b1ee1be 100644
--- a/doc/doxy/Doxyfile
+++ b/doc/doxy/Doxyfile
@@ -57,7 +57,6 @@ ALIASES                = qbk{1}="\xmlonly <qbk>\1</qbk> \endxmlonly" \
 			tparam_radius="numeric type for radius (of sphere, earth)" \
 			tparam_container="container type, for example std::vector, std::deque" \
 			tparam_dimension_required="Dimension, this template parameter is required. Should contain \\[0 .. n-1\\] for an n-dimensional geometry" \
-			tparam_first_point="first point type" \
 			tparam_functor="Function or class with operator()" \
 			tparam_output_collection="output collection, either a multi-geometry, or a std::vector<Geometry> / std::deque<Geometry> etc" \
 			tparam_geometry="Any type fulfilling a Geometry Concept" \
@@ -67,8 +66,10 @@ ALIASES                = qbk{1}="\xmlonly <qbk>\1</qbk> \endxmlonly" \
 			tparam_out{1}="A valid output iterator type, accepting geometries of \1 Concept" \
 			tparam_point="Any type fulfilling a Point Concept" \
 			tparam_range_point="Any type fulfilling a Range Concept where it range_value type fulfills the Point Concept" \
-			tparam_first_point="point type" \
+			tparam_first_point="first point type" \
+			tparam_first_box="first box type" \
 			tparam_second_point="second point type" \
+			tparam_second_box="second box type" \
 			tparam_segment_point="segment point type" \
 			tparam_strategy{1}="Any type fulfilling a \1 Strategy Concept" \
 			tparam_strategy_overlay="Compound strategy for segment intersection" \
@@ -176,9 +177,14 @@ WARN_LOGFILE           =
 INPUT                  = . .. ../../../../boost/geometry/core \
 			../../../../boost/geometry/algorithms \
 			../../../../boost/geometry/algorithms/detail \
-			../../../../boost/geometry/algorithms/detail/overlay \
+			../../../../boost/geometry/algorithms/detail/disjoint \
+			../../../../boost/geometry/algorithms/detail/distance \
 			../../../../boost/geometry/algorithms/detail/equals \
+			../../../../boost/geometry/algorithms/detail/overlay \
+			../../../../boost/geometry/algorithms/detail/relate \
 			../../../../boost/geometry/algorithms/detail/sections \
+			../../../../boost/geometry/algorithms/detail/turns \
+			../../../../boost/geometry/algorithms/detail/within \
 			../../../../boost/geometry/arithmetic \
 			../../../../boost/geometry/geometries/concepts \
 			../../../../boost/geometry/geometries \
@@ -233,7 +239,7 @@ FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
 #---------------------------------------------------------------------------
-SOURCE_BROWSER         = YES
+SOURCE_BROWSER         = NO
 INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 REFERENCED_BY_RELATION = NO
@@ -250,7 +256,7 @@ IGNORE_PREFIX          =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = html
+HTML_OUTPUT            = html_by_doxygen
 HTML_FILE_EXTENSION    = .html
 HTML_HEADER            = doxygen_input/ggl_doxygen_header.html
 HTML_FOOTER            = doxygen_input/ggl_doxygen_footer.html
diff --git a/doc/doxy/doxygen_input/groups/groups.hpp b/doc/doxy/doxygen_input/groups/groups.hpp
index 6128a44e8..cb6cc3337 100644
--- a/doc/doxy/doxygen_input/groups/groups.hpp
+++ b/doc/doxy/doxygen_input/groups/groups.hpp
@@ -24,6 +24,7 @@
 \defgroup core core: meta-functions for geometry types
 \defgroup correct correct: correct geometries
 \defgroup covered_by covered_by: detect if a geometry is inside or on the border of another geometry, a.o. point-in-polygon (border included)
+\defgroup crosses crosses: detect if two geometries crosses each other
 \defgroup cs coordinate systems
 \defgroup difference difference: difference of two geometries
 \defgroup disjoint disjoint: detect if geometries are not spatially related
diff --git a/doc/doxy/doxygen_output/html/doxygen.css b/doc/doxy/doxygen_output/html/doxygen.css
deleted file mode 100644
index 4f78a1bf0..000000000
--- a/doc/doxy/doxygen_output/html/doxygen.css
+++ /dev/null
@@ -1,1184 +0,0 @@
-/* The standard CSS for doxygen 1.8.3.1-20130324 */
-
-body, table, div, p, dl {
-	font: 400 14px/19px Roboto,sans-serif;
-}
-
-/* @group Heading Levels */
-
-h1.groupheader {
-	font-size: 150%;
-}
-
-.title {
-	font-size: 150%;
-	font-weight: bold;
-	margin: 10px 2px;
-}
-
-h2.groupheader {
-	border-bottom: 1px solid #879ECB;
-	color: #354C7B;
-	font-size: 150%;
-	font-weight: normal;
-	margin-top: 1.75em;
-	padding-top: 8px;
-	padding-bottom: 4px;
-	width: 100%;
-}
-
-h3.groupheader {
-	font-size: 100%;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	-webkit-transition: text-shadow 0.5s linear;
-	-moz-transition: text-shadow 0.5s linear;
-	-ms-transition: text-shadow 0.5s linear;
-	-o-transition: text-shadow 0.5s linear;
-	transition: text-shadow 0.5s linear;
-	margin-right: 15px;
-}
-
-h1.glow, h2.glow, h3.glow, h4.glow, h5.glow, h6.glow {
-	text-shadow: 0 0 15px cyan;
-}
-
-dt {
-	font-weight: bold;
-}
-
-div.multicol {
-	-moz-column-gap: 1em;
-	-webkit-column-gap: 1em;
-	-moz-column-count: 3;
-	-webkit-column-count: 3;
-}
-
-p.startli, p.startdd, p.starttd {
-	margin-top: 2px;
-}
-
-p.endli {
-	margin-bottom: 0px;
-}
-
-p.enddd {
-	margin-bottom: 4px;
-}
-
-p.endtd {
-	margin-bottom: 2px;
-}
-
-/* @end */
-
-caption {
-	font-weight: bold;
-}
-
-span.legend {
-        font-size: 70%;
-        text-align: center;
-}
-
-h3.version {
-        font-size: 90%;
-        text-align: center;
-}
-
-div.qindex, div.navtab{
-	background-color: #EBEFF6;
-	border: 1px solid #A3B4D7;
-	text-align: center;
-}
-
-div.qindex, div.navpath {
-	width: 100%;
-	line-height: 140%;
-}
-
-div.navtab {
-	margin-right: 15px;
-}
-
-/* @group Link Styling */
-
-a {
-	color: #3D578C;
-	font-weight: normal;
-	text-decoration: none;
-}
-
-.contents a:visited {
-	color: #4665A2;
-}
-
-a:hover {
-	text-decoration: underline;
-}
-
-a.qindex {
-	font-weight: bold;
-}
-
-a.qindexHL {
-	font-weight: bold;
-	background-color: #9CAFD4;
-	color: #ffffff;
-	border: 1px double #869DCA;
-}
-
-.contents a.qindexHL:visited {
-        color: #ffffff;
-}
-
-a.el {
-	font-weight: bold;
-}
-
-a.elRef {
-}
-
-a.code, a.code:visited {
-	color: #4665A2; 
-}
-
-a.codeRef, a.codeRef:visited {
-	color: #4665A2; 
-}
-
-/* @end */
-
-dl.el {
-	margin-left: -1cm;
-}
-
-pre.fragment {
-        border: 1px solid #C4CFE5;
-        background-color: #FBFCFD;
-        padding: 4px 6px;
-        margin: 4px 8px 4px 2px;
-        overflow: auto;
-        word-wrap: break-word;
-        font-size:  9pt;
-        line-height: 125%;
-        font-family: monospace, fixed;
-        font-size: 105%;
-}
-
-div.fragment {
-        padding: 4px;
-        margin: 4px;
-	background-color: #FBFCFD;
-	border: 1px solid #C4CFE5;
-}
-
-div.line {
-	font-family: monospace, fixed;
-        font-size: 13px;
-	min-height: 13px;
-	line-height: 1.0;
-	text-wrap: unrestricted;
-	white-space: -moz-pre-wrap; /* Moz */
-	white-space: -pre-wrap;     /* Opera 4-6 */
-	white-space: -o-pre-wrap;   /* Opera 7 */
-	white-space: pre-wrap;      /* CSS3  */
-	word-wrap: break-word;      /* IE 5.5+ */
-	text-indent: -53px;
-	padding-left: 53px;
-	padding-bottom: 0px;
-	margin: 0px;
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-div.line.glow {
-	background-color: cyan;
-	box-shadow: 0 0 10px cyan;
-}
-
-
-span.lineno {
-	padding-right: 4px;
-	text-align: right;
-	border-right: 2px solid #0F0;
-	background-color: #E8E8E8;
-        white-space: pre;
-}
-span.lineno a {
-	background-color: #D8D8D8;
-}
-
-span.lineno a:hover {
-	background-color: #C8C8C8;
-}
-
-div.ah {
-	background-color: black;
-	font-weight: bold;
-	color: #ffffff;
-	margin-bottom: 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;
-	font-weight: bold;
-}
-
-div.groupText {
-	margin-left: 16px;
-	font-style: italic;
-}
-
-body {
-	background-color: white;
-	color: black;
-        margin: 0;
-}
-
-div.contents {
-	margin-top: 10px;
-	margin-left: 12px;
-	margin-right: 8px;
-}
-
-td.indexkey {
-	background-color: #EBEFF6;
-	font-weight: bold;
-	border: 1px solid #C4CFE5;
-	margin: 2px 0px 2px 0;
-	padding: 2px 10px;
-        white-space: nowrap;
-        vertical-align: top;
-}
-
-td.indexvalue {
-	background-color: #EBEFF6;
-	border: 1px solid #C4CFE5;
-	padding: 2px 10px;
-	margin: 2px 0px;
-}
-
-tr.memlist {
-	background-color: #EEF1F7;
-}
-
-p.formulaDsp {
-	text-align: center;
-}
-
-img.formulaDsp {
-	
-}
-
-img.formulaInl {
-	vertical-align: middle;
-}
-
-div.center {
-	text-align: center;
-        margin-top: 0px;
-        margin-bottom: 0px;
-        padding: 0px;
-}
-
-div.center img {
-	border: 0px;
-}
-
-address.footer {
-	text-align: right;
-	padding-right: 12px;
-}
-
-img.footer {
-	border: 0px;
-	vertical-align: middle;
-}
-
-/* @group Code Colorization */
-
-span.keyword {
-	color: #008000
-}
-
-span.keywordtype {
-	color: #604020
-}
-
-span.keywordflow {
-	color: #e08000
-}
-
-span.comment {
-	color: #800000
-}
-
-span.preprocessor {
-	color: #806020
-}
-
-span.stringliteral {
-	color: #002080
-}
-
-span.charliteral {
-	color: #008080
-}
-
-span.vhdldigit { 
-	color: #ff00ff 
-}
-
-span.vhdlchar { 
-	color: #000000 
-}
-
-span.vhdlkeyword { 
-	color: #700070 
-}
-
-span.vhdllogic { 
-	color: #ff0000 
-}
-
-blockquote {
-        background-color: #F7F8FB;
-        border-left: 2px solid #9CAFD4;
-        margin: 0 24px 0 4px;
-        padding: 0 12px 0 16px;
-}
-
-/* @end */
-
-/*
-.search {
-	color: #003399;
-	font-weight: bold;
-}
-
-form.search {
-	margin-bottom: 0px;
-	margin-top: 0px;
-}
-
-input.search {
-	font-size: 75%;
-	color: #000080;
-	font-weight: normal;
-	background-color: #e8eef2;
-}
-*/
-
-td.tiny {
-	font-size: 75%;
-}
-
-.dirtab {
-	padding: 4px;
-	border-collapse: collapse;
-	border: 1px solid #A3B4D7;
-}
-
-th.dirtab {
-	background: #EBEFF6;
-	font-weight: bold;
-}
-
-hr {
-	height: 0px;
-	border: none;
-	border-top: 1px solid #4A6AAA;
-}
-
-hr.footer {
-	height: 1px;
-}
-
-/* @group Member Descriptions */
-
-table.memberdecls {
-	border-spacing: 0px;
-	padding: 0px;
-}
-
-.memberdecls td, .fieldtable tr {
-	-webkit-transition-property: background-color, box-shadow;
-	-webkit-transition-duration: 0.5s;
-	-moz-transition-property: background-color, box-shadow;
-	-moz-transition-duration: 0.5s;
-	-ms-transition-property: background-color, box-shadow;
-	-ms-transition-duration: 0.5s;
-	-o-transition-property: background-color, box-shadow;
-	-o-transition-duration: 0.5s;
-	transition-property: background-color, box-shadow;
-	transition-duration: 0.5s;
-}
-
-.memberdecls td.glow, .fieldtable tr.glow {
-	background-color: cyan;
-	box-shadow: 0 0 15px cyan;
-}
-
-.mdescLeft, .mdescRight,
-.memItemLeft, .memItemRight,
-.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
-	background-color: #F9FAFC;
-	border: none;
-	margin: 4px;
-	padding: 1px 0 0 8px;
-}
-
-.mdescLeft, .mdescRight {
-	padding: 0px 8px 4px 8px;
-	color: #555;
-}
-
-.memSeparator {
-        border-bottom: 1px solid #DEE4F0;
-        line-height: 1px;
-        margin: 0px;
-        padding: 0px;
-}
-
-.memItemLeft, .memTemplItemLeft {
-        white-space: nowrap;
-}
-
-.memItemRight {
-	width: 100%;
-}
-
-.memTemplParams {
-	color: #4665A2;
-        white-space: nowrap;
-	font-size: 80%;
-}
-
-/* @end */
-
-/* @group Member Details */
-
-/* Styles for detailed member documentation */
-
-.memtemplate {
-	font-size: 80%;
-	color: #4665A2;
-	font-weight: normal;
-	margin-left: 9px;
-}
-
-.memnav {
-	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;
-        -webkit-transition: box-shadow 0.5s linear;
-        -moz-transition: box-shadow 0.5s linear;
-        -ms-transition: box-shadow 0.5s linear;
-        -o-transition: box-shadow 0.5s linear;
-        transition: box-shadow 0.5s linear;
-        display: table !important;
-        width: 100%;
-}
-
-.memitem.glow {
-         box-shadow: 0 0 15px cyan;
-}
-
-.memname {
-        font-weight: bold;
-        margin-left: 6px;
-}
-
-.memname td {
-	vertical-align: bottom;
-}
-
-.memproto, dl.reflist dt {
-        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);
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        /* opera specific markup */
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        /* firefox specific markup */
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        -moz-border-radius-topright: 4px;
-        -moz-border-radius-topleft: 4px;
-        /* webkit specific markup */
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        -webkit-border-top-right-radius: 4px;
-        -webkit-border-top-left-radius: 4px;
-
-}
-
-.memdoc, dl.reflist dd {
-        border-bottom: 1px solid #A8B8D9;      
-        border-left: 1px solid #A8B8D9;      
-        border-right: 1px solid #A8B8D9; 
-        padding: 6px 10px 2px 10px;
-        background-color: #FBFCFD;
-        border-top-width: 0;
-        background-image:url('nav_g.png');
-        background-repeat:repeat-x;
-        background-color: #FFFFFF;
-        /* opera specific markup */
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-        /* firefox specific markup */
-        -moz-border-radius-bottomleft: 4px;
-        -moz-border-radius-bottomright: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
-        /* webkit specific markup */
-        -webkit-border-bottom-left-radius: 4px;
-        -webkit-border-bottom-right-radius: 4px;
-        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
-}
-
-dl.reflist dt {
-        padding: 5px;
-}
-
-dl.reflist dd {
-        margin: 0px 0px 10px 0px;
-        padding: 5px;
-}
-
-.paramkey {
-	text-align: right;
-}
-
-.paramtype {
-	white-space: nowrap;
-}
-
-.paramname {
-	color: #602020;
-	white-space: nowrap;
-}
-.paramname em {
-	font-style: normal;
-}
-.paramname code {
-        line-height: 14px;
-}
-
-.params, .retval, .exception, .tparams {
-        margin-left: 0px;
-        padding-left: 0px;
-}       
-
-.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;
-}
-
-table.mlabels {
-	border-spacing: 0px;
-}
-
-td.mlabels-left {
-	width: 100%;
-	padding: 0px;
-}
-
-td.mlabels-right {
-	vertical-align: bottom;
-	padding: 0px;
-	white-space: nowrap;
-}
-
-span.mlabels {
-        margin-left: 8px;
-}
-
-span.mlabel {
-        background-color: #728DC1;
-        border-top:1px solid #5373B4;
-        border-left:1px solid #5373B4;
-        border-right:1px solid #C4CFE5;
-        border-bottom:1px solid #C4CFE5;
-	text-shadow: none;
-	color: white;
-	margin-right: 4px;
-	padding: 2px 3px;
-	border-radius: 3px;
-	font-size: 7pt;
-	white-space: nowrap;
-	vertical-align: middle;
-}
-
-
-
-/* @end */
-
-/* these are for tree view when not used as main index */
-
-div.directory {
-        margin: 10px 0px;
-        border-top: 1px solid #A8B8D9;
-        border-bottom: 1px solid #A8B8D9;
-        width: 100%;
-}
-
-.directory table {
-        border-collapse:collapse;
-}
-
-.directory td {
-        margin: 0px;
-        padding: 0px;
-	vertical-align: top;
-}
-
-.directory td.entry {
-        white-space: nowrap;
-        padding-right: 6px;
-}
-
-.directory td.entry a {
-        outline:none;
-}
-
-.directory td.entry a img {
-        border: none;
-}
-
-.directory td.desc {
-        width: 100%;
-        padding-left: 6px;
-	padding-right: 6px;
-	padding-top: 3px;
-	border-left: 1px solid rgba(0,0,0,0.05);
-}
-
-.directory tr.even {
-	padding-left: 6px;
-	background-color: #F7F8FB;
-}
-
-.directory img {
-	vertical-align: -30%;
-}
-
-.directory .levels {
-        white-space: nowrap;
-        width: 100%;
-        text-align: right;
-        font-size: 9pt;
-}
-
-.directory .levels span {
-        cursor: pointer;
-        padding-left: 2px;
-        padding-right: 2px;
-	color: #3D578C;
-}
-
-div.dynheader {
-        margin-top: 8px;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-address {
-	font-style: normal;
-	color: #2A3D61;
-}
-
-table.doxtable {
-	border-collapse:collapse;
-        margin-top: 4px;
-        margin-bottom: 4px;
-}
-
-table.doxtable td, table.doxtable th {
-	border: 1px solid #2D4068;
-	padding: 3px 7px 2px;
-}
-
-table.doxtable th {
-	background-color: #374F7F;
-	color: #FFFFFF;
-	font-size: 110%;
-	padding-bottom: 4px;
-	padding-top: 5px;
-}
-
-table.fieldtable {
-        /*width: 100%;*/
-        margin-bottom: 10px;
-        border: 1px solid #A8B8D9;
-        border-spacing: 0px;
-        -moz-border-radius: 4px;
-        -webkit-border-radius: 4px;
-        border-radius: 4px;
-        -moz-box-shadow: rgba(0, 0, 0, 0.15) 2px 2px 2px;
-        -webkit-box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-        box-shadow: 2px 2px 2px rgba(0, 0, 0, 0.15);
-}
-
-.fieldtable td, .fieldtable th {
-        padding: 3px 7px 2px;
-}
-
-.fieldtable td.fieldtype, .fieldtable td.fieldname {
-        white-space: nowrap;
-        border-right: 1px solid #A8B8D9;
-        border-bottom: 1px solid #A8B8D9;
-        vertical-align: top;
-}
-
-.fieldtable td.fieldname {
-        padding-top: 3px;
-}
-
-.fieldtable td.fielddoc {
-        border-bottom: 1px solid #A8B8D9;
-        /*width: 100%;*/
-}
-
-.fieldtable td.fielddoc p:first-child {
-        margin-top: 0px;
-}       
-        
-.fieldtable td.fielddoc p:last-child {
-        margin-bottom: 2px;
-}
-
-.fieldtable tr:last-child td {
-        border-bottom: none;
-}
-
-.fieldtable th {
-        background-image:url('nav_f.png');
-        background-repeat:repeat-x;
-        background-color: #E2E8F2;
-        font-size: 90%;
-        color: #253555;
-        padding-bottom: 4px;
-        padding-top: 5px;
-        text-align:left;
-        -moz-border-radius-topleft: 4px;
-        -moz-border-radius-topright: 4px;
-        -webkit-border-top-left-radius: 4px;
-        -webkit-border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        border-bottom: 1px solid #A8B8D9;
-}
-
-
-.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;
-	background-position: 0 -5px;
-	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;
-	color: #283A5D;
-	font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-	text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9);
-	text-decoration: 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;
-	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 */
-dl.section
-{
-	margin-left: 0px;
-	padding-left: 0px;
-}
-
-dl.note
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #D0C000;
-}
-
-dl.warning, dl.attention
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #FF0000;
-}
-
-dl.pre, dl.post, dl.invariant
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00D000;
-}
-
-dl.deprecated
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #505050;
-}
-
-dl.todo
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #00C0E0;
-}
-
-dl.test
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #3030E0;
-}
-
-dl.bug
-{
-        margin-left:-7px;
-        padding-left: 3px;
-        border-left:4px solid;
-        border-color: #C08050;
-}
-
-dl.section dd {
-	margin-bottom: 6px;
-}
-
-
-#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;
-}
-
-div.zoom
-{
-	border: 1px solid #90A5CE;
-}
-
-dl.citelist {
-        margin-bottom:50px;
-}
-
-dl.citelist dt {
-        color:#334975;
-        float:left;
-        font-weight:bold;
-        margin-right:10px;
-        padding:5px;
-}
-
-dl.citelist dd {
-        margin:2px 0;
-        padding:5px 0;
-}
-
-div.toc {
-        padding: 14px 25px;
-        background-color: #F4F6FA;
-        border: 1px solid #D8DFEE;
-        border-radius: 7px 7px 7px 7px;
-        float: right;
-        height: auto;
-        margin: 0 20px 10px 10px;
-        width: 200px;
-}
-
-div.toc li {
-        background: url("bdwn.png") no-repeat scroll 0 5px transparent;
-        font: 10px/1.2 Verdana,DejaVu Sans,Geneva,sans-serif;
-        margin-top: 5px;
-        padding-left: 10px;
-        padding-top: 2px;
-}
-
-div.toc h3 {
-        font: bold 12px/1.2 Arial,FreeSans,sans-serif;
-	color: #4665A2;
-        border-bottom: 0 none;
-        margin: 0;
-}
-
-div.toc ul {
-        list-style: none outside none;
-        border: medium none;
-        padding: 0px;
-}       
-
-div.toc li.level1 {
-        margin-left: 0px;
-}
-
-div.toc li.level2 {
-        margin-left: 15px;
-}
-
-div.toc li.level3 {
-        margin-left: 30px;
-}
-
-div.toc li.level4 {
-        margin-left: 45px;
-}
-
-.inherit_header {
-        font-weight: bold;
-        color: gray;
-        cursor: pointer;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	-khtml-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-.inherit_header td {
-        padding: 6px 0px 2px 5px;
-}
-
-.inherit {
-        display: none;
-}
-
-tr.heading h2 {
-        margin-top: 12px;
-        margin-bottom: 4px;
-}
-
-@media print
-{
-  #top { display: none; }
-  #side-nav { display: none; }
-  #nav-path { display: none; }
-  body { overflow:visible; }
-  h1, h2, h3, h4, h5, h6 { page-break-after: avoid; }
-  .summary { display: none; }
-  .memitem { page-break-inside: avoid; }
-  #doc-content
-  {
-    margin-left:0 !important;
-    height:auto !important;
-    width:auto !important;
-    overflow:inherit;
-    display:inline;
-  }
-}
-
diff --git a/doc/doxy/doxygen_output/html/doxygen.png b/doc/doxy/doxygen_output/html/doxygen.png
deleted file mode 100644
index 3ff17d807..000000000
Binary files a/doc/doxy/doxygen_output/html/doxygen.png and /dev/null differ
diff --git a/doc/doxy/doxygen_output/html/tabs.css b/doc/doxy/doxygen_output/html/tabs.css
deleted file mode 100644
index 9cf578f23..000000000
--- a/doc/doxy/doxygen_output/html/tabs.css
+++ /dev/null
@@ -1,60 +0,0 @@
-.tabs, .tabs2, .tabs3 {
-    background-image: url('tab_b.png');
-    width: 100%;
-    z-index: 101;
-    font-size: 13px;
-    font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif;
-}
-
-.tabs2 {
-    font-size: 10px;
-}
-.tabs3 {
-    font-size: 9px;
-}
-
-.tablist {
-    margin: 0;
-    padding: 0;
-    display: table;
-}
-
-.tablist li {
-    float: left;
-    display: table-cell;
-    background-image: url('tab_b.png');
-    line-height: 36px;
-    list-style: 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;
-}
-
-.tabs3 .tablist a {
-    padding: 0 10px;
-}
-
-.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;
-}
-
-.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/generated/covered_by_status.qbk b/doc/generated/covered_by_status.qbk
deleted file mode 100644
index 2843670d5..000000000
--- a/doc/generated/covered_by_status.qbk
+++ /dev/null
@@ -1,13 +0,0 @@
-[heading Supported geometries]
-[table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Box][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-]
diff --git a/doc/generated/disjoint_status.qbk b/doc/generated/disjoint_status.qbk
deleted file mode 100644
index d7d9e977e..000000000
--- a/doc/generated/disjoint_status.qbk
+++ /dev/null
@@ -1,13 +0,0 @@
-[heading Supported geometries]
-[table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Segment][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Box][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Linestring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Ring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Polygon][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[MultiPoint][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[MultiLinestring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[MultiPolygon][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-]
diff --git a/doc/generated/overlaps_status.qbk b/doc/generated/overlaps_status.qbk
deleted file mode 100644
index 6caf4c90c..000000000
--- a/doc/generated/overlaps_status.qbk
+++ /dev/null
@@ -1,13 +0,0 @@
-[heading Supported geometries]
-[table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Ring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Polygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-]
diff --git a/doc/generated/within_status.qbk b/doc/generated/within_status.qbk
deleted file mode 100644
index 2843670d5..000000000
--- a/doc/generated/within_status.qbk
+++ /dev/null
@@ -1,13 +0,0 @@
-[heading Supported geometries]
-[table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Box][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-]
diff --git a/doc/geometry.qbk b/doc/geometry.qbk
index 72935105c..214636142 100644
--- a/doc/geometry.qbk
+++ b/doc/geometry.qbk
@@ -12,8 +12,8 @@
 
 [library Geometry
     [quickbook 1.5]
-    [authors [Gehrels, Barend], [Lalande, Bruno], [Loskot, Mateusz], [Wulkiewicz, Adam]]
-    [copyright 2009-2013 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam Wulkiewicz]
+    [authors [Gehrels, Barend], [Lalande, Bruno], [Loskot, Mateusz], [Wulkiewicz, Adam], [Karavelas, Menelaos]]
+    [copyright 2009-2014 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam Wulkiewicz, Oracle and/or its affiliates]
     [purpose Documentation of Boost.Geometry library]
     [license
         Distributed under the Boost Software License, Version 1.0.
@@ -113,6 +113,7 @@ Boost.Geometry contains contributions by:
 * Federico Fern\u00E1ndez (preliminary version of R-tree spatial index)
 * Karsten Ahnert (patch for cross-track distance)
 * Mats Taraldsvik (documentation: adapting a legacy model)
+* Samuel Debionne (variant support for distance, assign, crosses, intersection, ...)
 
 [include imports.qbk]
 
@@ -141,5 +142,6 @@ Boost.Geometry contains contributions by:
 
 [include release_notes.qbk]
 
+[/ TODO: [include guidelines.qbk] /]
 [include about_documentation.qbk]
 [include acknowledgments.qbk]
diff --git a/doc/guidelines.qbk b/doc/guidelines.qbk
new file mode 100644
index 000000000..e2e3fd75a
--- /dev/null
+++ b/doc/guidelines.qbk
@@ -0,0 +1,232 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+
+  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)
+
+=============================================================================/]
+
+[section:guidelines Guidelines for developers]
+
+This library is maintained by several developers, and in order it to have
+a consistent design, look and feel, a few guidelines need to be followed.
+
+Rules of [@boost:/development/requirements.html Boost Library Requirements and Guidelines]
+and [@boost:/development/header.html Boost Header Policy] always have highest authority.
+
+Generally, prefer style of modern C++, conventions as used in latest C++ standard
+document and C++ Standard Library. Boost.Spirit is a good example of
+how to write and format high quality C++ code.
+
+Some guidelines specific to Boost.Geometry library are outlined below.
+
+[heading Code structure]
+
+* Every file shall have header with copyright and license information.
+* Do not put any history or revision information in comments in source files.
+  Log it with VCS used in the Boost project.
+* Every header shall have `#include` guard based on header path and file name:
+``
+#ifndef BOOST_GEOMETRY_<DIR1>_<DIR2>_<FILE>_HPP
+#define BOOST_GEOMETRY_<DIR1>_<DIR2>_<FILE>_HPP
+...
+#endif // BOOST_GEOMETRY_<DIR1>_<DIR2>_<FILE>_HPP
+``
+* `#include` directives shall be ordered according the most authoritative header:
+  * C Standard Library (using C++ library names, i.e. `<cstdlib>`)
+  * C++ Standard Library
+  * Boost C++ Libraries
+  * Boost.Geometry headers
+  * Other 3rd-party headers (only if applicable! in some samples only)
+* Header within these sections should be ordered alphabetically, especially if there are many of them included.
+* Namespaces don't increase the level of indentation.
+  In all other cases braces increase the level of indentation.
+``
+namespace boost { namespace geometry
+{
+
+namespace mynewspace
+{
+
+template <typename Point>
+struct my_new_model
+{
+   typedef point_type;
+}
+
+} // namespace mynewspace
+
+}} // namespace boost::geometry
+``
+* Namespace closing brace should have comment with the namespace name.
+* All non-public headers should be placed into `boost/geometry/detail` or
+  `boost/geometry/*/detail` directory, depending on component level.
+* All non-public names should reside in the `boost::geometry::detail` or
+ `boost::geometry::*::detail` namespace, depending on component level.
+* All traits should be placed in dedicated `boost::geometry::traits` or
+ `boost::geometry::*::traits` namespace
+* All tag dispatching routines should be placed in dedicated
+  `boost::geometry::*::dispatch` namespace.
+* Access specifiers for class members shall be orderd as public first, then protected and private at the bottom.
+  The public members define class interface, thus they are of the highest interested for users, so show them first.
+  * Exceptions to this rule are allowed for typedef aliases required to be defined first.
+
+[heading Code formatting and indentation]
+
+* The code is indented with spaces, 4 spaces per tab.
+* The preferred line length is 80 characters, with maximum length of 100.
+  * The limit is relaxed for very long string literals (e.g. Well-Known Text with data used in tests and examples).
+* Member/base initialization list for constructors on the same line,
+  if it's small (1-2 members) or 1 member/base per line with leading comma on the left:
+```
+struct T
+{
+    T(int a, int b)
+    : a(a)
+    , b(b)
+    {}
+
+    int a;
+    int b;
+};
+```
+* Template declaration with long template parameter list shall be formatted
+  with one template parameter per line, all parameters indented,
+  but `<` and `>` brackets not indented:
+```
+template
+<
+    typename T,
+    typename P,
+    typename C = std::vector<Point>
+>
+struct polygon
+{
+    typedef typename boost::remove_const
+    <
+        typename traits::point_type<T>::type
+    >::type type
+};
+```
+* References and pointers should be formatted emphasizing type, not syntax:
+```
+T const& t;
+T* t;
+T* const t;
+T const* t;
+T const* const t;
+```
+* Braces enclosing block of code (if-else, loops) should be placed in separate lines
+```
+if (expr)
+{
+}
+```
+* Parentheses around expressions should not be pre/post-fixed with spaces.
+
+[heading Naming conventions]
+
+* All names follow style of the C++ Standard, lowercase with words separated with underscore `_`,
+  unless otherwise specified (see other rules).
+* Template parameters are named in CamelCase.
+* Concepts are named in CamelCase.
+* Name of a class data member shall start with `m_` prefix.
+  The Boost sample header gives no prefix or suffix at all.
+  However, the `m_` prefix is used in some (not many) Boost libraries as well (e.g. math/tools/remez).
+* All macro names shall be in upper-case, words separated with underscore `_`.
+* All macro names shall start with `BOOST_GEOMETRY_`.
+* All non-public macro names should start with `BOOST_GEOMETRY_DETAIL_` (not used often yet, if at all).
+* All public names should reside in the `boost::geometry` namespace.
+  Nested namespaces are also possible.
+* Avoid cryptic names and abbreviations for elements used in wider context (e.g. types, functions).
+  Short names are allowed if context of use is local, narrow and easily tracable
+  For example, use of `it` for `iterator` in body of a loop in function:
+```
+template <typename Range, typename Functor>
+static inline void apply(Range& range, Functor& f)
+{
+    for (typename boost::range_iterator<Range>::type it = boost::begin(range);
+         it != boost::end(range); ++it)
+    {
+        f(*it);
+    }
+}
+```
+
+[heading C++ use conventions]
+
+* Keyword struct is preferred either for POD structures, or for classes used at compile-time
+  like metafunctions, tags, traits, etc.
+* Keyword class is preferred for classes meant to produce actual objects, which have methods
+  and an active role in the runtime functioning of the program.
+* In case of a template, prefer use of typename keyword over class.
+
+[heading Specialisations and dispatching conventions]
+
+* Algorithms are free inline functions, taking any geometry. Parameters are often one or two geometries
+* There might be an overload for a strategy. The strategy takes, a.o. care of coordinate systems
+* The free `inline` function forwards to a dispatch struct, specialized for the geometry type (so for point, polygon, etc.)
+* They have an `static` (`inline`) function called apply
+* The dispatch struct calls, or is derived from, an struct implemented in namespace detail
+* There the same: a `struct` with a `static` (`inline`) function called apply
+* This way the implementation structs are building blocks, they can be reused
+* In fact they are reused often by the multi-versions of the algorithms
+
+```
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace foo 
+{
+
+template <typename Point>
+struct foo_point
+{
+    // template parameters here
+    static inline int apply(Point const& p) 
+    { 
+        // do something here
+        return 1; 
+    }
+};
+
+}} // namespace detail::foo
+
+namespace dispatch 
+{
+
+template
+<
+    Geometry,
+    Tag = typename geometry::tag<Geometry>::type
+>
+struct foo
+{
+};
+
+// Specialization for POINT
+...
+
+} // namespace dispatch
+
+template <typename Point>
+inline int foo(Point const& point)
+{
+    return dispatch<Point>::apply(point);
+}
+
+}} // namespace boost::geometry
+```
+
+[heading Contributing code]
+
+* Create a patch, open a ticket in the Boost Trac with your patch attached.
+* Alternatively, post your patch to the Boost.Geometry mailing list.
+* If you contribute a code, always try to provide a minimal test for it.
+
+[endsect]
diff --git a/doc/html/img/index/rtree/knn_box_box.png b/doc/html/img/index/rtree/knn_box_box.png
new file mode 100644
index 000000000..6f70f884d
Binary files /dev/null and b/doc/html/img/index/rtree/knn_box_box.png differ
diff --git a/doc/html/img/index/rtree/knn_pt_box.png b/doc/html/img/index/rtree/knn_pt_box.png
new file mode 100644
index 000000000..af9c14874
Binary files /dev/null and b/doc/html/img/index/rtree/knn_pt_box.png differ
diff --git a/doc/html/img/index/rtree/knn_seg_box.png b/doc/html/img/index/rtree/knn_seg_box.png
new file mode 100644
index 000000000..13288d1ac
Binary files /dev/null and b/doc/html/img/index/rtree/knn_seg_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt.png b/doc/html/img/index/rtree/rtree_pt.png
new file mode 100644
index 000000000..8c3f5807e
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt_disjoint_box.png b/doc/html/img/index/rtree/rtree_pt_disjoint_box.png
new file mode 100644
index 000000000..e82275f1a
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt_disjoint_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt_intersects_box.png b/doc/html/img/index/rtree/rtree_pt_intersects_box.png
new file mode 100644
index 000000000..46baf009b
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt_intersects_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt_knn_box.png b/doc/html/img/index/rtree/rtree_pt_knn_box.png
new file mode 100644
index 000000000..237de694c
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt_knn_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt_knn_pt.png b/doc/html/img/index/rtree/rtree_pt_knn_pt.png
new file mode 100644
index 000000000..55d0a2d38
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt_knn_pt.png differ
diff --git a/doc/html/img/index/rtree/rtree_pt_knn_seg.png b/doc/html/img/index/rtree/rtree_pt_knn_seg.png
new file mode 100644
index 000000000..fc3e13811
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_pt_knn_seg.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg.png b/doc/html/img/index/rtree/rtree_seg.png
new file mode 100644
index 000000000..080433318
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg_disjoint_box.png b/doc/html/img/index/rtree/rtree_seg_disjoint_box.png
new file mode 100644
index 000000000..72cc1e71a
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg_disjoint_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg_intersects_box.png b/doc/html/img/index/rtree/rtree_seg_intersects_box.png
new file mode 100644
index 000000000..b6135eeda
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg_intersects_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg_knn_box.png b/doc/html/img/index/rtree/rtree_seg_knn_box.png
new file mode 100644
index 000000000..251117688
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg_knn_box.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg_knn_pt.png b/doc/html/img/index/rtree/rtree_seg_knn_pt.png
new file mode 100644
index 000000000..8def78502
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg_knn_pt.png differ
diff --git a/doc/html/img/index/rtree/rtree_seg_knn_seg.png b/doc/html/img/index/rtree/rtree_seg_knn_seg.png
new file mode 100644
index 000000000..68891d685
Binary files /dev/null and b/doc/html/img/index/rtree/rtree_seg_knn_seg.png differ
diff --git a/doc/html/index.html b/doc/html/index.html
index 5699ea120..9719e84fa 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -34,7 +34,11 @@
 <div><div class="author"><h3 class="author">
 <span class="firstname">Adam</span> <span class="surname">Wulkiewicz</span>
 </h3></div></div>
-<div><p class="copyright">Copyright &#169; 2009-2013 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam Wulkiewicz</p></div>
+<div><div class="author"><h3 class="author">
+<span class="firstname">Menelaos</span> <span class="surname">Karavelas</span>
+</h3></div></div>
+<div><p class="copyright">Copyright &#169; 2009-2014 Barend Gehrels, Bruno Lalande, Mateusz Loskot, Adam
+      Wulkiewicz, Oracle and/or its affiliates</p></div>
 <div><div class="legalnotice">
 <a name="geometry.legal"></a><p>
         Distributed under the Boost Software License, Version 1.0. (See accompanying
@@ -123,7 +127,7 @@
 </ul></div>
 </div>
 <table xmlns:rev="http://www.cs.rpi.edu/~gregod/boost/tools/doc/revision" width="100%"><tr>
-<td align="left"><p><small>Last revised: June 23, 2013 at 18:26:39 GMT</small></p></td>
+<td align="left"><p><small>Last revised: May 07, 2014 at 10:12:25 GMT</small></p></td>
 <td align="right"><div class="copyright-footer"></div></td>
 </tr></table>
 <hr>
diff --git a/doc/imports.qbk b/doc/imports.qbk
index 8ef073ab1..3d4706f2e 100644
--- a/doc/imports.qbk
+++ b/doc/imports.qbk
@@ -105,6 +105,8 @@
 [import src/examples/geometries/register/multi_polygon.cpp]
 
 [import src/examples/io/svg.cpp]
+[import src/examples/io/wkt.cpp]
+[import src/examples/io/read_wkt.cpp]
 
 [import src/examples/views/box_view.cpp]
 [import src/examples/views/segment_view.cpp]
diff --git a/doc/index/generated/dummy b/doc/index/generated/dummy
new file mode 100644
index 000000000..6da9b3dcb
--- /dev/null
+++ b/doc/index/generated/dummy
@@ -0,0 +1 @@
+This file is here because GIT doesn't handle empty directories
diff --git a/doc/index/imports.qbk b/doc/index/imports.qbk
index 5d81a7639..45a613f75 100644
--- a/doc/index/imports.qbk
+++ b/doc/index/imports.qbk
@@ -15,3 +15,4 @@
 [import src/examples/rtree/value_shared_ptr.cpp]
 [import src/examples/rtree/value_index.cpp]
 [import src/examples/rtree/interprocess.cpp]
+[import src/examples/rtree/mapped_file.cpp]
diff --git a/doc/index/introduction.qbk b/doc/index/introduction.qbk
index cb7bcf1d3..8e20ff903 100644
--- a/doc/index/introduction.qbk
+++ b/doc/index/introduction.qbk
@@ -51,7 +51,7 @@ The examples of structures of trees created by use of different algorithms and e
 [table
 [[]                         [Linear algorithm] [Quadratic algorithm] [R*-tree] [Packing algorithm]]
 [[*Example structure*]      [[$img/index/rtree/linear.png]] [[$img/index/rtree/quadratic.png]] [[$img/index/rtree/rstar.png]] [[$img/index/rtree/bulk.png]]]
-[[*1M Values inserts*]      [1.76s] [2.47s] [6.19s] [1.67s]]
+[[*1M Values inserts*]      [1.76s] [2.47s] [6.19s] [0.64s]]
 [[*100k spatial queries*]   [2.21s] [0.51s] [0.12s] [0.07s]]
 [[*100k knn queries*]       [6.37s] [2.09s] [0.64s] [0.52s]]
 ]
diff --git a/doc/index/make_qbk.py b/doc/index/make_qbk.py
index 9185f3f10..bff630488 100755
--- a/doc/index/make_qbk.py
+++ b/doc/index/make_qbk.py
@@ -17,23 +17,34 @@ cmd = cmd + " --start_include boost/"
 cmd = cmd + " --output_style alt"
 cmd = cmd + " > generated/%s.qbk"
 
-os.system("doxygen Doxyfile")
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "rtree"))
-os.system(cmd % ("group__rtree__functions", "rtree_functions"))
+def run_command(command):
+    if os.system(command) != 0:
+        raise Exception("Error running %s" % command)
 
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1linear", "rtree_linear"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1quadratic", "rtree_quadratic"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1rstar", "rtree_rstar"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__linear", "rtree_dynamic_linear"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__quadratic", "rtree_dynamic_quadratic"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__rstar", "rtree_dynamic_rstar"))
+def remove_all_files(dir):
+    if os.path.exists(dir):
+        for f in os.listdir(dir):
+            os.remove(dir+f)
 
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1indexable", "indexable"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1equal__to", "equal_to"))
+remove_all_files("xml/")
 
-os.system(cmd % ("group__predicates", "predicates"))
-#os.system(cmd % ("group__nearest__relations", "nearest_relations"))
-os.system(cmd % ("group__adaptors", "adaptors"))
-os.system(cmd % ("group__inserters", "inserters"))
+run_command("doxygen Doxyfile")
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "rtree"))
+run_command(cmd % ("group__rtree__functions", "rtree_functions"))
 
-#os.system("b2")
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1linear", "rtree_linear"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1quadratic", "rtree_quadratic"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1rstar", "rtree_rstar"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__linear", "rtree_dynamic_linear"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__quadratic", "rtree_dynamic_quadratic"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__rstar", "rtree_dynamic_rstar"))
+
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1indexable", "indexable"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1equal__to", "equal_to"))
+
+run_command(cmd % ("group__predicates", "predicates"))
+#run_command(cmd % ("group__nearest__relations", "nearest_relations"))
+run_command(cmd % ("group__adaptors", "adaptors"))
+run_command(cmd % ("group__inserters", "inserters"))
+
+#run_command("b2")
diff --git a/doc/index/rtree/creation.qbk b/doc/index/rtree/creation.qbk
index 0cb5d998b..6ea609b08 100644
--- a/doc/index/rtree/creation.qbk
+++ b/doc/index/rtree/creation.qbk
@@ -30,13 +30,20 @@ __rtree__ has 5 parameters but only 2 are required:
 
 __rtree__ may store `__value__`s of any type as long as passed function objects know how to interpret those `__value__`s, that is
 extract an `__indexable__` that the __rtree__ can handle and compare `__value__`s.
+The `__indexable__` is a type adapted to Point, Box or Segment concept.
+The examples of rtrees storing `__value__`s translatable to various `__indexable__`s are presented below.
+
+[table
+[[rtree<Point, ...>] [rtree<Box, ...>] [rtree<Segment, ...>]]
+[[[$img/index/rtree/rtree_pt.png]] [[$img/index/rtree/rstar.png]] [[$img/index/rtree/rtree_seg.png]]]
+]
 
 By default function objects `index::indexable<Value>` and `index::equal_to<Value>` are defined for some typically used `__value__`
 types which may be stored without defining any additional classes. By default the rtree may store pure `__indexable__`s, pairs
 and tuples. In the case of those two collection types, the `__indexable__` must be the first stored type.
 
-* `__indexable__ = __point__ | __box__`
-* `__value__ = Indexable | std::pair<__indexable__, T> | tuple<__indexable__, ...>`
+* `__indexable__ = __point__ | __box__ | Segment`
+* `__value__ = Indexable | std::pair<__indexable__, T> | boost::tuple<__indexable__, ...> [ | std::tuple<__indexable__, ...> ]`
 
 By default `boost::tuple<...>` is supported on all compilers. If the compiler supports C++11 tuples and variadic templates
 then `std::tuple<...>` may be used "out of the box" as well.
@@ -46,6 +53,7 @@ Examples of default `__value__` types:
  geometry::model::point<...>
  geometry::model::point_xy<...>
  geometry::model::box<...>
+ geometry::model::segment<...>
  std::pair<geometry::model::box<...>, unsigned>
  boost::tuple<geometry::model::point<...>, int, float>
 
@@ -55,7 +63,7 @@ The predefined `index::indexable<Value>` returns const reference to the `__index
 
 The predefined `index::equal_to<Value>`:
 
-* for `__point__` and `__box__` - compares `__value__`s with geometry::equals().
+* for `__point__`, `__box__` and `Segment` - compares `__value__`s with geometry::equals().
 * for `std::pair<...>` - compares both components of the `__value__`. The first value stored in the pair is compared before the second one.
   If the value stored in the pair is a Geometry, `geometry::equals()` is used. For other types it uses `operator==()`.
 * for `tuple<...>` - compares all components of the `__value__`. If the component is a `Geometry`, `geometry::equals()`
diff --git a/doc/index/rtree/examples.qbk b/doc/index/rtree/examples.qbk
index 8b57bde7e..24d54d466 100644
--- a/doc/index/rtree/examples.qbk
+++ b/doc/index/rtree/examples.qbk
@@ -12,30 +12,51 @@
 
 [section Quick start]
 [rtree_quickstart]
+[h4 Expected results]
+[include ../src/examples/rtree/quick_start_results.qbk]
 [endsect]
 
 [section Index of polygons stored in vector]
 [rtree_polygons_vector]
+[h4 Expected results]
+[include ../src/examples/rtree/polygons_vector_results.qbk]
 [endsect]
 
 [section Index of shared pointers to polygons]
 [rtree_polygons_shared_ptr]
+[h4 Expected results]
+[include ../src/examples/rtree/polygons_shared_ptr_results.qbk]
 [endsect]
 
 [section Index of iterators of a map storing variant geometries]
 [rtree_variants_map]
+[h4 Expected results]
+[include ../src/examples/rtree/variants_map_results.qbk]
 [endsect]
 
 [section Specializing index::indexable function object - storing shared pointers in the rtree]
 [rtree_value_shared_ptr]
+[h4 Expected results]
+[include ../src/examples/rtree/value_shared_ptr_results.qbk]
 [endsect]
 
 [section Using IndexableGetter function object - storing indexes of external container's elements]
 [rtree_value_index]
+[h4 Expected results]
+[include ../src/examples/rtree/value_index_results.qbk]
 [endsect]
 
 [section Index stored in shared memory using Boost.Interprocess]
 [rtree_interprocess]
+[h4 Expected results]
+[include ../src/examples/rtree/interprocess_results.qbk]
 [endsect]
 
+[section Index stored in mapped file using Boost.Interprocess]
+[rtree_mapped_file]
+[h4 Expected results]
+[include ../src/examples/rtree/mapped_file_results.qbk]
+[endsect]
+
+
 [endsect]
diff --git a/doc/index/rtree/query.qbk b/doc/index/rtree/query.qbk
index 7f10db949..0cf80acc7 100644
--- a/doc/index/rtree/query.qbk
+++ b/doc/index/rtree/query.qbk
@@ -73,6 +73,11 @@ Examples of some basic queries may be found in the tables below. The query regio
 [[[$img/index/rtree/intersects_ring.png]] [[$img/index/rtree/intersects_poly.png]] [[$img/index/rtree/intersects_mpoly.png]] [[$img/index/rtree/intersects_segment.png]] [[$img/index/rtree/intersects_linestring.png]]]
 ]
 
+[table
+[[intersects(Box)] [disjoint(Box)] [intersects(Box)] [disjoint(Box)]]
+[[[$img/index/rtree/rtree_pt_intersects_box.png]] [[$img/index/rtree/rtree_pt_disjoint_box.png]] [[$img/index/rtree/rtree_seg_intersects_box.png]] [[$img/index/rtree/rtree_seg_disjoint_box.png]]]
+]
+
 Spatial predicates are generated by functions defined in `boost::geometry::index` namespace.
 
  rt.query(index::contains(box), std::back_inserter(result));
@@ -91,20 +96,39 @@ All spatial predicates may be negated, e.g.:
 
 [h4 Nearest neighbours queries]
 
-Nearest neighbours queries returns `__value__`s which are closest to some point in space.
-The example of knn query is presented below. 5 `__value__`s nearest to the point are orange.
+Nearest neighbours queries returns `__value__`s which are closest to some Geometry.
+The examples of k-NN queries are presented below. 5 `__value__`s nearest to the Geometry are orange.
 
-[$img/index/rtree/knn.png]
+[table
+[[nearest(Point, k)] [nearest(Box, k)] [nearest(Point, k)] [nearest(Box, k)]]
+[[[$img/index/rtree/knn_pt_box.png]] [[$img/index/rtree/knn_box_box.png]] [[$img/index/rtree/rtree_pt_knn_pt.png]] [[$img/index/rtree/rtree_pt_knn_box.png]]]
+]
+[table
+[[nearest(Segment, k)]
+ [nearest(Point, k)] [nearest(Box, k)] [nearest(Segment, k)]
+ [nearest(Segment, k)]]
+[[[$img/index/rtree/knn_seg_box.png]]
+ [[$img/index/rtree/rtree_seg_knn_pt.png]] [[$img/index/rtree/rtree_seg_knn_box.png]] [[$img/index/rtree/rtree_seg_knn_seg.png]]
+ [[$img/index/rtree/rtree_pt_knn_seg.png]]]
+]
 
 To perform the knn query one must pass the nearest predicate generated by the
 `nearest()` function defined in `boost::geometry::index` namespace.
-The following query returns `k` `__value__`s closest to some point in space.
-For non-point `__indexable__`s the shortest distance is calculated.
+For non-point `__indexable__`s the shortest distance is calculated using `bg::comparable_distance()` function.
+The following query returns `k` `__value__`s closest to some Point in space.
 
  std::vector<__value__> returned_values;
- __point__ pt(...);
+ __point__ pt(/*...*/);
  rt.query(bgi::nearest(pt, k), std::back_inserter(returned_values));
 
+The same way different query Geometries can be used:
+
+ __box__ box(/*...*/);
+ rt.query(bgi::nearest(box, k), std::back_inserter(returned_values));
+
+ Segment seg(/*...*/);
+ rt.query(bgi::nearest(seg, k), std::back_inserter(returned_values));
+
 [h4 User-defined unary predicate]
 
 The user may pass a `UnaryPredicate` - function, function object or lambda expression taking const reference to Value and returning bool.
@@ -173,10 +197,11 @@ Of course it's possible to connect different types of predicates together.
  BOOST_FOREACH(Value & v, rt | index::adaptors::queried(index::nearest(pt, k) && index::covered_by(b)))
    ; // do something with v
 
-[h4 Breaking or pausing the query]
+[h4 Iterative queries]
 
 The query performed using query iterators may be paused and resumed if needed, e.g. when the query takes too long,
-or stopped at some point, e.g when all interesting values were gathered.
+or may be stopped at some point, when all interesting values were gathered. The query iterator is returned by
+`qbegin()` member function which requires passing predicates, like `query()` member function.
 
  for ( Rtree::const_query_iterator it = tree.qbegin(bgi::nearest(pt, 10000)) ;
        it != tree.qend() ; ++it )
@@ -186,6 +211,10 @@ or stopped at some point, e.g when all interesting values were gathered.
          break;
  }
 
+[note In the case of iterative k-NN queries it's guaranteed to iterate over the closest `__value__`s first. ]
+
+[warning The modification of the `rtree`, e.g. insertion or removal of `__value__`s may invalidate the iterators. ]
+
 [h4 Inserting query results into the other R-tree]
 
 There are several ways of inserting Values returned by a query to the other R-tree container.
@@ -208,8 +237,8 @@ The insert iterator may be passed directly into the query.
  RTree rt3;
  rt1.query(bgi::intersects(Box(/*...*/))), bgi::inserter(rt3));
 
-If you like Boost.Range you'll appreciate the third option. You may pass the result Range directly into the
-constructor.
+If you're a user of Boost.Range you'll appreciate the third option. You may pass the result Range directly into the
+constructor or `insert()` member function.
 
  RTree rt4(rt1 | bgi::adaptors::queried(bgi::intersects(Box(/*...*/)))));
 
diff --git a/doc/index/src/examples/rtree/Jamfile.v2 b/doc/index/src/examples/rtree/Jamfile.v2
index 79778b9ab..f45b5cb30 100644
--- a/doc/index/src/examples/rtree/Jamfile.v2
+++ b/doc/index/src/examples/rtree/Jamfile.v2
@@ -17,9 +17,25 @@ exe interprocess : interprocess.cpp /boost/thread//boost_thread
         :
         <toolset>acc:<linkflags>-lrt
         <toolset>acc-pa_risc:<linkflags>-lrt
-        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
         <host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
+#        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        <toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32" 
+        <host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
         :
         <threading>multi
         :  # requirements
     ;
+
+exe mapped_file : mapped_file.cpp /boost/thread//boost_thread
+        :
+        <toolset>acc:<linkflags>-lrt
+        <toolset>acc-pa_risc:<linkflags>-lrt
+        <host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
+#        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        <toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32" 
+        <host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        :
+        <threading>multi
+        :  # requirements
+    ;
+
diff --git a/doc/index/src/examples/rtree/interprocess_results.qbk b/doc/index/src/examples/rtree/interprocess_results.qbk
new file mode 100644
index 000000000..897bd523c
--- /dev/null
+++ b/doc/index/src/examples/rtree/interprocess_results.qbk
@@ -0,0 +1,24 @@
+ Parent: Constructing container
+ Parent: Filling container with 100 boxes
+ Parent: Tree content
+ [(0, 0)(99.5, 99.5)]
+ Parent: Running child process
+ Child: Searching of the container in shared memory
+ Child: Querying for objects intersecting box = [(45, 45)(55, 55)]
+ Child: Found objects:
+ 11
+ [(45, 45)(45.5, 45.5)]
+ [(46, 46)(46.5, 46.5)]
+ [(47, 47)(47.5, 47.5)]
+ [(48, 48)(48.5, 48.5)]
+ [(49, 49)(49.5, 49.5)]
+ [(50, 50)(50.5, 50.5)]
+ [(51, 51)(51.5, 51.5)]
+ [(52, 52)(52.5, 52.5)]
+ [(53, 53)(53.5, 53.5)]
+ [(54, 54)(54.5, 54.5)]
+ [(55, 55)(55.5, 55.5)]
+
+ Child: Destroying container
+ Parent: Container was properly destroyed by the child process
+
diff --git a/doc/index/src/examples/rtree/mapped_file.cpp b/doc/index/src/examples/rtree/mapped_file.cpp
new file mode 100644
index 000000000..18127505c
--- /dev/null
+++ b/doc/index/src/examples/rtree/mapped_file.cpp
@@ -0,0 +1,66 @@
+// Boost.Geometry Index
+//
+// Quickbook Examples
+//
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+//
+// 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)
+
+//[rtree_mapped_file
+
+#include <iostream>
+
+#include <boost/interprocess/managed_mapped_file.hpp>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/index/rtree.hpp>
+
+namespace bi = boost::interprocess;
+namespace bg = boost::geometry;
+namespace bgm = bg::model;
+namespace bgi = bg::index;
+
+int main()
+{
+    typedef bgm::point<float, 2, bg::cs::cartesian> point_t;
+
+    typedef point_t value_t;
+    typedef bgi::linear<32, 8> params_t;
+    typedef bgi::indexable<value_t> indexable_t;
+    typedef bgi::equal_to<value_t> equal_to_t;
+    typedef bi::allocator<value_t, bi::managed_mapped_file::segment_manager> allocator_t;
+    typedef bgi::rtree<value_t, params_t, indexable_t, equal_to_t, allocator_t> rtree_t;
+
+    {
+        bi::managed_mapped_file file(bi::open_or_create, "data.bin", 1024*1024);
+        allocator_t alloc(file.get_segment_manager());
+        rtree_t * rtree_ptr = file.find_or_construct<rtree_t>("rtree")(params_t(), indexable_t(), equal_to_t(), alloc);
+
+        std::cout << rtree_ptr->size() << std::endl;
+
+        rtree_ptr->insert(point_t(1.0, 1.0));
+        rtree_ptr->insert(point_t(2.0, 2.0));
+
+        std::cout << rtree_ptr->size() << std::endl;
+    }
+
+    {
+        bi::managed_mapped_file file(bi::open_or_create, "data.bin", 1024*1024);
+        allocator_t alloc(file.get_segment_manager());
+        rtree_t * rtree_ptr = file.find_or_construct<rtree_t>("rtree")(params_t(), indexable_t(), equal_to_t(), alloc);
+
+        std::cout << rtree_ptr->size() << std::endl;
+
+        rtree_ptr->insert(point_t(3.0, 3.0));
+        rtree_ptr->insert(point_t(4.0, 4.0));
+
+        std::cout << rtree_ptr->size() << std::endl;
+    }
+
+    return 0;
+}
+
+//]
diff --git a/doc/index/src/examples/rtree/mapped_file_results.qbk b/doc/index/src/examples/rtree/mapped_file_results.qbk
new file mode 100644
index 000000000..b2d73c6d0
--- /dev/null
+++ b/doc/index/src/examples/rtree/mapped_file_results.qbk
@@ -0,0 +1,5 @@
+ 0
+ 2
+ 2
+ 4
+
diff --git a/doc/index/src/examples/rtree/polygons_shared_ptr.cpp b/doc/index/src/examples/rtree/polygons_shared_ptr.cpp
index c65ba5376..0d34e23fe 100644
--- a/doc/index/src/examples/rtree/polygons_shared_ptr.cpp
+++ b/doc/index/src/examples/rtree/polygons_shared_ptr.cpp
@@ -69,6 +69,11 @@ int main(void)
     std::vector<value> result_n;
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
 
+    // note: in Boost.Geometry the WKT representation of a box is polygon
+
+    // note: the values store the bounding boxes of polygons
+    // the polygons aren't used for querying but are printed
+
     // display results
     std::cout << "spatial query box:" << std::endl;
     std::cout << bg::wkt<box>(query_box) << std::endl;
diff --git a/doc/index/src/examples/rtree/polygons_shared_ptr_results.qbk b/doc/index/src/examples/rtree/polygons_shared_ptr_results.qbk
new file mode 100644
index 000000000..5280647be
--- /dev/null
+++ b/doc/index/src/examples/rtree/polygons_shared_ptr_results.qbk
@@ -0,0 +1,29 @@
+ filling index with polygons shared pointers:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2,6 5))
+ POLYGON((7 6,6.4 6.8,5.5 6.8,5.1 6,5.6 5.2,6.5 5.2,7 6))
+ POLYGON((8 7,7.4 7.8,6.5 7.8,6.1 7,6.6 6.2,7.5 6.2,8 7))
+ POLYGON((9 8,8.4 8.8,7.5 8.8,7.1 8,7.6 7.2,8.5 7.2,9 8))
+ POLYGON((10 9,9.4 9.8,8.5 9.8,8.1 9,8.6 8.2,9.5 8.2,10 9))
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2,6 5))
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+
diff --git a/doc/index/src/examples/rtree/polygons_vector.cpp b/doc/index/src/examples/rtree/polygons_vector.cpp
index a8984a732..7102862c6 100644
--- a/doc/index/src/examples/rtree/polygons_vector.cpp
+++ b/doc/index/src/examples/rtree/polygons_vector.cpp
@@ -77,6 +77,11 @@ int main(void)
     std::vector<value> result_n;
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
 
+    // note: in Boost.Geometry the WKT representation of a box is polygon
+
+    // note: the values store the bounding boxes of polygons
+    // the polygons aren't used for querying but are printed
+
     // display results
     std::cout << "spatial query box:" << std::endl;
     std::cout << bg::wkt<box>(query_box) << std::endl;
diff --git a/doc/index/src/examples/rtree/polygons_vector_results.qbk b/doc/index/src/examples/rtree/polygons_vector_results.qbk
new file mode 100644
index 000000000..d1dbc6041
--- /dev/null
+++ b/doc/index/src/examples/rtree/polygons_vector_results.qbk
@@ -0,0 +1,29 @@
+ generated polygons:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2,6 5))
+ POLYGON((7 6,6.4 6.8,5.5 6.8,5.1 6,5.6 5.2,6.5 5.2,7 6))
+ POLYGON((8 7,7.4 7.8,6.5 7.8,6.1 7,6.6 6.2,7.5 6.2,8 7))
+ POLYGON((9 8,8.4 8.8,7.5 8.8,7.1 8,7.6 7.2,8.5 7.2,9 8))
+ POLYGON((10 9,9.4 9.8,8.5 9.8,8.1 9,8.6 8.2,9.5 8.2,10 9))
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2,6 5))
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ POLYGON((5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2,5 4))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2,4 3))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8,1 0))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2,2 1))
+
diff --git a/doc/index/src/examples/rtree/quick_start.cpp b/doc/index/src/examples/rtree/quick_start.cpp
index 80c883122..fd3834449 100644
--- a/doc/index/src/examples/rtree/quick_start.cpp
+++ b/doc/index/src/examples/rtree/quick_start.cpp
@@ -66,6 +66,8 @@ int main(void)
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
     //]
 
+    // note: in Boost.Geometry WKT representation of a box is polygon
+
     //[rtree_quickstart_output
     // display results
     std::cout << "spatial query box:" << std::endl;
diff --git a/doc/index/src/examples/rtree/quick_start_results.qbk b/doc/index/src/examples/rtree/quick_start_results.qbk
new file mode 100644
index 000000000..e1defd08c
--- /dev/null
+++ b/doc/index/src/examples/rtree/quick_start_results.qbk
@@ -0,0 +1,18 @@
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0)) - 0
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1)) - 1
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2)) - 2
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3)) - 3
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4)) - 4
+ POLYGON((5 5,5 5.5,5.5 5.5,5.5 5,5 5)) - 5
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4)) - 4
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3)) - 3
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2)) - 2
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0)) - 0
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1)) - 1
+
diff --git a/doc/index/src/examples/rtree/value_index.cpp b/doc/index/src/examples/rtree/value_index.cpp
index 32f306909..6f245403b 100644
--- a/doc/index/src/examples/rtree/value_index.cpp
+++ b/doc/index/src/examples/rtree/value_index.cpp
@@ -78,6 +78,8 @@ int main(void)
     std::vector<value> result_n;
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
 
+    // note: in Boost.Geometry the WKT representation of a box is polygon
+
     // display results
     std::cout << "spatial query box:" << std::endl;
     std::cout << bg::wkt<box>(query_box) << std::endl;
diff --git a/doc/index/src/examples/rtree/value_index_results.qbk b/doc/index/src/examples/rtree/value_index_results.qbk
new file mode 100644
index 000000000..046da1374
--- /dev/null
+++ b/doc/index/src/examples/rtree/value_index_results.qbk
@@ -0,0 +1,29 @@
+ generated boxes:
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((5 5,5 5.5,5.5 5.5,5.5 5,5 5))
+ POLYGON((6 6,6 6.5,6.5 6.5,6.5 6,6 6))
+ POLYGON((7 7,7 7.5,7.5 7.5,7.5 7,7 7))
+ POLYGON((8 8,8 8.5,8.5 8.5,8.5 8,8 8))
+ POLYGON((9 9,9 9.5,9.5 9.5,9.5 9,9 9))
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((5 5,5 5.5,5.5 5.5,5.5 5,5 5))
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+
diff --git a/doc/index/src/examples/rtree/value_shared_ptr.cpp b/doc/index/src/examples/rtree/value_shared_ptr.cpp
index e2ff55737..bf20646fe 100644
--- a/doc/index/src/examples/rtree/value_shared_ptr.cpp
+++ b/doc/index/src/examples/rtree/value_shared_ptr.cpp
@@ -72,6 +72,8 @@ int main(void)
     std::vector<value> result_n;
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
 
+    // note: in Boost.Geometry the WKT representation of a box is polygon
+
     // display results
     std::cout << "spatial query box:" << std::endl;
     std::cout << bg::wkt<box>(query_box) << std::endl;
diff --git a/doc/index/src/examples/rtree/value_shared_ptr_results.qbk b/doc/index/src/examples/rtree/value_shared_ptr_results.qbk
new file mode 100644
index 000000000..e745d7a84
--- /dev/null
+++ b/doc/index/src/examples/rtree/value_shared_ptr_results.qbk
@@ -0,0 +1,29 @@
+ filling index with boxes shared pointers:
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((5 5,5 5.5,5.5 5.5,5.5 5,5 5))
+ POLYGON((6 6,6 6.5,6.5 6.5,6.5 6,6 6))
+ POLYGON((7 7,7 7.5,7.5 7.5,7.5 7,7 7))
+ POLYGON((8 8,8 8.5,8.5 8.5,8.5 8,8 8))
+ POLYGON((9 9,9 9.5,9.5 9.5,9.5 9,9 9))
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((5 5,5 5.5,5.5 5.5,5.5 5,5 5))
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ POLYGON((4 4,4 4.5,4.5 4.5,4.5 4,4 4))
+ POLYGON((3 3,3 3.5,3.5 3.5,3.5 3,3 3))
+ POLYGON((2 2,2 2.5,2.5 2.5,2.5 2,2 2))
+ POLYGON((0 0,0 0.5,0.5 0.5,0.5 0,0 0))
+ POLYGON((1 1,1 1.5,1.5 1.5,1.5 1,1 1))
+
diff --git a/doc/index/src/examples/rtree/variants_map.cpp b/doc/index/src/examples/rtree/variants_map.cpp
index 462795002..efc043e3d 100644
--- a/doc/index/src/examples/rtree/variants_map.cpp
+++ b/doc/index/src/examples/rtree/variants_map.cpp
@@ -124,6 +124,11 @@ int main(void)
     std::vector<value> result_n;
     rtree.query(bgi::nearest(point(0, 0), 5), std::back_inserter(result_n));
 
+    // note: in Boost.Geometry the WKT representation of a box is polygon
+
+    // note: the values store the bounding boxes of geometries
+    // the geometries aren't used for querying but are printed
+
     // display results
     std::cout << "spatial query box:" << std::endl;
     std::cout << bg::wkt<box>(query_box) << std::endl;
diff --git a/doc/index/src/examples/rtree/variants_map_results.qbk b/doc/index/src/examples/rtree/variants_map_results.qbk
new file mode 100644
index 000000000..e6e76b347
--- /dev/null
+++ b/doc/index/src/examples/rtree/variants_map_results.qbk
@@ -0,0 +1,29 @@
+ generated geometries:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2))
+ LINESTRING(5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2)
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2))
+ POLYGON((7 6,6.4 6.8,5.5 6.8,5.1 6,5.6 5.2,6.5 5.2))
+ POLYGON((8 7,7.4 7.8,6.5 7.8,6.1 7,6.6 6.2,7.5 6.2,8 7))
+ POLYGON((9 8,8.4 8.8,7.5 8.8,7.1 8,7.6 7.2,8.5 7.2,9 8))
+ POLYGON((10 9,9.4 9.8,8.5 9.8,8.1 9,8.6 8.2,9.5 8.2))
+ spatial query box:
+ POLYGON((0 0,0 5,5 5,5 0,0 0))
+ spatial query result:
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2))
+ LINESTRING(5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2)
+ POLYGON((6 5,5.4 5.8,4.5 5.8,4.1 5,4.6 4.2,5.5 4.2))
+ knn query point:
+ POINT(0 0)
+ knn query result:
+ LINESTRING(5 4,4.4 4.8,3.5 4.8,3.1 4,3.6 3.2,4.5 3.2)
+ POLYGON((4 3,3.4 3.8,2.5 3.8,2.1 3,2.6 2.2,3.5 2.2))
+ POLYGON((3 2,2.4 2.8,1.5 2.8,1.1 2,1.6 1.2,2.5 1.2,3 2))
+ POLYGON((1 0,0.4 0.8,-0.5 0.8,-0.9 0,-0.4 -0.8,0.5 -0.8))
+ POLYGON((2 1,1.4 1.8,0.5 1.8,0.1 1,0.6 0.2,1.5 0.2))
+
diff --git a/doc/introduction.qbk b/doc/introduction.qbk
index dfac965d5..1762a169d 100644
--- a/doc/introduction.qbk
+++ b/doc/introduction.qbk
@@ -45,18 +45,14 @@ officially part of the Boost C++ Libraries.
 
 Latest stable version of the source code is included in the 
 [@http://www.boost.org/users/download/ Boost packaged releases].
-It can also be downloaded from the current 
-[@http://svn.boost.org/svn/boost/branches/release Boost release branch]
-in the Boost Subversion repository.
+It can also be downloaded from the [@http://github.com/boostorg/boost Boost GitHub repository] (master branch).
 
 The library development upstream is available from the 
-[@http://svn.boost.org/svn/boost/trunk Boost trunk] in the Boost Subversion 
-repository.
+[@https://github.com/boostorg/geometry/tree/develop Boost.Geometry (develop branch)].
 
 Note that the library [*extensions] are not distributed in the official Boost 
-releases, but  only available
-in the [@http://svn.boost.org/svn/boost/trunk/boost/geometry/extensions/ Boost 
-trunk] 
+releases, but only available
+in the [@https://github.com/boostorg/geometry/tree/develop Boost.Geometry (develop branch)] 
 and that they are subject to change.
 
 __boost_geometry__ was accepted by Boost at November 28, 2009
@@ -65,6 +61,8 @@ __boost_geometry__ was accepted by Boost at November 28, 2009
 There is a __boost_geometry__ [@http://lists.boost.org/mailman/listinfo.cgi/geometry 
 mailing list]. The mailing list and its messages are also accessible from  
 [@http://boost-geometry.203548.n3.nabble.com/ Nabble] as Boost Geometry. Also on 
-the Boost Developers list and on the Boost Users list __boost_geometry__ is discussed.
+the [@http://lists.boost.org/mailman/listinfo.cgi/boost 
+Boost Developers list] and on the [@http://lists.boost.org/mailman/listinfo.cgi/boost-users 
+Boost Users list] __boost_geometry__ is discussed.
 
 [endsect]
diff --git a/doc/make_qbk.py b/doc/make_qbk.py
index ae8adfda7..7bf5db409 100755
--- a/doc/make_qbk.py
+++ b/doc/make_qbk.py
@@ -12,7 +12,9 @@
 
 import os, sys
 
-os.chdir(os.path.dirname(sys.argv[0]))
+script_dir = os.path.dirname(__file__)
+os.chdir(os.path.abspath(script_dir))
+print("Boost.Geometry is making .qbk files in %s" % os.getcwd())
 
 if 'DOXYGEN' in os.environ:
     doxygen_cmd = os.environ['DOXYGEN']
@@ -34,44 +36,53 @@ cmd = cmd + " --copyright src/copyright_block.qbk"
 cmd = cmd + " --output_member_variables false"
 cmd = cmd + " > generated/%s.qbk"
 
+def run_command(command):
+    if os.system(command) != 0:
+        raise Exception("Error running %s" % command)
+
+def remove_all_files(dir):
+    if os.path.exists(dir):
+        for f in os.listdir(dir):
+            os.remove(dir+f)
+
 def call_doxygen():
-    os.chdir("doxy");
-    os.system("rm -f doxygen_output/xml/*.xml")
-    os.system(doxygen_cmd)
+    os.chdir("doxy")
+    remove_all_files("doxygen_output/xml/")
+    run_command(doxygen_cmd)
     os.chdir("..")
 
 def group_to_quickbook(section):
-    os.system(cmd % ("group__" + section.replace("_", "__"), section))
+    run_command(cmd % ("group__" + section.replace("_", "__"), section))
 
 def model_to_quickbook(section):
-    os.system(cmd % ("classboost_1_1geometry_1_1model_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("classboost_1_1geometry_1_1model_1_1" + section.replace("_", "__"), section))
 
 def model_to_quickbook2(classname, section):
-    os.system(cmd % ("classboost_1_1geometry_1_1model_1_1" + classname, section))
+    run_command(cmd % ("classboost_1_1geometry_1_1model_1_1" + classname, section))
 
 def struct_to_quickbook(section):
-    os.system(cmd % ("structboost_1_1geometry_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("structboost_1_1geometry_1_1" + section.replace("_", "__"), section))
 
 def class_to_quickbook(section):
-    os.system(cmd % ("classboost_1_1geometry_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("classboost_1_1geometry_1_1" + section.replace("_", "__"), section))
 
 def strategy_to_quickbook(section):
     p = section.find("::")
     ns = section[:p]
     strategy = section[p+2:]
-    os.system(cmd % ("classboost_1_1geometry_1_1strategy_1_1" 
+    run_command(cmd % ("classboost_1_1geometry_1_1strategy_1_1"
         + ns.replace("_", "__") + "_1_1" + strategy.replace("_", "__"), 
         ns + "_" + strategy))
         
 def cs_to_quickbook(section):
-    os.system(cmd % ("structboost_1_1geometry_1_1cs_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("structboost_1_1geometry_1_1cs_1_1" + section.replace("_", "__"), section))
         
 
 call_doxygen()
 
 algorithms = ["append", "assign", "make", "clear"
     , "area", "buffer", "centroid", "convert", "correct", "covered_by"
-    , "convex_hull", "difference", "disjoint", "distance" 
+    , "convex_hull", "crosses", "difference", "disjoint", "distance" 
     , "envelope", "equals", "expand", "for_each", "intersection", "intersects" 
     , "length", "num_geometries", "num_interior_rings", "num_points" 
     , "overlaps", "perimeter", "reverse", "simplify", "sym_difference" 
@@ -158,4 +169,4 @@ execfile("make_qbk.py")
 os.chdir("..")
 
 # Use either bjam or b2 or ../../../b2 (the last should be done on Release branch)
-os.system("bjam") 
+run_command("b2")
diff --git a/doc/quickbook/quickref.xml b/doc/quickbook/quickref.xml
new file mode 100644
index 000000000..8179d7a87
--- /dev/null
+++ b/doc/quickbook/quickref.xml
@@ -0,0 +1,739 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
+    "../../../../../../trunk/tools/boostbook/dtd/boostbook.dtd">
+
+<!-- TODO: original version for in-Boost libs
+<!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN" "../../../tools/boostbook/dtd/boostbook.dtd">
+-->
+
+<!--
+  Copyright (c) 2010 Mateusz Loskot (mateusz at loskot dot net)
+
+  Distributed under 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)
+-->
+
+<informaltable frame="all">
+ 
+<!-- ###### CONCEPTS ########################################################################### -->
+<tgroup cols="3">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect2">Geometry Concepts</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">0-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.concept__Point">boost::geometry::concept::Point</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstPoint">boost::geometry::concept::ConstPoint</link></member>
+      </simplelist>
+    </entry>
+    <entry valign="top">
+    <bridgehead renderas="sect3">1-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.concept__Segment">boost::geometry::concept::Segment</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstSegment">boost::geometry::concept::ConstSegment</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Linestring">boost::geometry::concept::Linestring</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstLinestring">boost::geometry::concept::ConstLinestring</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">2-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.concept__Box">boost::geometry::concept::Box</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstBox">boost::geometry::concept::ConstBox</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Ring">boost::geometry::concept::Ring</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstRing">boost::geometry::concept::ConstRing</link></member>
+     <member><link linkend="boost_geometry.reference.concept__Polygon">boost::geometry::concept::Polygon</link></member>
+     <member><link linkend="boost_geometry.reference.concept__ConstPolygon">boost::geometry::concept::ConstPolygon</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect3">Functions</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.concept__check">boost::geometry::concept::check</link></member>
+     <member><link linkend="boost_geometry.reference.concept__check_concepts_and_equal_dimensions">boost::geometry::concept::check_concepts_and_equal_dimensions</link></member>
+      </simplelist>
+    </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### MODELS ############################################################################# -->
+<tgroup cols="3">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect2">Geometry Models</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">0-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.point">boost::geometry::point</link></member>
+     <member><link linkend="boost_geometry.reference.point_xy">boost::geometry::point_xy</link></member>
+     <member><link linkend="boost_geometry.reference.point_2d">boost::geometry::point_2d</link></member>
+     <member><link linkend="boost_geometry.reference.point_3d">boost::geometry::point_3d</link></member>
+      </simplelist>
+    </entry>
+    <entry valign="top">
+    <bridgehead renderas="sect3">1-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.segment">boost::geometry::segment</link></member>
+     <member><link linkend="boost_geometry.reference.segment_2d">boost::geometry::segment_2d</link></member>
+     <member><link linkend="boost_geometry.reference.linestring">boost::geometry::linestring</link></member>
+     <member><link linkend="boost_geometry.reference.linestring_2d">boost::geometry::linestring_2d</link></member>
+     <member><link linkend="boost_geometry.reference.linestring_3d">boost::geometry::linestring_3d</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">2-dimensional</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.box">boost::geometry::box</link></member>
+     <member><link linkend="boost_geometry.reference.box_2d">boost::geometry::box_2d</link></member>
+     <member><link linkend="boost_geometry.reference.box_3d">boost::geometry::box_3d</link></member>
+     <member><link linkend="boost_geometry.reference.box">boost::geometry::box</link></member>
+     <member><link linkend="boost_geometry.reference.linear_ring">boost::geometry::linear_ring</link></member>
+     <member><link linkend="boost_geometry.reference.ring_2d">boost::geometry::ring_2d</link></member>
+     <member><link linkend="boost_geometry.reference.ring_3d">boost::geometry::ring_3d</link></member>
+     <member><link linkend="boost_geometry.reference.polygon">boost::geometry::polygon</link></member>
+     <member><link linkend="boost_geometry.reference.polygon_2d">boost::geometry::polygon_2d</link></member>
+     <member><link linkend="boost_geometry.reference.polygon_3d">boost::geometry::polygon_3d</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="top" namest="a" nameend="c">
+    <bridgehead renderas="sect3">Functions</bridgehead>
+    <simplelist type="vert" columns="1">
+    </simplelist>
+    <bridgehead renderas="sect3">Macros</bridgehead>
+    <simplelist type="vert" columns="1">
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+
+<!-- ###### CORE ############################################################################### -->
+<tgroup cols="2">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="b">
+    <bridgehead renderas="sect2">Core</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Metafunctions</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.cs_tag">boost::geometry::cs_tag</link></member>
+     <member><link linkend="boost_geometry.reference.coordinate_type">boost::geometry::coordinate_type</link></member>
+     <member><link linkend="boost_geometry.reference.coordinate_system">boost::geometry::coordinate_system</link></member>
+     <member><link linkend="boost_geometry.reference.dimension">boost::geometry::dimension</link></member>
+     <member><link linkend="boost_geometry.reference.geometry_id">boost::geometry::geometry_id</link></member>
+     <member><link linkend="boost_geometry.reference.interior_type">boost::geometry::interior_type</link></member>
+     <member><link linkend="boost_geometry.reference.is_linear">boost::geometry::is_linear</link></member>
+     <member><link linkend="boost_geometry.reference.is_multi">boost::geometry::is_multi</link></member>
+     <member><link linkend="boost_geometry.reference.is_radian">boost::geometry::is_radian</link></member>
+     <member><link linkend="boost_geometry.reference.point_order">boost::geometry::point_order</link></member>
+     <member><link linkend="boost_geometry.reference.point_type">boost::geometry::point_type</link></member>
+     <member><link linkend="boost_geometry.reference.ring_type">boost::geometry::ring_type</link></member>
+     <member><link linkend="boost_geometry.reference.replace_point_type">boost::geometry::replace_point_type</link></member>
+     <member><link linkend="boost_geometry.reference.reverse_dispatch">boost::geometry::reverse_dispatch</link></member>
+     <member><link linkend="boost_geometry.reference.tag">boost::geometry::tag</link></member>
+     <member><link linkend="boost_geometry.reference.topological_dimension">boost::geometry::topological_dimension</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Access Functions</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.exterior_ring">boost::geometry::exterior_ring</link></member>
+     <member><link linkend="boost_geometry.reference.get">boost::geometry::get</link></member>
+     <member><link linkend="boost_geometry.reference.get_as_radian">boost::geometry::get_as_radian</link></member>
+     <member><link linkend="boost_geometry.reference.interior_rings">boost::geometry::interior_rings</link></member>
+     <member><link linkend="boost_geometry.reference.num_interior_rings">boost::geometry::num_interior_rings</link></member>
+     <member><link linkend="boost_geometry.reference.num_points">boost::geometry::num_points</link></member>
+     <member><link linkend="boost_geometry.reference.set">boost::geometry::set</link></member>
+     <member><link linkend="boost_geometry.reference.set_from_radian">boost::geometry::set_from_radian</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Classes</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.exception">boost::geometry::exception</link></member>
+     <member> <link linkend="boost_geometry.reference.centroid_exception">boost::geometry::centroid_exception</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### CONSTANTS ########################################################################## -->
+<tgroup cols="2">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+  <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="b">
+    <bridgehead renderas="sect2">Constants</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Numeric</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.max_corner">boost::geometry::max_corner</link></member>
+    <member><link linkend="boost_geometry.reference.min_corner">boost::geometry::min_corner</link></member>
+    <member><link linkend="boost_geometry.reference.order_selector">boost::geometry::order_selector</link></member>
+    <member><link linkend="boost_geometry.reference.math__pi">boost::geometry::math::pi</link></member>
+    <member><link linkend="boost_geometry.reference.math__two_pi">boost::geometry::math::two_pi</link></member>
+    <member><link linkend="boost_geometry.reference.math__d2r">boost::geometry::math::d2r</link></member>
+    <member><link linkend="boost_geometry.reference.math__r2d">boost::geometry::math::r2d</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Types</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.degree">boost::geometry::degree</link></member>
+    <member><link linkend="boost_geometry.reference.radian">boost::geometry::radian</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### COORDINATE SYSTEMS / ITERATORS ##################################################### -->
+<tgroup cols="2">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+  <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="a">
+    <bridgehead renderas="sect2">Coordinate Systems</bridgehead>
+   </entry>
+   <entry valign="center" namest="b" nameend="c">
+    <bridgehead renderas="sect2">Iterators</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Classes</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.cs__cartesian">boost::geometry::cs::cartesian</link></member>
+    <member><link linkend="boost_geometry.reference.cs__geographic">boost::geometry::cs::geographic</link></member>
+    <member><link linkend="boost_geometry.reference.cs__polar">boost::geometry::cs::polar</link></member>
+    <member><link linkend="boost_geometry.reference.cs__spherical">boost::geometry::cs::spherical</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Metafunctions</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.range_type">boost::geometry::range_type</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Classes</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.circular_iterator">boost::geometry::circular_iterator</link></member>
+    <member><link linkend="boost_geometry.reference.ever_circling_iterator">boost::geometry::ever_circling_iterator</link></member>
+    <member><link linkend="boost_geometry.reference.one_section_segment_iterator">boost::geometry::one_section_segment_iterator</link></member>
+    <member><link linkend="boost_geometry.reference.section_iterator">boost::geometry::section_iterator</link></member>
+    <member><link linkend="boost_geometry.reference.segment_iterator">boost::geometry::segment_iterator</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Functions</bridgehead>
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.make_segment_iterator">boost::geometry::make_segment_iterator</link></member>
+    <member><link linkend="boost_geometry.reference.operator_eq__eq_">boost::geometry::operator==</link></member>
+    <member><link linkend="boost_geometry.reference.operator_not__eq_">boost::geometry::operator!=</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### ALGORITHMS ######################################################################### -->
+<tgroup cols="3">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect2">Algorithms</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Geometry Constructors</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.make">boost::geometry::make</link></member>
+     <member><link linkend="boost_geometry.reference.make_inverse">boost::geometry::make_inverse</link></member>
+     <member><link linkend="boost_geometry.reference.make_zero">boost::geometry::make_zero</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Predicates</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.crosses">boost::geometry::crosses</link></member>
+     <member><link linkend="boost_geometry.reference.disjoint">boost::geometry::disjoint</link></member>
+     <member><link linkend="boost_geometry.reference.equals">boost::geometry::equals</link></member>
+     <member><link linkend="boost_geometry.reference.intersects">boost::geometry::intersects</link></member>
+     <member><link linkend="boost_geometry.reference.overlaps">boost::geometry::overlaps</link></member>
+     <member><link linkend="boost_geometry.reference.selected">boost::geometry::selected</link></member>
+     <member><link linkend="boost_geometry.reference.within">boost::geometry::within</link></member>
+     </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Append</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.append">boost::geometry::append</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Area</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.area">boost::geometry::area</link></member>    
+    </simplelist>
+    <bridgehead renderas="sect3">Assign</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.assign">boost::geometry::assign</link></member>
+     <member><link linkend="boost_geometry.reference.assign_box_corners">boost::geometry::assign_box_corners</link></member>
+     <member><link linkend="boost_geometry.reference.assign_inverse">boost::geometry::assign_inverse</link></member>
+     <member><link linkend="boost_geometry.reference.assign_point_from_index">boost::geometry::assign_point_from_index</link></member>
+     <member><link linkend="boost_geometry.reference.assign_point_to_index">boost::geometry::assign_point_to_index</link></member>
+     <member><link linkend="boost_geometry.reference.assign_zero">boost::geometry::assign_zero</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Buffer</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.buffer">boost::geometry::buffer</link></member>
+     <member><link linkend="boost_geometry.reference.make_buffer">boost::geometry::make_buffer</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Centroid</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.centroid">boost::geometry::centroid</link></member>
+     <member><link linkend="boost_geometry.reference.make_centroid">boost::geometry::make_centroid</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Clear</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.clear">boost::geometry::clear</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Combine</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.combine">boost::geometry::combine</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Convert</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.convert">boost::geometry::convert</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Convex Hull</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.convex_hull">boost::geometry::convex_hull</link></member>
+     <member><link linkend="boost_geometry.reference.convex_hull_inserter">boost::geometry::convex_hull_inserter</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Correct</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.correct">boost::geometry::correct</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Distance</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.distance">boost::geometry::distance</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Difference</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.difference">boost::geometry::difference</link></member>
+     <member><link linkend="boost_geometry.reference.sym_difference">boost::geometry::sym_difference</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Dissolve</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.dissolve">boost::geometry::dissolve</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Envelope</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.envelope">boost::geometry::envelope</link></member>
+     <member><link linkend="boost_geometry.reference.make_envelope">boost::geometry::make_envelope</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">for_each</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.for_each_point">boost::geometry::for_each_point</link></member>
+     <member><link linkend="boost_geometry.reference.for_each_segment">boost::geometry::for_each_segment</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Intersection</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.intersection_inserter">boost::geometry::intersection_inserter</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Length</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.length">boost::geometry::length</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Overlay</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.copy_segments">boost::geometry::copy_segments</link></member>
+     <member><link linkend="boost_geometry.reference.copy_segment_point">boost::geometry::copy_segment_point</link></member>
+     <member><link linkend="boost_geometry.reference.copy_segment_points">boost::geometry::copy_segment_points</link></member>
+     <member><link linkend="boost_geometry.reference.enrich_intersection_points">boost::geometry::enrich_intersection_points</link></member>
+     <member><link linkend="boost_geometry.reference.get_turns">boost::geometry::get_turns</link></member>
+     <member><link linkend="boost_geometry.reference.traverse">boost::geometry::traverse</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Perimeter</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.perimeter">boost::geometry::perimeter</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Reverse</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.reverse">boost::geometry::reverse</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Section</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.get_section">boost::geometry::get_section</link></member>
+     <member><link linkend="boost_geometry.reference.sectionalize">boost::geometry::sectionalize</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Simplify</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.simplify">boost::geometry::simplify</link></member>
+     <member><link linkend="boost_geometry.reference.simplify_inserter">boost::geometry::simplify_inserter</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Transform</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.transform">boost::geometry::transform</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Union</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.union_inserter">boost::geometry::union_inserter</link></member>
+    </simplelist>
+    <bridgehead renderas="sect3">Unique</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.unique">boost::geometry::unique</link></member>
+    </simplelist>    
+    <bridgehead renderas="sect3">Miscellaneous Utilities</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.parse">boost::geometry::parse</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### POLICIES ########################################################################### -->
+<tgroup cols="2">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+  <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="b">
+    <bridgehead renderas="sect2">Policies</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Compare</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.equal_to">boost::geometry::equal_to</link></member>
+     <member><link linkend="boost_geometry.reference.greater">boost::geometry::greater</link></member>
+     <member><link linkend="boost_geometry.reference.less">boost::geometry::less</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Relate</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.policies__relate__direction_type">boost::geometry::policies::relate::direction_type</link></member>
+     <member><link linkend="boost_geometry.reference.policies__relate__segments_de9im">boost::geometry::policies::relate::segments_de9im</link></member>
+     <member><link linkend="boost_geometry.reference.policies__relate__segments_direction">boost::geometry::policies::relate::segments_direction</link></member>
+     <member><link linkend="boost_geometry.reference.policies__relate__segments_intersection_points">boost::geometry::policies::relate::segments_intersection_points</link></member>
+     <member><link linkend="boost_geometry.reference.policies__relate__segments_tupled">boost::geometry::policies::relate::segments_tupled</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### STRATEGY CONCEPTS ################################################################## -->
+<tgroup cols="2">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+  <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="b">
+    <bridgehead renderas="sect2">Strategy Concepts</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.concept__AreaStrategy">boost::geometry::concept::AreaStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__CentroidStrategy">boost::geometry::concept::CentroidStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__ConvexHullStrategy">boost::geometry::concept::ConvexHullStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__PointDistanceStrategy">boost::geometry::concept::PointDistanceStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__PointSegmentDistanceStrategy">boost::geometry::concept::PointSegmentDistanceStrategy</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <simplelist type="vert" columns="1">
+    <member><link linkend="boost_geometry.reference.concept__SegmentIntersectStrategy">boost::geometry::concept::SegmentIntersectStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__SimplifyStrategy">boost::geometry::concept::SimplifyStrategy</link></member>
+    <member><link linkend="boost_geometry.reference.concept__WithinStrategy">boost::geometry::concept::WithinStrategy</link></member>
+    </simplelist>
+   </entry>
+   </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### STRATEGIES ######################################################################### -->
+<tgroup cols="3">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+  <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect2">Strategies</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Area</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_area">boost::geometry::strategy_area</link></member>
+     <member><link linkend="boost_geometry.reference.area_result">boost::geometry::area_result</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__area__by_triangles">boost::geometry::strategy::area::by_triangles</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__area__huiller">boost::geometry::strategy::area::huiller</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Buffer</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy__buffer__join_miter">boost::geometry::strategy::buffer::join_miter</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__buffer__join_bevel">boost::geometry::strategy::buffer::join_bevel</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__buffer__join_round">boost::geometry::strategy::buffer::join_round</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Centroid</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_centroid">boost::geometry::strategy_centroid</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__centroid___bashein_detmer">boost::geometry::strategy::centroid_::bashein_detmer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__centroid___centroid_average">boost::geometry::strategy::centroid_::centroid_average</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Compare</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_compare">boost::geometry::strategy_compare</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__compare__default_strategy">boost::geometry::strategy::compare::default_strategy</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__compare__circular_comparator">boost::geometry::strategy::compare::circular_comparator</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Convex Hull</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_convex_hull">boost::geometry::strategy_convex_hull</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__convex_hull__graham_andrew">boost::geometry::strategy::convex_hull::graham_andrew</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Distance</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_distance">boost::geometry::strategy_distance</link></member>
+     <member><link linkend="boost_geometry.reference.strategy_distance_segment">boost::geometry::strategy_distance_segment</link></member>
+     <member><link linkend="boost_geometry.reference.cartesian_distance">boost::geometry::cartesian_distance</link></member>
+     <member><link linkend="boost_geometry.reference.distance_result">boost::geometry::distance_result</link></member>
+     <member><link linkend="boost_geometry.reference.make_distance_result">boost::geometry::make_distance_result</link></member>
+     <member><link linkend="boost_geometry.reference.close_to_zero">boost::geometry::close_to_zero</link></member>
+     <member><link linkend="boost_geometry.reference.fuzzy_equals">boost::geometry::fuzzy_equals</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__distance__projected_point">boost::geometry::strategy::distance::projected_point</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__distance__pythagoras">boost::geometry::strategy::distance::pythagoras</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__distance__cross_track">boost::geometry::strategy::distance::cross_track</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__distance__haversine">boost::geometry::strategy::distance::haversine</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Intersection</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.de9im">boost::geometry::de9im</link></member>
+     <member><link linkend="boost_geometry.reference.de9im_segment">boost::geometry::de9im_segment</link></member>
+     <member><link linkend="boost_geometry.reference.segment_intersection_points">boost::geometry::segment_intersection_points</link></member>
+     <member><link linkend="boost_geometry.reference.strategy_intersection">boost::geometry::strategy_intersection</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__intersection__liang_barsky">boost::geometry::strategy::intersection::liang_barsky</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__intersection__relate_cartesian_segments">boost::geometry::strategy::intersection::relate_cartesian_segments</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__intersection__relate_cartesian_segments">boost::geometry::strategy::intersection::relate_cartesian_segments</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Side</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_side">boost::geometry::strategy_side</link></member>
+     <member><link linkend="boost_geometry.reference.side_info">boost::geometry::side_info</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__side__course">boost::geometry::strategy::side::course</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__side__side_by_triangle">boost::geometry::strategy::side::side_by_triangle</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__side__side_by_cross_track">boost::geometry::strategy::side::side_by_cross_track</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Simplify</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy__simplify__douglas_peucker">boost::geometry::strategy::simplify::douglas_peucker</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Transform</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy_transform">boost::geometry::strategy_transform</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__copy_direct">boost::geometry::strategy::copy_direct</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__copy_per_coordinate">boost::geometry::strategy::copy_per_coordinate</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__degree_radian_vv">boost::geometry::strategy::degree_radian_vv</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__degree_radian_vv_3">boost::geometry::strategy::degree_radian_vv_3</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__from_spherical_2_to_cartesian_3">boost::geometry::strategy::from_spherical_2_to_cartesian_3</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__from_spherical_3_to_cartesian_3">boost::geometry::strategy::from_spherical_3_to_cartesian_3</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__from_cartesian_3_to_spherical_2">boost::geometry::strategy::from_cartesian_3_to_spherical_2</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__from_cartesian_3_to_spherical_3">boost::geometry::strategy::from_cartesian_3_to_spherical_3</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__inverse_transformer">boost::geometry::strategy::inverse_transformer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__map_transformer">boost::geometry::strategy::map_transformer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__ublas_transformer">boost::geometry::strategy::ublas_transformer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__translate_transformer">boost::geometry::strategy::translate_transformer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__scale_transformer">boost::geometry::strategy::scale_transformer</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__transform__rotate_transformer">boost::geometry::strategy::rotate_transformer</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Within</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy__within__winding">boost::geometry::strategy::winding</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__within__crossings_multiply">boost::geometry::strategy::crossings_multiply</link></member>
+     <member><link linkend="boost_geometry.reference.strategy__within__franklin">boost::geometry::strategy::franklin</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Miscellaneous Utilities</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.strategy__not_implemented">boost::geometry::strategy::not_implemented</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### ARITHMETIC ######################################################################### -->
+<tgroup cols="4">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+ <colspec colname="d"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="d">
+    <bridgehead renderas="sect2">Arithmetic</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Add</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.add_point">boost::geometry::add_point</link></member>
+     <member><link linkend="boost_geometry.reference.add_value">boost::geometry::add_value</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Subtract</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.subtract_point">boost::geometry::subtract_point</link></member>
+     <member><link linkend="boost_geometry.reference.subtract_value">boost::geometry::subtract_value</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Multiply</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.multiply_point">boost::geometry::multiply_point</link></member>
+     <member><link linkend="boost_geometry.reference.multiply_value">boost::geometry::multiply_value</link></member>
+    </simplelist>
+   </entry>
+   <entry valign="top">
+    <bridgehead renderas="sect3">Divide</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.divide_point">boost::geometry::divide_point</link></member>
+     <member><link linkend="boost_geometry.reference.divide_value">boost::geometry::divide_value</link></member>
+    </simplelist>
+   </entry>
+  </row>
+  <row>
+   <entry valign="center" namest="a" nameend="d">
+    <bridgehead renderas="sect3">Products</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.cross_product">boost::geometry::cross_product</link></member>
+     <member><link linkend="boost_geometry.reference.dot_product">boost::geometry::dot_product</link></member>
+    </simplelist>
+   </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+<!-- ###### EXTENSIONS ########################################################################### -->
+<tgroup cols="3">
+ <colspec colname="a"/>
+ <colspec colname="b"/>
+ <colspec colname="c"/>
+ <thead>
+  <row>
+   <entry valign="center" namest="a" nameend="c">
+    <bridgehead renderas="sect2">Extensions</bridgehead>
+   </entry>
+  </row>
+ </thead>
+ <tbody>
+  <row>
+   <entry valign="top">
+    <bridgehead renderas="sect3">TODO</bridgehead>
+    <simplelist type="vert" columns="1">
+     <member><link linkend="boost_geometry.reference.">...</link></member>
+      </simplelist>
+    </entry>
+  </row>
+ </tbody>
+</tgroup>
+
+</informaltable>
diff --git a/doc/quickref.xml b/doc/quickref.xml
index 987cad233..9e20847d3 100644
--- a/doc/quickref.xml
+++ b/doc/quickref.xml
@@ -318,6 +318,7 @@
     </simplelist>
     <bridgehead renderas="sect3">Predicates</bridgehead>
     <simplelist type="vert" columns="1">
+     <member><link linkend="geometry.reference.algorithms.crosses">crosses</link></member>
      <member><link linkend="geometry.reference.algorithms.covered_by">covered_by</link></member>
      <member><link linkend="geometry.reference.algorithms.disjoint">disjoint</link></member>
      <member><link linkend="geometry.reference.algorithms.equals">equals</link></member>
@@ -734,13 +735,13 @@
     <simplelist type="vert" columns="1">
      <member><link linkend="geometry.reference.spatial_indexes.group__predicates.contains_geometry_const___">contains(Geometry const &amp;)</link></member>
      <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covered_by_geometry_const___">covered_by(Geometry const &amp;)</link></member>
-        <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covers_geometry_const___">covers(Geometry const &amp;)</link></member>
+     <member><link linkend="geometry.reference.spatial_indexes.group__predicates.covers_geometry_const___">covers(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.disjoint_geometry_const___">disjoint(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.intersects_geometry_const___">intersects(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.overlaps_geometry_const___">overlaps(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.within_geometry_const___">within(Geometry const &amp;)</link></member>
 	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.satisfies_unarypredicate_const___">satisfies(UnaryPredicate const &amp;)</link></member>
-	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.nearest_point_const____unsigned_">nearest(Point const &amp;, unsigned)</link></member>
+	 <member><link linkend="geometry.reference.spatial_indexes.group__predicates.nearest_geometry_const____unsigned_">nearest(Geometry const &amp;, unsigned)</link></member>
     </simplelist>
    </entry>
    <!--entry valign="top">
diff --git a/doc/reference.qbk b/doc/reference.qbk
index ce226af36..2b295d677 100644
--- a/doc/reference.qbk
+++ b/doc/reference.qbk
@@ -89,6 +89,8 @@
 [include generated/covered_by.qbk]
 [endsect]
 
+[include generated/crosses.qbk]
+
 [include generated/difference.qbk]
 [include generated/disjoint.qbk]
 
@@ -96,6 +98,10 @@
 [include generated/distance.qbk]
 [endsect]
 
+[section:disjoint disjoint]
+[include generated/disjoint.qbk]
+[endsect]
+
 [section:envelope envelope]
 [include generated/envelope.qbk]
 [endsect]
@@ -221,7 +227,7 @@
 
 [section:io IO (input/output)]
 [section:wkt WKT (Well-Known Text)]
-[/include generated/wkt.qbk/]
+[include generated/wkt.qbk]
 [endsect]
 [section:svg SVG (Scalable Vector Graphics)]
 [include generated/svg.qbk]
diff --git a/doc/reference/algorithms/append.qbk b/doc/reference/algorithms/append.qbk
index 3582dfbf4..22dbb561a 100644
--- a/doc/reference/algorithms/append.qbk
+++ b/doc/reference/algorithms/append.qbk
@@ -1,9 +1,14 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-  Copyright (c) 2009-2012 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2014 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2014 Bruno Lalande, Paris, France.
+
+  This file was modified by Oracle on 2014.
+  Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+  Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -14,7 +19,7 @@
 
 [heading_conformance_no_ogc __this_function__]
 
-[include generated/append_status.qbk]
+[include reference/status/append_status.qbk]
 
 [heading Behavior]
 [table
@@ -26,6 +31,22 @@
 	either the exterior ring (the default) or specify a zero-based index for one of the interior rings. 
 	In the last case, the interior rings are not resized automatically, 
 	so ensure that the zero-based index is smaller than the number of interior rings]]
+[[__multi_linestring__][Appends point or range to the end of the
+        linestring with the given multi index.
+        The multi-linestring is not resized automatically, so ensure
+        that the multi index is smaller than then number of linestring
+        in the multi-linestring.]]
+[[__multi_polygon__][Appends point or range to the end of the polygon
+        (without explicitly closing it) with the given multi-index.
+        The point or range is appended at the end of the
+        exterior ring (the default) or specify a zero-based ring index for
+        the interior rings.
+        The multi-polygon is not resized automatically, so ensure
+        that the multi index is smaller than then number of polygon
+        in the multi-polygon. The same applies for the interior rings
+        of the polygon: the interior rings are not resized
+        automatically, so ensure that the zero-based ring index is
+        smaller than the number of interior rings of the polygon.]]
 ]
 
 [heading Complexity]
diff --git a/doc/reference/algorithms/area.qbk b/doc/reference/algorithms/area.qbk
index e459ee5da..f2e7355bf 100644
--- a/doc/reference/algorithms/area.qbk
+++ b/doc/reference/algorithms/area.qbk
@@ -25,7 +25,7 @@
 [[__rev__][[qbk_ret the negative area]]]
 ]
 
-[include generated/area_status.qbk]
+[include reference/status/area_status.qbk]
 
 [heading Complexity]
 Linear
diff --git a/doc/reference/algorithms/centroid.qbk b/doc/reference/algorithms/centroid.qbk
index 12152cb46..4399c4e7e 100644
--- a/doc/reference/algorithms/centroid.qbk
+++ b/doc/reference/algorithms/centroid.qbk
@@ -26,6 +26,7 @@
 [[__sph__][Calculates the centroid as if based on Cartesian coordinates]]
 ]
 
+[/ TODO: change by status /]
 [heading Supported geometries]
 [table
 [[ ][2D][3D]]
diff --git a/doc/reference/algorithms/clear.qbk b/doc/reference/algorithms/clear.qbk
index 969d6df84..689fa3b4d 100644
--- a/doc/reference/algorithms/clear.qbk
+++ b/doc/reference/algorithms/clear.qbk
@@ -16,7 +16,7 @@
 [heading_conformance_no_ogc __this_function__]
 [conformance_std __this_function__..__this_function__() method]
 
-[include generated/clear_status.qbk]
+[include reference/status/clear_status.qbk]
 
 [heading Behavior]
 [table
diff --git a/doc/reference/algorithms/convert.qbk b/doc/reference/algorithms/convert.qbk
index f5704cc0f..230346204 100644
--- a/doc/reference/algorithms/convert.qbk
+++ b/doc/reference/algorithms/convert.qbk
@@ -14,7 +14,7 @@
 
 [heading_conformance_no_ogc __this_function__]
 
-[include generated/convert_status.qbk]
+[include reference/status/convert_status.qbk]
 [note In this status matrix above: columns are source types
   and rows are target types. So a box can be converted to a ring, polygon
   or multi-polygon, but not vice versa.]
diff --git a/doc/reference/algorithms/convex_hull.qbk b/doc/reference/algorithms/convex_hull.qbk
index 492c99a5a..47d706a57 100644
--- a/doc/reference/algorithms/convex_hull.qbk
+++ b/doc/reference/algorithms/convex_hull.qbk
@@ -14,7 +14,7 @@
 
 [heading_conformance_ogc __this_function__..ConvexHull()]
 
-[include generated/convex_hull_status.qbk]
+[include reference/status/convex_hull_status.qbk]
 
 [heading Complexity]
 Logarithmic
diff --git a/doc/reference/algorithms/correct.qbk b/doc/reference/algorithms/correct.qbk
index cb3f6d902..d9e2c5335 100644
--- a/doc/reference/algorithms/correct.qbk
+++ b/doc/reference/algorithms/correct.qbk
@@ -15,7 +15,7 @@
 
 [heading_conformance_no_ogc __this_function__]
 
-[include generated/correct_status.qbk]
+[include reference/status/correct_status.qbk]
 
 [heading Behavior]
 [table
diff --git a/doc/reference/algorithms/covered_by.qbk b/doc/reference/algorithms/covered_by.qbk
index 0fb187f09..d1462c3a2 100644
--- a/doc/reference/algorithms/covered_by.qbk
+++ b/doc/reference/algorithms/covered_by.qbk
@@ -18,7 +18,7 @@
   See the [@http://www.postgis.org/docs/ST_CoveredBy.html PostGIS documentation]. 
 ]
 
-[include generated/covered_by_status.qbk]
+[include reference/status/covered_by_status.qbk]
 [note In this status matrix above: columns are types of first parameter
   and rows are types of second parameter. So a point can be checked to be 
   covered by a polygon, but not vice versa.
@@ -32,4 +32,4 @@ Linear
 
 [note The difference with the `within` algorithm is that this algorithm checks the
   border by default
-]
\ No newline at end of file
+]
diff --git a/doc/reference/algorithms/crosses.qbk b/doc/reference/algorithms/crosses.qbk
new file mode 100644
index 000000000..9a33ce85f
--- /dev/null
+++ b/doc/reference/algorithms/crosses.qbk
@@ -0,0 +1,22 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+  Copyright (c) 2009-2012 Bruno Lalande, Paris, France.
+
+  This file was modified by Oracle on 2014.
+  Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+  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)
+
+  Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+=============================================================================/]
+
+[def __this_function__ crosses]
+
+[heading_conformance_ogc __this_function__..Crosses]
+
+[include reference/status/crosses_status.qbk]
diff --git a/doc/reference/algorithms/difference_behavior.qbk b/doc/reference/algorithms/difference_behavior.qbk
index 0044026c8..25c20b66c 100644
--- a/doc/reference/algorithms/difference_behavior.qbk
+++ b/doc/reference/algorithms/difference_behavior.qbk
@@ -1,7 +1,12 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2011-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+  This file was modified by Oracle on 2014.
+  Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+  Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -14,6 +19,8 @@
 [[__2dim__][All combinations of: box, ring, polygon, multi_polygon]]
 [[__1dim__ / __2dim__][A combinations of a (multi) linestring with a (multi) polygon
     results in a collection of linestrings]]
+[[__1dim__][All combinations of: linestring, multi_linestring; results in a collection of linestrings]]
+[[__0dim__][All combinations of: point, multi_point; results in a collection of points]]
 [[__other__][__nyiversion__]]
 [[__sph__][__nyiversion__]]
 [[Three dimensional][__nyiversion__]]
diff --git a/doc/reference/algorithms/disjoint.qbk b/doc/reference/algorithms/disjoint.qbk
index 6f5c8ef49..0d0ec96ea 100644
--- a/doc/reference/algorithms/disjoint.qbk
+++ b/doc/reference/algorithms/disjoint.qbk
@@ -13,3 +13,4 @@
 [def __this_function__ disjoint]
 
 [heading_conformance_ogc __this_function__..Disjoint]
+[include reference/status/disjoint_status.qbk]
diff --git a/doc/reference/algorithms/distance.qbk b/doc/reference/algorithms/distance.qbk
index d9c448cfe..d553daf3e 100644
--- a/doc/reference/algorithms/distance.qbk
+++ b/doc/reference/algorithms/distance.qbk
@@ -14,7 +14,7 @@
 
 [heading_conformance_ogc __this_function__..Distance]
 
-[include generated/distance_status.qbk]
+[include reference/status/distance_status.qbk]
 
 [heading Complexity]
 Linear
diff --git a/doc/reference/algorithms/equals.qbk b/doc/reference/algorithms/equals.qbk
index b0159a90a..6021962e5 100644
--- a/doc/reference/algorithms/equals.qbk
+++ b/doc/reference/algorithms/equals.qbk
@@ -14,7 +14,7 @@
 
 [heading_conformance_ogc __this_function__..Equals]
 
-[include generated/equals_status.qbk]
+[include reference/status/equals_status.qbk]
 
 [heading Complexity]
 Linear
diff --git a/doc/reference/algorithms/intersects.qbk b/doc/reference/algorithms/intersects.qbk
index 49aea2322..7be7934ad 100644
--- a/doc/reference/algorithms/intersects.qbk
+++ b/doc/reference/algorithms/intersects.qbk
@@ -15,6 +15,9 @@
 [heading_conformance_ogc __this_function__..Intersects]
 [? __one_parameter__ The version with one parameter is additional and not described in the OGC standard]
 
+[/ uncomment if this file is splitted into one/two parameter versions /]
+[/ include reference/status/intersects_status.qbk /]
+
 [heading Examples]
 [intersects_linestring]
 [intersects_linestring_output]
diff --git a/doc/reference/algorithms/overlaps.qbk b/doc/reference/algorithms/overlaps.qbk
index 9f1a75265..94d509db6 100644
--- a/doc/reference/algorithms/overlaps.qbk
+++ b/doc/reference/algorithms/overlaps.qbk
@@ -13,3 +13,4 @@
 [def __this_function__ overlaps]
 
 [heading_conformance_ogc __this_function__..Overlaps]
+[include reference/status/overlaps_status.qbk]
diff --git a/doc/reference/algorithms/touches.qbk b/doc/reference/algorithms/touches.qbk
index 56e502c93..9271e4c4f 100644
--- a/doc/reference/algorithms/touches.qbk
+++ b/doc/reference/algorithms/touches.qbk
@@ -15,5 +15,5 @@
 [heading_conformance_ogc __this_function__..Touches]
 [? __one_parameter__ The version with one parameter is additional and not described in the OGC standard]
 
-[note only implemented for polygon/multi_polygon]
+[note Implemented for Point/Linestring/MultiLinestring/Polygon/MultiPolygon.]
 
diff --git a/doc/reference/algorithms/within.qbk b/doc/reference/algorithms/within.qbk
index db63e07e3..cd8eee5ee 100644
--- a/doc/reference/algorithms/within.qbk
+++ b/doc/reference/algorithms/within.qbk
@@ -15,7 +15,7 @@
 [heading_conformance_ogc __this_function__..Within]
 [note OGC defines within as completely within and not on the border. See the notes for within / on the border]
 
-[include generated/within_status.qbk]
+[include reference/status/within_status.qbk]
 [note In this status matrix above: columns are types of first parameter
   and rows are types of second parameter. So a point can be checked to be 
   within a polygon, but not vice versa.]
diff --git a/doc/reference/io/read_wkt.qbk b/doc/reference/io/read_wkt.qbk
new file mode 100644
index 000000000..d34e90647
--- /dev/null
+++ b/doc/reference/io/read_wkt.qbk
@@ -0,0 +1,32 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2009-2014 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)
+=============================================================================/]
+
+[heading The WKT Format]
+WKT is a general markup format in ASCII.
+It is described in detail on [@http://en.wikipedia.org/wiki/Well-known_text Wikipedia]
+
+Boost Geometry supports the common formats (POINT, LINESTRING, POLYGON, MULTIPOINT, MULTILINESTRING, MULTIPOLYGON). Because Boost.Geometry
+also supports Box and Segment geometries, which are not standard OGC geometries, there are some extensions:
+
+* a Box can be read from WKT by specifying either a polygon (with 4 points) or a specific BOX string (non OGC)
+* a Segment can be read from WKT by specifying either a linestring (with 2 points) or a specific SEGMENT string (non OGC)
+* a Ring can be read from WKT by specifying a polygon (with no holes)
+
+[heading Conformance]
+Other libraries refer to this functionality as [*ST_GeomFromText] or [*STGeomFromText].
+That is not done here because Boost.Geometry support more text formats. The name GeomFromText
+is reserved for future usage, which will then have an indication of the used text format.
+
+
+[heading Example]
+[read_wkt]
+
+[heading See also]
+* [link geometry.reference.io.wkt.wkt WKT streaming manipulator]
diff --git a/doc/reference/io/wkt.qbk b/doc/reference/io/wkt.qbk
new file mode 100644
index 000000000..7c45a9f67
--- /dev/null
+++ b/doc/reference/io/wkt.qbk
@@ -0,0 +1,22 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2009-2014 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)
+=============================================================================/]
+
+[def __this_function__ wkt]
+
+[heading_conformance_ogc __this_function__..AsText]
+[note __this_function__ is not named "AsText" or "as_text" because Boost.Geometry 
+also supports other textformats (svg, dsv)]
+
+[heading Example]
+[wkt]
+[wkt_output]
+
+[heading See also]
+* [link geometry.reference.io.wkt.read_wkt Read WKT]
diff --git a/doc/generated/append_status.qbk b/doc/reference/status/append_status.qbk
similarity index 66%
rename from doc/generated/append_status.qbk
rename to doc/reference/status/append_status.qbk
index 51329f887..ba6925202 100644
--- a/doc/generated/append_status.qbk
+++ b/doc/reference/status/append_status.qbk
@@ -1,4 +1,3 @@
-[/NOTE: adapted manually, multi-linestring/multi-polygon do compile but not run!]
 [heading Supported geometries]
 [table
 [[ ][Point][Range]]
@@ -9,6 +8,6 @@
 [[Ring][ [$img/ok.png] ][ [$img/ok.png] ]]
 [[Polygon][ [$img/ok.png] ][ [$img/ok.png] ]]
 [[MultiPoint][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/area_status.qbk b/doc/reference/status/area_status.qbk
similarity index 91%
rename from doc/generated/area_status.qbk
rename to doc/reference/status/area_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/area_status.qbk
+++ b/doc/reference/status/area_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/buffer_status.qbk b/doc/reference/status/buffer_status.qbk
similarity index 100%
rename from doc/generated/buffer_status.qbk
rename to doc/reference/status/buffer_status.qbk
diff --git a/doc/generated/centroid_status.qbk b/doc/reference/status/centroid_status.qbk
similarity index 83%
rename from doc/generated/centroid_status.qbk
rename to doc/reference/status/centroid_status.qbk
index 10e064127..edff68193 100644
--- a/doc/generated/centroid_status.qbk
+++ b/doc/reference/status/centroid_status.qbk
@@ -2,7 +2,7 @@
 [table
 [[Geometry][Status]]
 [[Point][ [$img/ok.png] ]]
-[[Segment][ [$img/nyi.png] ]]
+[[Segment][ [$img/ok.png] ]]
 [[Box][ [$img/ok.png] ]]
 [[Linestring][ [$img/ok.png] ]]
 [[Ring][ [$img/ok.png] ]]
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/clear_status.qbk b/doc/reference/status/clear_status.qbk
similarity index 91%
rename from doc/generated/clear_status.qbk
rename to doc/reference/status/clear_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/clear_status.qbk
+++ b/doc/reference/status/clear_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/convert_status.qbk b/doc/reference/status/convert_status.qbk
similarity index 100%
rename from doc/generated/convert_status.qbk
rename to doc/reference/status/convert_status.qbk
diff --git a/doc/generated/convex_hull_status.qbk b/doc/reference/status/convex_hull_status.qbk
similarity index 100%
rename from doc/generated/convex_hull_status.qbk
rename to doc/reference/status/convex_hull_status.qbk
diff --git a/doc/generated/correct_status.qbk b/doc/reference/status/correct_status.qbk
similarity index 91%
rename from doc/generated/correct_status.qbk
rename to doc/reference/status/correct_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/correct_status.qbk
+++ b/doc/reference/status/correct_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/reference/status/covered_by_status.qbk b/doc/reference/status/covered_by_status.qbk
new file mode 100644
index 000000000..3d9f98bab
--- /dev/null
+++ b/doc/reference/status/covered_by_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Segment][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+]
diff --git a/doc/reference/status/crosses_status.qbk b/doc/reference/status/crosses_status.qbk
new file mode 100644
index 000000000..6b1fe8758
--- /dev/null
+++ b/doc/reference/status/crosses_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Variant][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+]
diff --git a/doc/reference/status/disjoint_status.qbk b/doc/reference/status/disjoint_status.qbk
new file mode 100644
index 000000000..7c838e7c4
--- /dev/null
+++ b/doc/reference/status/disjoint_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Segment][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
+[[Box][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+]
diff --git a/doc/generated/distance_status.qbk b/doc/reference/status/distance_status.qbk
similarity index 61%
rename from doc/generated/distance_status.qbk
rename to doc/reference/status/distance_status.qbk
index 5dbdeba7f..9209452b6 100644
--- a/doc/generated/distance_status.qbk
+++ b/doc/reference/status/distance_status.qbk
@@ -1,13 +1,14 @@
 [heading Supported geometries]
 [table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[Segment][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Linestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPoint][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
-[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Segment][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPoint][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Variant][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
 ]
diff --git a/doc/generated/envelope_status.qbk b/doc/reference/status/envelope_status.qbk
similarity index 91%
rename from doc/generated/envelope_status.qbk
rename to doc/reference/status/envelope_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/envelope_status.qbk
+++ b/doc/reference/status/envelope_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/equals_status.qbk b/doc/reference/status/equals_status.qbk
similarity index 58%
rename from doc/generated/equals_status.qbk
rename to doc/reference/status/equals_status.qbk
index 573c78f4b..2628e4483 100644
--- a/doc/generated/equals_status.qbk
+++ b/doc/reference/status/equals_status.qbk
@@ -1,13 +1,14 @@
 [heading Supported geometries]
 [table
-[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon]]
-[[Point][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Ring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[Polygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
-[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
-[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
+[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/expand_status.qbk b/doc/reference/status/expand_status.qbk
similarity index 100%
rename from doc/generated/expand_status.qbk
rename to doc/reference/status/expand_status.qbk
diff --git a/doc/generated/for_each_point_status.qbk b/doc/reference/status/for_each_point_status.qbk
similarity index 100%
rename from doc/generated/for_each_point_status.qbk
rename to doc/reference/status/for_each_point_status.qbk
diff --git a/doc/generated/for_each_segment_status.qbk b/doc/reference/status/for_each_segment_status.qbk
similarity index 100%
rename from doc/generated/for_each_segment_status.qbk
rename to doc/reference/status/for_each_segment_status.qbk
diff --git a/doc/reference/status/intersects_status.qbk b/doc/reference/status/intersects_status.qbk
new file mode 100644
index 000000000..7c838e7c4
--- /dev/null
+++ b/doc/reference/status/intersects_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Segment][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ]]
+[[Box][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+]
diff --git a/doc/generated/length_status.qbk b/doc/reference/status/length_status.qbk
similarity index 91%
rename from doc/generated/length_status.qbk
rename to doc/reference/status/length_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/length_status.qbk
+++ b/doc/reference/status/length_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/num_geometries_status.qbk b/doc/reference/status/num_geometries_status.qbk
similarity index 100%
rename from doc/generated/num_geometries_status.qbk
rename to doc/reference/status/num_geometries_status.qbk
diff --git a/doc/generated/num_interior_rings_status.qbk b/doc/reference/status/num_interior_rings_status.qbk
similarity index 100%
rename from doc/generated/num_interior_rings_status.qbk
rename to doc/reference/status/num_interior_rings_status.qbk
diff --git a/doc/generated/num_points_status.qbk b/doc/reference/status/num_points_status.qbk
similarity index 91%
rename from doc/generated/num_points_status.qbk
rename to doc/reference/status/num_points_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/num_points_status.qbk
+++ b/doc/reference/status/num_points_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/reference/status/overlaps_status.qbk b/doc/reference/status/overlaps_status.qbk
new file mode 100644
index 000000000..8d26c4daf
--- /dev/null
+++ b/doc/reference/status/overlaps_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Segment][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Linestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+]
diff --git a/doc/generated/perimeter_status.qbk b/doc/reference/status/perimeter_status.qbk
similarity index 91%
rename from doc/generated/perimeter_status.qbk
rename to doc/reference/status/perimeter_status.qbk
index e4d8d3023..edff68193 100644
--- a/doc/generated/perimeter_status.qbk
+++ b/doc/reference/status/perimeter_status.qbk
@@ -10,4 +10,5 @@
 [[MultiPoint][ [$img/ok.png] ]]
 [[MultiLinestring][ [$img/ok.png] ]]
 [[MultiPolygon][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ]]
 ]
diff --git a/doc/generated/reverse_status.qbk b/doc/reference/status/reverse_status.qbk
similarity index 100%
rename from doc/generated/reverse_status.qbk
rename to doc/reference/status/reverse_status.qbk
diff --git a/doc/generated/simplify_status.qbk b/doc/reference/status/simplify_status.qbk
similarity index 100%
rename from doc/generated/simplify_status.qbk
rename to doc/reference/status/simplify_status.qbk
diff --git a/doc/generated/transform_status.qbk b/doc/reference/status/transform_status.qbk
similarity index 100%
rename from doc/generated/transform_status.qbk
rename to doc/reference/status/transform_status.qbk
diff --git a/doc/generated/unique_status.qbk b/doc/reference/status/unique_status.qbk
similarity index 100%
rename from doc/generated/unique_status.qbk
rename to doc/reference/status/unique_status.qbk
diff --git a/doc/reference/status/within_status.qbk b/doc/reference/status/within_status.qbk
new file mode 100644
index 000000000..3d9f98bab
--- /dev/null
+++ b/doc/reference/status/within_status.qbk
@@ -0,0 +1,14 @@
+[heading Supported geometries]
+[table
+[[ ][Point][Segment][Box][Linestring][Ring][Polygon][MultiPoint][MultiLinestring][MultiPolygon][Variant]]
+[[Point][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Segment][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Box][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Linestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[Ring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Polygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[MultiPoint][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiLinestring][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+[[MultiPolygon][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/ok.png] ][ [$img/ok.png] ][ [$img/ok.png] ]]
+[[Variant][ [$img/ok.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ][ [$img/nyi.png] ]]
+]
diff --git a/doc/generated/wkt_status.qbk b/doc/reference/status/wkt_status.qbk
similarity index 100%
rename from doc/generated/wkt_status.qbk
rename to doc/reference/status/wkt_status.qbk
diff --git a/doc/release_notes.qbk b/doc/release_notes.qbk
index a5842810a..4e8ffef9e 100644
--- a/doc/release_notes.qbk
+++ b/doc/release_notes.qbk
@@ -2,8 +2,8 @@
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
   Copyright (c) 2009-2013 Barend Gehrels, Geodan, Amsterdam, the Netherlands.
-  Copyright (c) 2009-2013 Mateusz Loskot (mateusz@loskot.net)
-  Copyright (c) 2009-2013 Mateusz Lalande, Paris, France.
+  Copyright (c) 2009-2013 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2013 Mateusz Loskot <mateusz@loskot.net>, London, UK
   Copyright (c) 2011-2013 Adam Wulkiewicz
 
   Use, modification and distribution is subject to the Boost Software License,
@@ -13,6 +13,29 @@
 
 [section:release_notes Release Notes]
 
+[/=================]
+[heading Boost 1.56]
+[/=================]
+
+[*Additional functionality]
+
+* New algorithm buffer for inflating/deflating geometries (buffer itself already existed but that was only to enlarge a box)
+* New algorithm remove_spikes, algorithm to remove spikes from a ring, polygon or multi_polygon.
+* New algorithm point_on_surface, generating a point lying on the surface (interior) of the polygon
+
+[*Solved tickets]
+
+* [@https://svn.boost.org/trac/boost/ticket/9245 9245] Check for process errors in make_qbk.py
+* [@https://svn.boost.org/trac/boost/ticket/9081 9081] Booleans create self-intersecting polygons from non-self-intersecting polygons
+* [@https://svn.boost.org/trac/boost/ticket/8310 8310] Wrong results with overlapping polygons (fixed using point_on_surface for disjoint)
+* [@https://svn.boost.org/trac/boost/ticket/9871 9871] Remove spike in polygon with only a spike
+* [@https://svn.boost.org/trac/boost/ticket/9563 9563] (Sym)difference not successful, fixed by rescaling to robust type
+
+[*Bugfixes]
+
+* intersects(polygon) could return a self-intersection-point for its closing point, fixed
+
+
 [/=================]
 [heading Boost 1.55]
 [/=================]
@@ -30,6 +53,8 @@
 [*Bugfixes]
 
 * In some cases .back() or .clear() was called, violating the usage of Concepts. Fixed for the reported cases
+* Use consistent side information in cart_intersect and get_turn_info and handle_tangencies and enrich_intersection_info. This
+  is done by switching to integer (if necessary) for the specific 6 points only, zooming in on the 4 or 3 segments
 
 [*Solved tickets]
 
diff --git a/doc/robustness.qbk b/doc/robustness.qbk
new file mode 100644
index 000000000..3c6654fa0
--- /dev/null
+++ b/doc/robustness.qbk
@@ -0,0 +1,47 @@
+[/============================================================================
+  Boost.Geometry (aka GGL, Generic Geometry Library)
+
+  Copyright (c) 2013 Mateusz Loskot, London, UK.
+
+  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)
+=============================================================================/]
+
+[/ TODO: this is a basic draft only, should NOT be built into final docs yet ]
+[/ TODO: discuss numerical stability per algorithm (at least for line intersection and point in polygon) ]
+[/ TODO: integrate with doxygen_d_robustness.hpp and http://geometrylibrary.geodan.nl/formal_review/robustness.html ]
+[/ TODO: interlink the interesting discussion from Boost.Polygon at 
+http://www.boost.org/doc/libs/release/libs/polygon/doc/voronoi_main.htm ]
+[/ TODO: discuss relation to EGC http://cs.nyu.edu/exact/intro/ ]
+
+[section Robustness]
+
+A numerical stability issues are a common problem in implementations of 
+computational geometry algorithms.
+
+They lead to variety of unexpected sitautions at run-time: an application 
+randomly throws segmentation faults, output computed by an algorithm 
+contains degeneracies, unexpected artefacts or completely invalid.
+
+For example, according to the OpenGIS Simple Feature Specification,
+
+["A Polygon may not have cut lines, spikes or punctures]
+
+From mathematical point of view such condition is easy to verify.
+However, depending on computational method and in the presence of round-off 
+or truncation errors, it is not easy to decided how "sharp" must be a part 
+of polygon in order to consider it a spike.
+
+A 100% robust implementation of an algorithm gives expected result in 100% of cases. Achieving complete floating point robustness implies use of certain set of algorithms as well as platform specific assumptions about floating point representations. 
+
+Despite Boost.Geometry does not promise absolute numerical stability, 
+it attempts to offer balanced efficiency and robustness by:
+
+# selection of algorithms, often solved at case-by-case basis
+# compile-time selection of most precise and capacious C++ type on which to perform computations.
+# support for arbitrary precision numeric types
+
+
+[endsect]
+
diff --git a/doc/src/copyright_block.qbk b/doc/src/copyright_block.qbk
index 028c02c0a..6f3da2169 100644
--- a/doc/src/copyright_block.qbk
+++ b/doc/src/copyright_block.qbk
@@ -1,9 +1,9 @@
 [/============================================================================
   Boost.Geometry (aka GGL, Generic Geometry Library)
 
-  Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-  Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-  Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+  Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+  Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+  Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
 
   Use, modification and distribution is subject to the Boost Software License,
   Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
index cb21cfdca..033bcc492 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/configuration.hpp
@@ -34,9 +34,9 @@ struct configuration
     enum output_style_type {def, alt};
     output_style_type output_style;
 
-    configuration() 
-      : output_style(def) 
-      , output_member_variables(false) 
+    configuration()
+      : output_style(def)
+      , output_member_variables(false)
     {}
 };
 
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
index 43fc98bce..95950a6d7 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_elements.hpp
@@ -19,12 +19,12 @@ enum markup_type { markup_default, markup_synopsis };
 enum markup_order_type { markup_any, markup_before, markup_after };
 
 // TODO: rename, not all are functions
-enum function_type 
-{ 
-    function_unknown, 
-    function_define, 
-    function_constructor_destructor, 
-    function_member, 
+enum function_type
+{
+    function_unknown,
+    function_define,
+    function_constructor_destructor,
+    function_member,
     function_free,
 };
 
@@ -32,7 +32,7 @@ struct base_element
 {
     std::string name;
     std::string brief_description;
-    
+
     bool skip;
 
     std::string id;
@@ -153,7 +153,7 @@ struct enumeration : public element
 struct base_class
 {
     std::string name;
-    std::string derivation; // "prot" element 
+    std::string derivation; // "prot" element
     std::string virtuality; // "virt" element
 };
 
@@ -176,10 +176,10 @@ struct documentation
     std::string group_title;
 
     // Only one expected (no grouping)
-    class_or_struct cos; 
+    class_or_struct cos;
 
     // There can be many of them (in groups):
-    std::vector<function> functions; 
+    std::vector<function> functions;
     std::vector<function> defines;
     std::vector<enumeration> enumerations;
 };
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
index f3a67fbec..60030eb83 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml2qbk.cpp
@@ -80,22 +80,22 @@ int main(int argc, char** argv)
             description.add_options()
                 ("help", "Help message")
                 ("version", "Version description")
-                ("xml", po::value<std::string>(&filename), 
+                ("xml", po::value<std::string>(&filename),
                             "Name of XML file written by Doxygen")
-                ("start_include", po::value<std::string>(&config.start_include), 
+                ("start_include", po::value<std::string>(&config.start_include),
                             "Start include")
-                ("convenience_header_path", po::value<std::string>(&config.convenience_header_path), 
+                ("convenience_header_path", po::value<std::string>(&config.convenience_header_path),
                             "Convenience header path")
-                ("convenience_headers", po::value<std::string>(&convenience_headers), 
+                ("convenience_headers", po::value<std::string>(&convenience_headers),
                             "Convenience header(s) (comma-separated)")
-                ("skip_namespace", po::value<std::string>(&config.skip_namespace), 
+                ("skip_namespace", po::value<std::string>(&config.skip_namespace),
                             "Namespace to skip (e.g. boost::mylib::)")
-                ("copyright", po::value<std::string>(&copyright_filename), 
+                ("copyright", po::value<std::string>(&copyright_filename),
                             "Name of QBK file including (commented) copyright and license")
 
                 ("output_style", po::value<std::string>(&output_style),
                             "Docbook output style. Available values: 'alt'")
-                ("output_member_variables", po::value<bool>(&config.output_member_variables), 
+                ("output_member_variables", po::value<bool>(&config.output_member_variables),
                             "Output member variables inside the class")
             ;
 
@@ -121,16 +121,16 @@ int main(int argc, char** argv)
             }
             else if (varmap.count("help"))
             {
-                std::cout 
-                    << program_description(true) << std::endl 
+                std::cout
+                    << program_description(true) << std::endl
                     << "Available options:" << std::endl
                     << description << std::endl;
                 return 0;
             }
             else if (filename.empty())
             {
-                std::cout 
-                    << program_description(true) << std::endl 
+                std::cout
+                    << program_description(true) << std::endl
                     << "Allowed options:" << std::endl
                     << description << std::endl;
                 return 1;
@@ -149,8 +149,8 @@ int main(int argc, char** argv)
 
         // Read files into strings
         std::string xml_string = file_to_string(filename);
-        std::string license = copyright_filename.empty() 
-            ? "" 
+        std::string license = copyright_filename.empty()
+            ? ""
             : file_to_string(copyright_filename);
 
         // Parse the XML outputted by Doxygen
@@ -236,7 +236,7 @@ int main(int argc, char** argv)
     }
     catch(...)
     {
-        std::cerr << "Unknown exception in doxygen_xml2qbk" 
+        std::cerr << "Unknown exception in doxygen_xml2qbk"
             << std::endl;
         return 1;
     }
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
index 119a57364..5642bb2eb 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/doxygen_xml_parser.hpp
@@ -53,9 +53,9 @@ static inline void add_or_set(std::vector<parameter>& parameters, parameter cons
 
 
 
-/// Parses a "para" element 
+/// Parses a "para" element
 /*
-This is used for different purposes within Doxygen. 
+This is used for different purposes within Doxygen.
 - Either a detailed description, possibly containing several sections (para's)
   -> so parse next siblings
 - Or a detailed description also containing qbk records
@@ -138,11 +138,11 @@ static void parse_para(rapidxml::xml_node<>* node, configuration const& config,
                     {
                         contents += std::string("[link ") + refid + " ";
                         parse_para(node->first_node(), config, contents, skip, false, in_block);
-                        contents += "]";                        
+                        contents += "]";
                         parse_para(node->next_sibling(), config, contents, skip, false, tb);
                         return;
                     }
-                }                                
+                }
             }
             else if (! (
                 (boost::equals(name, "para") && first)
@@ -210,8 +210,8 @@ static void parse_parameter(rapidxml::xml_node<>* node, configuration const& con
         }
         else if (name == "declname") p.name = node->value();
         else if (name == "parametername") p.name = node->value();
-        else if (name == "defname") p.name = node->value(); 
-        else if (name == "defval") 
+        else if (name == "defname") p.name = node->value();
+        else if (name == "defval")
         {
             parse_para(node, config, p.default_value, p.skip);
         }
@@ -439,7 +439,7 @@ static void parse_element(rapidxml::xml_node<>* node, configuration const& confi
                     p.title = title_node->value();
 
                 parse_para(node->first_node("para"), config, p.text, el.skip);
-                
+
                 el.paragraphs.push_back(p);
             }
             else if (kind == "warning")
@@ -649,7 +649,7 @@ static void parse(rapidxml::xml_node<>* node, configuration const& config, docum
                         boost::equals(f.name, std::string("~") + doc.cos.name);
 
                     f.type = c_or_d
-                        ? function_constructor_destructor 
+                        ? function_constructor_destructor
                         : function_member;
                     doc.cos.functions.push_back(f);
                 }
diff --git a/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp b/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
index 0f2d9de2a..56add116a 100644
--- a/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
+++ b/doc/src/docutils/tools/doxygen_xml2qbk/quickbook_output.hpp
@@ -34,7 +34,7 @@ std::string qbk_escaped(std::string const& s)
         {
             case '[' : counter++; break;
             case ']' : counter--; break;
-            case '\\' : 
+            case '\\' :
                 {
                     result += s[i];
                     if (i + 1 < len)
@@ -44,7 +44,7 @@ std::string qbk_escaped(std::string const& s)
                     i++;
                     continue;
                 }
-            case '_' : 
+            case '_' :
                 if (counter == 0)
                 {
                     result += "\\u005f";
@@ -104,7 +104,7 @@ void quickbook_synopsis(function const& f, std::ostream& out)
             // do nothing
             break;
     }
-    
+
     // Output the parameters
     // Because we want to be able to skip, we cannot use the argstring
     {
@@ -113,7 +113,7 @@ void quickbook_synopsis(function const& f, std::ostream& out)
         {
             if (! p.skip)
             {
-                out 
+                out
                     << (first ? "(" : ", ")
                     << p.fulltype << (p.fulltype.empty() ? "" : " ")
                     << p.name
@@ -132,7 +132,7 @@ void quickbook_synopsis(function const& f, std::ostream& out)
         }
     }
 
-    out << "``" 
+    out << "``"
         << std::endl
         << std::endl;
 }
@@ -157,7 +157,7 @@ void quickbook_synopsis(enumeration const& e, std::ostream& out)
     {
         out << "};";
     }
-    out << "``" 
+    out << "``"
         << std::endl
         << std::endl;
 }
@@ -221,8 +221,8 @@ void quickbook_header(std::string const& location,
 }
 
 
-void quickbook_markup(std::vector<markup> const& qbk_markup, 
-            markup_order_type order, markup_type type, 
+void quickbook_markup(std::vector<markup> const& qbk_markup,
+            markup_order_type order, markup_type type,
             std::ostream& out)
 {
     bool has_output = false;
@@ -357,7 +357,7 @@ void quickbook_output(function const& f, configuration const& config, std::ostre
         << std::endl;
 
     quickbook_output_indexterm(f.name, out);
-        
+
     out << qbk_escaped(f.brief_description) << std::endl;
     out << std::endl;
 
@@ -478,7 +478,7 @@ void quickbook_output(enumeration const& e, configuration const& config, std::os
     out << std::endl;
 }
 
-void quickbook_output_function(std::vector<function> const& functions, 
+void quickbook_output_function(std::vector<function> const& functions,
                                 function_type type,
                                 std::string const& title,
                                 configuration const& config, std::ostream& out)
@@ -734,7 +734,7 @@ void quickbook_output_functions(std::vector<function> const& functions,
     BOOST_FOREACH(function const& f, functions)
     {
         if ( (display_all || f.type == type) && (f.is_const || f.is_static) && !f.brief_description.empty() )
-            show_modifiers = true;        
+            show_modifiers = true;
     }
 
     out << "[table\n"
@@ -833,7 +833,7 @@ void inline_str_with_links(std::string const& str, std::ostream & out)
                     first = false;
                 }
                 out << str[i];
-            }            
+            }
         }
         else
         {
@@ -863,7 +863,7 @@ void inline_str_with_links(std::string const& str, std::ostream & out)
 void quickbook_template_parameter_list_alt(std::vector<parameter> const& parameters, std::ostream& out)
 {
     std::string next_param;
-    
+
     if ( 2 < parameters.size() )
         next_param = std::string("`,`\n") + "         ";
     else
@@ -981,7 +981,7 @@ void quickbook_synopsis_alt(class_or_struct const& cos, configuration const& con
         else
             out << short_name.substr(last_scope + 2) << "`" << std::endl;
     }
-    
+
     if (! cos.base_classes.empty())
     {
         out << "`      : ";
@@ -1080,7 +1080,7 @@ void quickbook_output_functions_details(std::vector<function> const& functions,
             out << "[section " << replace_brackets(ss.str()) << "]" << std::endl;
 
             quickbook_output_indexterm(f.name, out);
-            
+
             // Brief description
             out << f.brief_description << std::endl;
             out << std::endl;
@@ -1174,7 +1174,7 @@ void quickbook_output_functions_details(std::vector<function> const& functions,
                 out << "[heading Returns]" << std::endl;
                 out << f.return_description << std::endl;
             }
-            
+
             // Additional paragraphs, note, warning
             output_paragraphs_note_warning(f, out);
 
@@ -1276,7 +1276,7 @@ void quickbook_output_alt(documentation const& doc, configuration const& config,
     {
         out << "[endsect]" << std::endl
             << std::endl;
-    }    
+    }
 }
 
 void quickbook_output_alt(class_or_struct const& cos, configuration const& config, std::ostream& out)
diff --git a/doc/src/docutils/tools/implementation_status/implementation_status.cpp b/doc/src/docutils/tools/implementation_status/implementation_status.cpp
index 10cef081f..1a3e1e18e 100644
--- a/doc/src/docutils/tools/implementation_status/implementation_status.cpp
+++ b/doc/src/docutils/tools/implementation_status/implementation_status.cpp
@@ -1,8 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Tool reporting Implementation Status in QBK format
 
-// Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2011-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2011-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2011-2014 Bruno Lalande, Paris, France.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -30,18 +30,58 @@ static const int polygon = 5;
 static const int multi_point = 6;
 static const int multi_linestring = 7;
 static const int multi_polygon = 8;
-static const int geometry_count = 9;
-
+static const int variant = 9;
+static const int geometry_count = 10;
 
 struct compile_bjam
 {
-    static inline bool apply(int type1, int type2)
+    static inline bool apply(std::string const& id)
     {
         std::ostringstream command;
-        // For debugging: 
-        command << "bjam -a tmp > tmp/t" << type1 << "_" << type2 << ".out";
-        //command << "bjam -a tmp > tmp/t.out";
+        // For debugging:
+        command << "b2 -a tmp > tmp/t_" << id << ".out";
+        //command << "b2 -a tmp > tmp/t.out";
         int failed = system(command.str().c_str());
+
+        {
+            // For debugging: save t.cpp
+            std::ostringstream c2;
+            c2 << "cp tmp/t.cpp tmp/t_" << id << ".cpp";
+            system(c2.str().c_str());
+        }
+        return failed == 0;
+    }
+};
+
+
+struct compile_clang
+{
+    bool first;
+
+    compile_clang()
+        : first(true)
+    {}
+
+    inline bool apply(std::string const& id)
+    {
+        if (first)
+        {
+           // Generate the pre-compiled header
+           system("clang -x c++-header -I . -I ../../../../../../.. implementation_status.hpp");
+           first = false;
+        }
+
+        std::ostringstream command;
+        // We compile only, not even link
+        command << "clang -include implementation_status.hpp -I . -I ../../../../../../.. -c tmp/t.cpp > tmp/t_" << id << ".out 2>&1";
+        int failed = system(command.str().c_str());
+
+        {
+            // For debugging: save t.cpp
+            std::ostringstream c2;
+            c2 << "cp tmp/t.cpp tmp/t_" << id << ".cpp";
+            system(c2.str().c_str());
+        }
         return failed == 0;
     }
 };
@@ -56,7 +96,7 @@ struct compile_msvc
         , count(0)
     {}
 
-    inline bool apply(int type1, int type2)
+    inline bool apply(std::string const& id)
     {
         std::ostringstream command;
         command << "cl /nologo -I. -I/_svn/boost/trunk /EHsc /Y";
@@ -72,8 +112,8 @@ struct compile_msvc
         }
 
         command << "implementation_status.hpp tmp/t.cpp > tmp/t" //.out";
-            // For debugging: 
-            << type1 << "_" << type2 << ".out"; 
+            // For debugging:
+            << id << ".out";
 
         int failed = system(command.str().c_str());
         return failed == 0;
@@ -110,15 +150,16 @@ inline std::string typedef_string(int type, bool clockwise, bool open)
             out << "bg::model::ring<P, "
                 << bool_string(clockwise) << ", " << bool_string(open) << ">";
             break;
-        case polygon : 
+        case variant :
+        case polygon :
             out << "bg::model::polygon<P, "
                 << bool_string(clockwise) << ", " << bool_string(open) << ">";
             break;
         case multi_point : return "bg::model::multi_point<P>";
-        case multi_linestring : 
+        case multi_linestring :
             out << "bg::model::multi_linestring<bg::model::linestring<P> >";
             break;
-        case multi_polygon : 
+        case multi_polygon :
             out << "bg::model::multi_polygon<bg::model::polygon<P, "
                 << bool_string(clockwise) << ", " << bool_string(open) << "> >";
             break;
@@ -133,8 +174,9 @@ inline std::string wkt_string(int type)
         case point : return "POINT(1 1)";
         case linestring : return "LINESTRING(1 1,2 2)";
         case segment : return "LINESTRING(1 1,2 2)";
-        case box : return "POLYGON((1 1,2 2)";
-        case polygon : 
+        case box : return "POLYGON((1 1,2 2))";
+        case polygon :
+        case variant :
         case ring :
             return "POLYGON((0 0,0 1,1 1,0 0))";
         case multi_point : return "MULTIPOINT((1 1),(2 2))";
@@ -151,17 +193,17 @@ inline std::string geometry_string(int type)
         case point : return "Point";
         case linestring : return "Linestring";
         case box : return "Box";
-        case polygon : return "Polygon"; 
+        case polygon : return "Polygon";
         case ring : return "Ring";
         case segment : return "Segment";
         case multi_point : return "MultiPoint";
         case multi_linestring : return "MultiLinestring";
         case multi_polygon : return "MultiPolygon";
+        case variant : return "Variant";
     }
     return "";
 }
 
-
 template <typename CompilePolicy>
 int report_library(CompilePolicy& compile_policy,
                    int type, algorithm const& algo, bool clockwise,
@@ -176,9 +218,9 @@ int report_library(CompilePolicy& compile_policy,
         {
             out << "_" << geometry_string(type2);
         }
-        out 
+        out
             << "_" << algo.name
-            << "_" << bool_string(clockwise) 
+            << "_" << bool_string(clockwise)
             << "_" << bool_string(open)
             << "_" << boost::replace_all_copy
                         (
@@ -197,31 +239,68 @@ int report_library(CompilePolicy& compile_policy,
     {
         std::ofstream out("tmp/t.cpp");
 
+        std::string name = "geometry";
+
+        if (type == variant)
+        {
+            name = "source";
+        }
+
+        out << "#include <implementation_status.hpp>" << std::endl;
+
+        if (type == variant)
+        {
+            out << "#include <boost/variant/variant.hpp>" << std::endl;
+        }
+
         out
-            << "#include <implementation_status.hpp>" << std::endl
             << "template <typename P>" << std::endl
             << "inline void test()" << std::endl
             << "{" << std::endl
             << "  namespace bg = boost::geometry;" << std::endl
-            << "  " << typedef_string(type, clockwise, open) << " geometry;" << std::endl
-            << "  bg::read_wkt(\"" << wkt_string(type) << "\", geometry);" << std::endl;
+            << "  " << typedef_string(type, clockwise, open) << " " << name << ";" << std::endl
+            << "  bg::read_wkt(\"" << wkt_string(type) << "\", " << name << ");" << std::endl;
+
+        if (type == variant)
+        {
+            out
+                << "  typedef " << typedef_string(polygon, clockwise, open) << " type1;" << std::endl
+                << "  typedef " << typedef_string(box, clockwise, open) << " type2;" << std::endl
+                << "  boost::variant<type1, type2> geometry;" << std::endl
+                << "  geometry = source;"
+                << std::endl;
+        }
 
-        
         if (algo.arity > 1)
         {
-            out 
+            out
                 << "  " << typedef_string(type2, clockwise, open) << " geometry2;" << std::endl
                 << "  bg::read_wkt(\"" << wkt_string(type2) << "\", geometry2);" << std::endl;
         }
 
-        switch(algo.arity)
+        if (algo.name == std::string("centroid"))
         {
-            case 1 : 
-                out << "  bg::" << algo.name << "(geometry);" << std::endl; 
-                break;
-            case 2 : 
-                out << "  bg::" << algo.name << "(geometry, geometry2);" << std::endl; 
-                break;
+            out << "  P point;";
+            out << "  bg::" << algo.name << "(geometry, point);" << std::endl;
+        }
+        else if (algo.name == std::string("envelope"))
+        {
+            out << "  bg::model::box<P> box;";
+            out << "  bg::" << algo.name << "(geometry, box);" << std::endl;
+        }
+        else
+        {
+            switch(algo.arity)
+            {
+                case 1 :
+                    out << "  bg::" << algo.name << "(geometry);" << std::endl;
+                    break;
+                case 2 :
+                    // For cases as point-in-polygon, take first geometry 2 (point), then geometry (polygon) such that
+                    // it is listed as column:point in row:polygon
+                    out << "  bg::" << algo.name << "(geometry2, geometry);" << std::endl;
+                    break;
+            }
         }
 
         out
@@ -240,7 +319,7 @@ int report_library(CompilePolicy& compile_policy,
             ;
     }
 
-    bool result = compile_policy.apply(type, type2);
+    bool result = compile_policy.apply(lit);
     if (! result)
     {
         std::cout << " ERROR";
@@ -284,26 +363,34 @@ struct cs
 };
 
 
-int main(int argc, char** argv)
+int main(int , char** )
 {
 #if defined(_MSC_VER)
     compile_msvc compile_policy;
 #else
-    compile_bjam compile_policy;
+    //compile_bjam compile_policy;
+    compile_clang compile_policy;
 #endif
 
-
     typedef std::vector<algorithm> v_a_type;
     v_a_type algorithms;
     algorithms.push_back(algorithm("area"));
-    algorithms.push_back(algorithm("length"));
-    algorithms.push_back(algorithm("perimeter"));
+    algorithms.push_back(algorithm("clear"));
     algorithms.push_back(algorithm("correct"));
+    algorithms.push_back(algorithm("centroid")); // NOTE: current doc contains 2D / 3D
+    algorithms.push_back(algorithm("envelope"));
+    algorithms.push_back(algorithm("length"));
+    algorithms.push_back(algorithm("num_points"));
+    algorithms.push_back(algorithm("perimeter"));
+
+    algorithms.push_back(algorithm("covered_by", 2));
     algorithms.push_back(algorithm("distance", 2));
-    algorithms.push_back(algorithm("centroid", 2));
-    algorithms.push_back(algorithm("intersects", 2));
-    algorithms.push_back(algorithm("within", 2));
+    algorithms.push_back(algorithm("crosses", 2));
+    algorithms.push_back(algorithm("disjoint", 2));
     algorithms.push_back(algorithm("equals", 2));
+    algorithms.push_back(algorithm("intersects", 2));
+    algorithms.push_back(algorithm("overlaps", 2));
+    algorithms.push_back(algorithm("within", 2));
 
     typedef std::vector<cs> cs_type;
     cs_type css;
@@ -326,7 +413,7 @@ int main(int argc, char** argv)
 ]*/
 
         std::ostringstream name;
-        name << "../../../../generated/" << it->name << "_status.qbk";
+        name << "../../../../reference/status/" << it->name << "_status.qbk";
 
         std::ofstream out(name.str().c_str());
         out << "[heading Supported geometries]" << std::endl;
@@ -344,6 +431,7 @@ int main(int argc, char** argv)
             }
 
 
+#if SURPRESS
             // Detect red rows/columns
 
             std::vector<int> lines_status(table.size(), false);
@@ -357,6 +445,7 @@ int main(int argc, char** argv)
                     columns_status[j] |= table[i][j];
                 }
             }
+#endif
 
 
             // Display the table
@@ -368,7 +457,9 @@ int main(int argc, char** argv)
                 out << "[ ]";
                 for (int type = point; type < geometry_count; type++)
                 {
+#if SURPRESS
                     if (!columns_status[type]) continue;
+#endif
                     out << "[" << geometry_string(type) << "]";
                 }
             }
@@ -381,13 +472,17 @@ int main(int argc, char** argv)
 
             for (unsigned int i = 0; i != table.size(); ++i)
             {
+#if SURPRESS
                 if (!lines_status[i]) continue;
+#endif
                 out << "[";
                 out << "[" << geometry_string(i) << "]";
                 for (unsigned int j = 0; j != table[i].size(); ++j)
                 {
+#if SURPRESS
                     if (!columns_status[j]) continue;
-                    out << "[[$img/" << (table[i][j] ? "ok" : "nyi") << ".png]]";
+#endif
+                    out << "[ [$img/" << (table[i][j] ? "ok" : "nyi") << ".png] ]";
                 }
                 out << "]" << std::endl;
             }
diff --git a/doc/src/docutils/tools/implementation_status/implementation_status.hpp b/doc/src/docutils/tools/implementation_status/implementation_status.hpp
index 4f50c399e..3d1095e7f 100644
--- a/doc/src/docutils/tools/implementation_status/implementation_status.hpp
+++ b/doc/src/docutils/tools/implementation_status/implementation_status.hpp
@@ -8,7 +8,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/geometry/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
-#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
 
diff --git a/doc/src/docutils/tools/support_status/Jamfile.v2 b/doc/src/docutils/tools/support_status/Jamfile.v2
new file mode 100644
index 000000000..04cc5e543
--- /dev/null
+++ b/doc/src/docutils/tools/support_status/Jamfile.v2
@@ -0,0 +1,26 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+# 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)
+
+
+project support-status
+    :
+    ;
+
+exe support-status : support_status.cpp
+    ;
+install dist-bin
+    :
+    support-status
+    :
+    <install-type>EXE
+    <location>../../../../../../../dist/bin
+    :
+    release
+    ;
diff --git a/doc/src/docutils/tools/support_status/qbk_outputter.hpp b/doc/src/docutils/tools/support_status/qbk_outputter.hpp
index 14a365f75..447669cd3 100644
--- a/doc/src/docutils/tools/support_status/qbk_outputter.hpp
+++ b/doc/src/docutils/tools/support_status/qbk_outputter.hpp
@@ -36,11 +36,11 @@ struct qbk_table_row_header
     void operator()(G)
     {
         m_out
-            << "[" 
+            << "["
             << qbk_geometry_name
                 <
                     typename boost::geometry::tag<G>::type
-                >::name() 
+                >::name()
             << "]";
     }
 };
@@ -70,7 +70,7 @@ struct qbk_outputter
     }
 
     template <typename Types>
-    inline void table_header() 
+    inline void table_header()
     {
         m_out << "[table" << std::endl << "[[ ]";
         boost::mpl::for_each<Types>(qbk_table_row_header(m_out));
@@ -81,25 +81,25 @@ struct qbk_outputter
         m_out << "[table" << std::endl << "[[Geometry][Status]]" << std::endl;
     }
 
-    inline void table_footer() 
+    inline void table_footer()
     {
         m_out << "]" << std::endl;
     }
 
     template <typename G>
-    inline void begin_row() 
+    inline void begin_row()
     {
-        m_out 
+        m_out
             << "[["
             << qbk_geometry_name
                 <
                     typename boost::geometry::tag<G>::type
                 >::name()
-            << "]" 
+            << "]"
             ;
     }
 
-    inline void end_row() 
+    inline void end_row()
     {
         m_out << "]" << std::endl;
     }
diff --git a/doc/src/docutils/tools/support_status/support_status.cpp b/doc/src/docutils/tools/support_status/support_status.cpp
index 5a8fa1e35..2fbc46a14 100644
--- a/doc/src/docutils/tools/support_status/support_status.cpp
+++ b/doc/src/docutils/tools/support_status/support_status.cpp
@@ -12,14 +12,13 @@
 #include <fstream>
 #include <sstream>
 
-#include <boost/type_traits/is_base_of.hpp>
 #include <boost/mpl/for_each.hpp>
 #include <boost/mpl/vector.hpp>
+#include <boost/type_traits/is_base_of.hpp>
 
 #define BOOST_GEOMETRY_IMPLEMENTATION_STATUS_BUILD true
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/multi/geometries/multi_geometries.hpp>
 #include <boost/geometry/algorithms/append.hpp>
 #include <boost/geometry/algorithms/area.hpp>
 #include <boost/geometry/algorithms/buffer.hpp>
@@ -66,7 +65,6 @@
 #include <boost/geometry/multi/algorithms/simplify.hpp>
 #include <boost/geometry/multi/algorithms/transform.hpp>
 #include <boost/geometry/multi/algorithms/unique.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include "text_outputter.hpp"
diff --git a/doc/src/examples/Jamfile.v2 b/doc/src/examples/Jamfile.v2
index faddc32a5..90c5337d2 100644
--- a/doc/src/examples/Jamfile.v2
+++ b/doc/src/examples/Jamfile.v2
@@ -18,4 +18,5 @@ exe quick_start : quick_start.cpp ;
 build-project algorithms ;
 build-project core ;
 build-project geometries ;
+build-project io ;
 build-project views ;
diff --git a/doc/src/examples/algorithms/assign.cpp b/doc/src/examples/algorithms/assign.cpp
index 857eebb34..32ae0db9d 100644
--- a/doc/src/examples/algorithms/assign.cpp
+++ b/doc/src/examples/algorithms/assign.cpp
@@ -30,7 +30,7 @@ int main()
     box b;
     boost::geometry::assign_values(p1, 1, 1);
     boost::geometry::assign_values(b, 1, 1, 2, 2);
-    
+
     // Assign a box to a polygon (target = source)
     polygon p;
     boost::geometry::assign(p, b);
@@ -38,7 +38,7 @@ int main()
     // Assign a point to another point type (conversion of point-type)
     boost::tuple<double, double> p2;
     boost::geometry::assign(p2, p1);
-        
+
     using boost::geometry::dsv;
     std::cout
         << "box: " << dsv(b) << std::endl
diff --git a/doc/src/examples/algorithms/comparable_distance.cpp b/doc/src/examples/algorithms/comparable_distance.cpp
index 87b5100ce..8ac50167c 100644
--- a/doc/src/examples/algorithms/comparable_distance.cpp
+++ b/doc/src/examples/algorithms/comparable_distance.cpp
@@ -21,9 +21,9 @@
 int main()
 {
     typedef boost::geometry::model::d2::point_xy<double> point_type;
-    
+
     point_type p(1.4, 2.6);
-    
+
     std::vector<point_type> v;
     for (double x = 0.0; x <= 4.0; x++)
     {
@@ -32,7 +32,7 @@ int main()
             v.push_back(point_type(x, y));
         }
     }
-    
+
     point_type min_p;
     double min_d = boost::numeric::bounds<double>::highest();
     BOOST_FOREACH(point_type const& pv, v)
@@ -44,8 +44,8 @@ int main()
             min_p = pv;
         }
     }
-    
-    std::cout 
+
+    std::cout
         << "Closest: " << boost::geometry::dsv(min_p) << std::endl
         << "At: " << boost::geometry::distance(p, min_p) << std::endl;
 
diff --git a/doc/src/examples/algorithms/convert.cpp b/doc/src/examples/algorithms/convert.cpp
index 6d43fd4d8..1f4570507 100644
--- a/doc/src/examples/algorithms/convert.cpp
+++ b/doc/src/examples/algorithms/convert.cpp
@@ -28,7 +28,7 @@ int main()
 
     point p1(1, 1);
     box bx = boost::geometry::make<box>(1, 1, 2, 2);
-    
+
     // Assign a box to a polygon (conversion box->poly)
     polygon poly;
     boost::geometry::convert(bx, poly);
@@ -36,7 +36,7 @@ int main()
     // Convert a point to another point type (conversion of point-type)
     boost::tuple<double, double> p2;
     boost::geometry::convert(p1, p2); // source -> target
-        
+
     using boost::geometry::dsv;
     std::cout
         << "box: " << dsv(bx) << std::endl
diff --git a/doc/src/examples/algorithms/convex_hull.cpp b/doc/src/examples/algorithms/convex_hull.cpp
index 2d9394f73..cfa658cc0 100644
--- a/doc/src/examples/algorithms/convex_hull.cpp
+++ b/doc/src/examples/algorithms/convex_hull.cpp
@@ -30,7 +30,7 @@ int main()
 
     polygon hull;
     boost::geometry::convex_hull(poly, hull);
-        
+
     using boost::geometry::dsv;
     std::cout
         << "polygon: " << dsv(poly) << std::endl
diff --git a/doc/src/examples/algorithms/create_svg_overlay.hpp b/doc/src/examples/algorithms/create_svg_overlay.hpp
index 53d81d6d6..fd281bdf2 100644
--- a/doc/src/examples/algorithms/create_svg_overlay.hpp
+++ b/doc/src/examples/algorithms/create_svg_overlay.hpp
@@ -49,7 +49,7 @@ void create_svg(std::string const& filename, Geometry const& a, Geometry const&
     boost::ignore_unused_variable_warning(a);
     boost::ignore_unused_variable_warning(b);
     boost::ignore_unused_variable_warning(range);
-#endif    
+#endif
 }
 
 // NOTE: convert manually from svg to png using Inkscape ctrl-shift-E
diff --git a/doc/src/examples/algorithms/distance.cpp b/doc/src/examples/algorithms/distance.cpp
index 89a629641..056cc8432 100644
--- a/doc/src/examples/algorithms/distance.cpp
+++ b/doc/src/examples/algorithms/distance.cpp
@@ -17,8 +17,8 @@
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_point.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/io/wkt/wkt.hpp>
 
@@ -44,7 +44,7 @@ int main()
     mp.push_back(point_type(0,0));
     mp.push_back(point_type(3,3));
 
-    std::cout 
+    std::cout
         << "Point-Poly: " << boost::geometry::distance(p, poly) << std::endl
         << "Point-Line: " << boost::geometry::distance(p, line) << std::endl
         << "Point-MultiPoint: " << boost::geometry::distance(p, mp) << std::endl;
diff --git a/doc/src/examples/algorithms/equals.cpp b/doc/src/examples/algorithms/equals.cpp
index fe2836a48..461a111e8 100644
--- a/doc/src/examples/algorithms/equals.cpp
+++ b/doc/src/examples/algorithms/equals.cpp
@@ -30,19 +30,19 @@ int main()
     boost::geometry::exterior_ring(poly1) = tuple_list_of(0, 0)(0, 5)(5, 5)(5, 0)(0, 0);
     boost::geometry::exterior_ring(poly2) = tuple_list_of(5, 0)(0, 0)(0, 5)(5, 5)(5, 0);
 
-    std::cout 
-        << "polygons are spatially " 
+    std::cout
+        << "polygons are spatially "
         << (boost::geometry::equals(poly1, poly2) ? "equal" : "not equal")
         << std::endl;
-    
+
     boost::geometry::model::box<point> box;
     boost::geometry::assign_values(box, 0, 0, 5, 5);
-    
-    std::cout 
-        << "polygon and box are spatially " 
+
+    std::cout
+        << "polygon and box are spatially "
         << (boost::geometry::equals(box, poly2) ? "equal" : "not equal")
         << std::endl;
-    
+
 
     return 0;
 }
diff --git a/doc/src/examples/algorithms/num_geometries.cpp b/doc/src/examples/algorithms/num_geometries.cpp
index 8a350d5b8..de242d4c5 100644
--- a/doc/src/examples/algorithms/num_geometries.cpp
+++ b/doc/src/examples/algorithms/num_geometries.cpp
@@ -15,9 +15,8 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 int main()
diff --git a/doc/src/examples/algorithms/num_interior_rings.cpp b/doc/src/examples/algorithms/num_interior_rings.cpp
index aeb8c92b7..1765ac4cd 100644
--- a/doc/src/examples/algorithms/num_interior_rings.cpp
+++ b/doc/src/examples/algorithms/num_interior_rings.cpp
@@ -15,9 +15,8 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 int main()
diff --git a/doc/src/examples/algorithms/num_points.cpp b/doc/src/examples/algorithms/num_points.cpp
index 2e3c5c678..3ccb2e7bb 100644
--- a/doc/src/examples/algorithms/num_points.cpp
+++ b/doc/src/examples/algorithms/num_points.cpp
@@ -13,12 +13,10 @@
 #include <iostream>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/multi/multi.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
 
 
 int main()
diff --git a/doc/src/examples/algorithms/sym_difference.cpp b/doc/src/examples/algorithms/sym_difference.cpp
index 1bb955bcd..3b86933a4 100644
--- a/doc/src/examples/algorithms/sym_difference.cpp
+++ b/doc/src/examples/algorithms/sym_difference.cpp
@@ -15,7 +15,7 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/doc/src/examples/algorithms/transform.cpp b/doc/src/examples/algorithms/transform.cpp
index 97aea3c3d..a50845b2c 100644
--- a/doc/src/examples/algorithms/transform.cpp
+++ b/doc/src/examples/algorithms/transform.cpp
@@ -20,18 +20,18 @@ int main()
 
     // Select a point near the pole (theta=5.0, phi=15.0)
     bg::model::point<long double, 2, bg::cs::spherical<bg::degree> > p1(15.0, 5.0);
-    
+
     // Transform from degree to radian. Default strategy is automatically selected,
     // it will convert from degree to radian
     bg::model::point<long double, 2, bg::cs::spherical<bg::radian> > p2;
     bg::transform(p1, p2);
-    
-    // Transform from degree (lon-lat) to 3D (x,y,z). Default strategy is automatically selected, 
+
+    // Transform from degree (lon-lat) to 3D (x,y,z). Default strategy is automatically selected,
     // it will consider points on a unit sphere
     bg::model::point<long double, 3, bg::cs::cartesian> p3;
     bg::transform(p1, p3);
-    
-    std::cout 
+
+    std::cout
         << "p1: " << bg::dsv(p1) << std::endl
         << "p2: " << bg::dsv(p2) << std::endl
         << "p3: " << bg::dsv(p3) << std::endl;
diff --git a/doc/src/examples/algorithms/transform_with_strategy.cpp b/doc/src/examples/algorithms/transform_with_strategy.cpp
index d55e5e2d1..62a12dc5f 100644
--- a/doc/src/examples/algorithms/transform_with_strategy.cpp
+++ b/doc/src/examples/algorithms/transform_with_strategy.cpp
@@ -18,7 +18,7 @@ int main()
 {
     namespace trans = boost::geometry::strategy::transform;
     using boost::geometry::dsv;
-    
+
     typedef boost::geometry::model::point<double, 2, boost::geometry::cs::cartesian> point_type;
 
     point_type p1(1.0, 1.0);
@@ -37,8 +37,8 @@ int main()
     point_type p4;
     trans::rotate_transformer<boost::geometry::degree, double, 2, 2> rotate(90.0);
     boost::geometry::transform(p1, p4, rotate);
-    
-    std::cout 
+
+    std::cout
         << "p1: " << dsv(p1) << std::endl
         << "p2: " << dsv(p2) << std::endl
         << "p3: " << dsv(p3) << std::endl
diff --git a/doc/src/examples/core/closure.cpp b/doc/src/examples/core/closure.cpp
index 62c6c1895..6f76378e7 100644
--- a/doc/src/examples/core/closure.cpp
+++ b/doc/src/examples/core/closure.cpp
@@ -22,10 +22,10 @@ int main()
     typedef boost::geometry::model::polygon<point_type> polygon_type;
 
     boost::geometry::closure_selector clos = boost::geometry::closure<polygon_type>::value;
-    
+
     std::cout << "closure: " << clos << std::endl
         << "(open = " << boost::geometry::open
-        << ", closed = " << boost::geometry::closed 
+        << ", closed = " << boost::geometry::closed
         << ") "<< std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/coordinate_dimension.cpp b/doc/src/examples/core/coordinate_dimension.cpp
index 05881d274..166416860 100644
--- a/doc/src/examples/core/coordinate_dimension.cpp
+++ b/doc/src/examples/core/coordinate_dimension.cpp
@@ -27,7 +27,7 @@ int main()
                     boost::tuple<float, float, float>
                 >
         >::value;
-    
+
     std::cout << "dimensions: " << dim << std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/coordinate_system.cpp b/doc/src/examples/core/coordinate_system.cpp
index 63db3a5dc..8f9879c46 100644
--- a/doc/src/examples/core/coordinate_system.cpp
+++ b/doc/src/examples/core/coordinate_system.cpp
@@ -23,7 +23,7 @@ int main()
     typedef boost::geometry::model::polygon<point_type> polygon_type;
 
     typedef boost::geometry::coordinate_system<polygon_type>::type system;
-    
+
     std::cout << "system: " << typeid(system).name() << std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/coordinate_type.cpp b/doc/src/examples/core/coordinate_type.cpp
index dd043bddb..2447e596c 100644
--- a/doc/src/examples/core/coordinate_type.cpp
+++ b/doc/src/examples/core/coordinate_type.cpp
@@ -23,7 +23,7 @@ int main()
     typedef boost::geometry::model::polygon<point_type> polygon_type;
 
     typedef boost::geometry::coordinate_type<polygon_type>::type ctype;
-    
+
     std::cout << "type: " << typeid(ctype).name() << std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/degree_radian.cpp b/doc/src/examples/core/degree_radian.cpp
index aed6bbead..4fa375656 100644
--- a/doc/src/examples/core/degree_radian.cpp
+++ b/doc/src/examples/core/degree_radian.cpp
@@ -19,12 +19,12 @@ int main()
 {
     typedef model::point<double, 2, cs::spherical_equatorial<degree> > degree_point;
     typedef model::point<double, 2, cs::spherical_equatorial<radian> > radian_point;
-    
+
     degree_point d(4.893, 52.373);
     radian_point r(0.041, 0.8527);
 
     double dist = distance(d, r);
-    std::cout 
+    std::cout
         << "distance:" << std::endl
         << dist << " over unit sphere" << std::endl
         << dist * 3959  << " over a spherical earth, in miles" << std::endl;
diff --git a/doc/src/examples/core/interior_type.cpp b/doc/src/examples/core/interior_type.cpp
index 61096bf47..029d86670 100644
--- a/doc/src/examples/core/interior_type.cpp
+++ b/doc/src/examples/core/interior_type.cpp
@@ -23,11 +23,11 @@ BOOST_GEOMETRY_REGISTER_BOOST_ARRAY_CS(cs::cartesian)
 int main()
 {
     // Define a polygon storing points in a deque and storing interior rings
-    // in a list (note that std::list is not supported by most algorithms 
+    // in a list (note that std::list is not supported by most algorithms
     // because not supporting a random access iterator)
     typedef boost::geometry::model::polygon
         <
-            boost::array<short, 3>, 
+            boost::array<short, 3>,
             true, true,
             std::deque, std::list
         > polygon;
diff --git a/doc/src/examples/core/point_order.cpp b/doc/src/examples/core/point_order.cpp
index 2f8b7058e..62b28c388 100644
--- a/doc/src/examples/core/point_order.cpp
+++ b/doc/src/examples/core/point_order.cpp
@@ -22,7 +22,7 @@ int main()
     typedef boost::geometry::model::polygon<point_type, false> polygon_type;
 
     boost::geometry::order_selector order = boost::geometry::point_order<polygon_type>::value;
-    
+
     std::cout << "order: " << order << std::endl
         << "(clockwise = " << boost::geometry::clockwise
         << ", counterclockwise = " << boost::geometry::counterclockwise
diff --git a/doc/src/examples/core/point_type.cpp b/doc/src/examples/core/point_type.cpp
index 17ab38ffc..f9fc565c8 100644
--- a/doc/src/examples/core/point_type.cpp
+++ b/doc/src/examples/core/point_type.cpp
@@ -16,7 +16,7 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 int main()
 {
diff --git a/doc/src/examples/core/ring_type.cpp b/doc/src/examples/core/ring_type.cpp
index 9e19bd421..781f4456c 100644
--- a/doc/src/examples/core/ring_type.cpp
+++ b/doc/src/examples/core/ring_type.cpp
@@ -24,19 +24,19 @@ int main()
 
     typedef boost::geometry::ring_type<polygon>::type ring_type;
     typedef boost::geometry::interior_type<polygon>::type int_type;
-    
+
     std::cout << typeid(ring_type).name() << std::endl;
     std::cout << typeid(int_type).name() << std::endl;
-    
-    // So int_type defines a collection of rings, 
+
+    // So int_type defines a collection of rings,
     // which is a Boost.Range compatible range
     // The type of an element of the collection is the very same ring type again.
     // We show that.
     typedef boost::range_value<int_type>::type int_ring_type;
-    
-    std::cout 
+
+    std::cout
         << std::boolalpha
-        << boost::is_same<ring_type, int_ring_type>::value 
+        << boost::is_same<ring_type, int_ring_type>::value
         << std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/rings.cpp b/doc/src/examples/core/rings.cpp
index 81f1ded65..8d483d184 100644
--- a/doc/src/examples/core/rings.cpp
+++ b/doc/src/examples/core/rings.cpp
@@ -9,7 +9,7 @@
 
 //[rings
 /*`
-Shows how to access the exterior ring (one) 
+Shows how to access the exterior ring (one)
 and interior rings (zero or more) of a polygon.
 Also shows the related ring_type and interior_type.
 */
@@ -27,17 +27,17 @@ int main()
     typedef boost::geometry::model::polygon<point> polygon_type;
 
     polygon_type poly;
-    
+
     typedef boost::geometry::ring_type<polygon_type>::type ring_type;
     ring_type& ring = boost::geometry::exterior_ring(poly);
-    
+
     // For a ring of model::polygon, you can call "push_back".
     // (internally, it is done using a traits::push_back class)
     ring.push_back(point(0, 0));
     ring.push_back(point(0, 5));
     ring.push_back(point(5, 4));
     ring.push_back(point(0, 0));
-    
+
     ring_type inner;
     inner.push_back(point(1, 1));
     inner.push_back(point(2, 1));
@@ -49,16 +49,16 @@ int main()
     interiors.push_back(inner);
 
     std::cout << boost::geometry::dsv(poly) << std::endl;
-    
-    // So int_type defines a collection of rings, 
+
+    // So int_type defines a collection of rings,
     // which is a Boost.Range compatible range
     // The type of an element of the collection is the very same ring type again.
     // We show that.
     typedef boost::range_value<int_type>::type int_ring_type;
-    
-    std::cout 
+
+    std::cout
         << std::boolalpha
-        << boost::is_same<ring_type, int_ring_type>::value 
+        << boost::is_same<ring_type, int_ring_type>::value
         << std::endl;
 
     return 0;
diff --git a/doc/src/examples/core/tag.cpp b/doc/src/examples/core/tag.cpp
index 13bf4ff79..bb5b765ec 100644
--- a/doc/src/examples/core/tag.cpp
+++ b/doc/src/examples/core/tag.cpp
@@ -16,7 +16,7 @@
 
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
@@ -31,9 +31,9 @@ template <> struct dispatch<boost::geometry::point_tag>
     {
         // Use the Boost.Geometry free function "get"
         // working on all supported point types
-        std::cout << "Hello POINT, you are located at: " 
-            << boost::geometry::get<0>(p) << ", " 
-            << boost::geometry::get<1>(p) 
+        std::cout << "Hello POINT, you are located at: "
+            << boost::geometry::get<0>(p) << ", "
+            << boost::geometry::get<1>(p)
             << std::endl;
     }
 };
@@ -44,10 +44,10 @@ template <> struct dispatch<boost::geometry::polygon_tag>
     template <typename Polygon>
     static inline void apply(Polygon const& p)
     {
-        // Use the Boost.Geometry manipulator "dsv" 
+        // Use the Boost.Geometry manipulator "dsv"
         // working on all supported geometries
-        std::cout << "Hello POLYGON, you look like: " 
-            << boost::geometry::dsv(p) 
+        std::cout << "Hello POLYGON, you look like: "
+            << boost::geometry::dsv(p)
             << std::endl;
     }
 };
@@ -60,7 +60,7 @@ template <> struct dispatch<boost::geometry::multi_polygon_tag>
     {
         // Use the Boost.Range free function "size" because all
         // multigeometries comply to Boost.Range
-        std::cout << "Hello MULTIPOLYGON, you contain: " 
+        std::cout << "Hello MULTIPOLYGON, you contain: "
             << boost::size(m) << " polygon(s)"
             << std::endl;
     }
@@ -84,7 +84,7 @@ int main()
     // Declare and fill a polygon and a multipolygon
     polygon_type poly;
     boost::geometry::exterior_ring(poly) = boost::assign::tuple_list_of(0, 0)(0, 10)(10, 5)(0, 0);
-        
+
     boost::geometry::model::multi_polygon<polygon_type> multi;
     multi.push_back(poly);
 
diff --git a/doc/src/examples/core/tag_cast.cpp b/doc/src/examples/core/tag_cast.cpp
index 2e85f3d34..ff4a7c82f 100644
--- a/doc/src/examples/core/tag_cast.cpp
+++ b/doc/src/examples/core/tag_cast.cpp
@@ -25,7 +25,7 @@ int main()
 
     typedef geo::tag<polygon_type>::type tag;
     typedef geo::tag_cast<tag, geo::linear_tag, geo::areal_tag>::type base_tag;
-    
+
     std::cout << "tag: " << typeid(tag).name() << std::endl
         << "base tag: " << typeid(base_tag).name() << std::endl;
 
diff --git a/doc/src/examples/geometries/adapted/boost_array.cpp b/doc/src/examples/geometries/adapted/boost_array.cpp
index 846c0be7b..88a0ad75d 100644
--- a/doc/src/examples/geometries/adapted/boost_array.cpp
+++ b/doc/src/examples/geometries/adapted/boost_array.cpp
@@ -23,14 +23,14 @@ int main()
     boost::array<float, 2> a = { {1, 2} };
     boost::array<double, 2> b = { {2, 3} };
     std::cout << boost::geometry::distance(a, b) << std::endl;
-    
+
     boost::geometry::set<0>(a, 1.1);
     boost::geometry::set<1>(a, 2.2);
     std::cout << boost::geometry::distance(a, b) << std::endl;
 
     boost::geometry::assign_values(b, 2.2, 3.3);
     std::cout << boost::geometry::distance(a, b) << std::endl;
-    
+
     boost::geometry::model::linestring<boost::array<double, 2> > line;
     line.push_back(b);
 
diff --git a/doc/src/examples/geometries/adapted/boost_fusion.cpp b/doc/src/examples/geometries/adapted/boost_fusion.cpp
index 89f044699..0bb00a5a2 100644
--- a/doc/src/examples/geometries/adapted/boost_fusion.cpp
+++ b/doc/src/examples/geometries/adapted/boost_fusion.cpp
@@ -29,20 +29,20 @@ BOOST_GEOMETRY_REGISTER_BOOST_FUSION_CS(cs::cartesian)
 int main()
 {
     sample_point a, b, c;
-    
+
     // Set coordinates the Boost.Geometry way (one of the ways)
     boost::geometry::assign_values(a, 3, 2, 1);
-    
+
     // Set coordinates the Boost.Fusion way
     boost::fusion::at_c<0>(b) = 6;
     boost::fusion::at_c<1>(b) = 5;
     boost::fusion::at_c<2>(b) = 4;
-    
+
     // Set coordinates the native way
     c.x = 9;
     c.y = 8;
     c.z = 7;
-    
+
     std::cout << "Distance a-b: " << boost::geometry::distance(a, b) << std::endl;
     std::cout << "Distance a-c: " << boost::geometry::distance(a, c) << std::endl;
 
diff --git a/doc/src/examples/geometries/adapted/boost_polygon.cpp b/doc/src/examples/geometries/adapted/boost_polygon.cpp
index 3f71990fa..b56a13d45 100644
--- a/doc/src/examples/geometries/adapted/boost_polygon.cpp
+++ b/doc/src/examples/geometries/adapted/boost_polygon.cpp
@@ -17,9 +17,9 @@
 int main()
 {
     boost::polygon::point_data<int> a(1, 2), b(3, 4);
-    std::cout << "Distance (using Boost.Geometry): " 
+    std::cout << "Distance (using Boost.Geometry): "
         << boost::geometry::distance(a, b) << std::endl;
-    std::cout << "Distance (using Boost.Polygon): " 
+    std::cout << "Distance (using Boost.Polygon): "
         << boost::polygon::euclidean_distance(a, b) << std::endl;
 
     return 0;
diff --git a/doc/src/examples/geometries/adapted/boost_range/filtered.cpp b/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
index ffc394a5e..174c0425b 100644
--- a/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/filtered.cpp
@@ -40,9 +40,9 @@ int main()
     line.push_back(xy(6, 2));
     line.push_back(xy(7, 1));
     line.push_back(xy(8, 0));
-    
+
     using boost::adaptors::filtered;
-    std::cout 
+    std::cout
         << boost::geometry::length(line) << std::endl
         << boost::geometry::length(line | filtered(not_two())) << std::endl
         << boost::geometry::dsv(line | filtered(not_two())) << std::endl;
diff --git a/doc/src/examples/geometries/adapted/boost_range/reversed.cpp b/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
index a73343850..44e8068c7 100644
--- a/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/reversed.cpp
@@ -23,9 +23,9 @@ int main()
     boost::geometry::model::linestring<xy> line;
     line.push_back(xy(0, 0));
     line.push_back(xy(1, 1));
-    
-    std::cout 
-        << boost::geometry::dsv(line | boost::adaptors::reversed) 
+
+    std::cout
+        << boost::geometry::dsv(line | boost::adaptors::reversed)
         << std::endl;
 
     return 0;
diff --git a/doc/src/examples/geometries/adapted/boost_range/sliced.cpp b/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
index b07d6d584..bdfd74c62 100644
--- a/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/sliced.cpp
@@ -23,7 +23,7 @@
 int main()
 {
     using namespace boost::assign;
-    
+
     typedef boost::geometry::model::d2::point_xy<int> xy;
     boost::geometry::model::linestring<xy> line;
     line += xy(0, 0);
@@ -31,8 +31,8 @@ int main()
     line += xy(2, 2);
     line += xy(3, 3);
     line += xy(4, 4);
-    
-    std::cout 
+
+    std::cout
         << boost::geometry::dsv(line | boost::adaptors::sliced(1, 3)) << std::endl;
 
     return 0;
diff --git a/doc/src/examples/geometries/adapted/boost_range/strided.cpp b/doc/src/examples/geometries/adapted/boost_range/strided.cpp
index 95a130acb..8b9dc6865 100644
--- a/doc/src/examples/geometries/adapted/boost_range/strided.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/strided.cpp
@@ -24,7 +24,7 @@ int main()
 {
     using namespace boost::assign;
     using boost::adaptors::strided;
-    
+
     typedef boost::geometry::model::d2::point_xy<int> xy;
     boost::geometry::model::ring<xy> ring;
     ring += xy(0, 0);
@@ -35,8 +35,8 @@ int main()
     ring += xy(2, 0);
 
     boost::geometry::correct(ring);
-    
-    std::cout 
+
+    std::cout
         << "Normal : " << boost::geometry::dsv(ring) << std::endl
         << "Strided: " << boost::geometry::dsv(ring | strided(2)) << std::endl;
 
diff --git a/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp b/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
index 9f138b00c..6df47dee1 100644
--- a/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
+++ b/doc/src/examples/geometries/adapted/boost_range/uniqued.cpp
@@ -32,7 +32,7 @@ int main()
 {
     using namespace boost::assign;
     using boost::adaptors::uniqued;
-    
+
     boost::geometry::model::ring<xy> ring;
     ring += xy(0, 0);
     ring += xy(0, 1);
@@ -43,8 +43,8 @@ int main()
     ring += xy(2, 2);
     ring += xy(2, 0);
     ring += xy(0, 0);
-    
-    std::cout 
+
+    std::cout
         << "Normal: " << boost::geometry::dsv(ring) << std::endl
         << "Unique: " << boost::geometry::dsv(ring | uniqued) << std::endl;
 
diff --git a/doc/src/examples/geometries/adapted/boost_tuple.cpp b/doc/src/examples/geometries/adapted/boost_tuple.cpp
index 747df8881..6c6599c5e 100644
--- a/doc/src/examples/geometries/adapted/boost_tuple.cpp
+++ b/doc/src/examples/geometries/adapted/boost_tuple.cpp
@@ -11,7 +11,7 @@
 /*`
 Shows how to use Boost.Tuple points in Boost.Geometry
 
-Working with Boost.Tuples in Boost.Geometry is straightforward and shown in 
+Working with Boost.Tuples in Boost.Geometry is straightforward and shown in
 various other examples as well.
 
 */
@@ -31,11 +31,11 @@ int main()
     poly.outer().push_back(boost::make_tuple(6.0, 4.0));
     poly.outer().push_back(boost::make_tuple(5.0, 1.0));
     poly.outer().push_back(boost::make_tuple(1.0, 2.0));
-    
+
     std::cout << "Area: " << boost::geometry::area(poly) << std::endl;
-    std::cout << "Contains (1.5, 2.5): " 
+    std::cout << "Contains (1.5, 2.5): "
         << std::boolalpha
-        << boost::geometry::within(boost::make_tuple(1.5, 2.5), poly) 
+        << boost::geometry::within(boost::make_tuple(1.5, 2.5), poly)
         << std::endl;
 
     return 0;
diff --git a/doc/src/examples/geometries/adapted/c_array.cpp b/doc/src/examples/geometries/adapted/c_array.cpp
index 335346b89..95f403303 100644
--- a/doc/src/examples/geometries/adapted/c_array.cpp
+++ b/doc/src/examples/geometries/adapted/c_array.cpp
@@ -14,7 +14,7 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 
-BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian) 
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 
 int main()
 {
@@ -22,7 +22,7 @@ int main()
     int b[3] = {2, 3, 4};
 
     std::cout << boost::geometry::distance(a, b) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/linestring.cpp b/doc/src/examples/geometries/register/linestring.cpp
index ce4d97d7b..ab5f5998a 100644
--- a/doc/src/examples/geometries/register/linestring.cpp
+++ b/doc/src/examples/geometries/register/linestring.cpp
@@ -18,7 +18,7 @@
 
 typedef boost::geometry::model::d2::point_xy<double> point_2d;
 
-BOOST_GEOMETRY_REGISTER_LINESTRING(std::vector<point_2d>) 
+BOOST_GEOMETRY_REGISTER_LINESTRING(std::vector<point_2d>)
 
 int main()
 {
@@ -27,16 +27,16 @@ int main()
     line.push_back(point_2d(1, 1));
     line.push_back(point_2d(2, 2));
     line.push_back(point_2d(3, 1));
-    
+
     // Usage of Boost.Geometry's length and wkt functions
-    std::cout << "Length: "  
+    std::cout << "Length: "
         << boost::geometry::length(line)
         << std::endl;
-        
-    std::cout << "WKT: "  
+
+    std::cout << "WKT: "
         << boost::geometry::wkt(line)
         << std::endl;
-        
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/linestring_templated.cpp b/doc/src/examples/geometries/register/linestring_templated.cpp
index 064f78eee..5722b581d 100644
--- a/doc/src/examples/geometries/register/linestring_templated.cpp
+++ b/doc/src/examples/geometries/register/linestring_templated.cpp
@@ -18,18 +18,18 @@
 #include <boost/geometry/geometries/register/linestring.hpp>
 
 // Adapt any deque to Boost.Geometry Linestring Concept
-BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::deque) 
+BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::deque)
 
 int main()
 {
     std::deque<boost::geometry::model::d2::point_xy<double> > line(2);
     boost::geometry::assign_values(line[0], 1, 1);
     boost::geometry::assign_values(line[1], 2, 2);
-    
+
     // Boost.Geometry algorithms work on any deque now
     std::cout << "Length: "  << boost::geometry::length(line) << std::endl;
     std::cout << "Line: "  << boost::geometry::dsv(line) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/multi_linestring.cpp b/doc/src/examples/geometries/register/multi_linestring.cpp
index 9ed40da73..77a6c614d 100644
--- a/doc/src/examples/geometries/register/multi_linestring.cpp
+++ b/doc/src/examples/geometries/register/multi_linestring.cpp
@@ -15,11 +15,11 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/multi/geometries/register/multi_linestring.hpp>
+#include <boost/geometry/geometries/register/multi_linestring.hpp>
 
 typedef boost::geometry::model::linestring
     <
-        boost::tuple<float, float> 
+        boost::tuple<float, float>
     > linestring_type;
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
@@ -31,10 +31,10 @@ int main()
     std::deque<linestring_type> lines(2);
     boost::geometry::read_wkt("LINESTRING(0 0,1 1)", lines[0]);
     boost::geometry::read_wkt("LINESTRING(2 2,3 3)", lines[1]);
-    
+
     // Usage of Boost.Geometry
     std::cout << "LENGTH: "  << boost::geometry::length(lines) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/multi_point.cpp b/doc/src/examples/geometries/register/multi_point.cpp
index e854da2b0..dbfd3169c 100644
--- a/doc/src/examples/geometries/register/multi_point.cpp
+++ b/doc/src/examples/geometries/register/multi_point.cpp
@@ -13,8 +13,8 @@
 #include <iostream>
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/multi/geometries/register/multi_point.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
+#include <boost/geometry/geometries/register/multi_point.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
 
 typedef boost::tuple<float, float> point_type;
 
@@ -27,10 +27,10 @@ int main()
     std::deque<point_type> multi_point;
     multi_point.push_back(point_type(1, 1));
     multi_point.push_back(point_type(3, 2));
-    
+
     // Usage of Boost.Geometry
     std::cout << "WKT: "  << boost::geometry::wkt(multi_point) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/multi_point_templated.cpp b/doc/src/examples/geometries/register/multi_point_templated.cpp
index bba16bbbd..08656fb5d 100644
--- a/doc/src/examples/geometries/register/multi_point_templated.cpp
+++ b/doc/src/examples/geometries/register/multi_point_templated.cpp
@@ -13,8 +13,8 @@
 #include <iostream>
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/multi/geometries/register/multi_point.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
+#include <boost/geometry/geometries/register/multi_point.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
 
 
 BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED(std::deque)
@@ -27,10 +27,10 @@ int main()
     std::deque<boost::tuple<float, float> > multi_point;
     multi_point.push_back(boost::tuple<float, float>(1, 1));
     multi_point.push_back(boost::tuple<float, float>(3, 2));
-    
+
     // Usage of Boost.Geometry
     std::cout << "WKT: "  << boost::geometry::wkt(multi_point) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/multi_polygon.cpp b/doc/src/examples/geometries/register/multi_polygon.cpp
index f21f3cf95..1cfc9d832 100644
--- a/doc/src/examples/geometries/register/multi_polygon.cpp
+++ b/doc/src/examples/geometries/register/multi_polygon.cpp
@@ -15,11 +15,11 @@
 #include <boost/geometry.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <boost/geometry/multi/geometries/register/multi_polygon.hpp>
+#include <boost/geometry/geometries/register/multi_polygon.hpp>
 
 typedef boost::geometry::model::polygon
     <
-        boost::tuple<float, float> 
+        boost::tuple<float, float>
     > polygon_type;
 
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
@@ -31,10 +31,10 @@ int main()
     std::vector<polygon_type> polygons(2);
     boost::geometry::read_wkt("POLYGON((0 0,0 1,1 1,1 0,0 0))", polygons[0]);
     boost::geometry::read_wkt("POLYGON((3 0,3 1,4 1,4 0,3 0))", polygons[1]);
-    
+
     // Usage of Boost.Geometry
     std::cout << "AREA: "  << boost::geometry::area(polygons) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/ring.cpp b/doc/src/examples/geometries/register/ring.cpp
index 4d7ca2a0a..58f35a447 100644
--- a/doc/src/examples/geometries/register/ring.cpp
+++ b/doc/src/examples/geometries/register/ring.cpp
@@ -27,13 +27,13 @@ int main()
     ring.push_back(point_2d(1, 1));
     ring.push_back(point_2d(2, 2));
     ring.push_back(point_2d(2, 1));
-    
-    
+
+
     // Usage of Boost.Geometry
     boost::geometry::correct(ring);
     std::cout << "Area: "  << boost::geometry::area(ring) << std::endl;
     std::cout << "WKT: "  << boost::geometry::wkt(ring) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/geometries/register/ring_templated.cpp b/doc/src/examples/geometries/register/ring_templated.cpp
index 0a27c99ca..a3223421a 100644
--- a/doc/src/examples/geometries/register/ring_templated.cpp
+++ b/doc/src/examples/geometries/register/ring_templated.cpp
@@ -18,7 +18,7 @@
 #include <boost/geometry/geometries/register/ring.hpp>
 
 // Adapt any deque to Boost.Geometry Ring Concept
-BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(std::deque) 
+BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(std::deque)
 
 int main()
 {
@@ -26,12 +26,12 @@ int main()
     boost::geometry::assign_values(ring[0], 0, 0);
     boost::geometry::assign_values(ring[2], 4, 1);
     boost::geometry::assign_values(ring[1], 1, 4);
-    
+
     // Boost.Geometry algorithms work on any deque now
     boost::geometry::correct(ring);
     std::cout << "Area: "  << boost::geometry::area(ring) << std::endl;
     std::cout << "Contents: "  << boost::geometry::wkt(ring) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/io/Jamfile.v2 b/doc/src/examples/io/Jamfile.v2
new file mode 100644
index 000000000..489fa6a77
--- /dev/null
+++ b/doc/src/examples/io/Jamfile.v2
@@ -0,0 +1,19 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+# Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+
+# 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)
+
+
+project boost-geometry-doc-example-io
+    : # requirements
+    ;
+
+exe svg : svg.cpp ;
+exe wkt : wkt.cpp ;
+exe read_wkt : read_wkt.cpp ;
diff --git a/doc/src/examples/io/read_wkt.cpp b/doc/src/examples/io/read_wkt.cpp
new file mode 100644
index 000000000..55ed25e97
--- /dev/null
+++ b/doc/src/examples/io/read_wkt.cpp
@@ -0,0 +1,38 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// QuickBook Example
+
+// Copyright (c) 2014 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)
+
+//[read_wkt
+//` Shows the usage of read_wkt
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+int main()
+{
+    typedef boost::geometry::model::d2::point_xy<double> point_type;
+
+    point_type a;
+    boost::geometry::model::linestring<point_type> b;
+    boost::geometry::model::polygon<point_type> c;
+    boost::geometry::model::box<point_type> d;
+    boost::geometry::model::segment<point_type> e;
+
+    boost::geometry::read_wkt("POINT(1 2)", a);
+    boost::geometry::read_wkt("LINESTRING(0 0,2 2,3 1)", b);
+    boost::geometry::read_wkt("POLYGON((0 0,0 7,4 2,2 0,0 0))", c);
+    boost::geometry::read_wkt("BOX(0 0,3 3)", d);
+    boost::geometry::read_wkt("SEGMENT(1 0,3 4)", e);
+
+    return 0;
+}
+
+//]
+
diff --git a/doc/src/examples/io/svg.cpp b/doc/src/examples/io/svg.cpp
index 1a423b8c2..37fb171cc 100644
--- a/doc/src/examples/io/svg.cpp
+++ b/doc/src/examples/io/svg.cpp
@@ -36,7 +36,7 @@ int main()
     // Declare a stream and an SVG mapper
     std::ofstream svg("my_map.svg");
     boost::geometry::svg_mapper<point_type> mapper(svg, 400, 400);
-    
+
     // Add geometries such that all these geometries fit on the map
     mapper.add(a);
     mapper.add(b);
@@ -46,7 +46,7 @@ int main()
     mapper.map(a, "fill-opacity:0.5;fill:rgb(153,204,0);stroke:rgb(153,204,0);stroke-width:2", 5);
     mapper.map(b, "fill-opacity:0.3;fill:rgb(51,51,153);stroke:rgb(51,51,153);stroke-width:2");
     mapper.map(c, "opacity:0.4;fill:none;stroke:rgb(212,0,0);stroke-width:5");
-    
+
     // Destructor of map will be called - adding </svg>
     // Destructor of stream will be called, closing the file
 
diff --git a/doc/src/examples/io/wkt.cpp b/doc/src/examples/io/wkt.cpp
new file mode 100644
index 000000000..ffde1b094
--- /dev/null
+++ b/doc/src/examples/io/wkt.cpp
@@ -0,0 +1,51 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// QuickBook Example
+
+// Copyright (c) 2014 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)
+
+//[wkt
+//` Shows the usage of wkt
+
+#include <iostream>
+
+#include <boost/geometry.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+int main()
+{
+    namespace geom = boost::geometry;
+    typedef geom::model::d2::point_xy<double> point_type;
+
+    point_type point = geom::make<point_type>(3, 6);
+    geom::model::polygon<point_type> polygon;
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 0));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 4));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(4, 4));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(4, 0));
+    geom::append(geom::exterior_ring(polygon), geom::make<point_type>(0, 0));
+
+    std::cout << boost::geometry::wkt(point) << std::endl;
+    std::cout << boost::geometry::wkt(polygon) << std::endl;
+
+    return 0;
+}
+
+//]
+
+
+//[wkt_output
+/*`
+Output:
+[pre
+POINT(3 6)
+POLYGON((0 0,0 4,4 4,4 0,0 0))
+]
+
+
+*/
+//]
diff --git a/doc/src/examples/quick_start.cpp b/doc/src/examples/quick_start.cpp
index 9a739efab..f77c8909b 100644
--- a/doc/src/examples/quick_start.cpp
+++ b/doc/src/examples/quick_start.cpp
@@ -114,7 +114,7 @@ int main(void)
     double d = distance(a, b);
     std::cout << "Distance a-b is: " << d << std::endl;
     //]
-    
+
     //[quickstart_point_in_polygon
     double points[][2] = {{2.0, 1.3}, {4.1, 3.0}, {5.3, 2.6}, {2.9, 0.7}, {2.0, 1.3}};
     model::polygon<model::d2::point_xy<double> > poly;
@@ -122,7 +122,7 @@ int main(void)
     boost::tuple<double, double> p = boost::make_tuple(3.7, 2.0);
     std::cout << "Point p is in polygon? " << std::boolalpha << within(p, poly) << std::endl;
     //]
-    
+
     //[quickstart_area
     std::cout << "Area: " << area(poly) << std::endl;
     //]
@@ -131,16 +131,16 @@ int main(void)
     double d2 = distance(a, p);
     std::cout << "Distance a-p is: " << d2 << std::endl;
     //]
-    
+
     //[quick_start_spherical
     typedef boost::geometry::model::point
         <
             double, 2, boost::geometry::cs::spherical_equatorial<boost::geometry::degree>
         > spherical_point;
-    
+
     spherical_point amsterdam(4.90, 52.37);
     spherical_point paris(2.35, 48.86);
-    
+
     double const earth_radius = 3959; // miles
     std::cout << "Distance in miles: " << distance(amsterdam, paris) * earth_radius << std::endl;
     //]
@@ -161,7 +161,7 @@ int main(void)
         assign_values(r2, 200, 300, 220, 320);
     }
     //]
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/views/box_view.cpp b/doc/src/examples/views/box_view.cpp
index e95b54ecb..e968a867c 100644
--- a/doc/src/examples/views/box_view.cpp
+++ b/doc/src/examples/views/box_view.cpp
@@ -21,15 +21,15 @@ int main()
         <
             boost::geometry::model::point<double, 2, boost::geometry::cs::cartesian>
         > box_type;
-        
+
     // Define the Boost.Range compatible type:
-    typedef boost::geometry::box_view<box_type> box_view;        
-        
+    typedef boost::geometry::box_view<box_type> box_view;
+
     box_type box;
     boost::geometry::assign_values(box, 0, 0, 4, 4);
-    
+
     box_view view(box);
-    
+
     // Iterating in clockwise direction over the points of this box
     for (boost::range_iterator<box_view const>::type it = boost::begin(view);
         it != boost::end(view); ++it)
@@ -37,10 +37,10 @@ int main()
         std::cout << " " << boost::geometry::dsv(*it);
     }
     std::cout << std::endl;
-    
+
     // Note that a box_view is tagged as a ring, so supports area etc.
     std::cout << "Area: " << boost::geometry::area(view) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/doc/src/examples/views/segment_view.cpp b/doc/src/examples/views/segment_view.cpp
index 5337189f9..56f21d1f4 100644
--- a/doc/src/examples/views/segment_view.cpp
+++ b/doc/src/examples/views/segment_view.cpp
@@ -21,14 +21,14 @@ int main()
         <
             boost::geometry::model::point<double, 2, boost::geometry::cs::cartesian>
         > segment_type;
-        
-    typedef boost::geometry::segment_view<segment_type> segment_view;        
-        
+
+    typedef boost::geometry::segment_view<segment_type> segment_view;
+
     segment_type segment;
     boost::geometry::assign_values(segment, 0, 0, 1, 1);
-    
+
     segment_view view(segment);
-    
+
     // Iterating over the points of this segment
     for (boost::range_iterator<segment_view const>::type it = boost::begin(view);
         it != boost::end(view); ++it)
@@ -36,10 +36,10 @@ int main()
         std::cout << " " << boost::geometry::dsv(*it);
     }
     std::cout << std::endl;
-    
+
     // Note that a segment_view is tagged as a linestring, so supports length etc.
     std::cout << "Length: " << boost::geometry::length(view) << std::endl;
-    
+
     return 0;
 }
 
diff --git a/example/01_point_example.cpp b/example/01_point_example.cpp
index 4feee82c6..1bc155070 100644
--- a/example/01_point_example.cpp
+++ b/example/01_point_example.cpp
@@ -70,7 +70,7 @@ int main()
     double d1 = distance(pt1, pt2);
     double d2 = distance(pt3, pt4);
     double d3 = distance(pt5, pt6);
-    std::cout << "Distances: " 
+    std::cout << "Distances: "
         << d1 << " and " << d2 << " and " << d3 << std::endl;
 
     // (in case you didn't note, distances can be calculated
diff --git a/example/03_polygon_example.cpp b/example/03_polygon_example.cpp
index 3b962ce01..4dcb3aaae 100644
--- a/example/03_polygon_example.cpp
+++ b/example/03_polygon_example.cpp
@@ -18,7 +18,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 
diff --git a/example/05_b_overlay_linestring_polygon_example.cpp b/example/05_b_overlay_linestring_polygon_example.cpp
index 49e54b443..9c44df7c4 100644
--- a/example/05_b_overlay_linestring_polygon_example.cpp
+++ b/example/05_b_overlay_linestring_polygon_example.cpp
@@ -70,7 +70,8 @@ int main(void)
     typedef bg::detail::overlay::turn_info<point_2d> turn_info;
     std::vector<turn_info> turns;
     bg::detail::get_turns::no_interrupt_policy policy;
-    bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(ls, p, turns, policy);
+    bg::detail::no_rescale_policy rescale_policy;
+    bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(ls, p, rescale_policy, turns, policy);
 
     std::cout << "Intersection of linestring/polygon" << std::endl;
     BOOST_FOREACH(turn_info const& turn, turns)
diff --git a/example/07_a_graph_route_example.cpp b/example/07_a_graph_route_example.cpp
index 5b476ffb5..7bd4c6774 100644
--- a/example/07_a_graph_route_example.cpp
+++ b/example/07_a_graph_route_example.cpp
@@ -304,12 +304,12 @@ int main()
     double const km = 1000.0;
     std::cout << "distances, all in KM" << std::endl
         << std::fixed << std::setprecision(0);
-        
+
     // To calculate distance, declare and construct a strategy with average earth radius
     boost::geometry::strategy::distance::haversine<double> haversine(6372795.0);
 
     // Main functionality: calculate shortest routes from/to all cities
-    
+
 
     // For the first one, the complete route is stored as a linestring
     bool first = true;
@@ -385,7 +385,7 @@ int main()
         mapper.text(city.get<0>(), city.get<1>(),
                 "fill:rgb(0,0,0);font-family:Arial;font-size:10px", 5, 5);
     }
-#endif    
+#endif
 
     return 0;
 }
diff --git a/example/07_b_graph_route_example.cpp b/example/07_b_graph_route_example.cpp
index 5490dc5fb..5dedbf801 100644
--- a/example/07_b_graph_route_example.cpp
+++ b/example/07_b_graph_route_example.cpp
@@ -294,7 +294,7 @@ int main()
 
     // To calculate distance, declare and construct a strategy with average earth radius
     boost::geometry::strategy::distance::haversine<double> haversine(6372795.0);
-        
+
     // Main functionality: calculate shortest routes from/to all cities
 
     // For the first one, the complete route is stored as a linestring
@@ -371,7 +371,7 @@ int main()
         mapper.text(city.get<0>(), city.get<1>(),
                 "fill:rgb(0,0,0);font-family:Arial;font-size:10px", 5, 5);
     }
-#endif    
+#endif
 
     return 0;
 }
diff --git a/example/c10_custom_cs_example.cpp b/example/c10_custom_cs_example.cpp
index 6676955d7..098916cd6 100644
--- a/example/c10_custom_cs_example.cpp
+++ b/example/c10_custom_cs_example.cpp
@@ -8,7 +8,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 //
-// Example: Custom coordinate system example 
+// Example: Custom coordinate system example
 
 #include <iostream>
 
@@ -45,8 +45,8 @@ struct cs_tag<martian<DegreeOrRadian> >
 }}} // namespaces
 
 
-// NOTE: if the next steps would not be here, 
-// compiling a distance function call with martian coordinates 
+// NOTE: if the next steps would not be here,
+// compiling a distance function call with martian coordinates
 // would result in a MPL assertion
 
 // 4: so register a distance strategy as its default strategy
@@ -62,21 +62,21 @@ struct default_strategy<point_tag, Point1, Point2, martian_tag, martian_tag>
 }}}}} // namespaces
 
 // 5: not worked out. To implement a specific distance strategy for Mars,
-//    e.g. with the Mars radius given by default, 
+//    e.g. with the Mars radius given by default,
 //    you will have to implement (/register) several other metafunctions:
-//      tag, return_type, similar_type, comparable_type, 
+//      tag, return_type, similar_type, comparable_type,
 //    and structs:
 //      get_similar, get_comparable, result_from_distance
-//   See e.g. .../boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp 
+//   See e.g. .../boost/geometry/extensions/gis/geographic/strategies/andoyer.hpp
 
 int main()
 {
     typedef boost::geometry::model::point
         <
-            double, 2, martian<boost::geometry::degree> 
+            double, 2, martian<boost::geometry::degree>
         > mars_point;
 
-    // Declare two points 
+    // Declare two points
     // (Source: http://nssdc.gsfc.nasa.gov/planetary/mars_mileage_guide.html)
     // (Other sources: Wiki and Google give slightly different coordinates, resulting
     //  in other distance, 20 km off)
@@ -87,11 +87,11 @@ int main()
 
     // Using the Mars mean radius
     // (Source: http://nssdc.gsfc.nasa.gov/planetary/factsheet/marsfact.html)
-    std::cout << "Distance between Viking1 and Pathfinder landing sites: " 
+    std::cout << "Distance between Viking1 and Pathfinder landing sites: "
         << d * 3389.5 << " km" << std::endl;
 
     // We would get 832.616 here, same order as the 835 (rounded on 5 km) listed
-    // on the mentioned site 
+    // on the mentioned site
 
 #ifdef OPTIONALLY_ELLIPSOIDAL
     // Optionally the distance can be calculated more accurate by an Ellipsoidal approach,
diff --git a/example/c11_custom_cs_transform_example.cpp b/example/c11_custom_cs_transform_example.cpp
index 896ee069a..84c94eb06 100644
--- a/example/c11_custom_cs_transform_example.cpp
+++ b/example/c11_custom_cs_transform_example.cpp
@@ -30,7 +30,7 @@ template<> struct cs_tag<cart_shifted5> { typedef cartesian_tag type; };
 }}} // namespaces
 
 
-// 3: sample implementation of a shift 
+// 3: sample implementation of a shift
 //    to convert coordinate system "cart" to "cart_shirted5"
 struct shift
 {
@@ -46,7 +46,7 @@ struct shift
 
 
 // 4: register the default strategy to transform any cart point to any cart_shifted5 point
-namespace boost { namespace geometry  { namespace strategy { namespace transform { namespace services 
+namespace boost { namespace geometry  { namespace strategy { namespace transform { namespace services
 {
 
 template <typename P1, typename P2>
@@ -75,14 +75,14 @@ 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 
+namespace boost { namespace geometry { namespace strategy { namespace distance { namespace services
 {
     template <>
     struct tag<shift_and_calc_distance>
     {
         typedef strategy_tag_distance_point_point type;
     };
-    
+
     template <typename P1, typename P2>
     struct return_type<shift_and_calc_distance, P1, P2>
     {
@@ -103,27 +103,27 @@ namespace boost { namespace geometry { namespace strategy { namespace distance {
 int main()
 {
     point1 p1_a(0, 0), p1_b(5, 5);
-    point2 p2_a(2, 2), p2_b(6, 6); 
+    point2 p2_a(2, 2), p2_b(6, 6);
 
     // Distances run for points on the same coordinate system.
     // This is possible by default because they are cartesian coordinate systems.
-    double d1 = boost::geometry::distance(p1_a, p1_b); 
-    double d2 = boost::geometry::distance(p2_a, p2_b); 
+    double d1 = boost::geometry::distance(p1_a, p1_b);
+    double d2 = boost::geometry::distance(p2_a, p2_b);
 
     std::cout << d1 << " " << d2 << std::endl;
 
     // Transform from a to b:
     boost::geometry::model::point<double, 2, cart_shifted5> p1_shifted;
-    boost::geometry::transform(p1_a, p1_shifted); 
+    boost::geometry::transform(p1_a, p1_shifted);
 
 
     // Of course this can be calculated now, same CS
-    double d3 = boost::geometry::distance(p1_shifted, p2_a); 
+    double d3 = boost::geometry::distance(p1_shifted, p2_a);
 
 
-    // Calculate distance between them. Note that inside distance the 
+    // Calculate distance between them. Note that inside distance the
     // transformation is called.
-    double d4 = boost::geometry::distance(p1_a, p2_a); 
+    double d4 = boost::geometry::distance(p1_a, p2_a);
 
     // The result should be the same.
     std::cout << d3 << " " << d4 << std::endl;
diff --git a/example/ml01_multipolygon_simplify.cpp b/example/ml01_multipolygon_simplify.cpp
index 71933db35..f9b329371 100644
--- a/example/ml01_multipolygon_simplify.cpp
+++ b/example/ml01_multipolygon_simplify.cpp
@@ -14,7 +14,7 @@
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 #include <boost/geometry/geometries/ring.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 #include <boost/foreach.hpp>
 
 int main()
diff --git a/example/ml02_distance_strategy.cpp b/example/ml02_distance_strategy.cpp
index 3baf60e44..1e2989016 100644
--- a/example/ml02_distance_strategy.cpp
+++ b/example/ml02_distance_strategy.cpp
@@ -32,5 +32,5 @@ int main()
   strategy2_type strategy2;
   strategy2_type::calculation_type d2 = strategy2.apply(p1, p2);
 
-  return 0;  
+  return 0;
 }
diff --git a/example/with_external_libs/x02_gd_example.cpp b/example/with_external_libs/x02_gd_example.cpp
index f5441d589..dd2d8dd4a 100644
--- a/example/with_external_libs/x02_gd_example.cpp
+++ b/example/with_external_libs/x02_gd_example.cpp
@@ -28,7 +28,7 @@
 #include <boost/foreach.hpp>
 
 #include <boost/geometry.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/extensions/gis/latlong/latlong.hpp>
 #include <boost/geometry/extensions/gis/geographic/strategies/area_huiller_earth.hpp>
diff --git a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
index d3d2cc186..f8b9c27c4 100644
--- a/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
+++ b/example/with_external_libs/x04_wxwidgets_world_mapper.cpp
@@ -20,7 +20,7 @@
 #include <boost/geometry/geometry.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+#include <boost/geometry/geometries/multi_geometries.hpp>
 
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
diff --git a/example/with_external_libs/x06_qt_world_mapper.cpp b/example/with_external_libs/x06_qt_world_mapper.cpp
index b4a060c84..67bd9067c 100644
--- a/example/with_external_libs/x06_qt_world_mapper.cpp
+++ b/example/with_external_libs/x06_qt_world_mapper.cpp
@@ -25,7 +25,7 @@
 #include <boost/geometry/geometry.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+#include <boost/geometry/geometries/multi_geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/geometries/register/point.hpp>
diff --git a/include/boost/geometry/algorithms/append.hpp b/include/boost/geometry/algorithms/append.hpp
index f2d0d366d..1dafac04b 100644
--- a/include/boost/geometry/algorithms/append.hpp
+++ b/include/boost/geometry/algorithms/append.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -105,7 +110,7 @@ struct range_to_polygon
     typedef typename ring_type<Polygon>::type ring_type;
 
     static inline void apply(Polygon& polygon, Range const& range,
-                int ring_index, int )
+                int ring_index, int = 0)
     {
         if (ring_index == -1)
         {
@@ -194,8 +199,14 @@ struct append<Geometry, RangeOrPoint, point_tag>
     : splitted_dispatch::append_point<typename tag<Geometry>::type, Geometry, RangeOrPoint>
 {};
 
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
 template <typename Geometry>
-struct devarianted_append
+struct append
 {
     template <typename RangeOrPoint>
     static inline void apply(Geometry& geometry,
@@ -204,16 +215,16 @@ struct devarianted_append
                              int multi_index)
     {
         concept::check<Geometry>();
-        append<Geometry, RangeOrPoint>::apply(geometry,
-                                              range_or_point,
-                                              ring_index,
-                                              multi_index);
+        dispatch::append<Geometry, RangeOrPoint>::apply(geometry,
+                                                        range_or_point,
+                                                        ring_index,
+                                                        multi_index);
     }
 };
 
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     template <typename RangeOrPoint>
     struct visitor: boost::static_visitor<void>
@@ -221,7 +232,7 @@ struct devarianted_append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
         RangeOrPoint const& m_range_or_point;
         int m_ring_index;
         int m_multi_index;
-    
+
         visitor(RangeOrPoint const& range_or_point,
                 int ring_index,
                 int multi_index):
@@ -229,15 +240,14 @@ struct devarianted_append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
             m_ring_index(ring_index),
             m_multi_index(multi_index)
         {}
-    
+
         template <typename Geometry>
         void operator()(Geometry& geometry) const
         {
-            concept::check<Geometry>();
-            append<Geometry, RangeOrPoint>::apply(geometry,
-                                                  m_range_or_point,
-                                                  m_ring_index,
-                                                  m_multi_index);
+            append<Geometry>::apply(geometry,
+                                    m_range_or_point,
+                                    m_ring_index,
+                                    m_multi_index);
         }
     };
 
@@ -258,9 +268,7 @@ struct devarianted_append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
+} // namespace resolve_variant;
 
 
 /*!
@@ -272,7 +280,7 @@ struct devarianted_append<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 \param range_or_point The point or range to add
 \param ring_index The index of the ring in case of a polygon:
     exterior ring (-1, the default) or  interior ring index
-\param multi_index Reserved for multi polygons or multi linestrings
+\param multi_index The index of the geometry to which the points are appended
 
 \qbk{[include reference/algorithms/append.qbk]}
 }
@@ -281,8 +289,8 @@ template <typename Geometry, typename RangeOrPoint>
 inline void append(Geometry& geometry, RangeOrPoint const& range_or_point,
                    int ring_index = -1, int multi_index = 0)
 {
-    dispatch::devarianted_append<Geometry>
-            ::apply(geometry, range_or_point, ring_index, multi_index);
+    resolve_variant::append<Geometry>
+                   ::apply(geometry, range_or_point, ring_index, multi_index);
 }
 
 
diff --git a/include/boost/geometry/algorithms/area.hpp b/include/boost/geometry/algorithms/area.hpp
index 537a36763..737779871 100644
--- a/include/boost/geometry/algorithms/area.hpp
+++ b/include/boost/geometry/algorithms/area.hpp
@@ -26,13 +26,16 @@
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/detail/calculate_null.hpp>
 #include <boost/geometry/algorithms/detail/calculate_sum.hpp>
 // #include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 
 #include <boost/geometry/strategies/area.hpp>
 #include <boost/geometry/strategies/default_area_result.hpp>
@@ -87,7 +90,7 @@ struct ring_area
         // An open ring has at least three points,
         // A closed ring has at least four points,
         // if not, there is no (zero) area
-        if (int(boost::size(ring))
+        if (boost::size(ring)
                 < core_detail::closure::minimum_ring_size<Closure>::value)
         {
             return typename Strategy::return_type();
@@ -176,19 +179,41 @@ struct area<Polygon, polygon_tag> : detail::calculate_polygon_sum
 };
 
 
+template <typename MultiGeometry>
+struct area<MultiGeometry, multi_polygon_tag> : detail::multi_sum
+{
+    template <typename Strategy>
+    static inline typename Strategy::return_type
+    apply(MultiGeometry const& multi, Strategy const& strategy)
+    {
+        return multi_sum::apply
+               <
+                   typename Strategy::return_type,
+                   area<typename boost::range_value<MultiGeometry>::type>
+               >(multi, strategy);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
 template <typename Geometry>
-struct devarianted_area
+struct area
 {
     template <typename Strategy>
     static inline typename Strategy::return_type apply(Geometry const& geometry,
                                                        Strategy const& strategy)
     {
-        return area<Geometry>::apply(geometry, strategy);
+        return dispatch::area<Geometry>::apply(geometry, strategy);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_area<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct area<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     template <typename Strategy>
     struct visitor: boost::static_visitor<typename Strategy::return_type>
@@ -200,7 +225,7 @@ struct devarianted_area<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
         template <typename Geometry>
         typename Strategy::return_type operator()(Geometry const& geometry) const
         {
-            return devarianted_area<Geometry>::apply(geometry, m_strategy);
+            return area<Geometry>::apply(geometry, m_strategy);
         }
     };
 
@@ -213,10 +238,7 @@ struct devarianted_area<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
+} // namespace resolve_variant
 
 
 /*!
@@ -245,6 +267,8 @@ inline typename default_area_result<Geometry>::type area(Geometry const& geometr
 {
     concept::check<Geometry const>();
 
+    // TODO put this into a resolve_strategy stage
+    //      (and take the return type from resolve_variant)
     typedef typename point_type<Geometry>::type point_type;
     typedef typename strategy::area::services::default_strategy
         <
@@ -253,8 +277,8 @@ inline typename default_area_result<Geometry>::type area(Geometry const& geometr
         >::type strategy_type;
 
     // detail::throw_on_empty_input(geometry);
-        
-    return dispatch::devarianted_area<Geometry>::apply(geometry, strategy_type());
+
+    return resolve_variant::area<Geometry>::apply(geometry, strategy_type());
 }
 
 /*!
@@ -288,8 +312,8 @@ inline typename Strategy::return_type area(
     concept::check<Geometry const>();
 
     // detail::throw_on_empty_input(geometry);
-    
-    return dispatch::devarianted_area<Geometry>::apply(geometry, strategy);
+
+    return resolve_variant::area<Geometry>::apply(geometry, strategy);
 }
 
 
diff --git a/include/boost/geometry/algorithms/assign.hpp b/include/boost/geometry/algorithms/assign.hpp
index 97a033d1d..f7b8679f1 100644
--- a/include/boost/geometry/algorithms/assign.hpp
+++ b/include/boost/geometry/algorithms/assign.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -40,6 +41,8 @@
 
 #include <boost/geometry/util/for_each_coordinate.hpp>
 
+#include <boost/variant/variant_fwd.hpp>
+
 namespace boost { namespace geometry
 {
 
@@ -121,6 +124,137 @@ inline void assign_zero(Geometry& geometry)
         >::apply(geometry);
 }
 
+
+namespace resolve_variant
+{
+
+template <typename Geometry1, typename Geometry2>
+struct assign
+{
+    static inline void
+    apply(
+            Geometry1& geometry1,
+            const Geometry2& geometry2)
+    {
+        concept::check<Geometry1>();
+        concept::check<Geometry2 const>();
+        concept::check_concepts_and_equal_dimensions<Geometry1, Geometry2 const>();
+            
+        bool const same_point_order =
+            point_order<Geometry1>::value == point_order<Geometry2>::value;
+        bool const same_closure =
+            closure<Geometry1>::value == closure<Geometry2>::value;
+            
+        BOOST_MPL_ASSERT_MSG
+        (
+                same_point_order, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_POINT_ORDER
+                , (types<Geometry1, Geometry2>)
+        );
+        BOOST_MPL_ASSERT_MSG
+        (
+                same_closure, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_CLOSURE
+                , (types<Geometry1, Geometry2>)
+        );
+            
+        dispatch::convert<Geometry2, Geometry1>::apply(geometry2, geometry1);
+    }
+};
+    
+    
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct assign<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    struct visitor: static_visitor<void>
+    {
+        Geometry2 const& m_geometry2;
+            
+        visitor(Geometry2 const& geometry2)
+        : m_geometry2(geometry2)
+        {}
+            
+        template <typename Geometry1>
+        result_type operator()(Geometry1& geometry1) const
+        {
+            return assign
+            <
+                Geometry1,
+                Geometry2
+            >::apply
+            (geometry1, m_geometry2);
+        }
+    };
+        
+    static inline void
+    apply(variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry1,
+          Geometry2 const& geometry2)
+    {
+        return apply_visitor(visitor(geometry2), geometry1);
+    }
+};
+    
+    
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct assign<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: static_visitor<void>
+    {
+        Geometry1& m_geometry1;
+            
+        visitor(Geometry1 const& geometry1)
+        : m_geometry1(geometry1)
+        {}
+            
+        template <typename Geometry2>
+        result_type operator()(Geometry2 const& geometry2) const
+        {
+            return assign
+            <
+                Geometry1,
+                Geometry2
+            >::apply
+            (m_geometry1, geometry2);
+        }
+    };
+        
+    static inline void
+    apply(Geometry1& geometry1,
+          variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2)
+    {
+        return apply_visitor(visitor(geometry1), geometry2);
+    }
+};
+    
+    
+template <BOOST_VARIANT_ENUM_PARAMS(typename A), BOOST_VARIANT_ENUM_PARAMS(typename B)>
+struct assign<variant<BOOST_VARIANT_ENUM_PARAMS(A)>, variant<BOOST_VARIANT_ENUM_PARAMS(B)> >
+{
+    struct visitor: static_visitor<void>
+    {
+        template <typename Geometry1, typename Geometry2>
+        result_type operator()(
+                                Geometry1& geometry1,
+                                Geometry2 const& geometry2) const
+        {
+            return assign
+            <
+                Geometry1,
+                Geometry2
+            >::apply
+            (geometry1, geometry2);
+        }
+    };
+        
+    static inline void
+    apply(variant<BOOST_VARIANT_ENUM_PARAMS(A)>& geometry1,
+          variant<BOOST_VARIANT_ENUM_PARAMS(B)> const& geometry2)
+    {
+        return apply_visitor(visitor(), geometry1, geometry2);
+    }
+};
+    
+} // namespace resolve_variant
+    
+
 /*!
 \brief Assigns one geometry to another geometry
 \details The assign algorithm assigns one geometry, e.g. a BOX, to another
@@ -142,25 +276,7 @@ geometry, e.g. a RING. This only works if it is possible and applicable.
 template <typename Geometry1, typename Geometry2>
 inline void assign(Geometry1& geometry1, Geometry2 const& geometry2)
 {
-    concept::check_concepts_and_equal_dimensions<Geometry1, Geometry2 const>();
-
-    bool const same_point_order = 
-            point_order<Geometry1>::value == point_order<Geometry2>::value;
-    bool const same_closure = 
-            closure<Geometry1>::value == closure<Geometry2>::value;
-
-    BOOST_MPL_ASSERT_MSG
-        (
-            same_point_order, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_POINT_ORDER
-            , (types<Geometry1, Geometry2>)
-        );
-    BOOST_MPL_ASSERT_MSG
-        (
-            same_closure, ASSIGN_IS_NOT_SUPPORTED_FOR_DIFFERENT_CLOSURE
-            , (types<Geometry1, Geometry2>)
-        );
-
-    dispatch::convert<Geometry2, Geometry1>::apply(geometry2, geometry1);
+    resolve_variant::assign<Geometry1, Geometry2>::apply(geometry1, geometry2);
 }
 
 
diff --git a/include/boost/geometry/algorithms/buffer.hpp b/include/boost/geometry/algorithms/buffer.hpp
index 29966d8cc..13d48c0d5 100644
--- a/include/boost/geometry/algorithms/buffer.hpp
+++ b/include/boost/geometry/algorithms/buffer.hpp
@@ -17,11 +17,12 @@
 #include <cstddef>
 
 #include <boost/numeric/conversion/cast.hpp>
-
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/geometries/segment.hpp>
@@ -92,7 +93,7 @@ struct buffer<BoxIn, BoxOut, box_tag, box_tag>
 {
     template <typename Distance>
     static inline void apply(BoxIn const& box_in, Distance const& distance,
-                Distance const& , BoxIn& box_out)
+                Distance const& , BoxOut& box_out)
     {
         detail::buffer::buffer_box(box_in, distance, box_out);
     }
@@ -107,6 +108,61 @@ struct buffer<BoxIn, BoxOut, box_tag, box_tag>
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_variant {
+
+template <typename Geometry>
+struct buffer
+{
+    template <typename Distance, typename GeometryOut>
+    static inline void apply(Geometry const& geometry,
+                             Distance const& distance,
+                             Distance const& chord_length,
+                             GeometryOut& out)
+    {
+        dispatch::buffer<Geometry, GeometryOut>::apply(geometry, distance, chord_length, out);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct buffer<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Distance, typename GeometryOut>
+    struct visitor: boost::static_visitor<void>
+    {
+        Distance const& m_distance;
+        Distance const& m_chord_length;
+        GeometryOut& m_out;
+
+        visitor(Distance const& distance,
+                Distance const& chord_length,
+                GeometryOut& out)
+        : m_distance(distance),
+          m_chord_length(chord_length),
+          m_out(out)
+        {}
+
+        template <typename Geometry>
+        void operator()(Geometry const& geometry) const
+        {
+            buffer<Geometry>::apply(geometry, m_distance, m_chord_length, m_out);
+        }
+    };
+
+    template <typename Distance, typename GeometryOut>
+    static inline void apply(
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+        Distance const& distance,
+        Distance const& chord_length,
+        GeometryOut& out
+    )
+    {
+        boost::apply_visitor(visitor<Distance, GeometryOut>(distance, chord_length, out), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief \brief_calc{buffer}
 \ingroup buffer
@@ -129,11 +185,7 @@ inline void buffer(Input const& geometry_in, Output& geometry_out,
     concept::check<Input const>();
     concept::check<Output>();
 
-    dispatch::buffer
-        <
-            Input,
-            Output
-        >::apply(geometry_in, distance, chord_length, geometry_out);
+    resolve_variant::buffer<Input>::apply(geometry_in, distance, chord_length, geometry_out);
 }
 
 /*!
@@ -157,11 +209,7 @@ Output return_buffer(Input const& geometry, Distance const& distance, Distance c
 
     Output geometry_out;
 
-    dispatch::buffer
-        <
-            Input,
-            Output
-        >::apply(geometry, distance, chord_length, geometry_out);
+    resolve_variant::buffer<Input>::apply(geometry, distance, chord_length, geometry_out);
 
     return geometry_out;
 }
diff --git a/include/boost/geometry/algorithms/centroid.hpp b/include/boost/geometry/algorithms/centroid.hpp
index f673c133d..38cc18a2a 100644
--- a/include/boost/geometry/algorithms/centroid.hpp
+++ b/include/boost/geometry/algorithms/centroid.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -18,7 +19,10 @@
 #include <cstddef>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/cs.hpp>
@@ -27,18 +31,24 @@
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
 
-#include <boost/geometry/algorithms/convert.hpp>
-#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/strategies/centroid.hpp>
 #include <boost/geometry/strategies/concepts/centroid_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
 
 #include <boost/geometry/util/for_each_coordinate.hpp>
 #include <boost/geometry/util/select_coordinate_type.hpp>
 
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
 
 
 namespace boost { namespace geometry
@@ -232,9 +242,11 @@ struct centroid_polygon_state
 
         per_ring::apply(exterior_ring(poly), strategy, state);
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(poly);
+
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             per_ring::apply(*it, strategy, state);
         }
@@ -257,6 +269,59 @@ struct centroid_polygon
 };
 
 
+/*!
+    \brief Building block of a multi-point, to be used as Policy in the
+        more generec centroid_multi
+*/
+struct centroid_multi_point_state
+{
+    template <typename Point, typename Strategy>
+    static inline void apply(Point const& point,
+            Strategy const& strategy, typename Strategy::state_type& state)
+    {
+        strategy.apply(point, state);
+    }
+};
+
+
+/*!
+    \brief Generic implementation which calls a policy to calculate the
+        centroid of the total of its single-geometries
+    \details The Policy is, in general, the single-version, with state. So
+        detail::centroid::centroid_polygon_state is used as a policy for this
+        detail::centroid::centroid_multi
+
+*/
+template <typename Policy>
+struct centroid_multi
+{
+    template <typename Multi, typename Point, typename Strategy>
+    static inline void apply(Multi const& multi, Point& centroid,
+            Strategy const& strategy)
+    {
+#if ! defined(BOOST_GEOMETRY_CENTROID_NO_THROW)
+        // If there is nothing in any of the ranges, it is not possible
+        // to calculate the centroid
+        if (geometry::num_points(multi) == 0)
+        {
+            throw centroid_exception();
+        }
+#endif
+
+        typename Strategy::state_type state;
+
+        for (typename boost::range_iterator<Multi const>::type
+                it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            Policy::apply(*it, strategy, state);
+        }
+        Strategy::result(state, centroid);
+    }
+};
+
+
 }} // namespace detail::centroid
 #endif // DOXYGEN_NO_DETAIL
 
@@ -296,17 +361,124 @@ struct centroid<Ring, ring_tag>
 template <typename Linestring>
 struct centroid<Linestring, linestring_tag>
     : detail::centroid::centroid_range<closed>
- {};
+{};
 
 template <typename Polygon>
 struct centroid<Polygon, polygon_tag>
     : detail::centroid::centroid_polygon
- {};
+{};
+
+template <typename MultiLinestring>
+struct centroid<MultiLinestring, multi_linestring_tag>
+    : detail::centroid::centroid_multi
+        <
+            detail::centroid::centroid_range_state<closed>
+        >
+{};
+
+template <typename MultiPolygon>
+struct centroid<MultiPolygon, multi_polygon_tag>
+    : detail::centroid::centroid_multi
+        <
+            detail::centroid::centroid_polygon_state
+        >
+{};
+
+template <typename MultiPoint>
+struct centroid<MultiPoint, multi_point_tag>
+    : detail::centroid::centroid_multi
+        <
+            detail::centroid::centroid_multi_point_state
+        >
+{};
+
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy {
+
+template <typename Geometry>
+struct centroid
+{
+    template <typename Point, typename Strategy>
+    static inline void apply(Geometry const& geometry, Point& out, Strategy const& strategy)
+    {
+        dispatch::centroid<Geometry>::apply(geometry, out, strategy);
+    }
+
+    template <typename Point>
+    static inline void apply(Geometry const& geometry, Point& out, default_strategy)
+    {
+        typedef typename strategy::centroid::services::default_strategy
+        <
+            typename cs_tag<Geometry>::type,
+            typename tag_cast
+                <
+                    typename tag<Geometry>::type,
+                    pointlike_tag,
+                    linear_tag,
+                    areal_tag
+                >::type,
+            dimension<Geometry>::type::value,
+            Point,
+            Geometry
+        >::type strategy_type;
+
+        dispatch::centroid<Geometry>::apply(geometry, out, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct centroid
+{
+    template <typename Point, typename Strategy>
+    static inline void apply(Geometry const& geometry, Point& out, Strategy const& strategy)
+    {
+        concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
+        resolve_strategy::centroid<Geometry>::apply(geometry, out, strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct centroid<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Point, typename Strategy>
+    struct visitor: boost::static_visitor<void>
+    {
+        Point& m_out;
+        Strategy const& m_strategy;
+
+        visitor(Point& out, Strategy const& strategy)
+        : m_out(out), m_strategy(strategy)
+        {}
+
+        template <typename Geometry>
+        void operator()(Geometry const& geometry) const
+        {
+            centroid<Geometry>::apply(geometry, m_out, m_strategy);
+        }
+    };
+
+    template <typename Point, typename Strategy>
+    static inline void
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          Point& out,
+          Strategy const& strategy)
+    {
+        boost::apply_visitor(visitor<Point, Strategy>(out, strategy), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief \brief_calc{centroid} \brief_strategy
 \ingroup centroid
@@ -328,15 +500,7 @@ template<typename Geometry, typename Point, typename Strategy>
 inline void centroid(Geometry const& geometry, Point& c,
         Strategy const& strategy)
 {
-    //BOOST_CONCEPT_ASSERT( (geometry::concept::CentroidStrategy<Strategy>) );
-
-    concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
-
-    typedef typename point_type<Geometry>::type point_type;
-
-    // Call dispatch apply method. That one returns true if centroid
-    // should be taken from state.
-    dispatch::centroid<Geometry>::apply(geometry, c, strategy);
+    resolve_variant::centroid<Geometry>::apply(geometry, c, strategy);
 }
 
 
@@ -359,24 +523,7 @@ inline void centroid(Geometry const& geometry, Point& c,
 template<typename Geometry, typename Point>
 inline void centroid(Geometry const& geometry, Point& c)
 {
-    concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
-
-    typedef typename strategy::centroid::services::default_strategy
-        <
-            typename cs_tag<Geometry>::type,
-            typename tag_cast
-                <
-                    typename tag<Geometry>::type,
-                    pointlike_tag,
-                    linear_tag,
-                    areal_tag
-                >::type,
-            dimension<Geometry>::type::value,
-            Point,
-            Geometry
-        >::type strategy_type;
-
-    centroid(geometry, c, strategy_type());
+    centroid(geometry, c, default_strategy());
 }
 
 
@@ -394,8 +541,6 @@ inline void centroid(Geometry const& geometry, Point& c)
 template<typename Point, typename Geometry>
 inline Point return_centroid(Geometry const& geometry)
 {
-    concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
-
     Point c;
     centroid(geometry, c);
     return c;
@@ -419,10 +564,6 @@ inline Point return_centroid(Geometry const& geometry)
 template<typename Point, typename Geometry, typename Strategy>
 inline Point return_centroid(Geometry const& geometry, Strategy const& strategy)
 {
-    //BOOST_CONCEPT_ASSERT( (geometry::concept::CentroidStrategy<Strategy>) );
-
-    concept::check_concepts_and_equal_dimensions<Point, Geometry const>();
-
     Point c;
     centroid(geometry, c, strategy);
     return c;
diff --git a/include/boost/geometry/algorithms/clear.hpp b/include/boost/geometry/algorithms/clear.hpp
index b8cd0dca7..1850816b1 100644
--- a/include/boost/geometry/algorithms/clear.hpp
+++ b/include/boost/geometry/algorithms/clear.hpp
@@ -15,17 +15,19 @@
 #define BOOST_GEOMETRY_ALGORITHMS_CLEAR_HPP
 
 
+#include <boost/type_traits/remove_const.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/type_traits/remove_const.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 
 namespace boost { namespace geometry
@@ -125,16 +127,28 @@ struct clear<Polygon, polygon_tag>
 
 
 template <typename Geometry>
-struct devarianted_clear
+struct clear<Geometry, multi_tag>
+    : detail::clear::collection_clear<Geometry>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct clear
 {
     static inline void apply(Geometry& geometry)
     {
-        clear<Geometry>::apply(geometry);
+        dispatch::clear<Geometry>::apply(geometry);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_clear<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct clear<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     struct visitor: static_visitor<void>
     {
@@ -151,9 +165,7 @@ struct devarianted_clear<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
+} // namespace resolve_variant
 
 
 /*!
@@ -174,7 +186,7 @@ inline void clear(Geometry& geometry)
 {
     concept::check<Geometry>();
 
-    dispatch::devarianted_clear<Geometry>::apply(geometry);
+    resolve_variant::clear<Geometry>::apply(geometry);
 }
 
 
diff --git a/include/boost/geometry/algorithms/comparable_distance.hpp b/include/boost/geometry/algorithms/comparable_distance.hpp
index 3467045ca..6f009da3e 100644
--- a/include/boost/geometry/algorithms/comparable_distance.hpp
+++ b/include/boost/geometry/algorithms/comparable_distance.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,61 +19,7 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_COMPARABLE_DISTANCE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_COMPARABLE_DISTANCE_HPP
 
-
-#include <boost/geometry/algorithms/distance.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-/*!
-\brief \brief_calc2{comparable distance measurement}
-\ingroup distance
-\details The free function comparable_distance does not necessarily calculate the distance,
-    but it calculates a distance measure such that two distances are comparable to each other.
-    For example: for the Cartesian coordinate system, Pythagoras is used but the square root
-    is not taken, which makes it faster and the results of two point pairs can still be 
-    compared to each other.
-\tparam Geometry1 first geometry type
-\tparam Geometry2 second geometry type
-\param geometry1 \param_geometry
-\param geometry2 \param_geometry
-\return \return_calc{comparable distance}
-
-\qbk{[include reference/algorithms/comparable_distance.qbk]}
- */
-template <typename Geometry1, typename Geometry2>
-inline typename default_distance_result<Geometry1, Geometry2>::type comparable_distance(
-                Geometry1 const& geometry1, Geometry2 const& geometry2)
-{
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-
-    typedef typename point_type<Geometry1>::type point1_type;
-    typedef typename point_type<Geometry2>::type point2_type;
-
-    // Define a point-point-distance-strategy
-    // for either the normal case, either the reversed case
-
-    typedef typename strategy::distance::services::comparable_type
-        <
-            typename boost::mpl::if_c
-                <
-                    geometry::reverse_dispatch
-                        <Geometry1, Geometry2>::type::value,
-                    typename strategy::distance::services::default_strategy
-                            <point_tag, point2_type, point1_type>::type,
-                    typename strategy::distance::services::default_strategy
-                            <point_tag, point1_type, point2_type>::type
-                >::type
-        >::type strategy_type;
-
-    return distance(geometry1, geometry2, strategy_type());
-}
-
-
-}} // namespace boost::geometry
-
+#include <boost/geometry/algorithms/detail/comparable_distance/interface.hpp>
+#include <boost/geometry/algorithms/detail/comparable_distance/implementation.hpp>
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_COMPARABLE_DISTANCE_HPP
diff --git a/include/boost/geometry/algorithms/convert.hpp b/include/boost/geometry/algorithms/convert.hpp
index 6b48ca604..f8685af2d 100644
--- a/include/boost/geometry/algorithms/convert.hpp
+++ b/include/boost/geometry/algorithms/convert.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -20,6 +21,10 @@
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/range.hpp>
 #include <boost/type_traits/is_array.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
@@ -31,6 +36,7 @@
 #include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
 #include <boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/views/reversible_view.hpp>
@@ -38,11 +44,9 @@
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/point_order.hpp>
-#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
 
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
@@ -51,7 +55,7 @@ namespace boost { namespace geometry
 // Silence warning C4127: conditional expression is constant
 // Silence warning C4512: assignment operator could not be generated
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4127 4512)
 #endif
 
@@ -127,22 +131,22 @@ struct segment_to_range
     }
 };
 
-template 
+template
 <
-    typename Range1, 
-    typename Range2, 
+    typename Range1,
+    typename Range2,
     bool Reverse = false
 >
 struct range_to_range
 {
     typedef typename reversible_view
         <
-            Range1 const, 
+            Range1 const,
             Reverse ? iterate_reverse : iterate_forward
         >::type rview_type;
     typedef typename closeable_view
         <
-            rview_type const, 
+            rview_type const,
             geometry::closure<Range1>::value
         >::type view_type;
 
@@ -178,7 +182,7 @@ struct polygon_to_polygon
 {
     typedef range_to_range
         <
-            typename geometry::ring_type<Polygon1>::type, 
+            typename geometry::ring_type<Polygon1>::type,
             typename geometry::ring_type<Polygon2>::type,
             geometry::point_order<Polygon1>::value
                 != geometry::point_order<Polygon2>::value
@@ -188,7 +192,7 @@ struct polygon_to_polygon
     {
         // Clearing managed per ring, and in the resizing of interior rings
 
-        per_ring::apply(geometry::exterior_ring(source), 
+        per_ring::apply(geometry::exterior_ring(source),
             geometry::exterior_ring(destination));
 
         // Container should be resizeable
@@ -200,13 +204,15 @@ struct polygon_to_polygon
                 >::type
             >::apply(interior_rings(destination), num_interior_rings(source));
 
-        typename interior_return_type<Polygon1 const>::type rings_source
-                    = interior_rings(source);
-        typename interior_return_type<Polygon2>::type rings_dest
-                    = interior_rings(destination);
+        typename interior_return_type<Polygon1 const>::type
+            rings_source = interior_rings(source);
+        typename interior_return_type<Polygon2>::type
+            rings_dest = interior_rings(destination);
 
-        BOOST_AUTO_TPL(it_source, boost::begin(rings_source));
-        BOOST_AUTO_TPL(it_dest, boost::begin(rings_dest));
+        typename detail::interior_iterator<Polygon1 const>::type
+            it_source = boost::begin(rings_source);
+        typename detail::interior_iterator<Polygon2>::type
+            it_dest = boost::begin(rings_dest);
 
         for ( ; it_source != boost::end(rings_source); ++it_source, ++it_dest)
         {
@@ -215,6 +221,37 @@ struct polygon_to_polygon
     }
 };
 
+template <typename Single, typename Multi, typename Policy>
+struct single_to_multi: private Policy
+{
+    static inline void apply(Single const& single, Multi& multi)
+    {
+        traits::resize<Multi>::apply(multi, 1);
+        Policy::apply(single, *boost::begin(multi));
+    }
+};
+
+
+
+template <typename Multi1, typename Multi2, typename Policy>
+struct multi_to_multi: private Policy
+{
+    static inline void apply(Multi1 const& multi1, Multi2& multi2)
+    {
+        traits::resize<Multi2>::apply(multi2, boost::size(multi1));
+
+        typename boost::range_iterator<Multi1 const>::type it1
+                = boost::begin(multi1);
+        typename boost::range_iterator<Multi2>::type it2
+                = boost::begin(multi2);
+
+        for (; it1 != boost::end(multi1); ++it1, ++it2)
+        {
+            Policy::apply(*it1, *it2);
+        }
+    }
+};
+
 
 }} // namespace detail::conversion
 #endif // DOXYGEN_NO_DETAIL
@@ -292,8 +329,8 @@ struct convert<Segment, LineString, segment_tag, linestring_tag, DimensionCount,
 template <typename Ring1, typename Ring2, std::size_t DimensionCount>
 struct convert<Ring1, Ring2, ring_tag, ring_tag, DimensionCount, false>
     : detail::conversion::range_to_range
-        <   
-            Ring1, 
+        <
+            Ring1,
             Ring2,
             geometry::point_order<Ring1>::value
                 != geometry::point_order<Ring2>::value
@@ -314,8 +351,8 @@ template <typename Box, typename Ring>
 struct convert<Box, Ring, box_tag, ring_tag, 2, false>
     : detail::conversion::box_to_range
         <
-            Box, 
-            Ring, 
+            Box,
+            Ring,
             geometry::closure<Ring>::value == closed,
             geometry::point_order<Ring>::value == counterclockwise
         >
@@ -389,18 +426,74 @@ struct convert<Polygon, Ring, polygon_tag, ring_tag, DimensionCount, false>
 };
 
 
+// Dispatch for multi <-> multi, specifying their single-version as policy.
+// Note that, even if the multi-types are mutually different, their single
+// version types might be the same and therefore we call boost::is_same again
+
+template <typename Multi1, typename Multi2, std::size_t DimensionCount>
+struct convert<Multi1, Multi2, multi_tag, multi_tag, DimensionCount, false>
+    : detail::conversion::multi_to_multi
+        <
+            Multi1,
+            Multi2,
+            convert
+                <
+                    typename boost::range_value<Multi1>::type,
+                    typename boost::range_value<Multi2>::type,
+                    typename single_tag_of
+                                <
+                                    typename tag<Multi1>::type
+                                >::type,
+                    typename single_tag_of
+                                <
+                                    typename tag<Multi2>::type
+                                >::type,
+                    DimensionCount
+                >
+        >
+{};
+
+
+template <typename Single, typename Multi, typename SingleTag, std::size_t DimensionCount>
+struct convert<Single, Multi, SingleTag, multi_tag, DimensionCount, false>
+    : detail::conversion::single_to_multi
+        <
+            Single,
+            Multi,
+            convert
+                <
+                    Single,
+                    typename boost::range_value<Multi>::type,
+                    typename tag<Single>::type,
+                    typename single_tag_of
+                                <
+                                    typename tag<Multi>::type
+                                >::type,
+                    DimensionCount,
+                    false
+                >
+        >
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
 template <typename Geometry1, typename Geometry2>
-struct devarianted_convert
+struct convert
 {
     static inline void apply(Geometry1 const& geometry1, Geometry2& geometry2)
     {
         concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2>();
-        convert<Geometry1, Geometry2>::apply(geometry1, geometry2);
+        dispatch::convert<Geometry1, Geometry2>::apply(geometry1, geometry2);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
-struct devarianted_convert<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+struct convert<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
 {
     struct visitor: static_visitor<void>
     {
@@ -413,7 +506,7 @@ struct devarianted_convert<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometr
         template <typename Geometry1>
         inline void operator()(Geometry1 const& geometry1) const
         {
-            devarianted_convert<Geometry1, Geometry2>::apply(geometry1, m_geometry2);
+            convert<Geometry1, Geometry2>::apply(geometry1, m_geometry2);
         }
     };
 
@@ -426,17 +519,15 @@ struct devarianted_convert<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometr
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
+}
 
 
 /*!
 \brief Converts one geometry to another geometry
 \details The convert algorithm converts one geometry, e.g. a BOX, to another
 geometry, e.g. a RING. This only works if it is possible and applicable.
-If the point-order is different, or the closure is different between two 
-geometry types, it will be converted correctly by explicitly reversing the 
+If the point-order is different, or the closure is different between two
+geometry types, it will be converted correctly by explicitly reversing the
 points or closing or opening the polygon rings.
 \ingroup convert
 \tparam Geometry1 \tparam_geometry
@@ -449,7 +540,7 @@ points or closing or opening the polygon rings.
 template <typename Geometry1, typename Geometry2>
 inline void convert(Geometry1 const& geometry1, Geometry2& geometry2)
 {
-    dispatch::devarianted_convert<Geometry1, Geometry2>::apply(geometry1, geometry2);
+    resolve_variant::convert<Geometry1, Geometry2>::apply(geometry1, geometry2);
 }
 
 #if defined(_MSC_VER)
diff --git a/include/boost/geometry/algorithms/convex_hull.hpp b/include/boost/geometry/algorithms/convex_hull.hpp
index a623064bf..d5bd4d92a 100644
--- a/include/boost/geometry/algorithms/convex_hull.hpp
+++ b/include/boost/geometry/algorithms/convex_hull.hpp
@@ -15,6 +15,9 @@
 #define BOOST_GEOMETRY_ALGORITHMS_CONVEX_HULL_HPP
 
 #include <boost/array.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/point_order.hpp>
@@ -24,6 +27,7 @@
 
 #include <boost/geometry/strategies/convex_hull.hpp>
 #include <boost/geometry/strategies/concepts/convex_hull_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
 
 #include <boost/geometry/views/detail/range_type.hpp>
 
@@ -77,18 +81,6 @@ struct hull_to_geometry
     }
 };
 
-
-// Helper metafunction for default strategy retrieval
-template <typename Geometry>
-struct default_strategy
-    : strategy_convex_hull
-          <
-              Geometry,
-              typename point_type<Geometry>::type
-          >
-{};
-
-
 }} // namespace detail::convex_hull
 #endif // DOXYGEN_NO_DETAIL
 
@@ -142,25 +134,169 @@ struct convex_hull_insert
 #endif // DOXYGEN_NO_DISPATCH
 
 
-template<typename Geometry, typename OutputGeometry, typename Strategy>
-inline void convex_hull(Geometry const& geometry,
-            OutputGeometry& out, Strategy const& strategy)
+namespace resolve_strategy {
+
+struct convex_hull
 {
-    concept::check_concepts_and_equal_dimensions
-        <
+    template <typename Geometry, typename OutputGeometry, typename Strategy>
+    static inline void apply(Geometry const& geometry,
+                             OutputGeometry& out,
+                             Strategy const& strategy)
+    {
+        BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
+        dispatch::convex_hull<Geometry>::apply(geometry, out, strategy);
+    }
+
+    template <typename Geometry, typename OutputGeometry>
+    static inline void apply(Geometry const& geometry,
+                             OutputGeometry& out,
+                             default_strategy)
+    {
+        typedef typename strategy_convex_hull<
+            Geometry,
+            typename point_type<Geometry>::type
+        >::type strategy_type;
+
+        apply(geometry, out, strategy_type());
+    }
+};
+
+struct convex_hull_insert
+{
+    template <typename Geometry, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(Geometry const& geometry,
+                                       OutputIterator& out,
+                                       Strategy const& strategy)
+    {
+        BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
+
+        return dispatch::convex_hull_insert<
+                   geometry::point_order<Geometry>::value
+               >::apply(geometry, out, strategy);
+    }
+
+    template <typename Geometry, typename OutputIterator>
+    static inline OutputIterator apply(Geometry const& geometry,
+                                       OutputIterator& out,
+                                       default_strategy)
+    {
+        typedef typename strategy_convex_hull<
+            Geometry,
+            typename point_type<Geometry>::type
+        >::type strategy_type;
+
+        return apply(geometry, out, strategy_type());
+    }
+};
+
+}; // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct convex_hull
+{
+    template <typename OutputGeometry, typename Strategy>
+    static inline void apply(Geometry const& geometry, OutputGeometry& out, Strategy const& strategy)
+    {
+        concept::check_concepts_and_equal_dimensions<
             const Geometry,
             OutputGeometry
         >();
 
-    BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
+        resolve_strategy::convex_hull::apply(geometry, out, strategy);
+    }
+};
 
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct convex_hull<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename OutputGeometry, typename Strategy>
+    struct visitor: boost::static_visitor<void>
+    {
+        OutputGeometry& m_out;
+        Strategy const& m_strategy;
+
+        visitor(OutputGeometry& out, Strategy const& strategy)
+        : m_out(out), m_strategy(strategy)
+        {}
+
+        template <typename Geometry>
+        void operator()(Geometry const& geometry) const
+        {
+            convex_hull<Geometry>::apply(geometry, m_out, m_strategy);
+        }
+    };
+
+    template <typename OutputGeometry, typename Strategy>
+    static inline void
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          OutputGeometry& out,
+          Strategy const& strategy)
+    {
+        boost::apply_visitor(visitor<OutputGeometry, Strategy>(out, strategy), geometry);
+    }
+};
+
+template <typename Geometry>
+struct convex_hull_insert
+{
+    template <typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(Geometry const& geometry, OutputIterator& out, Strategy const& strategy)
+    {
+        // Concept: output point type = point type of input geometry
+        concept::check<Geometry const>();
+        concept::check<typename point_type<Geometry>::type>();
+
+        return resolve_strategy::convex_hull_insert::apply(geometry, out, strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct convex_hull_insert<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename OutputIterator, typename Strategy>
+    struct visitor: boost::static_visitor<OutputIterator>
+    {
+        OutputIterator& m_out;
+        Strategy const& m_strategy;
+
+        visitor(OutputIterator& out, Strategy const& strategy)
+        : m_out(out), m_strategy(strategy)
+        {}
+
+        template <typename Geometry>
+        OutputIterator operator()(Geometry const& geometry) const
+        {
+            return convex_hull_insert<Geometry>::apply(geometry, m_out, m_strategy);
+        }
+    };
+
+    template <typename OutputIterator, typename Strategy>
+    static inline OutputIterator
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          OutputIterator& out,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(visitor<OutputIterator, Strategy>(out, strategy), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
+template<typename Geometry, typename OutputGeometry, typename Strategy>
+inline void convex_hull(Geometry const& geometry,
+            OutputGeometry& out, Strategy const& strategy)
+{
     if (geometry::num_points(geometry) == 0)
     {
         // Leave output empty
         return;
     }
 
-    dispatch::convex_hull<Geometry>::apply(geometry, out, strategy);
+    resolve_variant::convex_hull<Geometry>::apply(geometry, out, strategy);
 }
 
 
@@ -179,15 +315,7 @@ template<typename Geometry, typename OutputGeometry>
 inline void convex_hull(Geometry const& geometry,
             OutputGeometry& hull)
 {
-    concept::check_concepts_and_equal_dimensions
-        <
-            const Geometry,
-            OutputGeometry
-        >();
-
-    typedef typename detail::convex_hull::default_strategy<Geometry>::type strategy_type;
-
-    convex_hull(geometry, hull, strategy_type());
+    convex_hull(geometry, hull, default_strategy());
 }
 
 #ifndef DOXYGEN_NO_DETAIL
@@ -199,16 +327,8 @@ template<typename Geometry, typename OutputIterator, typename Strategy>
 inline OutputIterator convex_hull_insert(Geometry const& geometry,
             OutputIterator out, Strategy const& strategy)
 {
-    // Concept: output point type = point type of input geometry
-    concept::check<Geometry const>();
-    concept::check<typename point_type<Geometry>::type>();
-
-    BOOST_CONCEPT_ASSERT( (geometry::concept::ConvexHullStrategy<Strategy>) );
-
-    return dispatch::convex_hull_insert
-        <
-            geometry::point_order<Geometry>::value
-        >::apply(geometry, out, strategy);
+    return resolve_variant::convex_hull_insert<Geometry>
+                          ::apply(geometry, out, strategy);
 }
 
 
@@ -229,13 +349,7 @@ template<typename Geometry, typename OutputIterator>
 inline OutputIterator convex_hull_insert(Geometry const& geometry,
             OutputIterator out)
 {
-    // Concept: output point type = point type of input geometry
-    concept::check<Geometry const>();
-    concept::check<typename point_type<Geometry>::type>();
-
-    typedef typename detail::convex_hull::default_strategy<Geometry>::type strategy_type;
-
-    return convex_hull_insert(geometry, out, strategy_type());
+    return convex_hull_insert(geometry, out, default_strategy());
 }
 
 
diff --git a/include/boost/geometry/algorithms/correct.hpp b/include/boost/geometry/algorithms/correct.hpp
index 79c76a567..3c61b2c0d 100644
--- a/include/boost/geometry/algorithms/correct.hpp
+++ b/include/boost/geometry/algorithms/correct.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -21,28 +22,34 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/core/mutable_range.hpp>
-#include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/area.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/multi_modify.hpp>
 #include <boost/geometry/util/order_as_direction.hpp>
 
-
 namespace boost { namespace geometry
 {
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4127)
 #endif
 
@@ -176,9 +183,10 @@ struct correct_polygon
                 std::less<area_result_type>
             >::apply(exterior_ring(poly));
 
-        typename interior_return_type<Polygon>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(poly);
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             correct_ring
                 <
@@ -238,10 +246,69 @@ struct correct<Polygon, polygon_tag>
 {};
 
 
+template <typename MultiPoint>
+struct correct<MultiPoint, multi_point_tag>
+    : detail::correct::correct_nop<MultiPoint>
+{};
+
+
+template <typename MultiLineString>
+struct correct<MultiLineString, multi_linestring_tag>
+    : detail::correct::correct_nop<MultiLineString>
+{};
+
+
+template <typename Geometry>
+struct correct<Geometry, multi_polygon_tag>
+    : detail::multi_modify
+        <
+            Geometry,
+            detail::correct::correct_polygon
+                <
+                    typename boost::range_value<Geometry>::type
+                >
+        >
+{};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_variant {
+
+template <typename Geometry>
+struct correct
+{
+    static inline void apply(Geometry& geometry)
+    {
+        concept::check<Geometry const>();
+        dispatch::correct<Geometry>::apply(geometry);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct correct<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<void>
+    {
+        template <typename Geometry>
+        void operator()(Geometry& geometry) const
+        {
+            correct<Geometry>::apply(geometry);
+        }
+    };
+
+    static inline void
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry)
+    {
+        boost::apply_visitor(visitor(), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief Corrects a geometry
 \details Corrects a geometry: all rings which are wrongly oriented with respect
@@ -257,9 +324,7 @@ struct correct<Polygon, polygon_tag>
 template <typename Geometry>
 inline void correct(Geometry& geometry)
 {
-    concept::check<Geometry const>();
-
-    dispatch::correct<Geometry>::apply(geometry);
+    resolve_variant::correct<Geometry>::apply(geometry);
 }
 
 #if defined(_MSC_VER)
diff --git a/include/boost/geometry/algorithms/covered_by.hpp b/include/boost/geometry/algorithms/covered_by.hpp
index f0f572421..e50dc338a 100644
--- a/include/boost/geometry/algorithms/covered_by.hpp
+++ b/include/boost/geometry/algorithms/covered_by.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -11,21 +14,52 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_COVERED_BY_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_COVERED_BY_HPP
 
 
 #include <cstddef>
 
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/algorithms/within.hpp>
 
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
 #include <boost/geometry/strategies/cartesian/box_in_box.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
 
 namespace boost { namespace geometry
 {
 
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace covered_by {
+
+struct use_point_in_geometry
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        return detail::within::point_in_geometry(geometry1, geometry2, strategy) >= 0;
+    }
+};
+
+struct use_relate
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& /*strategy*/)
+    {
+        return Strategy::apply(geometry1, geometry2);
+    }
+};
+
+}} // namespace detail::covered_by
+#endif // DOXYGEN_NO_DETAIL
+
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
 {
@@ -37,7 +71,8 @@ template
     typename Tag1 = typename tag<Geometry1>::type,
     typename Tag2 = typename tag<Geometry2>::type
 >
-struct covered_by: not_implemented<Tag1, Tag2>
+struct covered_by
+    : not_implemented<Tag1, Tag2>
 {};
 
 
@@ -65,45 +100,328 @@ struct covered_by<Box1, Box2, box_tag, box_tag>
 };
 
 
+// P/P
+
+template <typename Point1, typename Point2>
+struct covered_by<Point1, Point2, point_tag, point_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiPoint>
+struct covered_by<Point, MultiPoint, point_tag, multi_point_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+// P/L
+
+template <typename Point, typename Segment>
+struct covered_by<Point, Segment, point_tag, segment_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+template <typename Point, typename Linestring>
+struct covered_by<Point, Linestring, point_tag, linestring_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiLinestring>
+struct covered_by<Point, MultiLinestring, point_tag, multi_linestring_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+// P/A
 
 template <typename Point, typename Ring>
 struct covered_by<Point, Ring, point_tag, ring_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, Ring const& ring, Strategy const& strategy)
-    {
-        return detail::within::point_in_ring
-            <
-                Point,
-                Ring,
-                order_as_direction<geometry::point_order<Ring>::value>::value,
-                geometry::closure<Ring>::value,
-                Strategy
-            >::apply(point, ring, strategy) >= 0;
-    }
-};
+    : public detail::covered_by::use_point_in_geometry
+{};
 
 template <typename Point, typename Polygon>
 struct covered_by<Point, Polygon, point_tag, polygon_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, Polygon const& polygon, Strategy const& strategy)
-    {
-        return detail::within::point_in_polygon
-        <
-            Point,
-            Polygon,
-            order_as_direction<geometry::point_order<Polygon>::value>::value,
-            geometry::closure<Polygon>::value,
-            Strategy
-        >::apply(point, polygon, strategy) >= 0;
-    }
-};
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiPolygon>
+struct covered_by<Point, MultiPolygon, point_tag, multi_polygon_tag>
+    : public detail::covered_by::use_point_in_geometry
+{};
+
+// L/L
+
+template <typename Linestring1, typename Linestring2>
+struct covered_by<Linestring1, Linestring2, linestring_tag, linestring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Linestring, typename MultiLinestring>
+struct covered_by<Linestring, MultiLinestring, linestring_tag, multi_linestring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiLinestring, typename Linestring>
+struct covered_by<MultiLinestring, Linestring, multi_linestring_tag, linestring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiLinestring1, typename MultiLinestring2>
+struct covered_by<MultiLinestring1, MultiLinestring2, multi_linestring_tag, multi_linestring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+// L/A
+
+template <typename Linestring, typename Ring>
+struct covered_by<Linestring, Ring, linestring_tag, ring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiLinestring, typename Ring>
+struct covered_by<MultiLinestring, Ring, multi_linestring_tag, ring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Linestring, typename Polygon>
+struct covered_by<Linestring, Polygon, linestring_tag, polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiLinestring, typename Polygon>
+struct covered_by<MultiLinestring, Polygon, multi_linestring_tag, polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Linestring, typename MultiPolygon>
+struct covered_by<Linestring, MultiPolygon, linestring_tag, multi_polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiLinestring, typename MultiPolygon>
+struct covered_by<MultiLinestring, MultiPolygon, multi_linestring_tag, multi_polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+// A/A
+
+template <typename Ring1, typename Ring2>
+struct covered_by<Ring1, Ring2, ring_tag, ring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Ring, typename Polygon>
+struct covered_by<Ring, Polygon, ring_tag, polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Polygon, typename Ring>
+struct covered_by<Polygon, Ring, polygon_tag, ring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Polygon1, typename Polygon2>
+struct covered_by<Polygon1, Polygon2, polygon_tag, polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Ring, typename MultiPolygon>
+struct covered_by<Ring, MultiPolygon, ring_tag, multi_polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiPolygon, typename Ring>
+struct covered_by<MultiPolygon, Ring, multi_polygon_tag, ring_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename Polygon, typename MultiPolygon>
+struct covered_by<Polygon, MultiPolygon, polygon_tag, multi_polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiPolygon, typename Polygon>
+struct covered_by<MultiPolygon, Polygon, multi_polygon_tag, polygon_tag>
+    : public detail::covered_by::use_relate
+{};
+
+template <typename MultiPolygon1, typename MultiPolygon2>
+struct covered_by<MultiPolygon1, MultiPolygon2, multi_polygon_tag, multi_polygon_tag>
+    : public detail::covered_by::use_relate
+{};
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy {
+
+struct covered_by
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             Strategy const& strategy)
+    {
+        concept::within::check
+            <
+                typename tag<Geometry1>::type,
+                typename tag<Geometry2>::type,
+                typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
+                Strategy
+            >();
+        concept::check<Geometry1 const>();
+        concept::check<Geometry2 const>();
+        assert_dimension_equal<Geometry1, Geometry2>();
+
+        return dispatch::covered_by<Geometry1, Geometry2>::apply(geometry1,
+                                                                 geometry2,
+                                                                 strategy);
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             default_strategy)
+    {
+        typedef typename point_type<Geometry1>::type point_type1;
+        typedef typename point_type<Geometry2>::type point_type2;
+
+        typedef typename strategy::covered_by::services::default_strategy
+            <
+                typename tag<Geometry1>::type,
+                typename tag<Geometry2>::type,
+                typename tag<Geometry1>::type,
+                typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
+                typename tag_cast
+                    <
+                        typename cs_tag<point_type1>::type, spherical_tag
+                    >::type,
+                typename tag_cast
+                    <
+                        typename cs_tag<point_type2>::type, spherical_tag
+                    >::type,
+                Geometry1,
+                Geometry2
+            >::type strategy_type;
+
+        return covered_by::apply(geometry1, geometry2, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry1, typename Geometry2>
+struct covered_by
+{
+    template <typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             Strategy const& strategy)
+    {
+        return resolve_strategy::covered_by
+                               ::apply(geometry1, geometry2, strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct covered_by<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry2 const& m_geometry2;
+        Strategy const& m_strategy;
+
+        visitor(Geometry2 const& geometry2, Strategy const& strategy)
+        : m_geometry2(geometry2), m_strategy(strategy) {}
+
+        template <typename Geometry1>
+        bool operator()(Geometry1 const& geometry1) const
+        {
+            return covered_by<Geometry1, Geometry2>
+                   ::apply(geometry1, m_geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(visitor<Strategy>(geometry2, strategy), geometry1);
+    }
+};
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct covered_by<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry1 const& m_geometry1;
+        Strategy const& m_strategy;
+
+        visitor(Geometry1 const& geometry1, Strategy const& strategy)
+        : m_geometry1(geometry1), m_strategy(strategy) {}
+
+        template <typename Geometry2>
+        bool operator()(Geometry2 const& geometry2) const
+        {
+            return covered_by<Geometry1, Geometry2>
+                   ::apply(m_geometry1, geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(Geometry1 const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(visitor<Strategy>(geometry1, strategy), geometry2);
+    }
+};
+
+template <
+    BOOST_VARIANT_ENUM_PARAMS(typename T1),
+    BOOST_VARIANT_ENUM_PARAMS(typename T2)
+>
+struct covered_by<
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
+>
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Strategy const& m_strategy;
+
+        visitor(Strategy const& strategy): m_strategy(strategy) {}
+
+        template <typename Geometry1, typename Geometry2>
+        bool operator()(Geometry1 const& geometry1,
+                        Geometry2 const& geometry2) const
+        {
+            return covered_by<Geometry1, Geometry2>
+                   ::apply(geometry1, geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(visitor<Strategy>(strategy), geometry1, geometry2);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief \brief_check12{is inside or on border}
 \ingroup covered_by
@@ -122,36 +440,8 @@ struct covered_by<Point, Polygon, point_tag, polygon_tag>
 template<typename Geometry1, typename Geometry2>
 inline bool covered_by(Geometry1 const& geometry1, Geometry2 const& geometry2)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-    assert_dimension_equal<Geometry1, Geometry2>();
-
-    typedef typename point_type<Geometry1>::type point_type1;
-    typedef typename point_type<Geometry2>::type point_type2;
-
-    typedef typename strategy::covered_by::services::default_strategy
-        <
-            typename tag<Geometry1>::type,
-            typename tag<Geometry2>::type,
-            typename tag<Geometry1>::type,
-            typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
-            typename tag_cast
-                <
-                    typename cs_tag<point_type1>::type, spherical_tag
-                >::type,
-            typename tag_cast
-                <
-                    typename cs_tag<point_type2>::type, spherical_tag
-                >::type,
-            Geometry1,
-            Geometry2
-        >::type strategy_type;
-
-    return dispatch::covered_by
-        <
-            Geometry1,
-            Geometry2
-        >::apply(geometry1, geometry2, strategy_type());
+    return resolve_variant::covered_by<Geometry1, Geometry2>
+                          ::apply(geometry1, geometry2, default_strategy());
 }
 
 /*!
@@ -174,22 +464,8 @@ template<typename Geometry1, typename Geometry2, typename Strategy>
 inline bool covered_by(Geometry1 const& geometry1, Geometry2 const& geometry2,
         Strategy const& strategy)
 {
-    concept::within::check
-        <
-            typename tag<Geometry1>::type, 
-            typename tag<Geometry2>::type, 
-            typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
-            Strategy
-        >();
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-    assert_dimension_equal<Geometry1, Geometry2>();
-
-    return dispatch::covered_by
-        <
-            Geometry1,
-            Geometry2
-        >::apply(geometry1, geometry2, strategy);
+    return resolve_variant::covered_by<Geometry1, Geometry2>
+                          ::apply(geometry1, geometry2, strategy);
 }
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/algorithms/crosses.hpp b/include/boost/geometry/algorithms/crosses.hpp
new file mode 100644
index 000000000..91ed3e080
--- /dev/null
+++ b/include/boost/geometry/algorithms/crosses.hpp
@@ -0,0 +1,194 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_CROSSES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_CROSSES_HPP
+
+#include <cstddef>
+#include <boost/variant/variant_fwd.hpp>
+
+#include <boost/geometry/core/access.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename Tag1 = typename tag<Geometry1>::type,
+    typename Tag2 = typename tag<Geometry2>::type
+>
+struct crosses
+    : detail::relate::relate_base
+        <
+            detail::relate::static_mask_crosses_type,
+            Geometry1,
+            Geometry2
+        >
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant
+{
+    template <typename Geometry1, typename Geometry2>
+    struct crosses
+    {
+        static inline bool
+        apply(
+              const Geometry1& geometry1,
+              const Geometry2& geometry2)
+        {
+            concept::check<Geometry1 const>();
+            concept::check<Geometry2 const>();
+            
+            return dispatch::crosses<Geometry1, Geometry2>::apply(geometry1, geometry2);
+        }
+    };
+    
+    
+    template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+    struct crosses<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+    {
+        struct visitor: static_visitor<bool>
+        {
+            Geometry2 const& m_geometry2;
+            
+            visitor(Geometry2 const& geometry2)
+            : m_geometry2(geometry2)
+            {}
+            
+            template <typename Geometry1>
+            result_type operator()(Geometry1 const& geometry1) const
+            {
+                return crosses
+                <
+                    Geometry1,
+                    Geometry2
+                >::apply
+                (geometry1, m_geometry2);
+            }
+        };
+        
+        static inline bool
+        apply(variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+              Geometry2 const& geometry2)
+        {
+            return apply_visitor(visitor(geometry2), geometry1);
+        }
+    };
+    
+    
+    template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+    struct crosses<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+    {
+        struct visitor: static_visitor<bool>
+        {
+            Geometry1 const& m_geometry1;
+            
+            visitor(Geometry1 const& geometry1)
+            : m_geometry1(geometry1)
+            {}
+            
+            template <typename Geometry2>
+            result_type operator()(Geometry2 const& geometry2) const
+            {
+                return crosses
+                <
+                    Geometry1,
+                    Geometry2
+                >::apply
+                (m_geometry1, geometry2);
+            }
+        };
+        
+        static inline bool
+        apply(
+              Geometry1 const& geometry1,
+              const variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry2)
+        {
+            return apply_visitor(visitor(geometry1), geometry2);
+        }
+    };
+    
+    
+    template <BOOST_VARIANT_ENUM_PARAMS(typename A), BOOST_VARIANT_ENUM_PARAMS(typename B)>
+    struct crosses<variant<BOOST_VARIANT_ENUM_PARAMS(A)>, variant<BOOST_VARIANT_ENUM_PARAMS(B)> >
+    {
+        struct visitor: static_visitor<bool>
+        {
+            template <typename Geometry1, typename Geometry2>
+            result_type operator()(
+                                   Geometry1 const& geometry1,
+                                   Geometry2 const& geometry2) const
+            {
+                return crosses
+                <
+                Geometry1,
+                Geometry2
+                >::apply
+                (geometry1, geometry2);
+            }
+        };
+        
+        static inline bool
+        apply(
+              const variant<BOOST_VARIANT_ENUM_PARAMS(A)>& geometry1,
+              const variant<BOOST_VARIANT_ENUM_PARAMS(B)>& geometry2)
+        {
+            return apply_visitor(visitor(), geometry1, geometry2);
+        }
+    };
+    
+} // namespace resolve_variant
+    
+    
+/*!
+\brief \brief_check2{crosses}
+\ingroup crosses
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\return \return_check2{crosses}
+
+\qbk{[include reference/algorithms/crosses.qbk]}
+*/
+template <typename Geometry1, typename Geometry2>
+inline bool crosses(Geometry1 const& geometry1, Geometry2 const& geometry2)
+{
+    return resolve_variant::crosses<Geometry1, Geometry2>::apply(geometry1, geometry2);
+}
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_CROSSES_HPP
diff --git a/include/boost/geometry/algorithms/detail/assign_box_corners.hpp b/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
index 1637c30cc..f1bc59613 100644
--- a/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
+++ b/include/boost/geometry/algorithms/detail/assign_box_corners.hpp
@@ -26,7 +26,7 @@ namespace boost { namespace geometry
 {
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail 
+namespace detail
 {
 // Note: this is moved to namespace detail because the names and parameter orders
 // are not yet 100% clear.
@@ -69,8 +69,8 @@ inline void assign_box_corners(Box const& box,
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
 
 
diff --git a/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp b/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
index a1cffb80a..acfc37e25 100644
--- a/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
+++ b/include/boost/geometry/algorithms/detail/assign_indexed_point.hpp
@@ -25,7 +25,7 @@ namespace boost { namespace geometry
 {
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail 
+namespace detail
 {
 
 /*!
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
new file mode 100644
index 000000000..815422b99
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp
@@ -0,0 +1,641 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_INSERTER_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_INSERTER_HPP
+
+#include <cstddef>
+#include <iterator>
+
+#include <boost/numeric/conversion/cast.hpp>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+#include <boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp>
+#include <boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+
+template
+<
+    typename RingOutput,
+    typename Tag
+>
+struct buffer_range
+{
+    typedef typename point_type<RingOutput>::type output_point_type;
+    typedef typename coordinate_type<RingOutput>::type coordinate_type;
+    typedef model::referring_segment<output_point_type const> segment_type;
+
+
+    template
+        <
+            typename Point,
+            typename DistanceStrategy
+        >
+    static inline void generate_side(Point const& ip1, Point const& ip2,
+                strategy::buffer::buffer_side_selector side,
+                DistanceStrategy const& distance,
+                output_point_type& p1, output_point_type& p2)
+    {
+        // Generate a block along (left or right of) the segment
+
+        // Simulate a vector d (dx,dy)
+        coordinate_type dx = get<0>(ip2) - get<0>(ip1);
+        coordinate_type dy = get<1>(ip2) - get<1>(ip1);
+
+        // For normalization [0,1] (=dot product d.d, sqrt)
+        // TODO promoted_type
+        coordinate_type const length = geometry::math::sqrt(dx * dx + dy * dy);
+
+        // Because coordinates are not equal, length should not be zero
+        BOOST_ASSERT((! geometry::math::equals(length, 0)));
+
+        // Generate the normalized perpendicular p, to the left (ccw)
+        coordinate_type const px = -dy / length;
+        coordinate_type const py = dx / length;
+
+        coordinate_type const d = distance.apply(ip1, ip2, side);
+
+        set<0>(p1, get<0>(ip1) + px * d);
+        set<1>(p1, get<1>(ip1) + py * d);
+        set<0>(p2, get<0>(ip2) + px * d);
+        set<1>(p2, get<1>(ip2) + py * d);
+    }
+
+    template
+    <
+        typename Collection,
+        typename Iterator,
+        typename DistanceStrategy,
+        typename JoinStrategy,
+        typename EndStrategy
+    >
+    static inline void iterate(Collection& collection,
+                Iterator begin, Iterator end,
+                strategy::buffer::buffer_side_selector side,
+                DistanceStrategy const& distance,
+                JoinStrategy const& join_strategy,
+                EndStrategy const& end_strategy,
+                bool /*close*/ = false)
+    {
+        output_point_type previous_p1, previous_p2;
+        output_point_type first_p1, first_p2;
+
+        bool first = true;
+
+        Iterator it = begin;
+
+        // We want to memorize the last segment too.
+        typedef typename std::iterator_traits
+        <
+            Iterator
+        >::value_type point_type;
+
+        point_type penultimate_point, ultimate_point; // last two points from begin/end
+
+
+        for (Iterator prev = it++; it != end; ++it)
+        {
+            if (! detail::equals::equals_point_point(*prev, *it))
+            {
+                output_point_type p1, p2;
+                penultimate_point = *prev;
+                ultimate_point = *it;
+                generate_side(*prev, *it, side, distance, p1, p2);
+
+                std::vector<output_point_type> range_out;
+                if (! first)
+                {
+                    output_point_type p;
+                    segment_type s1(p1, p2);
+                    segment_type s2(previous_p1, previous_p2);
+
+                    if (line_line_intersection<output_point_type, segment_type>::apply(s1, s2, p))
+                    {
+                        join_strategy.apply(p, *prev, previous_p2, p1,
+                                    distance.apply(*prev, *it, side),
+                                    range_out);
+                    }
+                }
+                else
+                {
+                    first = false;
+                    first_p1 = p1;
+                    first_p2 = p2;
+                }
+                if (! range_out.empty())
+                {
+                    collection.add_piece(strategy::buffer::buffered_join, *prev, range_out);
+                    range_out.clear();
+                }
+                collection.add_piece(strategy::buffer::buffered_segment, *prev, *it, p1, p2);
+
+                previous_p1 = p1;
+                previous_p2 = p2;
+                prev = it;
+            }
+        }
+
+        // TODO: take care of degenerate segments
+
+        // Might be replaced by specialization
+        if(boost::is_same<Tag, ring_tag>::value)
+        {
+            // Generate closing corner
+            output_point_type p;
+            segment_type s1(previous_p1, previous_p2);
+            segment_type s2(first_p1, first_p2);
+            if (line_line_intersection<output_point_type, segment_type>::apply(s1, s2, p))
+            {
+                std::vector<output_point_type> range_out;
+                join_strategy.apply(p, *begin, previous_p2, first_p1,
+                    distance.apply(*(end - 1), *begin, side),
+                    range_out);
+                if (! range_out.empty())
+                {
+                    collection.add_piece(strategy::buffer::buffered_join, *begin, range_out);
+                }
+            }
+
+            // Buffer is closed automatically by last closing corner (NOT FOR OPEN POLYGONS - TODO)
+        }
+        else if (boost::is_same<Tag, linestring_tag>::value)
+        {
+
+            // Generate perpendicular points to the reverse side,
+            // these points are necessary for all end-cap strategies
+            // TODO fix this (approach) for one-side buffer (1.5 - -1.0)
+            output_point_type rp1, rp2;
+            generate_side(ultimate_point, penultimate_point,
+                    side == strategy::buffer::buffer_side_left
+                    ? strategy::buffer::buffer_side_right
+                    : strategy::buffer::buffer_side_left,
+                    distance, rp2, rp1);
+
+            std::vector<output_point_type> range_out;
+
+            end_strategy.apply(penultimate_point, previous_p2, ultimate_point, rp2, side, distance, range_out);
+            collection.add_endcap(end_strategy, range_out, ultimate_point);
+        }
+    }
+};
+
+
+
+template
+<
+    typename Point,
+    typename RingOutput
+>
+struct buffer_point
+{
+    typedef typename point_type<RingOutput>::type output_point_type;
+    typedef typename coordinate_type<RingOutput>::type coordinate_type;
+    typedef model::referring_segment<output_point_type const> segment_type;
+
+    typedef typename geometry::select_most_precise
+        <
+            typename geometry::select_most_precise
+                <
+                    typename geometry::coordinate_type<Point>::type,
+                    typename geometry::coordinate_type<output_point_type>::type
+                >::type,
+            double
+        >::type promoted_type;
+
+
+    template <typename RangeOut>
+    static inline void generate_points(Point const& point,
+                promoted_type const& buffer_distance,
+                RangeOut& range_out)
+    {
+
+        promoted_type two = 2.0;
+        promoted_type two_pi = two * geometry::math::pi<promoted_type>();
+        int point_buffer_count = 88; // 88 gives now fixed problem (collinear opposite / robustness. TODO: make this value flexible
+
+        promoted_type diff = two_pi / promoted_type(point_buffer_count);
+        promoted_type a = 0;
+
+        output_point_type first;
+        for (int i = 0; i < point_buffer_count; i++, a -= diff)
+        {
+            output_point_type p;
+            set<0>(p, get<0>(point) + buffer_distance * cos(a));
+            set<1>(p, get<1>(point) + buffer_distance * sin(a));
+            range_out.push_back(p);
+            if (i == 0)
+            {
+                first = p;
+            }
+        }
+
+        // Close it:
+        range_out.push_back(first);
+    }
+
+
+    template
+    <
+        typename Collection,
+        typename DistanceStrategy,
+        typename JoinStrategy,
+        typename EndStrategy
+    >
+    static inline void generate_circle(Point const& point,
+                Collection& collection,
+                DistanceStrategy const& distance,
+                JoinStrategy const& ,
+                EndStrategy const& )
+    {
+        std::vector<output_point_type> range_out;
+
+        generate_points(point,
+            distance.apply(point, point, strategy::buffer::buffer_side_left),
+            range_out);
+
+        collection.add_piece(strategy::buffer::buffered_circle, range_out, false);
+    }
+};
+
+template
+<
+    typename Multi,
+    typename PolygonOutput,
+    typename Policy
+>
+struct buffer_multi
+{
+    template
+    <
+        typename Collection, typename DistanceStrategy, typename JoinStrategy, typename EndStrategy
+    >
+    static inline void apply(Multi const& multi,
+            Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        for (typename boost::range_iterator<Multi const>::type
+                it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            Policy::apply(*it, collection, distance, join_strategy, end_strategy);
+        }
+    }
+};
+
+struct visit_pieces_default_policy
+{
+    template <typename Collection>
+    static inline void apply(Collection const&)
+    {}
+};
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+template
+<
+    typename Tag,
+    typename RingInput,
+    typename RingOutput
+>
+struct buffer_inserter
+{};
+
+
+
+template
+<
+    typename Point,
+    typename RingOutput
+>
+struct buffer_inserter<point_tag, Point, RingOutput>
+    : public detail::buffer::buffer_point<Point, RingOutput>
+{
+    template<typename Collection, typename DistanceStrategy, typename JoinStrategy, typename EndStrategy>
+    static inline void apply(Point const& point, Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        collection.start_new_ring();
+            typedef detail::buffer::buffer_point<Point, RingOutput> base;
+        base::generate_circle(point, collection, distance, join_strategy, end_strategy);
+    }
+};
+
+
+template
+<
+    typename RingInput,
+    typename RingOutput
+>
+struct buffer_inserter<ring_tag, RingInput, RingOutput>
+    : public detail::buffer::buffer_range
+        <
+            RingOutput,
+            ring_tag
+        >
+{
+    typedef detail::buffer::buffer_range
+        <
+            RingOutput,
+            ring_tag
+        > base;
+
+    template
+    <
+        typename Collection, typename DistanceStrategy, typename JoinStrategy, typename EndStrategy
+    >
+    static inline void apply(RingInput const& ring,
+            Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        if (boost::size(ring) > 3)
+        {
+            if (distance.negative())
+            {
+                // Walk backwards (rings will be reversed afterwards)
+                // It might be that this will be changed later.
+                // TODO: decide this.
+                base::iterate(collection, boost::rbegin(ring), boost::rend(ring),
+                        strategy::buffer::buffer_side_right,
+                        distance, join_strategy, end_strategy);
+            }
+            else
+            {
+                base::iterate(collection, boost::begin(ring), boost::end(ring),
+                        strategy::buffer::buffer_side_left,
+                        distance, join_strategy, end_strategy);
+            }
+        }
+    }
+};
+
+
+template
+<
+    typename Linestring,
+    typename Polygon
+>
+struct buffer_inserter<linestring_tag, Linestring, Polygon>
+    : public detail::buffer::buffer_range
+        <
+            typename ring_type<Polygon>::type,
+            linestring_tag
+        >
+{
+    typedef detail::buffer::buffer_range
+        <
+            typename ring_type<Polygon>::type,
+            linestring_tag
+        > base;
+
+    template<typename Collection, typename DistanceStrategy, typename JoinStrategy, typename EndStrategy>
+    static inline void apply(Linestring const& linestring, Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        if (boost::size(linestring) > 1)
+        {
+            collection.start_new_ring();
+            base::iterate(collection, boost::begin(linestring), boost::end(linestring),
+                    strategy::buffer::buffer_side_left,
+                    distance, join_strategy, end_strategy);
+
+            base::iterate(collection, boost::rbegin(linestring), boost::rend(linestring),
+                    strategy::buffer::buffer_side_right,
+                    distance, join_strategy, end_strategy, true);
+        }
+
+    }
+};
+
+
+template
+<
+    typename PolygonInput,
+    typename PolygonOutput
+>
+struct buffer_inserter<polygon_tag, PolygonInput, PolygonOutput>
+{
+private:
+    typedef typename ring_type<PolygonInput>::type input_ring_type;
+    typedef typename ring_type<PolygonOutput>::type output_ring_type;
+
+    typedef buffer_inserter<ring_tag, input_ring_type, output_ring_type> policy;
+
+
+    template
+    <
+        typename Iterator,
+        typename Collection,
+        typename DistanceStrategy,
+        typename JoinStrategy,
+        typename EndStrategy
+    >
+    static inline
+    void iterate(Iterator begin, Iterator end,
+            Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        for (Iterator it = begin; it != end; ++it)
+        {
+            collection.start_new_ring();
+            policy::apply(*it, collection, distance, join_strategy, end_strategy);
+        }
+    }
+
+    template
+    <
+        typename InteriorRings,
+        typename Collection,
+        typename DistanceStrategy,
+        typename JoinStrategy,
+        typename EndStrategy
+    >
+    static inline
+    void apply_interior_rings(InteriorRings const& interior_rings,
+            Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        iterate(boost::begin(interior_rings), boost::end(interior_rings),
+            collection, distance, join_strategy, end_strategy);
+    }
+
+public:
+    template
+    <
+        typename Collection,
+        typename DistanceStrategy,
+        typename JoinStrategy,
+        typename EndStrategy
+    >
+    static inline void apply(PolygonInput const& polygon,
+            Collection& collection,
+            DistanceStrategy const& distance,
+            JoinStrategy const& join_strategy,
+            EndStrategy const& end_strategy)
+    {
+        {
+            collection.start_new_ring();
+            policy::apply(exterior_ring(polygon), collection,
+                    distance, join_strategy, end_strategy);
+        }
+
+        apply_interior_rings(interior_rings(polygon),
+            collection, distance, join_strategy, end_strategy);
+    }
+};
+
+
+template
+<
+    typename Multi,
+    typename PolygonOutput
+>
+struct buffer_inserter<multi_tag, Multi, PolygonOutput>
+    : public detail::buffer::buffer_multi
+             <
+                Multi,
+                PolygonOutput,
+                dispatch::buffer_inserter
+                <
+                    typename single_tag_of
+                                <
+                                    typename tag<Multi>::type
+                                >::type,
+                    typename boost::range_value<Multi const>::type,
+                    typename geometry::ring_type<PolygonOutput>::type
+                >
+            >
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+template
+<
+    typename GeometryOutput,
+    typename GeometryInput,
+    typename OutputIterator,
+    typename DistanceStrategy,
+    typename JoinStrategy,
+    typename EndStrategy,
+    typename RobustPolicy,
+    typename VisitPiecesPolicy
+>
+inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator out,
+        DistanceStrategy const& distance_strategy,
+        JoinStrategy const& join_strategy,
+        EndStrategy const& end_strategy,
+        RobustPolicy const& robust_policy,
+        VisitPiecesPolicy& visit_pieces_policy
+    )
+{
+    typedef detail::buffer::buffered_piece_collection
+    <
+        typename geometry::ring_type<GeometryOutput>::type,
+        RobustPolicy
+    > collection_type;
+    collection_type collection(robust_policy);
+
+    dispatch::buffer_inserter
+        <
+            typename tag_cast
+                <
+                    typename tag<GeometryInput>::type,
+                    multi_tag
+                >::type,
+            GeometryInput,
+            GeometryOutput
+        >::apply(geometry_input, collection, distance_strategy, join_strategy, end_strategy);
+
+    collection.get_turns(geometry_input, distance_strategy);
+
+    collection.discard_rings();
+    collection.discard_turns();
+    collection.enrich();
+    collection.traverse();
+
+    if (distance_strategy.negative()
+        && boost::is_same
+            <
+                typename tag_cast<typename tag<GeometryInput>::type, areal_tag>::type,
+                areal_tag
+            >::type::value)
+    {
+        collection.reverse();
+    }
+
+    collection.template assign<GeometryOutput>(out);
+
+    {
+        // Visit the piece collection. This does nothing (by default), but
+        // optionally a debugging tool can be attached (e.g. console or svg),
+        // or the piece collection can be unit-tested
+        collection_type const& const_collection = collection;
+        visit_pieces_policy.apply(const_collection);
+    }
+}
+
+template
+<
+    typename GeometryOutput,
+    typename GeometryInput,
+    typename OutputIterator,
+    typename DistanceStrategy,
+    typename JoinStrategy,
+    typename EndStrategy,
+    typename RobustPolicy
+>
+inline void buffer_inserter(GeometryInput const& geometry_input, OutputIterator out,
+        DistanceStrategy const& distance_strategy,
+        JoinStrategy const& join_strategy,
+        EndStrategy const& end_strategy,
+        RobustPolicy const& robust_policy)
+{
+    detail::buffer::visit_pieces_default_policy visitor;
+    buffer_inserter<GeometryOutput>(geometry_input, out,
+        distance_strategy, join_strategy, end_strategy,
+        robust_policy, visitor);
+}
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_INSERTER_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp b/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
new file mode 100644
index 000000000..ba1c27076
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/buffer_policies.hpp
@@ -0,0 +1,152 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_POLICIES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_POLICIES_HPP
+
+
+#include <cstddef>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+
+enum intersection_location_type
+{
+    location_ok, inside_buffer, inside_original
+};
+
+class backtrack_for_buffer
+{
+public :
+    typedef detail::overlay::backtrack_state state_type;
+
+    template <typename Operation, typename Rings, typename Turns, typename Geometry, typename RobustPolicy>
+    static inline void apply(std::size_t size_at_start,
+                Rings& rings, typename boost::range_value<Rings>::type& ring,
+                Turns& turns, Operation& operation,
+                std::string const& /*reason*/,
+                Geometry const& ,
+                Geometry const& ,
+                RobustPolicy const& ,
+                state_type& state
+                )
+    {
+#if defined(BOOST_GEOMETRY_COUNT_BACKTRACK_WARNINGS)
+extern int g_backtrack_warning_count;
+g_backtrack_warning_count++;
+#endif
+//std::cout << "!";
+//std::cout << "WARNING " << reason << std::endl;
+
+        // TODO this is a copy of dissolve, check this for buffer
+        state.m_good = false;
+
+        // Make bad output clean
+        rings.resize(size_at_start);
+        ring.clear();
+
+        // Reject this as a starting point
+        operation.visited.set_rejected();
+
+        // And clear all visit info
+        clear_visit_info(turns);
+    }
+};
+
+// Should follow traversal-turn-concept (enrichment, visit structure)
+// and adds index in piece vector to find it back
+template <typename Point, typename SegmentRatio>
+struct buffer_turn_operation
+    : public detail::overlay::traversal_turn_operation<Point, SegmentRatio>
+{
+    int piece_index;
+    int index_in_robust_ring;
+
+    inline buffer_turn_operation()
+        : piece_index(-1)
+        , index_in_robust_ring(-1)
+    {}
+};
+
+// Version for buffer including type of location, is_opposite, and helper variables
+template <typename Point, typename RobustPoint, typename SegmentRatio>
+struct buffer_turn_info
+    : public detail::overlay::turn_info
+        <
+            Point,
+            SegmentRatio,
+            buffer_turn_operation<Point, SegmentRatio>
+        >
+{
+    typedef Point point_type;
+    typedef RobustPoint robust_point_type;
+
+    int turn_index; // TODO: this might go if partition can operate on non-const input
+
+    RobustPoint robust_point;
+    RobustPoint mapped_robust_point; // alas... we still need to adapt our points, offsetting them 1 integer to be co-located with neighbours
+
+    intersection_location_type location;
+
+    int count_within;
+    int count_on_offsetted;
+    int count_on_helper;
+    int count_on_occupied;
+    int count_on_multi;
+
+    inline buffer_turn_info()
+        : turn_index(-1)
+        , location(location_ok)
+        , count_within(0)
+        , count_on_offsetted(0)
+        , count_on_helper(0)
+        , count_on_occupied(0)
+        , count_on_multi(0)
+    {}
+};
+
+struct buffer_operation_less
+{
+    template <typename Turn>
+    inline bool operator()(Turn const& left, Turn const& right) const
+    {
+        segment_identifier const& sl = left.seg_id;
+        segment_identifier const& sr = right.seg_id;
+
+        // Sort them descending
+        return sl == sr
+            ? left.fraction < right.fraction
+            : sl < sr;
+    }
+};
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFER_POLICIES_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
new file mode 100644
index 000000000..723a181a8
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/buffered_piece_collection.hpp
@@ -0,0 +1,820 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_PIECE_COLLECTION_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_PIECE_COLLECTION_HPP
+
+#include <algorithm>
+#include <cstddef>
+#include <set>
+#include <boost/range.hpp>
+
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/envelope.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+#include <boost/geometry/algorithms/detail/buffer/buffered_ring.hpp>
+#include <boost/geometry/algorithms/detail/buffer/buffer_policies.hpp>
+#include <boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp>
+#include <boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp>
+#include <boost/geometry/algorithms/detail/buffer/turn_in_input.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/add_rings.hpp>
+#include <boost/geometry/algorithms/detail/overlay/assign_parents.hpp>
+#include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp>
+#include <boost/geometry/algorithms/detail/overlay/ring_properties.hpp>
+#include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/traverse.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/occupation_info.hpp>
+#include <boost/geometry/algorithms/detail/partition.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+enum segment_relation_code
+{
+    segment_relation_on_left,
+    segment_relation_on_right,
+    segment_relation_within,
+    segment_relation_disjoint
+};
+
+
+template <typename Ring, typename RobustPolicy>
+struct buffered_piece_collection
+{
+    typedef buffered_piece_collection<Ring, RobustPolicy> this_type;
+
+    typedef typename geometry::point_type<Ring>::type point_type;
+    typedef typename geometry::coordinate_type<Ring>::type coordinate_type;
+    typedef typename geometry::robust_point_type
+    <
+        point_type,
+        RobustPolicy
+    >::type robust_point_type;
+
+    typedef typename strategy::side::services::default_strategy
+        <
+            typename cs_tag<point_type>::type
+        >::type side_strategy;
+
+    typedef typename geometry::rescale_policy_type
+        <
+            typename geometry::point_type<Ring>::type
+        >::type rescale_policy_type;
+
+    typedef typename geometry::segment_ratio_type
+    <
+        point_type,
+        RobustPolicy
+    >::type segment_ratio_type;
+
+    typedef buffer_turn_info
+    <
+        point_type,
+        robust_point_type,
+        segment_ratio_type
+    > buffer_turn_info_type;
+
+    typedef buffer_turn_operation
+    <
+        point_type,
+        segment_ratio_type
+    > buffer_turn_operation_type;
+
+    typedef std::vector<buffer_turn_info_type> turn_vector_type;
+
+    struct robust_turn
+    {
+        int turn_index;
+        int operation_index;
+        robust_point_type point;
+        segment_identifier seg_id;
+        segment_ratio_type fraction;
+    };
+
+    struct piece
+    {
+        strategy::buffer::piece_type type;
+        int index;
+
+        // The next two members form together a complete clockwise ring
+        // for each piece (with one dupped point)
+
+        // 1: half, part of offsetted_rings
+        segment_identifier first_seg_id;
+        int last_segment_index; // no segment-identifier - it is the same as first_seg_id
+        int offsetted_count;
+
+        // 2: half, not part (future: might be indexed in one vector too)
+        std::vector<point_type> helper_segments; // 3 points for segment, 2 points for join - 0 points for flat-end
+
+        // Robust representations
+        std::vector<robust_turn> robust_turns; // Used only in rescale_pieces - we might use a map instead
+        geometry::model::ring<robust_point_type> robust_ring;
+        geometry::model::box<robust_point_type> robust_envelope;
+    };
+
+    typedef std::vector<piece> piece_vector_type;
+
+    piece_vector_type m_pieces;
+    turn_vector_type m_turns;
+
+    buffered_ring_collection<buffered_ring<Ring> > offsetted_rings; // indexed by multi_index
+    std::vector< std::vector < robust_point_type > > robust_offsetted_rings;
+    buffered_ring_collection<Ring> traversed_rings;
+    segment_identifier current_segment_id;
+
+    RobustPolicy const& m_robust_policy;
+
+    struct redundant_turn
+    {
+        inline bool operator()(buffer_turn_info_type const& turn) const
+        {
+            // Erase discarded turns (location not OK) and the turns
+            // only used to detect oppositeness.
+            return turn.location != location_ok
+                || turn.opposite();
+        }
+    };
+
+    buffered_piece_collection(RobustPolicy const& robust_policy)
+        : m_robust_policy(robust_policy)
+    {}
+
+
+    template <typename OccupationMap>
+    inline void adapt_mapped_robust_point(OccupationMap const& map,
+            buffer_turn_info_type& turn, int distance) const
+    {
+        for (int x = -distance; x <= distance; x++)
+        {
+            for (int y = -distance; y <= distance; y++)
+            {
+                robust_point_type rp = turn.robust_point;
+                geometry::set<0>(rp, geometry::get<0>(rp) + x);
+                geometry::set<1>(rp, geometry::get<1>(rp) + y);
+                if (map.find(rp) != map.end())
+                {
+                    turn.mapped_robust_point = rp;
+                    return;
+                }
+            }
+        }
+    }
+
+    inline void get_occupation(int distance = 0)
+    {
+        typedef occupation_info<angle_info<robust_point_type, coordinate_type> >
+                buffer_occupation_info;
+
+        typedef std::map
+        <
+            robust_point_type,
+            buffer_occupation_info,
+            geometry::less<robust_point_type>
+        > occupation_map_type;
+
+        occupation_map_type occupation_map;
+
+        // 1: Add all intersection points to occupation map
+        typedef typename boost::range_iterator<turn_vector_type const>::type
+            const_iterator_type;
+        typedef typename boost::range_iterator<turn_vector_type>::type
+            iterator_type;
+
+        for (iterator_type it = boost::begin(m_turns);
+            it != boost::end(m_turns);
+            ++it)
+        {
+            if (it->count_on_offsetted >= 1)
+            {
+                if (distance > 0 && ! occupation_map.empty())
+                {
+                    adapt_mapped_robust_point(occupation_map, *it, distance);
+                }
+                occupation_map[it->mapped_robust_point].count++;
+            }
+        }
+
+        // 2: Remove all points from map which has only one
+        typename occupation_map_type::iterator it = occupation_map.begin();
+        while (it != occupation_map.end())
+        {
+            if (it->second.count <= 1)
+            {
+                typename occupation_map_type::iterator to_erase = it;
+                ++it;
+                occupation_map.erase(to_erase);
+            }
+            else
+            {
+                ++it;
+            }
+        }
+
+        if (occupation_map.empty())
+        {
+            return;
+        }
+
+        // 3: Add vectors (incoming->intersection-point,
+        //                 intersection-point -> outgoing)
+        //    for all (co-located) points still present in the map
+        //    and fill map segment_pair->turn_index
+        typedef
+        std::map
+        <
+            std::pair<segment_identifier, segment_identifier>,
+            std::set<int>
+        > segment_pair_map;
+        segment_pair_map turn_indices_per_segment_pair;
+
+        int index = 0;
+        for (iterator_type it = boost::begin(m_turns);
+            it != boost::end(m_turns);
+            ++it, ++index)
+        {
+            typename occupation_map_type::iterator mit =
+                        occupation_map.find(it->mapped_robust_point);
+
+            if (mit != occupation_map.end())
+            {
+                buffer_occupation_info& info = mit->second;
+                // a:
+                for (int i = 0; i < 2; i++)
+                {
+                    add_incoming_and_outgoing_angles(it->mapped_robust_point, *it,
+                                m_pieces,
+                                index, i, it->operations[i].seg_id,
+                                info);
+                }
+
+                it->count_on_multi++;
+
+                turn_indices_per_segment_pair
+                    [
+                        ordered_pair
+                            (
+                                it->operations[0].seg_id,
+                                it->operations[1].seg_id
+                            )
+                    ].insert(index);
+            }
+        }
+
+        // X: Check rounding issues
+        if (distance == 0)
+        {
+            for (typename occupation_map_type::const_iterator it = occupation_map.begin();
+                it != occupation_map.end(); ++it)
+            {
+                if (it->second.has_rounding_issues(it->first))
+                {
+                    if(distance == 0)
+                    {
+                        get_occupation(distance + 1);
+                        return;
+                    }
+                }
+            }
+        }
+
+        // If, in a cluster, one turn is blocked, block them all
+        for (typename occupation_map_type::const_iterator it = occupation_map.begin();
+            it != occupation_map.end(); ++it)
+        {
+            typename buffer_occupation_info::turn_vector_type const& turns = it->second.turns;
+            bool blocked = false;
+            for (int i = 0; i < turns.size(); i++)
+            {
+                if (m_turns[turns[i].turn_index].blocked())
+                {
+                    blocked = true;
+                    break;
+                }
+            }
+            if (blocked)
+            {
+                for (int i = 0; i < turns.size(); i++)
+                {
+                    m_turns[turns[i].turn_index].count_on_occupied++;
+                }
+            }
+        }
+
+        // 4: From these vectors, get the left turns
+        //    and mark all other turns as to-skip
+        for (typename occupation_map_type::iterator it = occupation_map.begin();
+            it != occupation_map.end(); ++it)
+        {
+            buffer_occupation_info& info = it->second;
+
+            std::vector<detail::left_turns::left_turn> turns_to_keep;
+            info.get_left_turns(it->first, turns_to_keep);
+
+            if (turns_to_keep.empty())
+            {
+                typename buffer_occupation_info::turn_vector_type const& turns = it->second.turns;
+                for (int i = 0; i < turns.size(); i++)
+                {
+                    m_turns[turns[i].turn_index].count_on_occupied++;
+                }
+            }
+        }
+    }
+
+    inline void classify_turns()
+    {
+        for (typename boost::range_iterator<turn_vector_type>::type it =
+            boost::begin(m_turns); it != boost::end(m_turns); ++it)
+        {
+            if ( it->count_within > 0
+              || it->count_on_occupied > 0 )
+            {
+                it->location = inside_buffer;
+            }
+        }
+    }
+
+    template <typename Geometry, typename DistanceStrategy>
+    inline void check_remaining_points(Geometry const& input_geometry, DistanceStrategy const& distance_strategy)
+    {
+        int const factor = distance_strategy.factor();
+
+        // This might use partition too (for multi-polygons)
+
+        for (typename boost::range_iterator<turn_vector_type>::type it =
+            boost::begin(m_turns); it != boost::end(m_turns); ++it)
+        {
+            if (it->location == location_ok)
+            {
+                int code = turn_in_input
+                        <
+                            typename geometry::tag<Geometry>::type
+                        >::apply(it->point, input_geometry);
+                if (code * factor == 1)
+                {
+                    it->location = inside_original;
+                }
+            }
+        }
+    }
+
+    inline bool assert_indices_in_robust_rings() const
+    {
+        geometry::equal_to<robust_point_type> comparator;
+        for (typename boost::range_iterator<turn_vector_type const>::type it =
+            boost::begin(m_turns); it != boost::end(m_turns); ++it)
+        {
+            for (int i = 0; i < 2; i++)
+            {
+                robust_point_type const &p1
+                    = m_pieces[it->operations[i].piece_index].robust_ring
+                              [it->operations[i].index_in_robust_ring];
+                robust_point_type const &p2 = it->robust_point;
+                if (! comparator(p1, p2))
+                {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    inline void rescale_piece_rings()
+    {
+        for (typename piece_vector_type::iterator it = boost::begin(m_pieces);
+            it != boost::end(m_pieces);
+            ++it)
+        {
+            piece& pc = *it;
+
+            pc.offsetted_count = pc.last_segment_index - pc.first_seg_id.segment_index;
+            BOOST_ASSERT(pc.offsetted_count >= 0);
+
+            pc.robust_ring.reserve(pc.offsetted_count + pc.helper_segments.size());
+
+            // Add rescaled offsetted segments
+            {
+                buffered_ring<Ring> const& ring = offsetted_rings[pc.first_seg_id.multi_index];
+
+                typedef typename boost::range_iterator<const buffered_ring<Ring> >::type it_type;
+                for (it_type it = boost::begin(ring) + pc.first_seg_id.segment_index;
+                    it != boost::begin(ring) + pc.last_segment_index;
+                    ++it)
+                {
+                    robust_point_type point;
+                    geometry::recalculate(point, *it, m_robust_policy);
+                    pc.robust_ring.push_back(point);
+                }
+            }
+
+            // Add rescaled helper-segments
+            {
+                typedef typename std::vector<point_type>::const_iterator it_type;
+                for (it_type it = boost::begin(pc.helper_segments);
+                    it != boost::end(pc.helper_segments);
+                    ++it)
+                {
+                    robust_point_type point;
+                    geometry::recalculate(point, *it, m_robust_policy);
+                    pc.robust_ring.push_back(point);
+                }
+            }
+
+            // Calculate the envelope
+            geometry::detail::envelope::envelope_range::apply(pc.robust_ring,
+                    pc.robust_envelope);
+        }
+    }
+
+    inline void insert_rescaled_piece_turns()
+    {
+        // Add rescaled turn points to corresponding pieces
+        // (after this, each turn occurs twice)
+        int index = 0;
+        for (typename boost::range_iterator<turn_vector_type>::type it =
+            boost::begin(m_turns); it != boost::end(m_turns); ++it, ++index)
+        {
+            geometry::recalculate(it->robust_point, it->point, m_robust_policy);
+            it->mapped_robust_point = it->robust_point;
+
+            robust_turn turn;
+            it->turn_index = index;
+            turn.turn_index = index;
+            turn.point = it->robust_point;
+            for (int i = 0; i < 2; i++)
+            {
+                turn.operation_index = i;
+                turn.seg_id = it->operations[i].seg_id;
+                turn.fraction = it->operations[i].fraction;
+
+                piece& pc = m_pieces[it->operations[i].piece_index];
+                pc.robust_turns.push_back(turn);
+
+                // Take into account for the box (intersection points should fall inside,
+                // but in theory they can be one off because of rounding
+                geometry::expand(pc.robust_envelope, it->robust_point);
+            }
+        }
+
+        // Insert all rescaled turn-points into these rings, to form a
+        // reliable integer-based ring. All turns can be compared (inside) to this
+        // rings to see if they are inside.
+
+        for (typename piece_vector_type::iterator it = boost::begin(m_pieces);
+            it != boost::end(m_pieces);
+            ++it)
+        {
+            piece& pc = *it;
+            int piece_segment_index = pc.first_seg_id.segment_index;
+            if (! pc.robust_turns.empty())
+            {
+                if (pc.robust_turns.size() > 1u)
+                {
+                    std::sort(pc.robust_turns.begin(), pc.robust_turns.end(), buffer_operation_less());
+                }
+                // Walk through them, in reverse to insert at right index
+                int index_offset = pc.robust_turns.size() - 1;
+                for (typename std::vector<robust_turn>::const_reverse_iterator
+                        rit = pc.robust_turns.rbegin();
+                    rit != pc.robust_turns.rend();
+                    ++rit, --index_offset)
+                {
+                    int const index_in_vector = 1 + rit->seg_id.segment_index - piece_segment_index;
+                    BOOST_ASSERT
+                        (
+                            index_in_vector > 0 && index_in_vector < pc.offsetted_count
+                        );
+
+                    pc.robust_ring.insert(boost::begin(pc.robust_ring) + index_in_vector, rit->point);
+                    pc.offsetted_count++;
+
+                    m_turns[rit->turn_index].operations[rit->operation_index].index_in_robust_ring = index_in_vector + index_offset;
+                }
+            }
+        }
+
+        BOOST_ASSERT(assert_indices_in_robust_rings());
+    }
+
+    template <typename Geometry, typename DistanceStrategy>
+    inline void get_turns(Geometry const& input_geometry, DistanceStrategy const& distance_strategy)
+    {
+        rescale_piece_rings();
+
+        {
+            // Calculate the turns
+            piece_turn_visitor
+                <
+                    buffered_ring_collection<buffered_ring<Ring> >,
+                    turn_vector_type,
+                    RobustPolicy
+                > visitor(offsetted_rings, m_turns, m_robust_policy, m_pieces.size());
+
+            geometry::partition
+                <
+                    model::box<robust_point_type>, piece_get_box, piece_ovelaps_box
+                >::apply(m_pieces, visitor);
+        }
+
+        insert_rescaled_piece_turns();
+
+        {
+            // Check if it is inside any of the pieces
+            turn_in_piece_visitor
+                <
+                    turn_vector_type
+                > visitor(m_turns);
+
+            geometry::partition
+                <
+                    model::box<robust_point_type>,
+                    turn_get_box, turn_ovelaps_box,
+                    piece_get_box, piece_ovelaps_box
+                >::apply(m_turns, m_pieces, visitor);
+
+        }
+
+
+        //get_occupation(); // Temporarily disabled, all tests passing...
+
+        classify_turns();
+
+        check_remaining_points(input_geometry, distance_strategy);
+    }
+
+    inline void start_new_ring()
+    {
+        int const n = offsetted_rings.size();
+        current_segment_id.source_index = 0;
+        current_segment_id.multi_index = n;
+        current_segment_id.ring_index = -1;
+        current_segment_id.segment_index = 0;
+
+        offsetted_rings.resize(n + 1);
+    }
+
+    inline int add_point(point_type const& p)
+    {
+        BOOST_ASSERT
+            (
+                boost::size(offsetted_rings) > 0
+            );
+
+        current_segment_id.segment_index++;
+        offsetted_rings.back().push_back(p);
+        return offsetted_rings.back().size();
+    }
+
+    //-------------------------------------------------------------------------
+
+    inline piece& add_piece(strategy::buffer::piece_type type, bool decrease_segment_index_by_one)
+    {
+        piece pc;
+        pc.type = type;
+        pc.index = boost::size(m_pieces);
+        pc.first_seg_id = current_segment_id;
+
+        std::size_t const n = boost::size(offsetted_rings.back());
+        pc.first_seg_id.segment_index = decrease_segment_index_by_one ? n - 1 : n;
+
+        m_pieces.push_back(pc);
+        return m_pieces.back();
+    }
+
+    inline void add_piece(strategy::buffer::piece_type type, point_type const& p1, point_type const& p2,
+            point_type const& b1, point_type const& b2)
+    {
+        // If the last type was a join, the segment_id of next segment should be decreased by one.
+        bool const last_type_join = ! m_pieces.empty()
+                && m_pieces.back().first_seg_id.multi_index == current_segment_id.multi_index
+                && (
+                        m_pieces.back().type == strategy::buffer::buffered_join
+                        || m_pieces.back().type == strategy::buffer::buffered_round_end
+                    );
+
+        piece& pc = add_piece(type, last_type_join);
+
+        // If it follows a non-join (so basically the same piece-type) point b1 should be added.
+        // There should be two intersections later and it should be discarded.
+        // But for now we need it to calculate intersections
+        if (! last_type_join)
+        {
+            add_point(b1);
+        }
+        pc.last_segment_index = add_point(b2);
+
+        pc.helper_segments.push_back(b2);
+        pc.helper_segments.push_back(p2);
+        pc.helper_segments.push_back(p1);
+        pc.helper_segments.push_back(b1);
+    }
+
+    template <typename Range>
+    inline piece& add_piece(strategy::buffer::piece_type type, Range const& range, bool decrease_segment_index_by_one)
+    {
+        piece& pc = add_piece(type, decrease_segment_index_by_one);
+
+        bool first = true;
+        int last = offsetted_rings.back().size() + 1;
+        for (typename Range::const_iterator it = boost::begin(range);
+            it != boost::end(range);
+            ++it)
+        {
+            bool add = true;
+            if (first)
+            {
+                // Only for very first one, add first. In all other cases it is shared with previous.
+                add = offsetted_rings.back().empty();
+                first = false;
+            }
+            if (add)
+            {
+                last = add_point(*it);
+            }
+
+        }
+
+        pc.last_segment_index = last;
+
+        return pc;
+    }
+
+    template <typename Range>
+    inline void add_piece(strategy::buffer::piece_type type, point_type const& p, Range const& range)
+    {
+        piece& pc = add_piece(type, range, true);
+
+        if (boost::size(range) > 0)
+        {
+            pc.helper_segments.push_back(range.back());
+            pc.helper_segments.push_back(p);
+            pc.helper_segments.push_back(range.front());
+        }
+    }
+
+    template <typename EndcapStrategy, typename Range>
+    inline void add_endcap(EndcapStrategy const& strategy, Range const& range, point_type const& end_point)
+    {
+        strategy::buffer::piece_type pt = strategy.get_piece_type();
+        if (pt == strategy::buffer::buffered_flat_end)
+        {
+            // It is flat, should just be added, without helper segments
+            add_piece(pt, range, true);
+        }
+        else
+        {
+            // Normal case, it has an "inside", helper segments should be added
+            add_piece(pt, end_point, range);
+        }
+    }
+
+    //-------------------------------------------------------------------------
+
+    inline void enrich()
+    {
+        typedef typename strategy::side::services::default_strategy
+        <
+            typename cs_tag<Ring>::type
+        >::type side_strategy_type;
+
+        enrich_intersection_points<false, false>(m_turns,
+                    detail::overlay::operation_union,
+                    offsetted_rings, offsetted_rings,
+                    m_robust_policy, side_strategy_type());
+    }
+
+    // Discards all rings which do have not-OK intersection points only.
+    // Those can never be traversed and should not be part of the output.
+    inline void discard_rings()
+    {
+        for (typename boost::range_iterator<turn_vector_type const>::type it =
+            boost::begin(m_turns); it != boost::end(m_turns); ++it)
+        {
+            if (it->location != location_ok)
+            {
+                offsetted_rings[it->operations[0].seg_id.multi_index].has_discarded_intersections = true;
+                offsetted_rings[it->operations[1].seg_id.multi_index].has_discarded_intersections = true;
+            }
+            else if (! it->both(detail::overlay::operation_union))
+            {
+                offsetted_rings[it->operations[0].seg_id.multi_index].has_accepted_intersections = true;
+                offsetted_rings[it->operations[1].seg_id.multi_index].has_accepted_intersections = true;
+            }
+        }
+    }
+
+    inline void discard_turns()
+    {
+        m_turns.erase
+            (
+                std::remove_if(boost::begin(m_turns), boost::end(m_turns),
+                                redundant_turn()),
+                boost::end(m_turns)
+            );
+
+    }
+
+    inline void traverse()
+    {
+        typedef detail::overlay::traverse
+            <
+                false, false,
+                buffered_ring_collection<buffered_ring<Ring> >, buffered_ring_collection<buffered_ring<Ring > >,
+                backtrack_for_buffer
+            > traverser;
+
+        traversed_rings.clear();
+        traverser::apply(offsetted_rings, offsetted_rings,
+                        detail::overlay::operation_union,
+                        m_robust_policy, m_turns, traversed_rings);
+    }
+
+    inline void reverse()
+    {
+        for(typename buffered_ring_collection<buffered_ring<Ring> >::iterator it = boost::begin(offsetted_rings);
+            it != boost::end(offsetted_rings);
+            ++it)
+        {
+            if (! it->has_intersections())
+            {
+                std::reverse(it->begin(), it->end());
+            }
+        }
+        for (typename boost::range_iterator<buffered_ring_collection<Ring> >::type
+                it = boost::begin(traversed_rings);
+                it != boost::end(traversed_rings);
+                ++it)
+        {
+            std::reverse(it->begin(), it->end());
+        }
+
+    }
+
+    template <typename GeometryOutput, typename OutputIterator>
+    inline OutputIterator assign(OutputIterator out) const
+    {
+        typedef detail::overlay::ring_properties<point_type> properties;
+
+        std::map<ring_identifier, properties> selected;
+
+        // Select all rings which do not have any self-intersection (other ones should be traversed)
+        int index = 0;
+        for(typename buffered_ring_collection<buffered_ring<Ring> >::const_iterator it = boost::begin(offsetted_rings);
+            it != boost::end(offsetted_rings);
+            ++it, ++index)
+        {
+            if (! it->has_intersections())
+            {
+                ring_identifier id(0, index, -1);
+                selected[id] = properties(*it, true);
+            }
+        }
+
+        // Select all created rings
+        index = 0;
+        for (typename boost::range_iterator<buffered_ring_collection<Ring> const>::type
+                it = boost::begin(traversed_rings);
+                it != boost::end(traversed_rings);
+                ++it, ++index)
+        {
+            ring_identifier id(2, index, -1);
+            selected[id] = properties(*it, true);
+        }
+
+        detail::overlay::assign_parents(offsetted_rings, traversed_rings, selected, false);
+        return detail::overlay::add_rings<GeometryOutput>(selected, offsetted_rings, traversed_rings, out);
+    }
+
+};
+
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_PIECE_COLLECTION_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp b/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
new file mode 100644
index 000000000..03ec598c9
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/buffered_ring.hpp
@@ -0,0 +1,238 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_RING
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_RING
+
+
+#include <cstddef>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+
+#include <boost/geometry/multi/algorithms/within.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+struct buffered_ring_collection_tag : polygonal_tag, multi_tag
+{};
+
+
+template <typename Ring>
+struct buffered_ring : public Ring
+{
+    bool has_accepted_intersections;
+    bool has_discarded_intersections;
+
+    inline buffered_ring()
+        : has_accepted_intersections(false)
+        , has_discarded_intersections(false)
+    {}
+
+    inline bool discarded() const
+    {
+        return has_discarded_intersections && ! has_accepted_intersections;
+    }
+    inline bool has_intersections() const
+    {
+        return has_discarded_intersections || has_accepted_intersections;
+    }
+};
+
+// This is a collection now special for overlay (needs vector of rings)
+template <typename Ring>
+struct buffered_ring_collection : public std::vector<Ring>
+{
+};
+
+}} // namespace detail::buffer
+
+
+// Turn off concept checking (for now)
+namespace dispatch
+{
+template <typename Geometry, bool IsConst>
+struct check<Geometry, detail::buffer::buffered_ring_collection_tag, IsConst>
+{
+};
+
+}
+
+
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+// Register the types
+namespace traits
+{
+
+
+template <typename Ring>
+struct tag<detail::buffer::buffered_ring<Ring> >
+{
+    typedef ring_tag type;
+};
+
+
+template <typename Ring>
+struct point_order<detail::buffer::buffered_ring<Ring> >
+{
+    static const order_selector value = geometry::point_order<Ring>::value;
+};
+
+
+template <typename Ring>
+struct closure<detail::buffer::buffered_ring<Ring> >
+{
+    static const closure_selector value = geometry::closure<Ring>::value;
+};
+
+
+template <typename Ring>
+struct point_type<detail::buffer::buffered_ring_collection<Ring> >
+{
+    typedef typename geometry::point_type<Ring>::type type;
+};
+
+template <typename Ring>
+struct tag<detail::buffer::buffered_ring_collection<Ring> >
+{
+    typedef detail::buffer::buffered_ring_collection_tag type;
+};
+
+
+} // namespace traits
+
+
+
+
+namespace core_dispatch
+{
+
+template <typename Ring>
+struct ring_type
+<
+    detail::buffer::buffered_ring_collection_tag,
+    detail::buffer::buffered_ring_collection<Ring>
+>
+{
+    typedef Ring type;
+};
+
+}
+
+namespace dispatch
+{
+
+template
+<
+    typename MultiRing,
+    bool Reverse,
+    typename SegmentIdentifier,
+    typename PointOut
+>
+struct copy_segment_point
+    <
+        detail::buffer::buffered_ring_collection_tag,
+        MultiRing,
+        Reverse,
+        SegmentIdentifier,
+        PointOut
+    >
+    : detail::copy_segments::copy_segment_point_multi
+        <
+            MultiRing,
+            SegmentIdentifier,
+            PointOut,
+            detail::copy_segments::copy_segment_point_range
+                <
+                    typename boost::range_value<MultiRing>::type,
+                    Reverse,
+                    SegmentIdentifier,
+                    PointOut
+                >
+        >
+{};
+
+
+template<bool Reverse>
+struct copy_segments
+    <
+        detail::buffer::buffered_ring_collection_tag,
+        Reverse
+    >
+    : detail::copy_segments::copy_segments_multi
+        <
+            detail::copy_segments::copy_segments_ring<Reverse>
+        >
+{};
+
+template <typename Point, typename MultiGeometry>
+struct within
+<
+    Point,
+    MultiGeometry,
+    point_tag,
+    detail::buffer::buffered_ring_collection_tag
+>
+{
+    template <typename Strategy>
+    static inline bool apply(Point const& point,
+                MultiGeometry const& multi, Strategy const& strategy)
+    {
+        return detail::within::point_in_geometry(point, multi, strategy) == 1;
+    }
+};
+
+
+} // namespace dispatch
+
+namespace detail { namespace overlay
+{
+
+template<>
+struct get_ring<detail::buffer::buffered_ring_collection_tag>
+{
+    template<typename MultiGeometry>
+    static inline typename ring_type<MultiGeometry>::type const& apply(
+                ring_identifier const& id,
+                MultiGeometry const& multi_ring)
+    {
+        BOOST_ASSERT
+            (
+                id.multi_index >= 0
+                && id.multi_index < int(boost::size(multi_ring))
+            );
+        return get_ring<ring_tag>::apply(id, multi_ring[id.multi_index]);
+    }
+};
+
+}}
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_BUFFERED_RING
diff --git a/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp b/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
new file mode 100644
index 000000000..aa45e6cbc
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/get_piece_turns.hpp
@@ -0,0 +1,208 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_GET_PIECE_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_GET_PIECE_TURNS_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
+#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+
+struct piece_get_box
+{
+    template <typename Box, typename Piece>
+    static inline void apply(Box& total, Piece const& piece)
+    {
+        geometry::expand(total, piece.robust_envelope);
+    }
+};
+
+struct piece_ovelaps_box
+{
+    template <typename Box, typename Piece>
+    static inline bool apply(Box const& box, Piece const& piece)
+    {
+        return ! geometry::detail::disjoint::disjoint_box_box(box, piece.robust_envelope);
+    }
+};
+
+template
+<
+    typename Rings,
+    typename Turns,
+    typename RobustPolicy
+>
+class piece_turn_visitor
+{
+    Rings const& m_rings;
+    Turns& m_turns;
+    RobustPolicy const& m_robust_policy;
+    int m_last_piece_index;
+
+    template <typename Piece>
+    inline bool is_neighbor(Piece const& piece1, Piece const& piece2) const
+    {
+        if (piece1.first_seg_id.multi_index != piece2.first_seg_id.multi_index)
+        {
+            return false;
+        }
+
+        if (std::abs(piece1.index - piece2.index) == 1)
+        {
+            return true;
+        }
+
+        return (piece1.index == 0 && piece2.index == m_last_piece_index)
+            || (piece1.index == m_last_piece_index && piece2.index == 0)
+            ;
+    }
+
+    template <typename Piece>
+    inline bool skip_neighbor(Piece const& piece1, Piece const& piece2) const
+    {
+        return piece1.type != piece2.type && is_neighbor(piece1, piece2);
+    }
+
+    template <typename Range, typename Iterator>
+    inline void move_to_next_point(Range const& range, Iterator& next) const
+    {
+        ++next;
+        if (next == boost::end(range))
+        {
+            next = boost::begin(range) + 1;
+        }
+    }
+
+    template <typename Range, typename Iterator>
+    inline Iterator next_point(Range const& range, Iterator it) const
+    {
+        Iterator result = it;
+        move_to_next_point(range, result);
+        // TODO: we could use either piece-boundaries, or comparison with
+        // robust points, to check if the point equals the last one
+        while(geometry::equals(*it, *result))
+        {
+            move_to_next_point(range, result);
+        }
+        return result;
+    }
+
+    template <typename Piece>
+    inline void calculate_turns(Piece const& piece1, Piece const& piece2)
+    {
+        typedef typename boost::range_value<Rings const>::type ring_type;
+        typedef typename boost::range_value<Turns const>::type turn_type;
+        typedef typename boost::range_iterator<ring_type const>::type iterator;
+
+        segment_identifier seg_id1 = piece1.first_seg_id;
+        segment_identifier seg_id2 = piece2.first_seg_id;
+
+        if (seg_id1.segment_index < 0 || seg_id2.segment_index < 0)
+        {
+            return;
+        }
+
+        ring_type const& ring1 = m_rings[seg_id1.multi_index];
+        iterator it1_first = boost::begin(ring1) + seg_id1.segment_index;
+        iterator it1_last = boost::begin(ring1) + piece1.last_segment_index;
+
+        ring_type const& ring2 = m_rings[seg_id2.multi_index];
+        iterator it2_first = boost::begin(ring2) + seg_id2.segment_index;
+        iterator it2_last = boost::begin(ring2) + piece2.last_segment_index;
+
+        turn_type the_model;
+        the_model.operations[0].piece_index = piece1.index;
+        the_model.operations[0].seg_id = piece1.first_seg_id;
+
+        iterator it1 = it1_first;
+        for (iterator prev1 = it1++;
+                it1 != it1_last;
+                prev1 = it1++, the_model.operations[0].seg_id.segment_index++)
+        {
+            the_model.operations[1].piece_index = piece2.index;
+            the_model.operations[1].seg_id = piece2.first_seg_id;
+
+            iterator next1 = next_point(ring1, it1);
+
+            iterator it2 = it2_first;
+            for (iterator prev2 = it2++;
+                    it2 != it2_last;
+                    prev2 = it2++, the_model.operations[1].seg_id.segment_index++)
+            {
+                // Revert (this is used more often - should be common function TODO)
+                the_model.operations[0].other_id = the_model.operations[1].seg_id;
+                the_model.operations[1].other_id = the_model.operations[0].seg_id;
+
+                iterator next2 = next_point(ring2, it2);
+
+                // TODO: internally get_turn_info calculates robust points.
+                // But they are already calculated.
+                // We should be able to use them.
+                // this means passing them to this visitor,
+                // and iterating in sync with them...
+                typedef detail::overlay::get_turn_info
+                    <
+                        detail::overlay::assign_null_policy
+                    > turn_policy;
+
+                turn_policy::apply(*prev1, *it1, *next1,
+                                    *prev2, *it2, *next2,
+                                    false, false, false, false,
+                                    the_model, m_robust_policy,
+                                    std::back_inserter(m_turns));
+            }
+        }
+    }
+
+public:
+
+    piece_turn_visitor(Rings const& ring_collection,
+            Turns& turns,
+            RobustPolicy const& robust_policy,
+            int last_piece_index)
+        : m_rings(ring_collection)
+        , m_turns(turns)
+        , m_robust_policy(robust_policy)
+        , m_last_piece_index(last_piece_index)
+    {}
+
+    template <typename Piece>
+    inline void apply(Piece const& piece1, Piece const& piece2,
+                    bool first = true)
+    {
+        boost::ignore_unused_variable_warning(first);
+        if ( ! detail::disjoint::disjoint_box_box(piece1.robust_envelope, piece2.robust_envelope)
+          && ! skip_neighbor(piece1, piece2) )
+        {
+            calculate_turns(piece1, piece2);
+        }
+    }
+};
+
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_GET_PIECE_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp b/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
new file mode 100644
index 000000000..ad70b0bc7
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
@@ -0,0 +1,86 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_LINE_LINE_INTERSECTION_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_LINE_LINE_INTERSECTION_HPP
+
+
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+
+// TODO: once change this to proper strategy
+// It is different from current segment intersection because these are not segments but lines
+// If we have the Line concept, we can create a strategy
+template <typename Point, typename Line1, typename Line2 = Line1>
+struct line_line_intersection
+{
+    template <typename A, typename B, typename C, typename D>
+    static inline A det(A const& a, B const& b, C const& c, D const& d)
+    {
+        return a * d - b * c;
+    }
+
+    static inline bool apply(Line1 const& line1, Line2 const& line2, Point& p)
+    {
+        // See http://mathworld.wolfram.com/Line-LineIntersection.html
+        typedef typename coordinate_type<Point>::type coordinate_type;
+        coordinate_type x1 = get<0,0>(line1), y1 = get<0,1>(line1);
+        coordinate_type x2 = get<1,0>(line1), y2 = get<1,1>(line1);
+        coordinate_type x3 = get<0,0>(line2), y3 = get<0,1>(line2);
+        coordinate_type x4 = get<1,0>(line2), y4 = get<1,1>(line2);
+
+        coordinate_type denominator = det(x1 - x2, y1 - y2, x3 - x4, y3 - y4);
+
+        // TODO: use something else then denominator (sides?) to determine this.
+
+        // If denominator is zero, segments are parallel.
+        // We have context information, so know that it should then
+        // be the case that line1.p2 == line2.p1, and that is the
+        // intersection point.
+        if (geometry::math::equals(denominator, 0.0))
+        {
+            set<0>(p, x2);
+            set<1>(p, y2);
+            return false;
+        }
+
+        coordinate_type d1 = det(x1, y1, x2, y2);
+        coordinate_type d2 = det(x3, y3, x4, y4);
+        coordinate_type px = det(d1, x1 - x2, d2, x3 - x4) / denominator;
+        coordinate_type py = det(d1, y1 - y2, d2, y3 - y4) / denominator;
+
+        set<0>(p, px);
+        set<1>(p, py);
+
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+        if (geometry::math::abs(denominator) < 1.0e-7)
+        {
+            std::cout << "small " << denominator << std::endl;
+        }
+#endif
+        return geometry::math::abs(denominator) > 1.0e-7;
+    }
+};
+
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_LINE_LINE_INTERSECTION_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/turn_in_input.hpp b/include/boost/geometry/algorithms/detail/buffer/turn_in_input.hpp
new file mode 100644
index 000000000..2b1c33d29
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/turn_in_input.hpp
@@ -0,0 +1,98 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_INPUT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_INPUT_HPP
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/algorithms/covered_by.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+// Checks if an turn/intersection point is inside (or covered by) the input geometry
+
+template <typename Tag>
+struct turn_in_input
+{
+};
+
+template <>
+struct turn_in_input<polygon_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& point, Geometry const& geometry)
+    {
+        return geometry::covered_by(point, geometry) ? 1 : -1;
+    }
+};
+
+template <>
+struct turn_in_input<linestring_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& , Geometry const& )
+    {
+        return 0;
+    }
+};
+
+template <>
+struct turn_in_input<point_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& , Geometry const& )
+    {
+        return 0;
+    }
+};
+
+template <>
+struct turn_in_input<multi_polygon_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& point, Geometry const& geometry)
+    {
+        return geometry::covered_by(point, geometry) ? 1 : -1;
+    }
+};
+
+template <>
+struct turn_in_input<multi_linestring_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& , Geometry const& )
+    {
+        return 0;
+    }
+};
+
+template <>
+struct turn_in_input<multi_point_tag>
+{
+    template <typename Point, typename Geometry>
+    static inline int apply(Point const& , Geometry const& )
+    {
+        return 0;
+    }
+};
+
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_INPUT_HPP
diff --git a/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp b/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp
new file mode 100644
index 000000000..057c63624
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/buffer/turn_in_piece_visitor.hpp
@@ -0,0 +1,173 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_PIECE_VISITOR
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_PIECE_VISITOR
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
+#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/strategies/buffer.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace buffer
+{
+
+
+struct turn_get_box
+{
+    template <typename Box, typename Turn>
+    static inline void apply(Box& total, Turn const& turn)
+    {
+        geometry::expand(total, turn.robust_point);
+    }
+};
+
+struct turn_ovelaps_box
+{
+    template <typename Box, typename Turn>
+    static inline bool apply(Box const& box, Turn const& turn)
+    {
+        return ! geometry::disjoint(box, turn.robust_point);
+    }
+};
+template <typename Turns>
+class turn_in_piece_visitor
+{
+    Turns& m_turns; // because partition is currently operating on const input only
+
+    template <typename Point>
+    static inline bool projection_on_segment(Point const& subject, Point const& p, Point const& q)
+    {
+        typedef Point vector_type;
+        typedef typename geometry::coordinate_type<Point>::type coordinate_type;
+
+        vector_type v = q;
+        vector_type w = subject;
+        subtract_point(v, p);
+        subtract_point(w, p);
+
+        coordinate_type const zero = coordinate_type();
+        coordinate_type const c1 = dot_product(w, v);
+
+        if (c1 < zero)
+        {
+            return false;
+        }
+        coordinate_type const c2 = dot_product(v, v);
+        if (c2 < c1)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+
+    template <typename Point, typename Piece>
+    inline bool on_offsetted(Point const& point, Piece const& piece) const
+    {
+        typedef typename strategy::side::services::default_strategy
+            <
+                typename cs_tag<Point>::type
+            >::type side_strategy;
+
+        for (int i = 1; i < piece.offsetted_count; i++)
+        {
+            Point const& previous = piece.robust_ring[i - 1];
+            Point const& current = piece.robust_ring[i];
+            int const side = side_strategy::apply(point, previous, current);
+            if (side == 0)
+            {
+                // Collinear, check if projection falls on it
+                if (projection_on_segment(point, previous, current))
+                {
+                    return true;
+                }
+            }
+
+        }
+        return false;
+    }
+
+public:
+
+    inline turn_in_piece_visitor(Turns& turns)
+        : m_turns(turns)
+    {}
+
+    template <typename Turn, typename Piece>
+    inline void apply(Turn const& turn, Piece const& piece, bool first = true)
+    {
+        boost::ignore_unused_variable_warning(first);
+
+        if (turn.count_within > 0)
+        {
+            // Already inside - no need to check again
+            return;
+        }
+
+        if (piece.type == strategy::buffer::buffered_flat_end)
+        {
+            // Turns cannot be inside a flat end (though they can be on border)
+            return;
+        }
+
+        for (int i = 0; i < 2; i++)
+        {
+            // Don't compare against one of the two source-pieces
+            if (turn.operations[i].piece_index == piece.index)
+            {
+                return;
+            }
+        }
+
+        int geometry_code = detail::within::point_in_geometry(turn.robust_point, piece.robust_ring);
+        if (geometry_code == -1)
+        {
+            return;
+        }
+
+        Turn& mutable_turn = m_turns[turn.turn_index];
+        if (geometry_code == 0)
+        {
+            if (! on_offsetted(turn.robust_point, piece))
+            {
+                // It is on the border but not on the offsetted ring.
+                // Then it is somewhere on the helper-segments
+                // Classify it as inside
+                // TODO: for neighbouring flat ends this does not apply
+                geometry_code = 1;
+                mutable_turn.count_on_helper++;
+            }
+        }
+
+        switch (geometry_code)
+        {
+            case 1 : mutable_turn.count_within++; break;
+            case 0 : mutable_turn.count_on_offsetted++; break;
+        }
+    }
+};
+
+
+}} // namespace detail::buffer
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_BUFFER_TURN_IN_PIECE_VISITOR
diff --git a/include/boost/geometry/algorithms/detail/calculate_sum.hpp b/include/boost/geometry/algorithms/detail/calculate_sum.hpp
index dd0399bb1..b23e70171 100644
--- a/include/boost/geometry/algorithms/detail/calculate_sum.hpp
+++ b/include/boost/geometry/algorithms/detail/calculate_sum.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,9 +15,7 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_CALCULATE_SUM_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_CALCULATE_SUM_HPP
 
-
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
 namespace boost { namespace geometry
 {
@@ -32,7 +31,8 @@ class calculate_polygon_sum
     static inline ReturnType sum_interior_rings(Rings const& rings, Strategy const& strategy)
     {
         ReturnType sum = ReturnType();
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        for (typename boost::range_iterator<Rings const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             sum += Policy::apply(*it, strategy);
         }
diff --git a/include/boost/geometry/algorithms/detail/check_iterator_range.hpp b/include/boost/geometry/algorithms/detail/check_iterator_range.hpp
new file mode 100644
index 000000000..71b06cc58
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/check_iterator_range.hpp
@@ -0,0 +1,47 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_CHECK_ITERATOR_RANGE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_CHECK_ITERATOR_RANGE_HPP
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+// Check whether (each element of) an iterator range satisfies a given
+// predicate.
+// The predicate must be implemented as having a static apply unary
+// method that returns a bool.
+template <typename Predicate, bool AllowEmptyMultiRange = false>
+struct check_iterator_range
+{
+    template <typename InputIterator>
+    static inline bool apply(InputIterator first, InputIterator beyond)
+    {
+        for (InputIterator it = first; it != beyond; ++it)
+        {
+            if ( !Predicate::apply(*it) )
+            {
+                return false;
+            }
+        }
+        return AllowEmptyMultiRange || first != beyond;
+    };
+};
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_CHECK_ITERATOR_RANGE_HPP
diff --git a/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp b/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp
new file mode 100644
index 000000000..b6eb7a27f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/comparable_distance/implementation.hpp
@@ -0,0 +1,24 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_IMPLEMENTATION_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_IMPLEMENTATION_HPP
+
+#include <boost/geometry/algorithms/detail/distance/implementation.hpp>
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_IMPLEMENTATION_HPP
diff --git a/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
new file mode 100644
index 000000000..45f4fcdf1
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
@@ -0,0 +1,96 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP
+
+#include <boost/geometry/strategies/default_comparable_distance_result.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/interface.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+// MK::need to add qbk documentation
+template <typename Geometry1, typename Geometry2, typename Strategy>
+inline typename strategy::distance::services::return_type
+                <
+                    typename strategy::distance::services::comparable_type
+                        <
+                            Strategy
+                        >::type,
+                    typename point_type<Geometry1>::type,
+                    typename point_type<Geometry2>::type
+                >::type
+comparable_distance(Geometry1 const& geometry1, Geometry2 const& geometry2,
+                    Strategy const& strategy)
+{
+    concept::check<Geometry1 const>();
+    concept::check<Geometry2 const>();
+
+    return distance(geometry1, geometry2,
+                    strategy::distance::services::get_comparable
+                        <
+                            Strategy
+                        >::apply(strategy)
+                    );
+}
+
+
+
+/*!
+\brief \brief_calc2{comparable distance measurement}
+\ingroup distance
+\details The free function comparable_distance does not necessarily calculate the distance,
+    but it calculates a distance measure such that two distances are comparable to each other.
+    For example: for the Cartesian coordinate system, Pythagoras is used but the square root
+    is not taken, which makes it faster and the results of two point pairs can still be
+    compared to each other.
+\tparam Geometry1 first geometry type
+\tparam Geometry2 second geometry type
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\return \return_calc{comparable distance}
+
+\qbk{[include reference/algorithms/comparable_distance.qbk]}
+ */
+template <typename Geometry1, typename Geometry2>
+inline typename default_comparable_distance_result<Geometry1, Geometry2>::type
+comparable_distance(Geometry1 const& geometry1, Geometry2 const& geometry2)
+{
+    concept::check<Geometry1 const>();
+    concept::check<Geometry2 const>();
+
+    // Define the default-distance-strategy
+    typedef typename strategy::distance::services::comparable_type
+        <
+            typename detail::distance::default_strategy
+                <
+                    Geometry1, Geometry2
+                >::type
+        >::type default_comparable_strategy_type;
+
+    return distance(geometry1, geometry2, default_comparable_strategy_type());
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP
diff --git a/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp b/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
index d39824a61..fccdf4bb1 100644
--- a/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
+++ b/include/boost/geometry/algorithms/detail/convert_indexed_to_indexed.hpp
@@ -33,9 +33,9 @@ namespace detail { namespace conversion
 
 template
 <
-    typename Source, 
-    typename Destination, 
-    std::size_t Dimension, 
+    typename Source,
+    typename Destination,
+    std::size_t Dimension,
     std::size_t DimensionCount
 >
 struct indexed_to_indexed
@@ -44,25 +44,25 @@ struct indexed_to_indexed
     {
         typedef typename coordinate_type<Destination>::type coordinate_type;
 
-        geometry::set<min_corner, Dimension>(destination, 
+        geometry::set<min_corner, Dimension>(destination,
             boost::numeric_cast<coordinate_type>(
                 geometry::get<min_corner, Dimension>(source)));
-        geometry::set<max_corner, Dimension>(destination, 
+        geometry::set<max_corner, Dimension>(destination,
             boost::numeric_cast<coordinate_type>(
                 geometry::get<max_corner, Dimension>(source)));
-                
+
         indexed_to_indexed
             <
-                Source, Destination, 
+                Source, Destination,
                 Dimension + 1, DimensionCount
             >::apply(source, destination);
     }
 };
 
-template 
+template
 <
-    typename Source, 
-    typename Destination, 
+    typename Source,
+    typename Destination,
     std::size_t DimensionCount
 >
 struct indexed_to_indexed<Source, Destination, DimensionCount, DimensionCount>
diff --git a/include/boost/geometry/algorithms/detail/disjoint.hpp b/include/boost/geometry/algorithms/detail/disjoint.hpp
deleted file mode 100644
index f25e8a843..000000000
--- a/include/boost/geometry/algorithms/detail/disjoint.hpp
+++ /dev/null
@@ -1,361 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-
-// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
-// (geolib/GGL), copyright (c) 1995-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)
-
-#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_HPP
-
-// Note: contrary to most files, the geometry::detail::disjoint namespace
-// is partly implemented in a separate file, to avoid circular references
-// disjoint -> get_turns -> disjoint
-
-#include <cstddef>
-
-#include <boost/range.hpp>
-
-#include <boost/geometry/core/access.hpp>
-#include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/core/reverse_dispatch.hpp>
-
-#include <boost/geometry/algorithms/covered_by.hpp>
-
-#include <boost/geometry/util/math.hpp>
-
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace disjoint
-{
-
-
-struct disjoint_interrupt_policy
-{
-    static bool const enabled = true;
-    bool has_intersections;
-
-    inline disjoint_interrupt_policy()
-        : has_intersections(false)
-    {}
-
-    template <typename Range>
-    inline bool apply(Range const& range)
-    {
-        // If there is any IP in the range, it is NOT disjoint
-        if (boost::size(range) > 0)
-        {
-            has_intersections = true;
-            return true;
-        }
-        return false;
-    }
-};
-
-
-
-template
-<
-    typename Point1, typename Point2,
-    std::size_t Dimension, std::size_t DimensionCount
->
-struct point_point
-{
-    static inline bool apply(Point1 const& p1, Point2 const& p2)
-    {
-        if (! geometry::math::equals(get<Dimension>(p1), get<Dimension>(p2)))
-        {
-            return true;
-        }
-        return point_point
-            <
-                Point1, Point2,
-                Dimension + 1, DimensionCount
-            >::apply(p1, p2);
-    }
-};
-
-
-template <typename Point1, typename Point2, std::size_t DimensionCount>
-struct point_point<Point1, Point2, DimensionCount, DimensionCount>
-{
-    static inline bool apply(Point1 const& , Point2 const& )
-    {
-        return false;
-    }
-};
-
-
-template
-<
-    typename Point, typename Box,
-    std::size_t Dimension, std::size_t DimensionCount
->
-struct point_box
-{
-    static inline bool apply(Point const& point, Box const& box)
-    {
-        if (get<Dimension>(point) < get<min_corner, Dimension>(box)
-            || get<Dimension>(point) > get<max_corner, Dimension>(box))
-        {
-            return true;
-        }
-        return point_box
-            <
-                Point, Box,
-                Dimension + 1, DimensionCount
-            >::apply(point, box);
-    }
-};
-
-
-template <typename Point, typename Box, std::size_t DimensionCount>
-struct point_box<Point, Box, DimensionCount, DimensionCount>
-{
-    static inline bool apply(Point const& , Box const& )
-    {
-        return false;
-    }
-};
-
-
-template
-<
-    typename Box1, typename Box2,
-    std::size_t Dimension, std::size_t DimensionCount
->
-struct box_box
-{
-    static inline bool apply(Box1 const& box1, Box2 const& box2)
-    {
-        if (get<max_corner, Dimension>(box1) < get<min_corner, Dimension>(box2))
-        {
-            return true;
-        }
-        if (get<min_corner, Dimension>(box1) > get<max_corner, Dimension>(box2))
-        {
-            return true;
-        }
-        return box_box
-            <
-                Box1, Box2,
-                Dimension + 1, DimensionCount
-            >::apply(box1, box2);
-    }
-};
-
-
-template <typename Box1, typename Box2, std::size_t DimensionCount>
-struct box_box<Box1, Box2, DimensionCount, DimensionCount>
-{
-    static inline bool apply(Box1 const& , Box2 const& )
-    {
-        return false;
-    }
-};
-
-// Segment - Box intersection
-// Based on Ray-AABB intersection
-// http://www.siggraph.org/education/materials/HyperGraph/raytrace/rtinter3.htm
-
-// TODO - later maybe move to strategy::intersects and add a policy to conditionally extract intersection points
-
-template <typename Point, typename Box, size_t I>
-struct segment_box_intersection_dim
-{
-    //BOOST_STATIC_ASSERT(I < dimension<Box>::value);
-    //BOOST_STATIC_ASSERT(I < dimension<Point>::value);
-    //BOOST_STATIC_ASSERT(dimension<Point>::value == dimension<Box>::value);
-
-    typedef typename coordinate_type<Point>::type point_coordinate;
-
-    template <typename RelativeDistance> static inline
-    bool apply(Point const& p0, Point const& p1, Box const& b, RelativeDistance & t_near, RelativeDistance & t_far)
-    {
-        //// WARNING! - RelativeDistance must be IEEE float for this to work (division by 0)
-        //BOOST_STATIC_ASSERT(boost::is_float<RelativeDistance>::value);
-        //// Ray origin is in segment point 0
-        //RelativeDistance ray_d = geometry::get<I>(p1) - geometry::get<I>(p0);
-        //RelativeDistance tn = ( geometry::get<min_corner, I>(b) - geometry::get<I>(p0) ) / ray_d;
-        //RelativeDistance tf = ( geometry::get<max_corner, I>(b) - geometry::get<I>(p0) ) / ray_d;
-
-        // TODO - should we support also unsigned integers?
-        BOOST_STATIC_ASSERT(!boost::is_unsigned<point_coordinate>::value);
-        point_coordinate ray_d = geometry::get<I>(p1) - geometry::get<I>(p0);
-        RelativeDistance tn, tf;
-        if ( is_zero(ray_d) )
-        {
-            tn = dist_div_by_zero<RelativeDistance>(geometry::get<min_corner, I>(b) - geometry::get<I>(p0));
-            tf = dist_div_by_zero<RelativeDistance>(geometry::get<max_corner, I>(b) - geometry::get<I>(p0));
-        }
-        else
-        {
-            tn = static_cast<RelativeDistance>(geometry::get<min_corner, I>(b) - geometry::get<I>(p0)) / ray_d;
-            tf = static_cast<RelativeDistance>(geometry::get<max_corner, I>(b) - geometry::get<I>(p0)) / ray_d;
-        }
-
-        if ( tf < tn )
-            ::std::swap(tn, tf);
-
-        if ( t_near < tn )
-            t_near = tn;
-        if ( tf < t_far )
-            t_far = tf;
-
-        return 0 <= t_far && t_near <= t_far && t_near <= 1;
-    }
-
-    template <typename R, typename T> static inline
-    R dist_div_by_zero(T const& val)
-    {
-        if ( is_zero(val) )
-            return 0;
-        else if ( val < 0 )
-            return -(::std::numeric_limits<R>::max)();
-        else
-            return (::std::numeric_limits<R>::max)();
-    }
-
-    template <typename T> static inline
-    bool is_zero(T const& val)
-    {
-        // ray_d == 0 is here because eps of rational<int> is 0 which isn't < than 0
-        return val == 0 || math::abs(val) < ::std::numeric_limits<T>::epsilon();
-    }
-};
-
-template <typename Point, typename Box, size_t CurrentDimension>
-struct segment_box_intersection_impl
-{
-    BOOST_STATIC_ASSERT(0 < CurrentDimension);
-
-    typedef segment_box_intersection_dim<Point, Box, CurrentDimension - 1> for_dim;
-
-    template <typename RelativeDistance>
-    static inline bool apply(Point const& p0, Point const& p1, Box const& b,
-                             RelativeDistance & t_near, RelativeDistance & t_far)
-    {
-        return segment_box_intersection_impl<Point, Box, CurrentDimension - 1>::apply(p0, p1, b, t_near, t_far)
-            && for_dim::apply(p0, p1, b, t_near, t_far);
-    }
-};
-
-template <typename Point, typename Box>
-struct segment_box_intersection_impl<Point, Box, 1>
-{
-    typedef segment_box_intersection_dim<Point, Box, 0> for_dim;
-
-    template <typename RelativeDistance>
-    static inline bool apply(Point const& p0, Point const& p1, Box const& b,
-                             RelativeDistance & t_near, RelativeDistance & t_far)
-    {
-        return for_dim::apply(p0, p1, b, t_near, t_far);
-    }
-};
-
-template <typename Point, typename Box>
-struct segment_box_intersection
-{
-    typedef segment_box_intersection_impl<Point, Box, dimension<Box>::value> impl;
-
-    static inline bool apply(Point const& p0, Point const& p1, Box const& b)
-    {
-        typedef
-        typename geometry::promote_floating_point<
-            typename geometry::select_most_precise<
-                typename coordinate_type<Point>::type,
-                typename coordinate_type<Box>::type
-            >::type
-        >::type relative_distance_type;
-
-        relative_distance_type t_near = -(::std::numeric_limits<relative_distance_type>::max)();
-        relative_distance_type t_far = (::std::numeric_limits<relative_distance_type>::max)();
-
-        // relative_distance = 0 < t_near ? t_near : 0;
-
-        return impl::apply(p0, p1, b, t_near, t_far);
-    }
-};
-
-template
-<
-    typename Geometry1, typename Geometry2
->
-struct reverse_covered_by
-{
-    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
-    {
-        return ! geometry::covered_by(geometry1, geometry2);
-    }
-};
-
-
-
-/*!
-    \brief Internal utility function to detect of boxes are disjoint
-    \note Is used from other algorithms, declared separately
-        to avoid circular references
- */
-template <typename Box1, typename Box2>
-inline bool disjoint_box_box(Box1 const& box1, Box2 const& box2)
-{
-    return box_box
-        <
-            Box1, Box2,
-            0, dimension<Box1>::type::value
-        >::apply(box1, box2);
-}
-
-
-
-/*!
-    \brief Internal utility function to detect of points are disjoint
-    \note To avoid circular references
- */
-template <typename Point1, typename Point2>
-inline bool disjoint_point_point(Point1 const& point1, Point2 const& point2)
-{
-    return point_point
-        <
-            Point1, Point2,
-            0, dimension<Point1>::type::value
-        >::apply(point1, point2);
-}
-
-
-}} // namespace detail::disjoint
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace equals
-{
-
-/*!
-    \brief Internal utility function to detect of points are disjoint
-    \note To avoid circular references
- */
-template <typename Point1, typename Point2>
-inline bool equals_point_point(Point1 const& point1, Point2 const& point2)
-{
-    return ! detail::disjoint::disjoint_point_point(point1, point2);
-}
-
-
-}} // namespace detail::equals
-#endif // DOXYGEN_NO_DETAIL
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp b/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
new file mode 100644
index 000000000..140d87daf
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/areal_areal.hpp
@@ -0,0 +1,134 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_AREAL_AREAL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_AREAL_AREAL_HPP
+
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/point_on_surface.hpp>
+
+#include <boost/geometry/algorithms/detail/disjoint/linear_linear.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template<typename Geometry>
+struct check_each_ring_for_within
+{
+    bool has_within;
+    Geometry const& m_geometry;
+
+    inline check_each_ring_for_within(Geometry const& g)
+        : has_within(false)
+        , m_geometry(g)
+    {}
+
+    template <typename Range>
+    inline void apply(Range const& range)
+    {
+        if ( geometry::within(geometry::return_point_on_surface(range), m_geometry) )
+        {
+            has_within = true;
+        }
+    }
+};
+
+
+
+template <typename FirstGeometry, typename SecondGeometry>
+inline bool rings_containing(FirstGeometry const& geometry1,
+                                 SecondGeometry const& geometry2)
+{
+    check_each_ring_for_within<FirstGeometry> checker(geometry1);
+    geometry::detail::for_each_range(geometry2, checker);
+    return checker.has_within;
+}
+
+
+
+template <typename Geometry1, typename Geometry2>
+struct general_areal
+{
+    static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        if ( ! disjoint_linear<Geometry1, Geometry2>::apply(geometry1, geometry2) )
+        {
+            return false;
+        }
+
+        // If there is no intersection of segments, they might located
+        // inside each other
+
+        // We check that using a point on the surface, and see if that is inside
+        // the other geometry. And vice versa.
+
+        if ( rings_containing(geometry1, geometry2)
+          || rings_containing(geometry2, geometry1) )
+        {
+            return false;
+        }
+
+        return true;
+    }
+};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Areal1, typename Areal2>
+struct disjoint<Areal1, Areal2, 2, areal_tag, areal_tag, false>
+    : detail::disjoint::general_areal<Areal1, Areal2>
+{};
+
+
+template <typename Areal, typename Box>
+struct disjoint<Areal, Box, 2, areal_tag, box_tag, false>
+    : detail::disjoint::general_areal<Areal, Box>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_AREAL_AREAL_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
new file mode 100644
index 000000000..ccff9799f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/box_box.hpp
@@ -0,0 +1,114 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_BOX_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_BOX_BOX_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template
+<
+    typename Box1, typename Box2,
+    std::size_t Dimension, std::size_t DimensionCount
+>
+struct box_box
+{
+    static inline bool apply(Box1 const& box1, Box2 const& box2)
+    {
+        if (get<max_corner, Dimension>(box1) < get<min_corner, Dimension>(box2))
+        {
+            return true;
+        }
+        if (get<min_corner, Dimension>(box1) > get<max_corner, Dimension>(box2))
+        {
+            return true;
+        }
+        return box_box
+            <
+                Box1, Box2,
+                Dimension + 1, DimensionCount
+            >::apply(box1, box2);
+    }
+};
+
+
+template <typename Box1, typename Box2, std::size_t DimensionCount>
+struct box_box<Box1, Box2, DimensionCount, DimensionCount>
+{
+    static inline bool apply(Box1 const& , Box2 const& )
+    {
+        return false;
+    }
+};
+
+
+/*!
+    \brief Internal utility function to detect of boxes are disjoint
+    \note Is used from other algorithms, declared separately
+        to avoid circular references
+ */
+template <typename Box1, typename Box2>
+inline bool disjoint_box_box(Box1 const& box1, Box2 const& box2)
+{
+    return box_box
+        <
+            Box1, Box2,
+            0, dimension<Box1>::type::value
+        >::apply(box1, box2);
+}
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Box1, typename Box2, std::size_t DimensionCount>
+struct disjoint<Box1, Box2, DimensionCount, box_tag, box_tag, false>
+    : detail::disjoint::box_box<Box1, Box2, 0, DimensionCount>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_BOX_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp b/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp
new file mode 100644
index 000000000..0c8079b8e
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/implementation.hpp
@@ -0,0 +1,36 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_IMPLEMENTATION_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_IMPLEMENTATION_HPP
+
+
+#include <boost/geometry/algorithms/detail/disjoint/areal_areal.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/linear_areal.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/point_point.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/point_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/segment_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp>
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_IMPLEMENTATION_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/interface.hpp b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
new file mode 100644
index 000000000..ec9057ba0
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/interface.hpp
@@ -0,0 +1,187 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_INTERFACE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_INTERFACE_HPP
+
+#include <cstddef>
+
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// If reversal is needed, perform it
+template
+<
+    typename Geometry1, typename Geometry2,
+    std::size_t DimensionCount,
+    typename Tag1, typename Tag2
+>
+struct disjoint<Geometry1, Geometry2, DimensionCount, Tag1, Tag2, true>
+{
+    static inline bool apply(Geometry1 const& g1, Geometry2 const& g2)
+    {
+        return disjoint
+            <
+                Geometry2, Geometry1,
+                DimensionCount,
+                Tag2, Tag1
+            >::apply(g2, g1);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
+template <typename Geometry1, typename Geometry2>
+struct disjoint
+{
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        concept::check_concepts_and_equal_dimensions
+            <
+                Geometry1 const,
+                Geometry2 const
+            >();
+
+        return dispatch::disjoint<Geometry1, Geometry2>::apply(geometry1, geometry2);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct disjoint<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry2 const& m_geometry2;
+
+        visitor(Geometry2 const& geometry2): m_geometry2(geometry2) {}
+
+        template <typename Geometry1>
+        bool operator()(Geometry1 const& geometry1) const
+        {
+            return disjoint<Geometry1, Geometry2>::apply(geometry1, m_geometry2);
+        }
+    };
+
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2)
+    {
+        return boost::apply_visitor(visitor(geometry2), geometry1);
+    }
+};
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct disjoint<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry1 const& m_geometry1;
+
+        visitor(Geometry1 const& geometry1): m_geometry1(geometry1) {}
+
+        template <typename Geometry2>
+        bool operator()(Geometry2 const& geometry2) const
+        {
+            return disjoint<Geometry1, Geometry2>::apply(m_geometry1, geometry2);
+        }
+    };
+
+    static inline bool
+    apply(Geometry1 const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2)
+    {
+        return boost::apply_visitor(visitor(geometry1), geometry2);
+    }
+};
+
+template <
+    BOOST_VARIANT_ENUM_PARAMS(typename T1),
+    BOOST_VARIANT_ENUM_PARAMS(typename T2)
+>
+struct disjoint<
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
+>
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        template <typename Geometry1, typename Geometry2>
+        bool operator()(Geometry1 const& geometry1,
+                        Geometry2 const& geometry2) const
+        {
+            return disjoint<Geometry1, Geometry2>::apply(geometry1, geometry2);
+        }
+    };
+
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2)
+    {
+        return boost::apply_visitor(visitor(), geometry1, geometry2);
+    }
+};
+
+} // namespace resolve_variant
+
+
+
+/*!
+\brief \brief_check2{are disjoint}
+\ingroup disjoint
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\return \return_check2{are disjoint}
+
+\qbk{[include reference/algorithms/disjoint.qbk]}
+*/
+template <typename Geometry1, typename Geometry2>
+inline bool disjoint(Geometry1 const& geometry1,
+            Geometry2 const& geometry2)
+{
+    return resolve_variant::disjoint<Geometry1, Geometry2>::apply(geometry1, geometry2);
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_INTERFACE_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
new file mode 100644
index 000000000..eefd351b8
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_areal.hpp
@@ -0,0 +1,244 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_AREAL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_AREAL_HPP
+
+#include <iterator>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/point_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/segment_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template<typename Geometry1, typename Geometry2>
+struct disjoint_linear_areal
+{
+    static inline bool apply(Geometry1 const& g1, Geometry2 const& g2)
+    {
+        // if there are intersections - return false
+        if ( !disjoint_linear<Geometry1, Geometry2>::apply(g1, g2) )
+            return false;
+
+        typedef typename point_type<Geometry1>::type point1_type;
+        point1_type p;
+        geometry::point_on_border(p, g1);
+        return !geometry::covered_by(p, g2);
+    }
+};
+
+
+
+
+template
+<
+    typename Segment,
+    typename Areal,
+    typename Tag = typename tag<Areal>::type
+>
+struct disjoint_segment_areal
+    : not_implemented<Segment, Areal>
+{};
+
+
+template <typename Segment, typename Polygon>
+class disjoint_segment_areal<Segment, Polygon, polygon_tag>
+{
+private:
+    template <typename RingIterator>
+    static inline bool check_interior_rings(RingIterator first,
+                                            RingIterator beyond,
+                                            Segment const& segment)
+    {
+        for (RingIterator it = first; it != beyond; ++it)
+        {
+            if ( !disjoint_range_segment_or_box
+                     <
+                         typename std::iterator_traits
+                             <
+                                 RingIterator
+                             >::value_type,
+                         closure<Polygon>::value,
+                         Segment
+                     >::apply(*it, segment) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    template <typename InteriorRings>
+    static inline
+    bool check_interior_rings(InteriorRings const& interior_rings,
+                              Segment const& segment)
+    {
+        return check_interior_rings(boost::begin(interior_rings),
+                                    boost::end(interior_rings),
+                                    segment);
+    }
+
+
+public:
+    static inline bool apply(Segment const& segment, Polygon const& polygon)
+    {
+        typedef typename geometry::ring_type<Polygon>::type ring;
+
+        if ( !disjoint_range_segment_or_box
+                 <
+                     ring, closure<Polygon>::value, Segment
+                 >::apply(geometry::exterior_ring(polygon), segment) )
+        {
+            return false;
+        }
+
+        if ( !check_interior_rings(geometry::interior_rings(polygon), segment) )
+        {
+            return false;
+        }
+
+        typename point_type<Segment>::type p;
+        detail::assign_point_from_index<0>(segment, p);
+
+        return !geometry::covered_by(p, polygon);
+    }
+};
+
+
+template <typename Segment, typename MultiPolygon>
+struct disjoint_segment_areal<Segment, MultiPolygon, multi_polygon_tag>
+{
+    static inline
+    bool apply(Segment const& segment, MultiPolygon const& multipolygon)
+    {
+        return disjoint_multirange_segment_or_box
+            <
+                MultiPolygon, Segment
+            >::apply(multipolygon, segment);
+    }
+};
+
+
+template <typename Segment, typename Ring>
+struct disjoint_segment_areal<Segment, Ring, ring_tag>
+{
+    static inline bool apply(Segment const& segment, Ring const& ring)
+    {
+        if ( !disjoint_range_segment_or_box
+                 <
+                     Ring, closure<Ring>::value, Segment
+                 >::apply(ring, segment) )
+        {
+            return false;
+        }
+
+        typename point_type<Segment>::type p;
+        detail::assign_point_from_index<0>(segment, p);
+        
+        return !geometry::covered_by(p, ring);        
+    }
+};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Linear, typename Areal>
+struct disjoint<Linear, Areal, 2, linear_tag, areal_tag, false>
+    : public detail::disjoint::disjoint_linear_areal<Linear, Areal>
+{};
+
+
+template <typename Areal, typename Linear>
+struct disjoint<Areal, Linear, 2, areal_tag, linear_tag, false>
+{    
+    static inline
+    bool apply(Areal const& areal, Linear const& linear)
+    {
+        return detail::disjoint::disjoint_linear_areal
+            <
+                Linear, Areal
+            >::apply(linear, areal);
+    }
+};
+
+
+template <typename Areal, typename Segment>
+struct disjoint<Areal, Segment, 2, areal_tag, segment_tag, false>
+{
+    static inline bool apply(Areal const& g1, Segment const& g2)
+    {
+        return detail::disjoint::disjoint_segment_areal
+            <
+                Segment, Areal
+            >::apply(g2, g1);
+    }
+};
+
+
+template <typename Segment, typename Areal>
+struct disjoint<Segment, Areal, 2, segment_tag, areal_tag, false>
+    : detail::disjoint::disjoint_segment_areal<Segment, Areal>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_AREAL_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
new file mode 100644
index 000000000..ad84d7191
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_linear.hpp
@@ -0,0 +1,174 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_LINEAR_HPP
+
+#include <cstddef>
+#include <deque>
+
+#include <boost/range.hpp>
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
+
+#include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+template <typename Segment1, typename Segment2>
+struct disjoint_segment
+{
+    static inline bool apply(Segment1 const& segment1, Segment2 const& segment2)
+    {
+        typedef typename point_type<Segment1>::type point_type;
+
+        // We don't need to rescale to detect disjointness
+        typedef no_rescale_policy rescale_policy_type;
+        rescale_policy_type robust_policy;
+
+        typedef segment_intersection_points
+                <
+                    point_type,
+                    typename segment_ratio_type
+                    <
+                        point_type,
+                        rescale_policy_type
+                    >::type
+                > intersection_return_type;
+
+        intersection_return_type is
+            = strategy::intersection::relate_cartesian_segments
+            <
+                policies::relate::segments_intersection_points
+                    <
+                        intersection_return_type
+                    >
+            >::apply(segment1, segment2, robust_policy);
+
+        return is.count == 0;
+    }
+};
+
+
+struct assign_disjoint_policy
+{
+    // We want to include all points:
+    static bool const include_no_turn = true;
+    static bool const include_degenerate = true;
+    static bool const include_opposite = true;
+
+    // We don't assign extra info:
+    template
+    <
+        typename Info,
+        typename Point1,
+        typename Point2,
+        typename IntersectionInfo,
+        typename DirInfo
+    >
+    static inline void apply(Info& , Point1 const& , Point2 const&,
+                IntersectionInfo const&, DirInfo const&)
+    {}
+};
+
+
+template <typename Geometry1, typename Geometry2>
+struct disjoint_linear
+{
+    static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        typedef typename geometry::point_type<Geometry1>::type point_type;
+        typedef detail::no_rescale_policy rescale_policy_type;
+        typedef overlay::turn_info
+        <
+            point_type,
+            typename segment_ratio_type<point_type, rescale_policy_type>::type
+        > turn_info;
+        std::deque<turn_info> turns;
+
+        static const bool reverse1 = overlay::do_reverse<geometry::point_order<Geometry1>::value>::value; // should be false
+        static const bool reverse2 = overlay::do_reverse<geometry::point_order<Geometry2>::value>::value; // should be false
+
+        // Specify two policies:
+        // 1) Stop at any intersection
+        // 2) In assignment, include also degenerate points (which are normally skipped)
+        disjoint_interrupt_policy policy;
+        rescale_policy_type robust_policy;
+        geometry::get_turns
+            <
+                reverse1, reverse2,
+                assign_disjoint_policy
+            >(geometry1, geometry2, robust_policy, turns, policy);
+
+        return !policy.has_intersections;
+    }
+};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Linear1, typename Linear2>
+struct disjoint<Linear1, Linear2, 2, linear_tag, linear_tag, false>
+    : detail::disjoint::disjoint_linear<Linear1, Linear2>
+{};
+
+
+template <typename Segment1, typename Segment2>
+struct disjoint<Segment1, Segment2, 2, segment_tag, segment_tag, false>
+    : detail::disjoint::disjoint_segment<Segment1, Segment2>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
new file mode 100644
index 000000000..d181726e2
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/linear_segment_or_box.hpp
@@ -0,0 +1,195 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_SEGMENT_OR_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_SEGMENT_OR_BOX_HPP
+
+#include <boost/range.hpp>
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+
+#include <boost/geometry/geometries/segment.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/views/closeable_view.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template <typename MultiRange, typename SegmentOrBox>
+struct disjoint_multirange_segment_or_box
+{
+    static inline
+    bool apply(MultiRange const& multirange, SegmentOrBox const& segment_or_box)
+    {
+        typedef typename boost::range_iterator
+            <
+                MultiRange const
+            >::type const_iterator;
+
+        for (const_iterator it = boost::begin(multirange);
+             it != boost::end(multirange); ++it)
+        {
+            if ( !dispatch::disjoint
+                     <
+                         typename boost::range_value<MultiRange>::type,
+                         SegmentOrBox
+                     >::apply(*it, segment_or_box) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+};
+
+
+template
+<
+    typename Range,
+    closure_selector Closure,
+    typename SegmentOrBox
+>
+struct disjoint_range_segment_or_box
+{
+    static inline
+    bool apply(Range const& range, SegmentOrBox const& segment_or_box)
+    {
+        typedef typename closeable_view<Range const, Closure>::type view_type;
+
+        typedef typename ::boost::range_value<view_type>::type point_type;
+        typedef typename ::boost::range_iterator
+            <
+                view_type const
+            >::type const_iterator;
+
+        typedef typename ::boost::range_size<view_type>::type size_type;
+
+        typedef typename geometry::model::referring_segment
+            <
+                point_type const
+            > range_segment;
+
+        view_type view(range);
+
+        const size_type count = ::boost::size(view);
+
+        if ( count == 0 )
+        {
+            return false;
+        }
+        else if ( count == 1 )
+        {
+            return dispatch::disjoint
+                <
+                    point_type, SegmentOrBox
+                >::apply(geometry::range::front<view_type const>(view),
+                         segment_or_box);
+        }
+        else
+        {
+            const_iterator it0 = ::boost::begin(view);
+            const_iterator it1 = ::boost::begin(view) + 1;
+            const_iterator last = ::boost::end(view);
+
+            for ( ; it1 != last ; ++it0, ++it1 )
+            {
+                range_segment rng_segment(*it0, *it1);
+                if ( !dispatch::disjoint
+                         <
+                             range_segment, SegmentOrBox
+                         >::apply(rng_segment, segment_or_box) )
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+};
+
+
+
+
+template
+<
+    typename Linear,
+    typename SegmentOrBox,
+    typename Tag = typename tag<Linear>::type
+>
+struct disjoint_linear_segment_or_box
+    : not_implemented<Linear, SegmentOrBox>
+{};
+
+
+template <typename Linestring, typename SegmentOrBox>
+struct disjoint_linear_segment_or_box<Linestring, SegmentOrBox, linestring_tag>
+    : disjoint_range_segment_or_box<Linestring, closed, SegmentOrBox>
+{};
+
+
+template <typename MultiLinestring, typename SegmentOrBox>
+struct disjoint_linear_segment_or_box
+    <
+        MultiLinestring, SegmentOrBox, multi_linestring_tag
+    > : disjoint_multirange_segment_or_box<MultiLinestring, SegmentOrBox>
+{};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Linear, typename Segment>
+struct disjoint<Linear, Segment, 2, linear_tag, segment_tag, false>
+    : detail::disjoint::disjoint_linear_segment_or_box<Linear, Segment>
+{};
+
+
+template <typename Linear, typename Box, std::size_t DimensionCount>
+struct disjoint<Linear, Box, DimensionCount, linear_tag, box_tag, false>
+    : detail::disjoint::disjoint_linear_segment_or_box<Linear, Box>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_LINEAR_SEGMENT_OR_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
new file mode 100644
index 000000000..ea6609a15
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/point_box.hpp
@@ -0,0 +1,94 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_BOX_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template
+<
+    typename Point, typename Box,
+    std::size_t Dimension, std::size_t DimensionCount
+>
+struct point_box
+{
+    static inline bool apply(Point const& point, Box const& box)
+    {
+        if (get<Dimension>(point) < get<min_corner, Dimension>(box)
+            || get<Dimension>(point) > get<max_corner, Dimension>(box))
+        {
+            return true;
+        }
+        return point_box
+            <
+                Point, Box,
+                Dimension + 1, DimensionCount
+            >::apply(point, box);
+    }
+};
+
+
+template <typename Point, typename Box, std::size_t DimensionCount>
+struct point_box<Point, Box, DimensionCount, DimensionCount>
+{
+    static inline bool apply(Point const& , Box const& )
+    {
+        return false;
+    }
+};
+
+
+}} // namespace detail::equals
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Point, typename Box, std::size_t DimensionCount>
+struct disjoint<Point, Box, DimensionCount, point_tag, box_tag, false>
+    : detail::disjoint::point_box<Point, Box, 0, DimensionCount>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp b/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp
new file mode 100644
index 000000000..a58bff41d
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/point_geometry.hpp
@@ -0,0 +1,111 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_GEOMETRY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_GEOMETRY_HPP
+
+#include <boost/geometry/geometries/segment.hpp>
+
+#include <boost/geometry/algorithms/covered_by.hpp>
+
+#include <boost/geometry/algorithms/detail/disjoint/linear_linear.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template<typename Point, typename Geometry>
+struct disjoint_point_linear
+{
+    static inline
+    bool apply(Point const& pt, Geometry const& g)
+    {
+        return !geometry::covered_by(pt, g);
+    }
+};
+
+
+template <typename Geometry1, typename Geometry2>
+struct reverse_covered_by
+{
+    static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        return !geometry::covered_by(geometry1, geometry2);
+    }
+};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template<typename Point, typename Linear, std::size_t DimensionCount>
+struct disjoint<Point, Linear, DimensionCount, point_tag, linear_tag, false>
+    : public detail::disjoint::disjoint_point_linear<Point, Linear>
+{};
+
+
+template <typename Point, typename Areal, std::size_t DimensionCount>
+struct disjoint<Point, Areal, DimensionCount, point_tag, areal_tag, false>
+    : detail::disjoint::reverse_covered_by<Point, Areal>
+{};
+
+
+template<typename Point, typename Segment, std::size_t DimensionCount>
+struct disjoint<Point, Segment, DimensionCount, point_tag, segment_tag, false>
+{
+    static inline bool apply(Point const& point, Segment const& segment)
+    {
+        typedef geometry::model::referring_segment<Point const> other_segment;
+
+        other_segment other(point, point);
+        return detail::disjoint::disjoint_segment
+            <
+                Segment, other_segment
+            >::apply(segment, other);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_GEOMETRY_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp b/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp
new file mode 100644
index 000000000..b1d32bf95
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/point_point.hpp
@@ -0,0 +1,112 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_POINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_POINT_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+template
+<
+    typename Point1, typename Point2,
+    std::size_t Dimension, std::size_t DimensionCount
+>
+struct point_point
+{
+    static inline bool apply(Point1 const& p1, Point2 const& p2)
+    {
+        if (! geometry::math::equals(get<Dimension>(p1), get<Dimension>(p2)))
+        {
+            return true;
+        }
+        return point_point
+            <
+                Point1, Point2,
+                Dimension + 1, DimensionCount
+            >::apply(p1, p2);
+    }
+};
+
+
+template <typename Point1, typename Point2, std::size_t DimensionCount>
+struct point_point<Point1, Point2, DimensionCount, DimensionCount>
+{
+    static inline bool apply(Point1 const& , Point2 const& )
+    {
+        return false;
+    }
+};
+
+
+/*!
+    \brief Internal utility function to detect of points are disjoint
+    \note To avoid circular references
+ */
+template <typename Point1, typename Point2>
+inline bool disjoint_point_point(Point1 const& point1, Point2 const& point2)
+{
+    return point_point
+        <
+            Point1, Point2,
+            0, dimension<Point1>::type::value
+        >::apply(point1, point2);
+}
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Point1, typename Point2, std::size_t DimensionCount>
+struct disjoint<Point1, Point2, DimensionCount, point_tag, point_tag, false>
+    : detail::disjoint::point_point<Point1, Point2, 0, DimensionCount>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_POINT_POINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp b/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
new file mode 100644
index 000000000..5368432ed
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/disjoint/segment_box.hpp
@@ -0,0 +1,291 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_SEGMENT_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_SEGMENT_BOX_HPP
+
+#include <cstddef>
+#include <utility>
+
+#include <boost/numeric/conversion/cast.hpp>
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/calculation_type.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+
+#include <boost/geometry/algorithms/dispatch/disjoint.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+template <std::size_t I>
+struct compute_tmin_tmax_per_dim
+{
+    template <typename SegmentPoint, typename Box, typename RelativeDistance>
+    static inline void apply(SegmentPoint const& p0,
+                             SegmentPoint const& p1,
+                             Box const& box,
+                             RelativeDistance& ti_min,
+                             RelativeDistance& ti_max,
+                             RelativeDistance& diff)
+    {
+        typedef typename coordinate_type<Box>::type box_coordinate_type;
+        typedef typename coordinate_type
+            <
+                SegmentPoint
+            >::type point_coordinate_type;
+
+        RelativeDistance c_p0 = boost::numeric_cast
+            <
+                point_coordinate_type
+            >( geometry::get<I>(p0) );
+
+        RelativeDistance c_p1 = boost::numeric_cast
+            <
+                point_coordinate_type
+            >( geometry::get<I>(p1) );
+
+        RelativeDistance c_b_min = boost::numeric_cast
+            <
+                box_coordinate_type
+            >( geometry::get<geometry::min_corner, I>(box) );
+
+        RelativeDistance c_b_max = boost::numeric_cast
+            <
+                box_coordinate_type
+            >( geometry::get<geometry::max_corner, I>(box) );
+
+        if ( geometry::get<I>(p1) >= geometry::get<I>(p0) )
+        {
+            diff = c_p1 - c_p0;
+            ti_min = c_b_min - c_p0;
+            ti_max = c_b_max - c_p0;
+        }
+        else
+        {
+            diff = c_p0 - c_p1;
+            ti_min = c_p0 - c_b_max;
+            ti_max = c_p0 - c_b_min;
+        }
+    }
+};
+
+
+template
+<
+    typename RelativeDistance,
+    typename SegmentPoint,
+    typename Box,
+    std::size_t I,
+    std::size_t Dimension
+>
+struct disjoint_segment_box_impl
+{
+    template <typename RelativeDistancePair>
+    static inline bool apply(SegmentPoint const& p0,
+                             SegmentPoint const& p1,
+                             Box const& box,
+                             RelativeDistancePair& t_min,
+                             RelativeDistancePair& t_max)
+    {
+        RelativeDistance ti_min, ti_max, diff;
+
+        compute_tmin_tmax_per_dim<I>::apply(p0, p1, box, ti_min, ti_max, diff);
+
+        if ( geometry::math::equals(diff, 0) )
+        {
+            if ( (geometry::math::equals(t_min.second, 0)
+                  && t_min.first > ti_max)
+                 ||
+                 (geometry::math::equals(t_max.second, 0)
+                  && t_max.first < ti_min) )
+            {
+                return true;
+            }
+        }
+
+        RelativeDistance t_min_x_diff = t_min.first * diff;
+        RelativeDistance t_max_x_diff = t_max.first * diff;
+
+        if ( t_min_x_diff > ti_max * t_min.second
+             || t_max_x_diff < ti_min * t_max.second )
+        {
+            return true;
+        }
+
+        if ( ti_min * t_min.second > t_min_x_diff )
+        {
+            t_min.first = ti_min;
+            t_min.second = diff;
+        }
+        if ( ti_max * t_max.second < t_max_x_diff )
+        {
+            t_max.first = ti_max;
+            t_max.second = diff;
+        }
+
+        if ( t_min.first > t_min.second || t_max.first < 0 )
+        {
+            return true;
+        }
+
+        return disjoint_segment_box_impl
+            <
+                RelativeDistance,
+                SegmentPoint,
+                Box, 
+                I + 1,
+                Dimension
+            >::apply(p0, p1, box, t_min, t_max);
+    }
+};
+
+
+template
+<
+    typename RelativeDistance,
+    typename SegmentPoint,
+    typename Box,
+    std::size_t Dimension
+>
+struct disjoint_segment_box_impl
+    <
+        RelativeDistance, SegmentPoint, Box, 0, Dimension
+    >
+{
+    static inline bool apply(SegmentPoint const& p0,
+                             SegmentPoint const& p1,
+                             Box const& box)
+    {
+        std::pair<RelativeDistance, RelativeDistance> t_min, t_max;
+        RelativeDistance diff;
+
+        compute_tmin_tmax_per_dim<0>::apply(p0, p1, box,
+                                            t_min.first, t_max.first, diff);
+
+        if ( geometry::math::equals(diff, 0) )
+        {
+            if ( geometry::math::equals(t_min.first, 0) ) { t_min.first = -1; }
+            if ( geometry::math::equals(t_max.first, 0) ) { t_max.first = 1; }
+        }
+
+        if ( t_min.first > diff || t_max.first < 0 )
+        {
+            return true;
+        }
+
+        t_min.second = t_max.second = diff;
+
+        return disjoint_segment_box_impl
+            <
+                RelativeDistance, SegmentPoint, Box, 1, Dimension
+            >::apply(p0, p1, box, t_min, t_max);
+    }
+};
+
+
+template
+<
+    typename RelativeDistance,
+    typename SegmentPoint,
+    typename Box,
+    std::size_t Dimension
+>
+struct disjoint_segment_box_impl
+    <
+        RelativeDistance, SegmentPoint, Box, Dimension, Dimension
+    >
+{
+    template <typename RelativeDistancePair>
+    static inline bool apply(SegmentPoint const&, SegmentPoint const&,
+                             Box const&,
+                             RelativeDistancePair&, RelativeDistancePair&)
+    {
+        return false;
+    }
+};
+
+
+//=========================================================================
+
+
+template <typename Segment, typename Box>
+struct disjoint_segment_box
+{ 
+    static inline bool apply(Segment const& segment, Box const& box)
+    {
+        assert_dimension_equal<Segment, Box>();
+
+        typedef typename util::calculation_type::geometric::binary
+            <
+                Segment, Box, void
+            >::type relative_distance_type;
+
+        typedef typename point_type<Segment>::type segment_point_type;
+        segment_point_type p0, p1;
+        geometry::detail::assign_point_from_index<0>(segment, p0);
+        geometry::detail::assign_point_from_index<1>(segment, p1);
+
+        return disjoint_segment_box_impl
+            <
+                relative_distance_type, segment_point_type, Box,
+                0, dimension<Box>::value
+            >::apply(p0, p1, box);
+    }
+};
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Segment, typename Box, std::size_t DimensionCount>
+struct disjoint<Segment, Box, DimensionCount, segment_tag, box_tag, false>
+    : detail::disjoint::disjoint_segment_box<Segment, Box>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISJOINT_SEGMENT_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp b/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
new file mode 100644
index 000000000..363439d20
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
@@ -0,0 +1,345 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BACKWARD_COMPATIBILITY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BACKWARD_COMPATIBILITY_HPP
+
+#include <utility>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
+#include <boost/geometry/algorithms/detail/distance/single_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/multi_to_multi.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+template<typename Point, typename Segment, typename Strategy>
+struct point_to_segment
+{
+    static inline typename strategy::distance::services::return_type
+        <
+            Strategy,
+            Point,
+            typename point_type<Segment>::type
+        >::type
+    apply(Point const& point, Segment const& segment, Strategy const& )
+    {
+        typename detail::distance::default_ps_strategy
+            <
+                Point,
+                typename point_type<Segment>::type,
+                Strategy
+            >::type segment_strategy;
+
+        typename point_type<Segment>::type p[2];
+        geometry::detail::assign_point_from_index<0>(segment, p[0]);
+        geometry::detail::assign_point_from_index<1>(segment, p[1]);
+        return segment_strategy.apply(point, p[0], p[1]);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// Point-segment version 1, with point-point strategy
+template <typename Point, typename Segment, typename Strategy>
+struct distance
+<
+    Point, Segment, Strategy,
+    point_tag, segment_tag, strategy_tag_distance_point_point,
+    false
+> : detail::distance::point_to_segment<Point, Segment, Strategy>
+{};
+
+
+// Point-line version 1, where point-point strategy is specified
+template <typename Point, typename Linestring, typename Strategy>
+struct distance
+<
+    Point, Linestring, Strategy,
+    point_tag, linestring_tag, strategy_tag_distance_point_point,
+    false
+>
+{
+
+    static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
+    apply(Point const& point,
+          Linestring const& linestring,
+          Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+                    <
+                        Point,
+                        typename point_type<Linestring>::type,
+                        Strategy
+                    >::type ps_strategy_type;
+
+        return detail::distance::point_to_range
+            <
+                Point, Linestring, closed, ps_strategy_type
+            >::apply(point, linestring, ps_strategy_type());
+    }
+};
+
+
+// Point-ring , where point-point strategy is specified
+template <typename Point, typename Ring, typename Strategy>
+struct distance
+<
+    Point, Ring, Strategy,
+    point_tag, ring_tag, strategy_tag_distance_point_point,
+    false
+>
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Ring>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point,
+            Ring const& ring,
+            Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+            <
+                Point,
+                typename point_type<Ring>::type,
+                Strategy
+            >::type ps_strategy_type;
+
+        std::pair<return_type, bool>
+            dc = detail::distance::point_to_ring
+            <
+                Point, Ring,
+                geometry::closure<Ring>::value,
+                ps_strategy_type
+            >::apply(point, ring, ps_strategy_type());
+
+        return dc.second ? return_type(0) : dc.first;
+    }
+};
+
+
+// Point-polygon , where point-point strategy is specified
+template <typename Point, typename Polygon, typename Strategy>
+struct distance
+<
+    Point, Polygon, Strategy,
+    point_tag, polygon_tag, strategy_tag_distance_point_point,
+    false
+>
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Polygon>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point,
+            Polygon const& polygon,
+            Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+            <
+                Point,
+                typename point_type<Polygon>::type,
+                Strategy
+            >::type ps_strategy_type;
+
+        std::pair<return_type, bool>
+            dc = detail::distance::point_to_polygon
+            <
+                Point, Polygon,
+                geometry::closure<Polygon>::value,
+                ps_strategy_type
+            >::apply(point, polygon, ps_strategy_type());
+
+        return dc.second ? return_type(0) : dc.first;
+    }
+};
+
+
+
+
+namespace splitted_dispatch
+{
+
+
+template
+<
+    typename Point,
+    typename MultiGeometry,
+    typename MultiGeometryTag,
+    typename Strategy
+>
+struct distance_single_to_multi
+    <
+        Point, MultiGeometry, Strategy,
+        point_tag, MultiGeometryTag,
+        strategy_tag_distance_point_point
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<MultiGeometry>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point,
+                                    MultiGeometry const& multigeometry,
+                                    Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+            <
+                Point,
+                typename point_type<MultiGeometry>::type,
+                Strategy
+            >::type ps_strategy_type;
+    
+        return distance_single_to_multi
+            <
+                Point, MultiGeometry, ps_strategy_type,
+                point_tag, MultiGeometryTag,
+                strategy_tag_distance_point_segment
+            >::apply(point, multigeometry, ps_strategy_type());
+    }
+};
+
+
+template
+<
+    typename Geometry,
+    typename MultiPoint,
+    typename GeometryTag,
+    typename Strategy
+>
+struct distance_single_to_multi
+    <
+        Geometry, MultiPoint, Strategy,
+        GeometryTag, multi_point_tag,
+        strategy_tag_distance_point_point
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<MultiPoint>::type,
+            typename point_type<Geometry>::type
+        >::type return_type;
+
+    static inline return_type apply(Geometry const& geometry,
+                                    MultiPoint const& multipoint,
+                                    Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+            <
+                typename point_type<MultiPoint>::type,
+                typename point_type<Geometry>::type,
+                Strategy
+            >::type ps_strategy_type;
+    
+        return distance_single_to_multi
+            <
+                Geometry, MultiPoint, ps_strategy_type,
+                GeometryTag, multi_point_tag,
+                strategy_tag_distance_point_segment
+            >::apply(geometry, multipoint, ps_strategy_type());
+    }
+};
+
+
+template
+<
+    typename MultiPoint,
+    typename MultiGeometry,
+    typename MultiGeometryTag,
+    typename Strategy
+>
+struct distance_multi_to_multi
+    <
+        MultiPoint, MultiGeometry, Strategy,
+        multi_point_tag, MultiGeometryTag,
+        strategy_tag_distance_point_point
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<MultiPoint>::type, 
+            typename point_type<MultiGeometry>::type
+        >::type return_type;
+
+    static inline return_type apply(MultiPoint const& multipoint,
+                                    MultiGeometry const& multigeometry,
+                                    Strategy const&)
+    {
+        typedef typename detail::distance::default_ps_strategy
+            <
+                typename point_type<MultiPoint>::type,
+                typename point_type<MultiGeometry>::type,
+                Strategy
+            >::type ps_strategy_type;
+    
+        return distance_multi_to_multi
+            <
+                MultiPoint, MultiGeometry, ps_strategy_type,
+                multi_point_tag, MultiGeometryTag,
+                strategy_tag_distance_point_segment
+            >::apply(multipoint, multigeometry, ps_strategy_type());
+    }
+};
+
+
+} // namespace splitted_dispatch
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BACKWARD_COMPATIBILITY_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp b/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
new file mode 100644
index 000000000..57c908d38
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
@@ -0,0 +1,58 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BOX_TO_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BOX_TO_BOX_HPP
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Box1, typename Box2, typename Strategy>
+struct distance
+    <
+        Box1, Box2, Strategy, box_tag, box_tag,
+        strategy_tag_distance_box_box, false
+    >
+{
+    static inline typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Box1>::type,
+            typename point_type<Box2>::type
+        >::type
+    apply(Box1 const& box1, Box2 const& box2, Strategy const& strategy)
+    {
+        boost::ignore_unused_variable_warning(strategy);
+        return strategy.apply(box1, box2);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_BOX_TO_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp b/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
new file mode 100644
index 000000000..3b79f82a3
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/default_strategies.hpp
@@ -0,0 +1,143 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_DEFAULT_STRATEGIES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_DEFAULT_STRATEGIES_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/reverse_dispatch.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+
+// Helper metafunction for default strategy retrieval
+template
+<
+    typename Geometry1,
+    typename Geometry2 = Geometry1,
+    typename Tag1 = typename tag_cast
+        <
+            typename tag<Geometry1>::type, pointlike_tag
+        >::type,
+    typename Tag2 = typename tag_cast
+        <
+            typename tag<Geometry2>::type, pointlike_tag
+        >::type,
+    bool Reverse = geometry::reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct default_strategy
+    : strategy::distance::services::default_strategy
+          <
+              point_tag, segment_tag,
+              typename point_type<Geometry1>::type,
+              typename point_type<Geometry2>::type
+          >
+{};
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename Tag1,
+    typename Tag2
+>
+struct default_strategy<Geometry1, Geometry2, Tag1, Tag2, true>
+    : default_strategy<Geometry2, Geometry1, Tag2, Tag1, false>
+{};
+
+
+template <typename Pointlike1, typename Pointlike2>
+struct default_strategy
+    <
+        Pointlike1, Pointlike2,
+        pointlike_tag, pointlike_tag, false
+    > : strategy::distance::services::default_strategy
+          <
+              point_tag, point_tag,
+              typename point_type<Pointlike1>::type,
+              typename point_type<Pointlike2>::type
+          >
+{};
+
+
+template <typename Pointlike, typename Box>
+struct default_strategy<Pointlike, Box, pointlike_tag, box_tag, false>
+    : strategy::distance::services::default_strategy
+          <
+              point_tag, box_tag,
+              typename point_type<Pointlike>::type,
+              typename point_type<Box>::type,
+              cartesian_tag,
+              cartesian_tag,
+              void
+          >
+{};
+
+
+template <typename Box1, typename Box2>
+struct default_strategy<Box1, Box2, box_tag, box_tag, false>
+    : strategy::distance::services::default_strategy
+          <
+              box_tag, box_tag,
+              typename point_type<Box1>::type,
+              typename point_type<Box2>::type,
+              cartesian_tag,
+              cartesian_tag,
+              void
+          >
+{};
+
+
+
+// Helper metafunction for default point-segment strategy retrieval
+template <typename Geometry1, typename Geometry2, typename Strategy>
+struct default_ps_strategy
+    : strategy::distance::services::default_strategy
+          <
+              point_tag, segment_tag,
+              typename point_type<Geometry1>::type,
+              typename point_type<Geometry2>::type,
+              typename cs_tag<typename point_type<Geometry1>::type>::type,
+              typename cs_tag<typename point_type<Geometry2>::type>::type,
+              Strategy
+          >
+{};
+
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_DEFAULT_STRATEGIES_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp b/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp
new file mode 100644
index 000000000..078aba793
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp
@@ -0,0 +1,369 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_GEOMETRY_TO_GEOMETRY_RTREE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_GEOMETRY_TO_GEOMETRY_RTREE_HPP
+
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
+
+#include <boost/assert.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/iterators/point_iterator.hpp>
+#include <boost/geometry/iterators/has_one_element.hpp>
+
+#include <boost/geometry/algorithms/for_each.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/index/rtree.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+
+template
+<
+    typename RTreePoint,
+    typename Geometry,
+    typename Strategy
+>
+class point_range_to_geometry_rtree
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            RTreePoint,
+            typename point_type<Geometry>::type
+        >::type comparable_return_type;
+
+    typedef index::rtree<RTreePoint, index::linear<8> > r_tree;
+
+    // functor to evaluate minimum comparable distance
+    struct minimum_comparable_distance_evaluator
+    {
+        r_tree const& m_r_tree;
+        comparable_strategy const& m_cstrategy;
+        bool m_first;
+        comparable_return_type m_min_cd;
+
+        minimum_comparable_distance_evaluator
+        (r_tree const& r_tree, comparable_strategy const& cstrategy)
+            : m_r_tree(r_tree)
+            , m_cstrategy(cstrategy)
+            , m_first(true)
+            , m_min_cd()
+        {}
+
+        template <typename QueryGeometry>
+        inline void operator()(QueryGeometry const& query_geometry)
+        {
+            typename r_tree::value_type t_v;
+            std::size_t n =
+                m_r_tree.query(index::nearest(query_geometry, 1), &t_v);
+
+            BOOST_ASSERT( n > 0 );
+
+            comparable_return_type cd = dispatch::distance
+                <
+                    typename r_tree::value_type,
+                    QueryGeometry,
+                    comparable_strategy
+                >::apply(t_v, query_geometry, m_cstrategy);
+
+            if ( m_first || cd < m_min_cd )
+            {
+                m_first = false;
+                m_min_cd = cd;
+            }
+        }
+    };
+
+
+
+    // class to choose between for_each_point and for_each_segment
+    template <typename G, typename Tag = typename tag<G>::type>
+    struct for_each_selector
+    {
+        typedef dispatch::for_each_segment<G> type;
+    };
+
+    template <typename MultiPoint>
+    struct for_each_selector<MultiPoint, multi_point_tag>
+    {
+        typedef dispatch::for_each_point<MultiPoint> type;
+    };
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            RTreePoint,
+            typename point_type<Geometry>::type
+        >::type return_type;
+
+    template <typename PointIterator>
+    static inline return_type apply(PointIterator points_first,
+                                    PointIterator points_beyond,
+                                    Geometry const& geometry,
+                                    Strategy const& strategy)
+    {
+        BOOST_ASSERT( points_first != points_beyond );
+
+        if ( geometry::has_one_element(points_first, points_beyond) )
+        {
+            return dispatch::distance
+                <
+                    typename std::iterator_traits<PointIterator>::value_type,
+                    Geometry,
+                    Strategy
+                >::apply(*points_first, geometry, strategy);
+        }
+
+        // create -- packing algorithm
+        r_tree rt(points_first, points_beyond);
+
+        minimum_comparable_distance_evaluator
+            functor(rt,
+                    strategy::distance::services::get_comparable
+                        <
+                            Strategy
+                        >::apply(strategy));
+
+        for_each_selector<Geometry>::type::apply(geometry, functor);
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, RTreePoint, Geometry
+            >::apply(functor.m_min_cd);
+    }
+};
+
+
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename Strategy
+>
+class geometry_to_geometry_rtree
+{
+    // the following works with linear geometries seen as ranges of points
+    //
+    // we compute the r-tree for the points of one range and then,
+    // compute nearest points for the segments of the other,
+    // ... and ...
+    // vice versa.
+
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type return_type;   
+
+    static inline return_type apply(Geometry1 const& geometry1,
+                                    Geometry2 const& geometry2,
+                                    Strategy const& strategy,
+                                    bool check_intersection = true)
+    {
+        point_iterator<Geometry1 const> first1 = points_begin(geometry1);
+        point_iterator<Geometry1 const> beyond1 = points_end(geometry1);
+        point_iterator<Geometry2 const> first2 = points_begin(geometry2);
+        point_iterator<Geometry2 const> beyond2 = points_end(geometry2);
+        
+        if ( geometry::has_one_element(first1, beyond1) )
+        {
+            return dispatch::distance
+                <
+                    typename point_type<Geometry1>::type,
+                    Geometry2,
+                    Strategy
+                >::apply(*first1, geometry2, strategy);
+        }
+
+        if ( geometry::has_one_element(first2, beyond2) )
+        {
+            return dispatch::distance
+                <
+                    typename point_type<Geometry2>::type,
+                    Geometry1,
+                    Strategy
+                >::apply(*first2, geometry1, strategy);
+        }
+
+        if ( check_intersection && geometry::intersects(geometry1, geometry2) )
+        {
+            return return_type(0);
+        }
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        comparable_return_type cdist1 = point_range_to_geometry_rtree
+            <
+                typename point_type<Geometry1>::type,
+                Geometry2,
+                comparable_strategy
+            >::apply(first1, beyond1, geometry2, cstrategy);
+
+        comparable_return_type cdist2 = point_range_to_geometry_rtree
+            <
+                typename point_type<Geometry2>::type,
+                Geometry1,
+                comparable_strategy
+            >::apply(first2, beyond2, geometry1, cstrategy);
+
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Geometry1, Geometry2
+            >::apply( (std::min)(cdist1, cdist2) );
+    }
+};
+
+
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Linestring1, typename Linestring2, typename Strategy>
+struct distance
+    <
+        Linestring1, Linestring2, Strategy,
+        linestring_tag, linestring_tag, 
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::geometry_to_geometry_rtree
+        <
+            Linestring1, Linestring2, Strategy
+        >
+{};
+
+
+
+template <typename Linestring, typename Polygon, typename Strategy>
+struct distance
+    <
+        Linestring, Polygon, Strategy,
+        linestring_tag, polygon_tag, 
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::geometry_to_geometry_rtree
+        <
+            Linestring, Polygon, Strategy
+        >
+{};
+
+
+
+template <typename Linestring, typename Ring, typename Strategy>
+struct distance
+    <
+        Linestring, Ring, Strategy,
+        linestring_tag, ring_tag, 
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::geometry_to_geometry_rtree
+        <
+            Linestring, Ring, Strategy
+        >
+{};
+
+
+
+template <typename Polygon1, typename Polygon2, typename Strategy>
+struct distance
+    <
+        Polygon1, Polygon2, Strategy,
+        polygon_tag, polygon_tag,
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::geometry_to_geometry_rtree
+        <
+            Polygon1, Polygon2, Strategy
+        >
+{};
+
+
+
+template <typename Polygon, typename Ring, typename Strategy>
+struct distance
+    <
+        Polygon, Ring, Strategy,
+        polygon_tag, ring_tag,
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::geometry_to_geometry_rtree
+        <
+            Polygon, Ring, Strategy
+        >
+{};
+
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_GEOMETRY_TO_GEOMETRY_RTREE_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/implementation.hpp b/include/boost/geometry/algorithms/detail/distance/implementation.hpp
new file mode 100644
index 000000000..45f40bbb3
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/implementation.hpp
@@ -0,0 +1,38 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_IMPLEMENTATION_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_IMPLEMENTATION_HPP
+
+// the implementation details
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
+#include <boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp>
+#include <boost/geometry/algorithms/detail/distance/segment_to_box.hpp>
+#include <boost/geometry/algorithms/detail/distance/polygon_to_segment_or_box.hpp>
+#include <boost/geometry/algorithms/detail/distance/box_to_box.hpp>
+#include <boost/geometry/algorithms/detail/distance/single_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/multi_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp>
+#include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
+#include <boost/geometry/algorithms/detail/distance/segment_to_segment.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/backward_compatibility.hpp>
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_IMPLEMENTATION_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/interface.hpp b/include/boost/geometry/algorithms/detail/distance/interface.hpp
new file mode 100644
index 000000000..ace6df8ee
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/interface.hpp
@@ -0,0 +1,510 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_INTERFACE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_INTERFACE_HPP
+
+#include <boost/concept_check.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
+
+#include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/default_distance_result.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/util/compress_variant.hpp>
+#include <boost/geometry/util/transform_variant.hpp>
+#include <boost/geometry/util/combine_if.hpp>
+//#include <boost/geometry/util/is_implemented.hpp>
+
+#include <boost/mpl/always.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/vector.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// If reversal is needed, perform it
+template
+<
+    typename Geometry1, typename Geometry2, typename Strategy,
+    typename Tag1, typename Tag2, typename StrategyTag
+>
+struct distance
+<
+    Geometry1, Geometry2, Strategy,
+    Tag1, Tag2, StrategyTag,
+    true
+>
+    : distance<Geometry2, Geometry1, Strategy, Tag2, Tag1, StrategyTag, false>
+{
+    typedef typename strategy::distance::services::return_type
+                     <
+                         Strategy,
+                         typename point_type<Geometry2>::type,
+                         typename point_type<Geometry1>::type
+                     >::type return_type;
+
+    static inline return_type apply(
+        Geometry1 const& g1,
+        Geometry2 const& g2,
+        Strategy const& strategy)
+    {
+        return distance
+            <
+                Geometry2, Geometry1, Strategy,
+                Tag2, Tag1, StrategyTag,
+                false
+            >::apply(g2, g1, strategy);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_strategy {
+
+namespace result_of
+{
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+struct distance
+    : strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >
+{};
+
+template <typename Geometry1, typename Geometry2>
+struct distance<Geometry1, Geometry2, default_strategy>
+    : default_distance_result
+        <
+            Geometry1, Geometry2
+        >
+{};
+
+} // namespace result_of
+
+
+struct distance
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline typename result_of::distance<Geometry1, Geometry2, Strategy>::type
+    apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        return dispatch::distance<Geometry1, Geometry2, Strategy>::apply(geometry1, geometry2, strategy);
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline typename result_of::distance<Geometry1, Geometry2, default_strategy>::type
+    apply(Geometry1 const& geometry1, Geometry2 const& geometry2, default_strategy)
+    {
+        typedef typename detail::distance::default_strategy
+            <
+                Geometry1, Geometry2
+            >::type strategy_type;
+
+        return dispatch::distance<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant
+{
+
+namespace result_of
+{
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+struct distance
+    : resolve_strategy::result_of::distance
+        <
+            Geometry1,
+            Geometry2,
+            Strategy
+        >
+{};
+
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T), typename Strategy>
+struct distance<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Strategy>
+{
+    // A set of all variant type combinations that are compatible and implemented
+    typedef typename util::combine_if<
+        typename mpl::vector1<Geometry1>,
+        typename variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+        // Here we want should remove most of the combinations that are not valid
+        // mostly to limit the size of the resulting MPL set.
+        // But is_implementedn is not ready for prime time
+        //
+        // util::is_implemented2<mpl::_1, mpl::_2, dispatch::distance<mpl::_1, mpl::_2> >
+        mpl::always<mpl::true_>
+    >::type possible_input_types;
+
+    // The (possibly variant) result type resulting from these combinations
+    typedef typename compress_variant<
+        typename transform_variant<
+            possible_input_types,
+            resolve_strategy::result_of::distance<
+                point_type<mpl::first<mpl::_> >,
+                point_type<mpl::second<mpl::_> >,
+                Strategy
+            >,
+            mpl::back_inserter<mpl::vector0<> >
+        >::type
+    >::type type;
+};
+
+
+// Distance arguments are commutative
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2, typename Strategy>
+struct distance<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2, Strategy>
+    : public distance<Geometry2, variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Strategy>
+{};
+
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Strategy>
+struct distance<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Strategy>
+{
+    // A set of all variant type combinations that are compatible and implemented
+    typedef typename util::combine_if
+        <
+            typename variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+            typename variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+            // Here we want to try to remove most of the combinations that are not valid
+            // mostly to limit the size of the resulting MPL vector.
+            // But is_implementedn is not ready for prime time
+            //
+            // util::is_implemented2<mpl::_1, mpl::_2, dispatch::distance<mpl::_1, mpl::_2> >
+            mpl::always<mpl::true_>
+        >::type possible_input_types;
+
+    // The (possibly variant) result type resulting from these combinations
+    typedef typename compress_variant<
+        typename transform_variant<
+            possible_input_types,
+            resolve_strategy::result_of::distance<
+                point_type<mpl::first<mpl::_> >,
+                point_type<mpl::second<mpl::_> >,
+                Strategy
+            >,
+            mpl::back_inserter<mpl::vector0<> >
+        >::type
+    >::type type;
+};
+
+} // namespace result_of
+
+
+template <typename Geometry1, typename Geometry2>
+struct distance
+{
+    template <typename Strategy>
+    static inline typename result_of::distance<Geometry1, Geometry2, Strategy>::type
+    apply(
+        const Geometry1& geometry1,
+        const Geometry2& geometry2,
+        Strategy const& strategy)
+    {
+        return resolve_strategy::distance::apply(geometry1, geometry2, strategy);
+    }
+};
+
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct distance<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    template <typename Strategy>
+    struct visitor: static_visitor
+        <
+            typename result_of::distance
+                <
+                    variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+                    Geometry2,
+                    Strategy
+                >::type
+        >
+    {
+        Geometry2 const& m_geometry2;
+        Strategy const& m_strategy;
+
+        visitor(Geometry2 const& geometry2,
+                Strategy const& strategy)
+            : m_geometry2(geometry2),
+              m_strategy(strategy)
+        {}
+
+        template <typename Geometry1>
+        typename result_of::distance<Geometry1, Geometry2, Strategy>::type
+        operator()(Geometry1 const& geometry1) const
+        {
+            return distance
+                <
+                    Geometry1,
+                    Geometry2
+                >::template apply
+                <
+                    Strategy
+                >(geometry1, m_geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline typename result_of::distance
+        <
+            variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+            Geometry2,
+            Strategy
+        >::type
+    apply(variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2,
+          Strategy const& strategy)
+    {
+        return apply_visitor(visitor<Strategy>(geometry2, strategy), geometry1);
+    }
+};
+
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct distance<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Strategy>
+    struct visitor: static_visitor
+        <
+            typename result_of::distance
+                <
+                    Geometry1,
+                    variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+                    Strategy
+                >::type
+        >
+    {
+        Geometry1 const& m_geometry1;
+        Strategy const& m_strategy;
+
+        visitor(Geometry1 const& geometry1,
+                Strategy const& strategy)
+            : m_geometry1(geometry1),
+              m_strategy(strategy)
+        {}
+
+        template <typename Geometry2>
+        typename result_of::distance<Geometry1, Geometry2, Strategy>::type
+        operator()(Geometry2 const& geometry2) const
+        {
+            return distance
+                <
+                    Geometry1,
+                    Geometry2
+                >::template apply
+                <
+                    Strategy
+                >(m_geometry1, geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline typename result_of::distance
+        <
+            Geometry1,
+            variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+            Strategy
+        >::type
+    apply(
+        Geometry1 const& geometry1,
+        const variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry2,
+        Strategy const& strategy)
+    {
+        return apply_visitor(visitor<Strategy>(geometry1, strategy), geometry2);
+    }
+};
+
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename A), BOOST_VARIANT_ENUM_PARAMS(typename B)>
+struct distance<variant<BOOST_VARIANT_ENUM_PARAMS(A)>, variant<BOOST_VARIANT_ENUM_PARAMS(B)> >  
+{
+    template <typename Strategy>
+    struct visitor: static_visitor
+        <
+            typename result_of::distance
+                <
+                    variant<BOOST_VARIANT_ENUM_PARAMS(A)>,
+                    variant<BOOST_VARIANT_ENUM_PARAMS(B)>,
+                    Strategy
+                >
+                ::type
+        >
+    {
+        Strategy const& m_strategy;
+
+        visitor(Strategy const& strategy)
+            : m_strategy(strategy)
+        {}
+
+        template <typename Geometry1, typename Geometry2>
+        typename result_of::distance<Geometry1, Geometry2, Strategy>::type
+        operator()(Geometry1 const& geometry1, Geometry2 const& geometry2) const
+        {
+            return distance
+                <
+                    Geometry1,
+                    Geometry2
+                >::template apply
+                <
+                    Strategy
+                >(geometry1, geometry2, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline typename result_of::distance
+        <
+            variant<BOOST_VARIANT_ENUM_PARAMS(A)>,
+            variant<BOOST_VARIANT_ENUM_PARAMS(B)>,
+            Strategy
+        >
+        ::type
+    apply(
+        const variant<BOOST_VARIANT_ENUM_PARAMS(A)>& geometry1,
+        const variant<BOOST_VARIANT_ENUM_PARAMS(B)>& geometry2,
+        Strategy const& strategy)
+    {
+        return apply_visitor(visitor<Strategy>(strategy), geometry1, geometry2);
+    }
+};
+
+} // namespace resolve_variant
+
+
+/*!
+\brief \brief_calc2{distance} \brief_strategy
+\ingroup distance
+\details
+\details \details_calc{area}. \brief_strategy. \details_strategy_reasons
+
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
+\tparam Strategy \tparam_strategy{Distance}
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\param strategy \param_strategy{distance}
+\return \return_calc{distance}
+\note The strategy can be a point-point strategy. In case of distance point-line/point-polygon
+    it may also be a point-segment strategy.
+
+\qbk{distinguish,with strategy}
+
+\qbk{
+[heading Available Strategies]
+\* [link geometry.reference.strategies.strategy_distance_pythagoras Pythagoras (cartesian)]
+\* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
+\* [link geometry.reference.strategies.strategy_distance_cross_track Cross track (spherical\, point-to-segment)]
+\* [link geometry.reference.strategies.strategy_distance_projected_point Projected point (cartesian\, point-to-segment)]
+\* more (currently extensions): Vincenty\, Andoyer (geographic)
+}
+ */
+
+/*
+Note, in case of a Compilation Error:
+if you get:
+ - "Failed to specialize function template ..."
+ - "error: no matching function for call to ..."
+for distance, it is probably so that there is no specialization
+for return_type<...> for your strategy.
+*/
+template <typename Geometry1, typename Geometry2, typename Strategy>
+inline typename resolve_variant::result_of::distance
+    <
+        Geometry1,
+        Geometry2,
+        Strategy
+    >::type
+distance(Geometry1 const& geometry1,
+         Geometry2 const& geometry2,
+         Strategy const& strategy)
+{
+    concept::check<Geometry1 const>();
+    concept::check<Geometry2 const>();
+
+    detail::throw_on_empty_input(geometry1);
+    detail::throw_on_empty_input(geometry2);
+
+    return resolve_variant::distance
+               <
+                   Geometry1,
+                   Geometry2
+               >::apply(geometry1, geometry2, strategy);
+}
+
+
+/*!
+\brief \brief_calc2{distance}
+\ingroup distance
+\details The default strategy is used, corresponding to the coordinate system of the geometries
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
+\return \return_calc{distance}
+
+\qbk{[include reference/algorithms/distance.qbk]}
+ */
+template <typename Geometry1, typename Geometry2>
+inline typename resolve_variant::result_of::distance
+    <
+        Geometry1,
+        Geometry2,
+        default_strategy
+    >::type
+distance(Geometry1 const& geometry1,
+         Geometry2 const& geometry2)
+{
+    concept::check<Geometry1 const>();
+    concept::check<Geometry2 const>();
+
+    return distance(geometry1, geometry2, default_strategy());
+}
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_INTERFACE_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp b/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp
new file mode 100644
index 000000000..29ceb96be
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/multi_to_multi.hpp
@@ -0,0 +1,256 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_MULTI_TO_MULTI_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_MULTI_TO_MULTI_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/single_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+
+template <typename Multi1, typename Multi2, typename Strategy>
+class distance_multi_to_multi_generic
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            typename point_type<Multi1>::type,
+            typename point_type<Multi2>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Multi1>::type,
+            typename point_type<Multi2>::type
+        >::type return_type;
+
+    static inline return_type apply(Multi1 const& multi1,
+                Multi2 const& multi2, Strategy const& strategy)
+    {
+        comparable_return_type min_cdist = comparable_return_type();
+        bool first = true;
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        for(typename range_iterator<Multi1 const>::type it = boost::begin(multi1);
+                it != boost::end(multi1);
+                ++it, first = false)
+        {
+            comparable_return_type cdist =
+                dispatch::splitted_dispatch::distance_single_to_multi
+                    <
+                        typename range_value<Multi1>::type,
+                        Multi2,
+                        comparable_strategy,
+                        typename tag<typename range_value<Multi1>::type>::type,
+                        typename tag<Multi2>::type,
+                        typename strategy::distance::services::tag
+                            <
+                                comparable_strategy
+                            >::type
+                    >::apply(*it, multi2, cstrategy);
+            if (first || cdist < min_cdist)
+            {
+                min_cdist = cdist;
+            }
+            if ( geometry::math::equals(min_cdist, 0) )
+            {
+                break;
+            }
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy,
+                Strategy,
+                Multi1,
+                Multi2
+            >::apply(min_cdist);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+namespace splitted_dispatch
+{
+
+
+template
+<
+    typename MultiGeometry1,
+    typename MultiGeometry2,
+    typename Strategy,
+    typename Tag1,
+    typename Tag2,
+    typename StrategyTag
+>
+struct distance_multi_to_multi
+    : not_implemented<MultiGeometry1, MultiGeometry2>
+{};
+
+
+
+template
+<
+    typename MultiPoint,
+    typename MultiPolygon,
+    typename Strategy
+>
+struct distance_multi_to_multi
+    <
+        MultiPoint, MultiPolygon, Strategy,
+        multi_point_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_multi_generic
+        <
+            MultiPoint, MultiPolygon, Strategy
+        >
+{};
+
+
+
+template
+<
+    typename MultiLinestring1,
+    typename MultiLinestring2,
+    typename Strategy
+>
+struct distance_multi_to_multi
+    <
+        MultiLinestring1, MultiLinestring2, Strategy,
+        multi_linestring_tag, multi_linestring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            MultiLinestring1, MultiLinestring2, Strategy
+        >
+{};
+
+
+template
+<
+    typename MultiLinestring,
+    typename MultiPolygon,
+    typename Strategy
+>
+struct distance_multi_to_multi
+    <
+        MultiLinestring, MultiPolygon, Strategy,
+        multi_linestring_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            MultiLinestring, MultiPolygon, Strategy
+        >
+{};
+
+
+template <typename MultiPolygon1, typename MultiPolygon2, typename Strategy>
+struct distance_multi_to_multi
+    <
+        MultiPolygon1, MultiPolygon2, Strategy,
+        multi_polygon_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            MultiPolygon1, MultiPolygon2, Strategy
+        >
+{};
+
+
+} // namespace splitted_dispatch
+
+
+
+
+template
+<
+    typename MultiGeometry1,
+    typename MultiGeometry2,
+    typename Strategy,
+    typename StrategyTag
+>
+struct distance
+    <
+        MultiGeometry1, MultiGeometry2, Strategy, multi_tag, multi_tag,
+        StrategyTag, false
+    > : splitted_dispatch::distance_multi_to_multi
+        <
+            MultiGeometry1, MultiGeometry2, Strategy,
+            typename geometry::tag<MultiGeometry1>::type,
+            typename geometry::tag<MultiGeometry2>::type,
+            StrategyTag
+        >
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_MULTI_TO_MULTI_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp b/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp
new file mode 100644
index 000000000..1774fab72
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/multipoint_to_range.hpp
@@ -0,0 +1,183 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_MULTIPOINT_TO_RANGE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_MULTIPOINT_TO_RANGE_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/single_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/multi_to_multi.hpp>
+#include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/iterators/point_iterator.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+template <typename MultiPoint1, typename MultiPoint2, typename Strategy>
+struct multipoint_to_multipoint
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<MultiPoint1>::type,
+            typename point_type<MultiPoint2>::type
+        >::type return_type;   
+
+    static inline return_type apply(MultiPoint1 const& multipoint1,
+                                    MultiPoint2 const& multipoint2,
+                                    Strategy const& strategy)
+    {
+        if ( boost::size(multipoint1) > boost::size(multipoint2) )
+
+        {
+            return multipoint_to_multipoint
+                <
+                    MultiPoint2, MultiPoint1, Strategy
+                >::apply(multipoint2, multipoint1, strategy);
+        }
+
+        return point_range_to_geometry_rtree
+            <
+                typename point_type<MultiPoint1>::type,
+                MultiPoint2,
+                Strategy
+            >::apply(points_begin(multipoint1), points_end(multipoint1),
+                     multipoint2, strategy);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+namespace splitted_dispatch
+{
+
+// specializations of distance_single_to_multi for various geometry combinations
+
+template<typename Linestring, typename MultiPoint, typename Strategy>
+struct distance_single_to_multi
+    <
+        Linestring, MultiPoint, Strategy,
+        linestring_tag, multi_point_tag,
+        strategy_tag_distance_point_segment
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Linestring>::type,
+            typename point_type<MultiPoint>::type
+        >::type return_type;   
+
+    static inline return_type apply(Linestring const& linestring,
+                                    MultiPoint const& multipoint,
+                                    Strategy const& strategy)
+    {
+        return detail::distance::point_range_to_geometry_rtree
+            <
+                typename point_type<MultiPoint>::type,
+                Linestring,
+                Strategy
+            >::apply(geometry::points_begin(multipoint),
+                     geometry::points_end(multipoint),
+                     linestring, strategy);
+        
+    }
+};
+
+
+
+
+// specializations of distance_multi_to_multi for various geometry combinations
+
+
+template <typename MultiPoint1, typename MultiPoint2, typename Strategy>
+struct distance_multi_to_multi
+    <
+        MultiPoint1, MultiPoint2, Strategy,
+        multi_point_tag, multi_point_tag,
+        strategy_tag_distance_point_point
+    > : detail::distance::multipoint_to_multipoint
+        <
+            MultiPoint1, MultiPoint2, Strategy
+        >
+{};
+
+
+
+template
+<
+    typename MultiPoint,
+    typename MultiLinestring,
+    typename Strategy
+>
+struct distance_multi_to_multi
+    <
+        MultiPoint, MultiLinestring, Strategy,
+        multi_point_tag, multi_linestring_tag,
+        strategy_tag_distance_point_segment
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<MultiPoint>::type,
+            typename point_type<MultiLinestring>::type
+        >::type return_type;   
+
+    static inline return_type apply(MultiPoint const& multipoint,
+                                    MultiLinestring const& multilinestring,
+                                    Strategy const& strategy)
+    {
+        return detail::distance::point_range_to_geometry_rtree
+            <
+                typename point_type<MultiPoint>::type,
+                MultiLinestring,
+                Strategy
+            >::apply(geometry::points_begin(multipoint),
+                     geometry::points_end(multipoint),
+                     multilinestring, strategy);
+        
+    }
+};
+
+} // namespace splitted_dispatch
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_ALTERNATE_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp b/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
new file mode 100644
index 000000000..a46f1fe7d
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
@@ -0,0 +1,442 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POINT_TO_GEOMETRY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POINT_TO_GEOMETRY_HPP
+
+#include <utility>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/interior_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+
+#include <boost/geometry/views/closeable_view.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+template <typename P1, typename P2, typename Strategy>
+struct point_to_point
+{
+    static inline
+    typename strategy::distance::services::return_type<Strategy, P1, P2>::type
+    apply(P1 const& p1, P2 const& p2, Strategy const& strategy)
+    {
+        boost::ignore_unused_variable_warning(strategy);
+        return strategy.apply(p1, p2);
+    }
+};
+
+
+template
+<
+    typename Point,
+    typename Range,
+    closure_selector Closure,
+    typename Strategy
+>
+class point_to_range
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            Point,
+            typename boost::range_value<Range>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            Point,
+            typename boost::range_value<Range>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point, Range const& range,
+                                    Strategy const& strategy)
+    {
+        comparable_strategy c_strategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        comparable_return_type const zero = comparable_return_type(0);
+
+        if (boost::size(range) == 0)
+        {
+            return zero;
+        }
+
+        typedef typename closeable_view<Range const, Closure>::type view_type;
+
+        view_type view(range);
+
+        // line of one point: return point distance
+        typedef typename boost::range_iterator<view_type const>::type iterator_type;
+        iterator_type it = boost::begin(view);
+        iterator_type prev = it++;
+        if (it == boost::end(view))
+        {
+            return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Point,
+                typename boost::range_value<Range>::type
+            >::apply( c_strategy.apply(point,
+                                       *boost::begin(view),
+                                       *boost::begin(view)) );
+        }
+
+        // start with first segment distance
+        comparable_return_type cd = c_strategy.apply(point, *prev, *it);
+
+        // check if other segments are closer
+        for (++prev, ++it; it != boost::end(view); ++prev, ++it)
+        {
+            comparable_return_type cds = c_strategy.apply(point, *prev, *it);
+            if (geometry::math::equals(cds, zero))
+            {
+                return strategy::distance::services::comparable_to_regular
+                    <
+                        comparable_strategy,
+                        Strategy,
+                        Point,
+                        typename boost::range_value<Range>::type
+                    >::apply(zero);
+            }
+            else if (cds < cd)
+            {
+                cd = cds;
+            }
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy,
+                Strategy,
+                Point,
+                typename boost::range_value<Range>::type
+            >::apply(cd);
+    }
+};
+
+
+template
+<
+    typename Point,
+    typename Ring,
+    closure_selector Closure,
+    typename Strategy
+>
+struct point_to_ring
+{
+    typedef std::pair
+        <
+            typename strategy::distance::services::return_type
+                <
+                    Strategy, Point, typename point_type<Ring>::type
+                >::type,
+            bool
+        > distance_containment;
+
+    static inline distance_containment apply(Point const& point,
+                                             Ring const& ring,
+                                             Strategy const& strategy)
+    {
+        return distance_containment
+            (
+                point_to_range
+                    <
+                        Point,
+                        Ring,
+                        Closure,
+                        Strategy
+                    >::apply(point, ring, strategy),
+                geometry::within(point, ring)
+            );
+    }
+};
+
+
+
+template
+<
+    typename Point,
+    typename Polygon,
+    closure_selector Closure,
+    typename Strategy
+>
+class point_to_polygon
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy, Point, typename point_type<Polygon>::type
+        >::type comparable_return_type;
+
+    typedef std::pair
+        <
+            comparable_return_type, bool
+        > comparable_distance_containment;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Polygon>::type
+        >::type return_type;
+    typedef std::pair<return_type, bool> distance_containment;
+
+    static inline distance_containment apply(Point const& point,
+                                             Polygon const& polygon,
+                                             Strategy const& strategy)
+    {
+        comparable_strategy c_strategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        // Check distance to all rings
+        typedef point_to_ring
+            <
+                Point,
+                typename ring_type<Polygon>::type,
+                Closure,
+                comparable_strategy
+            > per_ring;
+
+        comparable_distance_containment dc =
+            per_ring::apply(point, exterior_ring(polygon), c_strategy);
+
+        typename interior_return_type<Polygon const>::type rings
+                    = interior_rings(polygon);
+        for (typename boost::range_iterator
+                 <
+                     typename interior_type<Polygon const>::type const
+                 >::type it = boost::begin(rings);
+             it != boost::end(rings); ++it)
+        {
+            comparable_distance_containment dcr =
+                per_ring::apply(point, *it, c_strategy);
+            if (dcr.first < dc.first)
+            {
+                dc.first = dcr.first;
+            }
+            // If it was inside, and also inside inner ring,
+            // turn off the inside-flag, it is outside the polygon
+            if (dc.second && dcr.second)
+            {
+                dc.second = false;
+            }
+        }
+
+        return_type rd = strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Point, Polygon
+            >::apply(dc.first);
+
+        return std::make_pair(rd, dc.second);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// Point-point
+template <typename P1, typename P2, typename Strategy>
+struct distance
+    <
+        P1, P2, Strategy,
+        point_tag, point_tag, strategy_tag_distance_point_point,
+        false
+    >
+    : detail::distance::point_to_point<P1, P2, Strategy>
+{};
+
+
+// Point-line version 2, where point-segment strategy is specified
+template <typename Point, typename Linestring, typename Strategy>
+struct distance
+<
+    Point, Linestring, Strategy,
+    point_tag, linestring_tag, strategy_tag_distance_point_segment,
+    false
+> : detail::distance::point_to_range<Point, Linestring, closed, Strategy>
+{};
+
+
+// Point-ring , where point-segment strategy is specified
+template <typename Point, typename Ring, typename Strategy>
+struct distance
+<
+    Point, Ring, Strategy,
+    point_tag, ring_tag, strategy_tag_distance_point_segment,
+    false
+>
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Ring>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point,
+                                    Ring const& ring,
+                                    Strategy const& strategy)
+    {
+        std::pair<return_type, bool>
+            dc = detail::distance::point_to_ring
+            <
+                Point, Ring,
+                geometry::closure<Ring>::value,
+                Strategy
+            >::apply(point, ring, strategy);
+
+        return dc.second ? return_type(0) : dc.first;
+    }
+};
+
+
+// Point-polygon , where point-segment strategy is specified
+template <typename Point, typename Polygon, typename Strategy>
+struct distance
+<
+    Point, Polygon, Strategy, point_tag, polygon_tag, 
+    strategy_tag_distance_point_segment, false
+>
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Polygon>::type
+        >::type return_type;
+
+    static inline return_type apply(Point const& point,
+                                    Polygon const& polygon,
+                                    Strategy const& strategy)
+    {
+        std::pair<return_type, bool>
+            dc = detail::distance::point_to_polygon
+            <
+                Point, Polygon,
+                geometry::closure<Polygon>::value,
+                Strategy
+            >::apply(point, polygon, strategy);
+
+        return dc.second ? return_type(0) : dc.first;
+    }
+};
+
+
+// Point-segment version 2, with point-segment strategy
+template <typename Point, typename Segment, typename Strategy>
+struct distance
+<
+    Point, Segment, Strategy,
+    point_tag, segment_tag, strategy_tag_distance_point_segment,
+    false
+>
+{
+    static inline typename return_type<Strategy, Point, typename point_type<Segment>::type>::type
+    apply(Point const& point,
+          Segment const& segment,
+          Strategy const& strategy)
+    {
+        typename point_type<Segment>::type p[2];
+        geometry::detail::assign_point_from_index<0>(segment, p[0]);
+        geometry::detail::assign_point_from_index<1>(segment, p[1]);
+
+        boost::ignore_unused_variable_warning(strategy);
+        return strategy.apply(point, p[0], p[1]);
+    }
+};
+
+
+
+template <typename Point, typename Box, typename Strategy>
+struct distance
+    <
+         Point, Box, Strategy, point_tag, box_tag,
+         strategy_tag_distance_point_box, false
+    >
+{
+    static inline typename strategy::distance::services::return_type
+        <
+            Strategy, Point, typename point_type<Box>::type
+        >::type
+    apply(Point const& point, Box const& box, Strategy const& strategy)
+    {
+        boost::ignore_unused_variable_warning(strategy);
+        return strategy.apply(point, box);
+    }
+};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POINT_TO_GEOMETRY_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/polygon_to_segment_or_box.hpp b/include/boost/geometry/algorithms/detail/distance/polygon_to_segment_or_box.hpp
new file mode 100644
index 000000000..631cb25d3
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/polygon_to_segment_or_box.hpp
@@ -0,0 +1,160 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POLYGON_TO_SEGMENT_OR_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POLYGON_TO_SEGMENT_OR_BOX_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
+#include <boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+template <typename Polygon, typename SegmentOrBox, typename Strategy>
+class polygon_to_segment_or_box
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+       <
+           Strategy
+       >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            typename point_type<Polygon>::type,
+            typename point_type<SegmentOrBox>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Polygon>::type,
+            typename point_type<SegmentOrBox>::type
+        >::type return_type;
+
+    static inline return_type apply(Polygon const& polygon,
+                                    SegmentOrBox const& segment_or_box,
+                                    Strategy const& strategy)
+    {
+        typedef typename geometry::ring_type<Polygon>::type e_ring;
+        typedef typename geometry::interior_type<Polygon>::type i_rings;
+        typedef typename range_value<i_rings>::type i_ring;
+
+        if ( geometry::intersects(polygon, segment_or_box) )
+        {
+            return 0;
+        }
+
+        e_ring const& ext_ring = geometry::exterior_ring<Polygon>(polygon);
+        i_rings const& int_rings = geometry::interior_rings<Polygon>(polygon);
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+
+        comparable_return_type cd_min = range_to_segment_or_box
+            <
+                e_ring, SegmentOrBox, comparable_strategy
+            >::apply(ext_ring, segment_or_box, cstrategy, false);
+
+        typedef typename boost::range_iterator<i_rings const>::type iterator_type;
+        for (iterator_type it = boost::begin(int_rings);
+             it != boost::end(int_rings); ++it)
+        {
+            comparable_return_type cd = range_to_segment_or_box
+                <
+                    i_ring, SegmentOrBox, comparable_strategy
+                >::apply(*it, segment_or_box, cstrategy, false);
+
+            if ( cd < cd_min )
+            {
+                cd_min = cd;
+            }
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy,
+                Strategy,
+                Polygon,
+                SegmentOrBox
+            >::apply(cd_min);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace dispatch
+{
+
+
+template <typename Polygon, typename Segment, typename Strategy>
+struct distance
+    <
+        Polygon, Segment, Strategy, polygon_tag, segment_tag,
+        strategy_tag_distance_point_segment, false
+    >    
+    : detail::distance::polygon_to_segment_or_box<Polygon, Segment, Strategy>
+{};
+
+
+
+template <typename Polygon, typename Box, typename Strategy>
+struct distance
+    <
+        Polygon, Box, Strategy, polygon_tag, box_tag,
+        strategy_tag_distance_point_segment, false
+    >    
+    : detail::distance::polygon_to_segment_or_box<Polygon, Box, Strategy>
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_POLYGON_TO_SEGMENT_OR_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp b/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
new file mode 100644
index 000000000..8d02e1cce
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
@@ -0,0 +1,333 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_RANGE_TO_SEGMENT_OR_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_RANGE_TO_SEGMENT_OR_BOX_HPP
+
+#include <vector>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+
+template
+<
+    typename Range,
+    typename SegmentOrBox,
+    typename Strategy
+>
+class range_to_segment_or_box
+{
+private:
+    typedef typename point_type<SegmentOrBox>::type segment_or_box_point;
+    typedef typename point_type<Range>::type range_point;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy, range_point, segment_or_box_point
+        >::type comparable_return_type;
+
+    typedef typename strategy::distance::services::tag
+       <
+           comparable_strategy
+       >::type comparable_strategy_tag;
+
+    typedef dispatch::distance
+        <
+            segment_or_box_point, Range, comparable_strategy,
+            point_tag, typename tag<Range>::type,
+            comparable_strategy_tag, false
+        > comparable_point_to_range;
+
+    // compute distance of a point to a segment or a box
+    template
+    <
+        typename Point,
+        typename SegOrBoxPoints,
+        typename ComparableStrategy,
+        typename Tag
+    >
+    struct comparable_distance_point_to_segment_or_box
+    {};
+
+    template
+    <
+        typename Point,
+        typename SegmentPoints,
+        typename ComparableStrategy
+    >
+    struct comparable_distance_point_to_segment_or_box
+        <
+            Point, SegmentPoints, ComparableStrategy, segment_tag
+        >
+    {
+        static inline
+        comparable_return_type apply(Point const& point,
+                                     SegmentPoints const& segment_points,
+                                     ComparableStrategy const& strategy)
+        {
+            boost::ignore_unused_variable_warning(strategy);
+            return strategy.apply(point, segment_points[0], segment_points[1]);
+        }
+    };
+
+    template
+    <
+        typename Point,
+        typename BoxPoints,
+        typename ComparableStrategy
+    >
+    struct comparable_distance_point_to_segment_or_box
+        <
+            Point, BoxPoints, ComparableStrategy, box_tag
+        >
+    {
+        static inline
+        comparable_return_type apply(Point const& point,
+                                     BoxPoints const& box_points,
+                                     ComparableStrategy const& strategy)
+        {
+            return point_to_range
+                <
+                    Point, BoxPoints, open, ComparableStrategy
+                >::apply(point, box_points, strategy);
+        }
+    };
+
+
+    // assign the points of a segment or a box to a range
+    template
+    <
+        typename SegOrBox,
+        typename PointRange,
+        typename Tag = typename tag<SegOrBox>::type
+    >
+    struct assign_segment_or_box_points
+    {};
+
+
+    template <typename Segment, typename PointRange>
+    struct assign_segment_or_box_points<Segment, PointRange, segment_tag>
+    {
+        static inline void apply(Segment const& segment, PointRange& range)
+        {
+            detail::assign_point_from_index<0>(segment, range[0]);
+            detail::assign_point_from_index<1>(segment, range[1]);
+        }
+    };
+
+    template <typename Box, typename PointRange>
+    struct assign_segment_or_box_points<Box, PointRange, box_tag>
+    {
+        static inline void apply(Box const& box, PointRange& range)
+        {
+            detail::assign_box_corners_oriented<true>(box, range);
+        }
+    };
+
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, range_point, segment_or_box_point
+        >::type return_type;
+
+    static inline return_type
+    apply(Range const& range, SegmentOrBox const& segment_or_box,
+          Strategy const& strategy, bool check_intersection = true)
+    {
+        if ( check_intersection && geometry::intersects(range, segment_or_box) )
+        {
+            return 0;
+        }
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+
+        // get all points of the segment or the box
+        std::vector<segment_or_box_point>
+            segment_or_box_points(geometry::num_points(segment_or_box));
+
+        assign_segment_or_box_points
+            <
+                
+                SegmentOrBox, 
+                std::vector<segment_or_box_point>
+            >::apply(segment_or_box, segment_or_box_points);
+
+        // consider all distances from each endpoint of the segment or box
+        // to the range
+        typename std::vector<segment_or_box_point>::const_iterator it
+            = segment_or_box_points.begin();
+        comparable_return_type cd_min =
+            comparable_point_to_range::apply(*it, range, cstrategy);
+
+        for (++it; it != segment_or_box_points.end(); ++it)
+        {
+            comparable_return_type cd =
+                comparable_point_to_range::apply(*it, range, cstrategy);
+            if ( cd < cd_min )
+            {
+                cd_min = cd;
+            }
+        }
+
+        // consider all distances of the points in the range to the
+        // segment or box
+        typedef typename range_iterator<Range const>::type iterator_type;
+        for (iterator_type it = boost::begin(range); it != boost::end(range); ++it)
+        {
+            comparable_return_type cd =
+                comparable_distance_point_to_segment_or_box
+                    <
+                        typename point_type<Range>::type,
+                        std::vector<segment_or_box_point>,
+                        comparable_strategy,
+                        typename tag<SegmentOrBox>::type
+                    >::apply(*it, segment_or_box_points, cstrategy);
+
+            if ( cd < cd_min )
+            {
+                cd_min = cd;
+            }
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy,
+                range_point, segment_or_box_point
+            >::apply(cd_min);
+    }
+
+    static inline return_type
+    apply(SegmentOrBox const& segment_or_box, Range const& range, 
+          Strategy const& strategy, bool check_intersection = true)
+    {
+        return apply(range, segment_or_box, strategy, check_intersection);
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+
+template <typename Linestring, typename Segment, typename Strategy>
+struct distance
+    <
+        Linestring, Segment, Strategy, linestring_tag, segment_tag,
+        strategy_tag_distance_point_segment, false
+    >
+        : detail::distance::range_to_segment_or_box
+            <
+                Linestring, Segment, Strategy
+            >
+{};
+
+
+
+
+template <typename Segment, typename Ring, typename Strategy>
+struct distance
+    <
+        Segment, Ring, Strategy, segment_tag, ring_tag,
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::range_to_segment_or_box
+        <
+            Ring, Segment, Strategy
+        >
+{};
+
+
+
+
+template <typename Linestring, typename Box, typename Strategy>
+struct distance
+    <
+        Linestring, Box, Strategy, linestring_tag, box_tag,
+        strategy_tag_distance_point_segment, false
+    >
+        : detail::distance::range_to_segment_or_box
+            <
+                Linestring, Box, Strategy
+            >
+{};
+
+
+
+
+template <typename Ring, typename Box, typename Strategy>
+struct distance
+    <
+        Ring, Box, Strategy, ring_tag, box_tag,
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::range_to_segment_or_box
+        <
+            Ring, Box, Strategy
+        >
+{};
+
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_RANGE_TO_SEGMENT_OR_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp b/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
new file mode 100644
index 000000000..695f3a2be
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
@@ -0,0 +1,814 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_BOX_HPP
+
+#include <functional>
+#include <vector>
+
+#include <boost/assert.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/mpl/if.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/calculation_type.hpp>
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+template
+<
+    typename Segment,
+    typename Box,
+    typename Strategy,
+    bool UsePointBoxStrategy = false
+>
+class segment_to_box_2D_generic
+{
+private:
+    typedef typename point_type<Segment>::type segment_point;
+    typedef typename point_type<Box>::type box_point;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy, segment_point, box_point
+        >::type comparable_return_type;
+    
+    typedef point_to_range
+        <
+            segment_point, std::vector<box_point>, open, comparable_strategy
+        > point_to_box_boundary;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, segment_point, box_point
+        >::type return_type;
+
+    static inline return_type apply(Segment const& segment,
+                                    Box const& box,
+                                    Strategy const& strategy,
+                                    bool check_intersection = true)
+    {
+        if ( check_intersection && geometry::intersects(segment, box) )
+        {
+            return 0;
+        }
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+        boost::ignore_unused_variable_warning(cstrategy);
+
+        // get segment points
+        segment_point p[2];
+        detail::assign_point_from_index<0>(segment, p[0]);
+        detail::assign_point_from_index<1>(segment, p[1]);
+
+        // get box points
+        std::vector<box_point> box_points(4);
+        detail::assign_box_corners_oriented<true>(box, box_points);
+ 
+        comparable_return_type cd[6];
+        for (unsigned int i = 0; i < 4; ++i)
+        {
+            cd[i] = cstrategy.apply(box_points[i], p[0], p[1]);
+        }
+        cd[4] = point_to_box_boundary::apply(p[0], box_points, cstrategy);
+        cd[5] = point_to_box_boundary::apply(p[1], box_points, cstrategy);
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Segment, Box
+            >::apply( *std::min_element(cd, cd + 6) );
+    }
+};
+
+
+template
+<
+    typename Segment,
+    typename Box,
+    typename Strategy
+>
+class segment_to_box_2D_generic<Segment, Box, Strategy, true>
+{
+private:
+    typedef typename point_type<Segment>::type segment_point;
+    typedef typename point_type<Box>::type box_point;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy, segment_point, box_point
+        >::type comparable_return_type;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            typename detail::distance::default_strategy
+            <
+                segment_point, Box
+            >::type
+        >::type point_box_comparable_strategy;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy, segment_point, box_point
+        >::type return_type;
+
+    static inline return_type apply(Segment const& segment,
+                                    Box const& box,
+                                    Strategy const& strategy,
+                                    bool check_intersection = true)
+    {
+        if ( check_intersection && geometry::intersects(segment, box) )
+        {
+            return 0;
+        }
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+        boost::ignore_unused_variable_warning(cstrategy);
+
+        // get segment points
+        segment_point p[2];
+        detail::assign_point_from_index<0>(segment, p[0]);
+        detail::assign_point_from_index<1>(segment, p[1]);
+
+        // get box points
+        std::vector<box_point> box_points(4);
+        detail::assign_box_corners_oriented<true>(box, box_points);
+ 
+        comparable_return_type cd[6];
+        for (unsigned int i = 0; i < 4; ++i)
+        {
+            cd[i] = cstrategy.apply(box_points[i], p[0], p[1]);
+        }
+
+        point_box_comparable_strategy pb_cstrategy;
+        boost::ignore_unused_variable_warning(pb_cstrategy);
+        cd[4] = pb_cstrategy.apply(p[0], box);
+        cd[5] = pb_cstrategy.apply(p[1], box);
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Segment, Box
+            >::apply( *std::min_element(cd, cd + 6) );
+    }
+};
+
+
+
+
+template
+<
+    typename ReturnType,
+    typename SegmentPoint,
+    typename BoxPoint,
+    typename PPStrategy,
+    typename PSStrategy
+>
+class segment_to_box_2D
+{
+private:
+    template <typename Result>
+    struct cast_to_result
+    {
+        template <typename T>
+        static inline Result apply(T const& t)
+        {
+            return boost::numeric_cast<Result>(t);
+        }
+    };
+
+
+    template <typename T, bool IsLess /* true */>
+    struct compare_less_equal
+    {
+        typedef compare_less_equal<T, !IsLess> other;
+
+        template <typename T1, typename T2>
+        inline bool operator()(T1 const& t1, T2 const& t2) const
+        {
+            return std::less_equal<T>()(cast_to_result<T>::apply(t1),
+                                        cast_to_result<T>::apply(t2));
+        }
+    };
+
+    template <typename T>
+    struct compare_less_equal<T, false>
+    {
+        typedef compare_less_equal<T, true> other;
+
+        template <typename T1, typename T2>
+        inline bool operator()(T1 const& t1, T2 const& t2) const
+        {
+            return std::greater_equal<T>()(cast_to_result<T>::apply(t1),
+                                           cast_to_result<T>::apply(t2));
+        }
+    };
+
+
+    template <typename LessEqual>
+    struct other_compare
+    {
+        typedef typename LessEqual::other type;
+    };
+
+
+    // it is assumed here that p0 lies to the right of the box (so the
+    // entire segment lies to the right of the box)
+    template <typename LessEqual>
+    struct right_of_box
+    {
+        static inline ReturnType apply(SegmentPoint const& p0,
+                                       SegmentPoint const& p1,
+                                       BoxPoint const& bottom_right,
+                                       BoxPoint const& top_right,
+                                       PPStrategy const& pp_strategy,
+                                       PSStrategy const& ps_strategy)
+        {
+            // the implementation below is written for non-negative slope
+            // segments
+            //
+            // for negative slope segments swap the roles of bottom_right
+            // and top_right and use greater_equal instead of less_equal.
+
+            typedef cast_to_result<ReturnType> cast;
+
+            LessEqual less_equal;
+
+            if ( less_equal(geometry::get<1>(top_right), geometry::get<1>(p0)) )
+            {
+                // closest box point is the top-right corner
+                return cast::apply(pp_strategy.apply(p0, top_right));
+            }
+            else if ( less_equal(geometry::get<1>(bottom_right),
+                                 geometry::get<1>(p0)) )
+            {
+                // distance is realized between p0 and right-most
+                // segment of box
+                ReturnType diff = cast::apply(geometry::get<0>(p0))
+                    - cast::apply(geometry::get<0>(bottom_right));
+                return diff * diff;
+            }
+            else
+            {
+                // distance is realized between the bottom-right
+                // corner of the box and the segment
+                return cast::apply(ps_strategy.apply(bottom_right, p0, p1));
+            }
+        }
+    };
+
+
+    // it is assumed here that p0 lies above the box (so the
+    // entire segment lies above the box)
+    template <typename LessEqual>
+    struct above_of_box
+    {
+        static inline ReturnType apply(SegmentPoint const& p0,
+                                       SegmentPoint const& p1,
+                                       BoxPoint const& top_left,
+                                       PSStrategy const& ps_strategy)
+        {
+            // the segment lies above the box
+
+            typedef cast_to_result<ReturnType> cast;
+
+            LessEqual less_equal;
+
+            // p0 is above the upper segment of the box
+            // (and inside its band)
+            if ( less_equal(geometry::get<0>(top_left), geometry::get<0>(p0)) )
+            {
+                ReturnType diff = cast::apply(geometry::get<1>(p0))
+                    - cast::apply(geometry::get<1>(top_left));
+                return diff * diff;
+            }
+
+            // p0 is to the left of the box, but p1 is above the box
+            // in this case the distance is realized between the
+            // top-left corner of the box and the segment
+            return cast::apply(ps_strategy.apply(top_left, p0, p1));
+        }
+    };
+
+
+    template <typename LessEqual>
+    struct check_right_left_of_box
+    {
+        static inline bool apply(SegmentPoint const& p0,
+                                 SegmentPoint const& p1,
+                                 BoxPoint const& top_left,
+                                 BoxPoint const& top_right,
+                                 BoxPoint const& bottom_left,
+                                 BoxPoint const& bottom_right,
+                                 PPStrategy const& pp_strategy,
+                                 PSStrategy const& ps_strategy,
+                                 ReturnType& result)
+        {
+            // p0 lies to the right of the box
+            if ( geometry::get<0>(p0) >= geometry::get<0>(top_right) )
+            {
+                result = right_of_box
+                    <
+                        LessEqual
+                    >::apply(p0, p1, bottom_right, top_right,
+                             pp_strategy, ps_strategy);
+                return true;
+            }
+
+            // p1 lies to the left of the box
+            if ( geometry::get<0>(p1) <= geometry::get<0>(bottom_left) )
+            {
+                result = right_of_box
+                    <
+                        typename other_compare<LessEqual>::type
+                    >::apply(p1, p0, top_left, bottom_left,
+                             pp_strategy, ps_strategy);
+                return true;
+            }
+
+            return false;
+        }
+    };
+
+
+    template <typename LessEqual>
+    struct check_above_below_of_box
+    {
+        static inline bool apply(SegmentPoint const& p0,
+                                 SegmentPoint const& p1,
+                                 BoxPoint const& top_left,
+                                 BoxPoint const& top_right,
+                                 BoxPoint const& bottom_left,
+                                 BoxPoint const& bottom_right,
+                                 PSStrategy const& ps_strategy,
+                                 ReturnType& result)
+        {
+            // the segment lies below the box
+            if ( geometry::get<1>(p1) < geometry::get<1>(bottom_left) )
+            {
+                result = above_of_box
+                    <
+                        typename other_compare<LessEqual>::type
+                    >::apply(p1, p0, bottom_right, ps_strategy);
+                return true;
+            }
+
+            // the segment lies above the box
+            if ( geometry::get<1>(p0) > geometry::get<1>(top_right) )
+            {
+                result = above_of_box
+                    <
+                        LessEqual
+                    >::apply(p0, p1, top_left, ps_strategy);
+                return true;
+            }
+            return false;
+        }
+    };
+
+    struct check_generic_position
+    {
+        static inline bool apply(SegmentPoint const& p0,
+                                 SegmentPoint const& p1,
+                                 BoxPoint const& bottom_left0,
+                                 BoxPoint const& top_right0,
+                                 BoxPoint const& bottom_left1,
+                                 BoxPoint const& top_right1,
+                                 BoxPoint const& corner1,
+                                 BoxPoint const& corner2,
+                                 PSStrategy const& ps_strategy,
+                                 ReturnType& result)
+        {
+            typedef cast_to_result<ReturnType> cast;
+
+            ReturnType diff0 = cast::apply(geometry::get<0>(p1))
+                - cast::apply(geometry::get<0>(p0));
+            ReturnType t_min0 = cast::apply(geometry::get<0>(bottom_left0))
+                - cast::apply(geometry::get<0>(p0));
+            ReturnType t_max0 = cast::apply(geometry::get<0>(top_right0))
+                - cast::apply(geometry::get<0>(p0));
+
+            ReturnType diff1 = cast::apply(geometry::get<1>(p1))
+                - cast::apply(geometry::get<1>(p0));
+            ReturnType t_min1 = cast::apply(geometry::get<1>(bottom_left1))
+                - cast::apply(geometry::get<1>(p0));
+            ReturnType t_max1 = cast::apply(geometry::get<1>(top_right1))
+                - cast::apply(geometry::get<1>(p0));
+
+            if ( diff1 < 0 )
+            {
+                diff1 = -diff1;
+                t_min1 = -t_min1;
+                t_max1 = -t_max1;
+            }
+
+            //  t_min0 > t_max1
+            if ( t_min0 * diff1 > t_max1 * diff0 )
+            {
+                result = cast::apply(ps_strategy.apply(corner1, p0, p1));
+                return true;
+            }
+
+            //  t_max0 < t_min1
+            if ( t_max0 * diff1 < t_min1 * diff0 )
+            {
+                result = cast::apply(ps_strategy.apply(corner2, p0, p1));
+                return true;
+            }
+            return false;
+        }
+    };
+
+    static inline ReturnType
+    non_negative_slope_segment(SegmentPoint const& p0,
+                               SegmentPoint const& p1,
+                               BoxPoint const& top_left,
+                               BoxPoint const& top_right,
+                               BoxPoint const& bottom_left,
+                               BoxPoint const& bottom_right,
+                               PPStrategy const& pp_strategy,
+                               PSStrategy const& ps_strategy)
+    {
+        typedef compare_less_equal<ReturnType, true> less_equal;
+
+        // assert that the segment has non-negative slope
+        BOOST_ASSERT( ( math::equals(geometry::get<0>(p0), geometry::get<0>(p1))
+                        && geometry::get<1>(p0) < geometry::get<1>(p1))
+                      ||
+                      ( geometry::get<0>(p0) < geometry::get<0>(p1)
+                        && geometry::get<1>(p0) <= geometry::get<1>(p1) )
+                      );
+
+        ReturnType result(0);
+
+        if ( check_right_left_of_box
+                 <
+                     less_equal
+                 >::apply(p0, p1,
+                          top_left, top_right, bottom_left, bottom_right,
+                          pp_strategy, ps_strategy, result) )
+        {
+            return result;
+        }
+
+        if ( check_above_below_of_box
+                 <
+                     less_equal
+                 >::apply(p0, p1,
+                          top_left, top_right, bottom_left, bottom_right,
+                          ps_strategy, result) )
+        {
+            return result;
+        }
+
+        if ( check_generic_position::apply(p0, p1,
+                                           bottom_left, top_right,
+                                           bottom_left, top_right,
+                                           top_left, bottom_right,
+                                           ps_strategy, result) )
+        {
+            return result;
+        }
+
+        // in all other cases the box and segment intersect, so return 0
+        return result;
+    }
+
+
+    static inline ReturnType
+    negative_slope_segment(SegmentPoint const& p0,
+                           SegmentPoint const& p1,
+                           BoxPoint const& top_left,
+                           BoxPoint const& top_right,
+                           BoxPoint const& bottom_left,
+                           BoxPoint const& bottom_right,
+                           PPStrategy const& pp_strategy,
+                           PSStrategy const& ps_strategy)
+    {
+        typedef compare_less_equal<ReturnType, false> greater_equal;
+
+        // assert that the segment has negative slope
+        BOOST_ASSERT( geometry::get<0>(p0) < geometry::get<0>(p1)
+                      && geometry::get<1>(p0) > geometry::get<1>(p1) );
+
+        ReturnType result(0);
+
+        if ( check_right_left_of_box
+                 <
+                     greater_equal
+                 >::apply(p0, p1,
+                          bottom_left, bottom_right, top_left, top_right,
+                          pp_strategy, ps_strategy, result) )
+        {
+            return result;
+        }
+
+        if ( check_above_below_of_box
+                 <
+                     greater_equal
+                 >::apply(p1, p0,
+                          top_right, top_left, bottom_right, bottom_left,
+                          ps_strategy, result) )
+        {
+            return result;
+        }
+
+        if ( check_generic_position::apply(p0, p1,
+                                           bottom_left, top_right,
+                                           top_right, bottom_left,
+                                           bottom_left, top_right,
+                                           ps_strategy, result) )
+        {
+            return result;
+        }
+
+        // in all other cases the box and segment intersect, so return 0
+        return result;
+    }
+
+public:
+    static inline ReturnType apply(SegmentPoint const& p0,
+                                   SegmentPoint const& p1,
+                                   BoxPoint const& top_left,
+                                   BoxPoint const& top_right,
+                                   BoxPoint const& bottom_left,
+                                   BoxPoint const& bottom_right,
+                                   PPStrategy const& pp_strategy,
+                                   PSStrategy const& ps_strategy)
+    {
+        BOOST_ASSERT( geometry::less<SegmentPoint>()(p0, p1) );
+
+        if ( geometry::get<0>(p0) < geometry::get<0>(p1)
+             && geometry::get<1>(p0) > geometry::get<1>(p1) )
+        {
+            return negative_slope_segment(p0, p1,
+                                          top_left, top_right,
+                                          bottom_left, bottom_right,
+                                          pp_strategy, ps_strategy);
+        }
+
+        return non_negative_slope_segment(p0, p1,
+                                          top_left, top_right,
+                                          bottom_left, bottom_right,
+                                          pp_strategy, ps_strategy);
+    }
+};
+
+
+//=========================================================================
+
+
+template
+<
+    typename Segment,
+    typename Box,
+    typename std::size_t Dimension,
+    typename PPStrategy,
+    typename PSStrategy
+>
+class segment_to_box
+    : not_implemented<Segment, Box>
+{};
+
+
+template
+<
+    typename Segment,
+    typename Box,
+    typename PPStrategy,
+    typename PSStrategy
+>
+class segment_to_box<Segment, Box, 2, PPStrategy, PSStrategy>
+{
+private:
+    typedef typename point_type<Segment>::type segment_point;
+    typedef typename point_type<Box>::type box_point;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            PPStrategy
+        >::type pp_comparable_strategy;
+
+    typedef typename strategy::distance::services::comparable_type
+        <
+            PSStrategy
+        >::type ps_comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            ps_comparable_strategy, segment_point, box_point
+        >::type comparable_return_type;
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            PSStrategy, segment_point, box_point
+        >::type return_type;
+
+    static inline return_type apply(Segment const& segment,
+                                    Box const& box,
+                                    PPStrategy const& pp_strategy,
+                                    PSStrategy const& ps_strategy)
+    {
+        segment_point p[2];
+        detail::assign_point_from_index<0>(segment, p[0]);
+        detail::assign_point_from_index<1>(segment, p[1]);
+
+        if ( geometry::equals(p[0], p[1]) )
+        {
+            typedef typename boost::mpl::if_
+                <
+                    boost::is_same
+                        <
+                            ps_comparable_strategy,
+                            PSStrategy
+                        >,
+                    typename strategy::distance::services::comparable_type
+                        <
+                            typename detail::distance::default_strategy
+                                <
+                                    segment_point, Box
+                                >::type
+                        >::type,
+                    typename detail::distance::default_strategy
+                        <
+                            segment_point, Box
+                        >::type
+                >::type point_box_strategy_type;
+
+            return dispatch::distance
+                <
+                    segment_point,
+                    Box,
+                    point_box_strategy_type
+                >::apply(p[0], box, point_box_strategy_type());
+        }
+
+        box_point top_left, top_right, bottom_left, bottom_right;
+        detail::assign_box_corners(box, bottom_left, bottom_right,
+                                   top_left, top_right);
+
+        pp_comparable_strategy c_pp_strategy =
+            strategy::distance::services::get_comparable
+                <
+                    PPStrategy
+                >::apply(pp_strategy);
+
+        ps_comparable_strategy c_ps_strategy =
+            strategy::distance::services::get_comparable
+                <
+                    PSStrategy
+                >::apply(ps_strategy);
+
+        comparable_return_type cd;
+
+        if ( geometry::less<segment_point>()(p[0], p[1]) )
+        {
+            cd = segment_to_box_2D
+                <
+                    return_type,
+                    segment_point,
+                    box_point,
+                    pp_comparable_strategy,
+                    ps_comparable_strategy
+                >::apply(p[0], p[1],
+                         top_left, top_right, bottom_left, bottom_right,
+                         c_pp_strategy,
+                         c_ps_strategy);
+        }
+        else
+        {
+            cd = segment_to_box_2D
+                <
+                    return_type,
+                    segment_point,
+                    box_point,
+                    pp_comparable_strategy,
+                    ps_comparable_strategy
+                >::apply(p[1], p[0],
+                         top_left, top_right, bottom_left, bottom_right,
+                         c_pp_strategy,
+                         c_ps_strategy);
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                ps_comparable_strategy, PSStrategy, Segment, Box
+            >::apply( cd );
+    }
+};
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Segment, typename Box, typename Strategy>
+struct distance
+    <
+        Segment, Box, Strategy, segment_tag, box_tag,
+        strategy_tag_distance_point_segment, false
+    >
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Segment>::type,
+            typename point_type<Box>::type
+        >::type return_type;
+
+
+    static inline return_type apply(Segment const& segment,
+                                    Box const& box,
+                                    Strategy const& strategy)
+    {
+        assert_dimension_equal<Segment, Box>();
+
+        typedef typename detail::distance::default_strategy
+            <
+                typename point_type<Segment>::type,
+                typename point_type<Box>::type
+            >::type pp_strategy_type;
+
+        return detail::distance::segment_to_box
+            <
+                Segment,
+                Box,
+                dimension<Segment>::value,
+                pp_strategy_type,
+                Strategy
+            >::apply(segment, box, pp_strategy_type(), strategy);
+    }
+};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp b/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
new file mode 100644
index 000000000..1ae22153c
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/segment_to_segment.hpp
@@ -0,0 +1,131 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_SEGMENT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_SEGMENT_HPP
+
+#include <algorithm>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+
+// compute segment-segment distance
+template<typename Segment1, typename Segment2, typename Strategy>
+class segment_to_segment
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            typename point_type<Segment1>::type,
+            typename point_type<Segment2>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Segment1>::type,
+            typename point_type<Segment2>::type
+        >::type return_type;
+
+    static inline return_type
+    apply(Segment1 const& segment1, Segment2 const& segment2,
+          Strategy const& strategy)
+    {
+        if ( geometry::intersects(segment1, segment2) )
+        {
+            return 0;
+        }
+
+        typename point_type<Segment1>::type p[2];
+        detail::assign_point_from_index<0>(segment1, p[0]);
+        detail::assign_point_from_index<1>(segment1, p[1]);
+
+        typename point_type<Segment2>::type q[2];
+        detail::assign_point_from_index<0>(segment2, q[0]);
+        detail::assign_point_from_index<1>(segment2, q[1]);
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        comparable_return_type d[4];
+        d[0] = cstrategy.apply(q[0], p[0], p[1]);
+        d[1] = cstrategy.apply(q[1], p[0], p[1]);
+        d[2] = cstrategy.apply(p[0], q[0], q[1]);
+        d[3] = cstrategy.apply(p[1], q[0], q[1]);
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Segment1, Segment2
+            >::apply( *std::min_element(d, d + 4) );
+    }
+};
+
+
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+
+// segment-segment
+template <typename Segment1, typename Segment2, typename Strategy>
+struct distance
+    <
+        Segment1, Segment2, Strategy, segment_tag, segment_tag,
+        strategy_tag_distance_point_segment, false
+    >
+    : detail::distance::segment_to_segment<Segment1, Segment2, Strategy>
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SEGMENT_TO_SEGMENT_HPP
diff --git a/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
new file mode 100644
index 000000000..44af56d14
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/distance/single_to_multi.hpp
@@ -0,0 +1,483 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SINGLE_TO_MULTI_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SINGLE_TO_MULTI_HPP
+
+#include <boost/numeric/conversion/bounds.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/util/select_coordinate_type.hpp>
+#include <boost/geometry/util/math.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+#include <boost/geometry/algorithms/dispatch/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
+
+#include <boost/geometry/views/detail/range_type.hpp>
+
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/for_each.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/geometry_to_geometry_rtree.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace distance
+{
+
+
+template<typename Geometry, typename MultiGeometry, typename Strategy>
+class distance_single_to_multi_generic
+{
+private:
+    typedef typename strategy::distance::services::comparable_type
+        <
+            Strategy
+        >::type comparable_strategy;
+
+    typedef typename strategy::distance::services::return_type
+        <
+            comparable_strategy,
+            typename point_type<Geometry>::type,
+            typename point_type<MultiGeometry>::type
+        >::type comparable_return_type;
+
+public:
+    typedef typename strategy::distance::services::return_type
+        <
+            Strategy,
+            typename point_type<Geometry>::type,
+            typename point_type<MultiGeometry>::type
+        >::type return_type;
+
+    static inline return_type apply(Geometry const& geometry,
+                                    MultiGeometry const& multi,
+                                    Strategy const& strategy)
+    {
+        comparable_return_type min_cdist = comparable_return_type();
+        bool first = true;
+
+        comparable_strategy cstrategy =
+            strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        for (typename range_iterator<MultiGeometry const>::type it = boost::begin(multi);
+                it != boost::end(multi);
+                ++it, first = false)
+        {
+            comparable_return_type cdist = dispatch::distance
+                <
+                    Geometry,
+                    typename range_value<MultiGeometry>::type,
+                    comparable_strategy
+                >::apply(geometry, *it, cstrategy);
+
+            if (first || cdist < min_cdist)
+            {
+                min_cdist = cdist;
+            }
+            if ( geometry::math::equals(min_cdist, 0) )
+            {
+                break;
+            }
+        }
+
+        return strategy::distance::services::comparable_to_regular
+            <
+                comparable_strategy, Strategy, Geometry, MultiGeometry
+            >::apply(min_cdist);
+    }
+};
+
+
+
+template <typename MultiGeometry, typename Geometry, typename Strategy>
+struct distance_multi_to_single_generic
+{
+    typedef typename strategy::distance::services::return_type
+                     <
+                         Strategy,
+                         typename point_type<MultiGeometry>::type,
+                         typename point_type<Geometry>::type
+                     >::type return_type;
+
+    static inline return_type apply(MultiGeometry const& multi,
+                                    Geometry const& geometry,
+                                    Strategy const& strategy)
+    {
+        return distance_single_to_multi_generic
+            <
+                Geometry, MultiGeometry, Strategy
+            >::apply(geometry, multi, strategy);
+    }
+};
+
+
+
+
+}} // namespace detail::distance
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+namespace splitted_dispatch
+{
+
+
+template
+<
+    typename Geometry,
+    typename MultiGeometry,
+    typename Strategy,
+    typename GeometryTag,
+    typename MultiGeometryTag,
+    typename StrategyTag
+>
+struct distance_single_to_multi
+    : not_implemented<Geometry, MultiGeometry>
+{};
+
+
+
+template<typename Point, typename MultiPoint, typename Strategy>
+struct distance_single_to_multi
+    <
+        Point, MultiPoint, Strategy,
+        point_tag, multi_point_tag,
+        strategy_tag_distance_point_point
+    > : detail::distance::distance_single_to_multi_generic
+        <
+            Point, MultiPoint, Strategy
+        >
+{};
+
+
+
+template<typename Point, typename MultiLinestring, typename Strategy>
+struct distance_single_to_multi
+    <
+        Point, MultiLinestring, Strategy,
+        point_tag, multi_linestring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_single_to_multi_generic
+        <
+            Point, MultiLinestring, Strategy
+        >
+{};
+
+
+
+template<typename Point, typename MultiPolygon, typename Strategy>
+struct distance_single_to_multi
+    <
+        Point, MultiPolygon, Strategy,
+        point_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_single_to_multi_generic
+        <
+            Point, MultiPolygon, Strategy
+        >
+{};
+
+
+
+template<typename Linestring, typename MultiLinestring, typename Strategy>
+struct distance_single_to_multi
+    <
+        Linestring, MultiLinestring, Strategy,
+        linestring_tag, multi_linestring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            Linestring, MultiLinestring, Strategy
+        >
+{};
+
+
+
+template <typename Linestring, typename MultiPolygon, typename Strategy>
+struct distance_single_to_multi
+    <
+        Linestring, MultiPolygon, Strategy,
+        linestring_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            Linestring, MultiPolygon, Strategy
+        >
+{};
+
+
+
+template <typename Polygon, typename MultiPoint, typename Strategy>
+struct distance_single_to_multi
+    <
+        Polygon, MultiPoint, Strategy,
+        polygon_tag, multi_point_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_single_to_multi_generic
+        <
+            Polygon, MultiPoint, Strategy
+        >
+{};
+
+
+
+template <typename Polygon, typename MultiLinestring, typename Strategy>
+struct distance_single_to_multi
+    <
+        Polygon, MultiLinestring, Strategy,
+        polygon_tag, multi_linestring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            Polygon, MultiLinestring, Strategy
+        >
+{};
+
+
+
+template <typename Polygon, typename MultiPolygon, typename Strategy>
+struct distance_single_to_multi
+    <
+        Polygon, MultiPolygon, Strategy,
+        polygon_tag, multi_polygon_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            Polygon, MultiPolygon, Strategy
+        >
+{};
+
+
+
+template <typename MultiLinestring, typename Ring, typename Strategy>
+struct distance_single_to_multi
+    <
+        MultiLinestring, Ring, Strategy,
+        multi_linestring_tag, ring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            MultiLinestring, Ring, Strategy
+        >
+{};
+
+
+template <typename MultiPolygon, typename Ring, typename Strategy>
+struct distance_single_to_multi
+    <
+        MultiPolygon, Ring, Strategy,
+        multi_polygon_tag, ring_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::geometry_to_geometry_rtree
+        <
+            MultiPolygon, Ring, Strategy
+        >
+{};
+
+
+
+template
+<
+    typename MultiGeometry,
+    typename Geometry,
+    typename Strategy,
+    typename MultiGeometryTag,
+    typename GeometryTag,
+    typename StrategyTag
+>
+struct distance_multi_to_single
+    : not_implemented<MultiGeometry, Geometry>
+{};
+
+
+
+template
+<
+    typename MultiPoint,
+    typename Segment,
+    typename Strategy
+>
+struct distance_multi_to_single
+    <
+        MultiPoint, Segment, Strategy,
+        multi_point_tag, segment_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiPoint, Segment, Strategy
+        >
+{};
+
+
+
+template
+<
+    typename MultiPoint,
+    typename Box,
+    typename Strategy
+>
+struct distance_multi_to_single
+    <
+        MultiPoint, Box, Strategy,
+        multi_point_tag, box_tag,
+        strategy_tag_distance_point_box
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiPoint, Box, Strategy
+        >
+{};
+
+
+template <typename MultiLinestring, typename Segment, typename Strategy>
+struct distance_multi_to_single
+    <
+        MultiLinestring, Segment, Strategy,
+        multi_linestring_tag, segment_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiLinestring, Segment, Strategy
+        >
+{};
+
+
+
+template <typename MultiLinestring, typename Box, typename Strategy>
+struct distance_multi_to_single
+    <
+        MultiLinestring, Box, Strategy,
+        multi_linestring_tag, box_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiLinestring, Box, Strategy
+        >
+{};
+
+
+
+template <typename MultiPolygon, typename Segment, typename Strategy>
+struct distance_multi_to_single
+    <
+        MultiPolygon, Segment, Strategy,
+        multi_polygon_tag, segment_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiPolygon, Segment, Strategy
+        >
+{};
+
+
+
+template <typename MultiPolygon, typename Box, typename Strategy>
+struct distance_multi_to_single
+    <
+        MultiPolygon, Box, Strategy,
+        multi_polygon_tag, box_tag,
+        strategy_tag_distance_point_segment
+    > : detail::distance::distance_multi_to_single_generic
+        <
+            MultiPolygon, Box, Strategy
+        >
+{};
+
+
+} // namespace splitted_dispatch
+
+
+template
+<
+    typename Geometry,
+    typename MultiGeometry,
+    typename Strategy,
+    typename GeometryTag,
+    typename StrategyTag
+>
+struct distance
+    <
+        Geometry, MultiGeometry, Strategy, GeometryTag, multi_tag,
+        StrategyTag, false
+    > : splitted_dispatch::distance_single_to_multi
+        <
+            Geometry, MultiGeometry, Strategy,
+            GeometryTag, typename tag<MultiGeometry>::type,
+            StrategyTag
+        >
+{};
+
+
+
+template
+<
+    typename MultiGeometry,
+    typename Geometry,
+    typename Strategy,
+    typename GeometryTag,
+    typename StrategyTag
+>
+struct distance
+    <
+        MultiGeometry, Geometry, Strategy, multi_tag, GeometryTag,
+        StrategyTag, false
+    > : splitted_dispatch::distance_multi_to_single
+        <
+            MultiGeometry, Geometry, Strategy,
+            typename tag<MultiGeometry>::type, GeometryTag,
+            StrategyTag
+        >
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_DISTANCE_SINGLE_TO_MULTI_HPP
diff --git a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
index 9c2fe2805..5bcb5ffaa 100644
--- a/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
+++ b/include/boost/geometry/algorithms/detail/equals/collect_vectors.hpp
@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,12 +18,13 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
+
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/util/math.hpp>
@@ -75,9 +77,9 @@ struct collected_vector
 
     inline bool same_direction(collected_vector<T> const& other) const
     {
-        // For high precision arithmetic, we have to be 
+        // For high precision arithmetic, we have to be
         // more relaxed then using ==
-        // Because 2/sqrt( (0,0)<->(2,2) ) == 1/sqrt( (0,0)<->(1,1) ) 
+        // Because 2/sqrt( (0,0)<->(2,2) ) == 1/sqrt( (0,0)<->(1,1) )
         // is not always true (at least, it is not for ttmath)
         return math::equals_with_epsilon(dx, other.dx)
             && math::equals_with_epsilon(dy, other.dy);
@@ -111,6 +113,9 @@ struct range_collect_vectors
             return;
         }
 
+        typedef typename boost::range_size<Collection>::type collection_size_t;
+        collection_size_t c_old_size = boost::size(collection);
+
         typedef typename boost::range_iterator<Range const>::type iterator;
 
         bool first = true;
@@ -131,7 +136,7 @@ struct range_collect_vectors
 
             // Normalize the vector -> this results in points+direction
             // and is comparible between geometries
-            calculation_type magnitude = sqrt(
+            calculation_type magnitude = math::sqrt(
                 boost::numeric_cast<calculation_type>(v.dx * v.dx + v.dy * v.dy));
 
             // Avoid non-duplicate points (AND division by zero)
@@ -150,10 +155,19 @@ struct range_collect_vectors
         }
 
         // If first one has same direction as last one, remove first one
-        if (boost::size(collection) > 1 
-            && collection.front().same_direction(collection.back()))
+        collection_size_t collected_count = boost::size(collection) - c_old_size;
+        if ( collected_count > 1 )
         {
-            collection.erase(collection.begin());
+            typedef typename boost::range_iterator<Collection>::type c_iterator;
+            c_iterator first = collection.begin() + c_old_size;
+
+            if ( first->same_direction(collection.back()) )
+            {
+                //collection.erase(first);
+                // O(1) instead of O(N)
+                *first = collection.back();
+                collection.pop_back();
+            }
         }
     }
 };
@@ -194,9 +208,10 @@ struct polygon_collect_vectors
         typedef range_collect_vectors<ring_type, Collection> per_range;
         per_range::apply(collection, exterior_ring(polygon));
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(polygon);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             per_range::apply(collection, *it);
         }
diff --git a/include/boost/geometry/algorithms/detail/equals/point_point.hpp b/include/boost/geometry/algorithms/detail/equals/point_point.hpp
new file mode 100644
index 000000000..12daa85e9
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/equals/point_point.hpp
@@ -0,0 +1,52 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_EQUALS_POINT_POINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_EQUALS_POINT_POINT_HPP
+
+#include <boost/geometry/algorithms/detail/disjoint/point_point.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace equals
+{
+
+/*!
+    \brief Internal utility function to detect of points are disjoint
+    \note To avoid circular references
+ */
+template <typename Point1, typename Point2>
+inline bool equals_point_point(Point1 const& point1, Point2 const& point2)
+{
+    return ! detail::disjoint::disjoint_point_point(point1, point2);
+}
+
+
+}} // namespace detail::equals
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_EQUALS_POINT_POINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/extreme_points.hpp b/include/boost/geometry/algorithms/detail/extreme_points.hpp
new file mode 100644
index 000000000..c6a47bb8f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/extreme_points.hpp
@@ -0,0 +1,515 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
+
+
+#include <cstddef>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/iterators/ever_circling_iterator.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_box_corners.hpp>
+
+#include <boost/geometry/strategies/side.hpp>
+
+#include <boost/geometry/util/math.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace extreme_points
+{
+
+template <std::size_t Dimension>
+struct compare
+{
+    template <typename Point>
+    inline bool operator()(Point const& lhs, Point const& rhs)
+    {
+        return geometry::get<Dimension>(lhs) < geometry::get<Dimension>(rhs);
+    }
+};
+
+
+template <std::size_t Dimension, typename PointType, typename CoordinateType>
+inline void move_along_vector(PointType& point, PointType const& extreme, CoordinateType const& base_value)
+{
+    // Moves a point along the vector (point, extreme) in the direction of the extreme  point
+    // This adapts the possibly uneven legs of the triangle (or trapezium-like shape)
+    //      _____extreme            _____
+    //     /     \                 /     \                                    .
+    //    /base   \         =>    /       \ point                             .
+    //             \ point                                                    .
+    //
+    // For so-called intruders, it can be used to adapt both legs to the level of "base"
+    // For the base, it can be used to adapt both legs to the level of the max-value of the intruders
+    // If there are 2 or more extreme values, use the one close to 'point' to have a correct vector
+
+    CoordinateType const value = geometry::get<Dimension>(point);
+    //if (geometry::math::equals(value, base_value))
+    if (value >= base_value)
+    {
+        return;
+    }
+
+    PointType vector = point;
+    subtract_point(vector, extreme);
+
+    CoordinateType const diff = geometry::get<Dimension>(vector);
+
+    // diff should never be zero
+    // because of the way our triangle/trapezium is build.
+    // We just return if it would be the case.
+    if (geometry::math::equals(diff, 0))
+    {
+        return;
+    }
+
+    CoordinateType const base_diff = base_value - geometry::get<Dimension>(extreme);
+
+    multiply_value(vector, base_diff / diff);
+
+    // The real move:
+    point = extreme;
+    add_point(point, vector);
+}
+
+
+template <std::size_t Dimension, typename Range, typename CoordinateType>
+inline void move_along_vector(Range& range, CoordinateType const& base_value)
+{
+    if (range.size() >= 3)
+    {
+        move_along_vector<Dimension>(range.front(), *(range.begin() + 1), base_value);
+        move_along_vector<Dimension>(range.back(), *(range.rbegin() + 1), base_value);
+    }
+}
+
+
+template<typename Ring, std::size_t Dimension>
+struct extreme_points_on_ring
+{
+
+    typedef typename geometry::coordinate_type<Ring>::type coordinate_type;
+    typedef typename boost::range_iterator<Ring const>::type range_iterator;
+    typedef typename geometry::point_type<Ring>::type point_type;
+
+    typedef typename geometry::strategy::side::services::default_strategy
+        <
+            typename geometry::cs_tag<point_type>::type
+        >::type side_strategy;
+
+
+    template <typename CirclingIterator, typename Points>
+    static inline bool extend(CirclingIterator& it,
+            std::size_t n,
+            coordinate_type max_coordinate_value,
+            Points& points, int direction)
+    {
+        std::size_t safe_index = 0;
+        do
+        {
+            it += direction;
+
+            points.push_back(*it);
+
+            if (safe_index++ >= n)
+            {
+                // E.g.: ring is completely horizontal or vertical (= invalid, but we don't want to have an infinite loop)
+                return false;
+            }
+        } while (geometry::math::equals(geometry::get<Dimension>(*it), max_coordinate_value));
+
+        return true;
+    }
+
+    // Overload without adding to poinst
+    template <typename CirclingIterator>
+    static inline bool extend(CirclingIterator& it,
+            std::size_t n,
+            coordinate_type max_coordinate_value,
+            int direction)
+    {
+        std::size_t safe_index = 0;
+        do
+        {
+            it += direction;
+
+            if (safe_index++ >= n)
+            {
+                // E.g.: ring is completely horizontal or vertical (= invalid, but we don't want to have an infinite loop)
+                return false;
+            }
+        } while (geometry::math::equals(geometry::get<Dimension>(*it), max_coordinate_value));
+
+        return true;
+    }
+
+    template <typename CirclingIterator>
+    static inline bool extent_both_sides(Ring const& ring,
+            point_type extreme,
+            CirclingIterator& left,
+            CirclingIterator& right)
+    {
+        std::size_t const n = boost::size(ring);
+        coordinate_type const max_coordinate_value = geometry::get<Dimension>(extreme);
+
+        if (! extend(left, n, max_coordinate_value, -1))
+        {
+            return false;
+        }
+        if (! extend(right, n, max_coordinate_value, +1))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    template <typename Collection, typename CirclingIterator>
+    static inline bool collect(Ring const& ring,
+            point_type extreme,
+            Collection& points,
+            CirclingIterator& left,
+            CirclingIterator& right)
+    {
+        std::size_t const n = boost::size(ring);
+        coordinate_type const max_coordinate_value = geometry::get<Dimension>(extreme);
+
+        // Collects first left, which is reversed (if more than one point) then adds the top itself, then right
+        if (! extend(left, n, max_coordinate_value, points, -1))
+        {
+            return false;
+        }
+        std::reverse(points.begin(), points.end());
+        points.push_back(extreme);
+        if (! extend(right, n, max_coordinate_value, points, +1))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    template <typename Extremes, typename Intruders, typename CirclingIterator>
+    static inline void get_intruders(Ring const& ring, CirclingIterator left, CirclingIterator right,
+            Extremes const& extremes,
+            Intruders& intruders)
+    {
+        if (boost::size(extremes) < 3)
+        {
+            return;
+        }
+        coordinate_type const min_value = geometry::get<Dimension>(*std::min_element(boost::begin(extremes), boost::end(extremes), compare<Dimension>()));
+
+        // Also select left/right (if Dimension=1)
+        coordinate_type const other_min = geometry::get<1 - Dimension>(*std::min_element(boost::begin(extremes), boost::end(extremes), compare<1 - Dimension>()));
+        coordinate_type const other_max = geometry::get<1 - Dimension>(*std::max_element(boost::begin(extremes), boost::end(extremes), compare<1 - Dimension>()));
+
+        std::size_t defensive_check_index = 0; // in case we skip over left/right check, collect modifies right too
+        std::size_t const n = boost::size(ring);
+        while (left != right && defensive_check_index < n)
+        {
+            coordinate_type const coordinate = geometry::get<Dimension>(*right);
+            coordinate_type const other_coordinate = geometry::get<1 - Dimension>(*right);
+            if (coordinate > min_value && other_coordinate > other_min && other_coordinate < other_max)
+            {
+                int const first_side = side_strategy::apply(*right, extremes.front(), *(extremes.begin() + 1));
+                int const last_side = side_strategy::apply(*right, *(extremes.rbegin() + 1), extremes.back());
+
+                // If not lying left from any of the extemes side
+                if (first_side != 1 && last_side != 1)
+                {
+                    //std::cout << "first " << first_side << " last " << last_side << std::endl;
+
+                    // we start at this intrusion until it is handled, and don't affect our initial left iterator
+                    CirclingIterator left_intrusion_it = right;
+                    typename boost::range_value<Intruders>::type intruder;
+                    collect(ring, *right, intruder, left_intrusion_it, right);
+
+                    // Also moves these to base-level, makes sorting possible which can be done in case of self-tangencies
+                    // (we might postpone this action, it is often not necessary. However it is not time-consuming)
+                    move_along_vector<Dimension>(intruder, min_value);
+                    intruders.push_back(intruder);
+                    --right;
+                }
+            }
+            ++right;
+            defensive_check_index++;
+        }
+    }
+
+    template <typename Extremes, typename Intruders>
+    static inline void get_intruders(Ring const& ring,
+            Extremes const& extremes,
+            Intruders& intruders)
+    {
+        std::size_t const n = boost::size(ring);
+        if (n >= 3)
+        {
+            geometry::ever_circling_range_iterator<Ring const> left(ring);
+            geometry::ever_circling_range_iterator<Ring const> right(ring);
+            ++right;
+
+            get_intruders(ring, left, right, extremes, intruders);
+        }
+    }
+
+    template <typename Iterator>
+    static inline bool right_turn(Ring const& ring, Iterator it)
+    {
+        int const index = std::distance(boost::begin(ring), it);
+        geometry::ever_circling_range_iterator<Ring const> left(ring);
+        geometry::ever_circling_range_iterator<Ring const> right(ring);
+        left += index;
+        right += index;
+
+        if (! extent_both_sides(ring, *it, left, right))
+        {
+            return false;
+        }
+
+        int const first_side = side_strategy::apply(*(right - 1), *right, *left);
+        int const last_side = side_strategy::apply(*left, *(left + 1), *right);
+
+//std::cout << "Candidate at " << geometry::wkt(*it) << " first=" << first_side << " last=" << last_side << std::endl;
+
+        // Turn should not be left (actually, it should be right because extent removes horizontal/collinear cases)
+        return first_side != 1 && last_side != 1;
+    }
+
+
+    // Gets the extreme segments (top point plus neighbouring points), plus intruders, if any, on the same ring
+    template <typename Extremes, typename Intruders>
+    static inline bool apply(Ring const& ring, Extremes& extremes, Intruders& intruders)
+    {
+        std::size_t const n = boost::size(ring);
+        if (n < 3)
+        {
+            return false;
+        }
+
+        // Get all maxima, usually one. In case of self-tangencies, or self-crossings,
+        // the max might be is not valid. A valid max should make a right turn
+        range_iterator max_it = boost::begin(ring);
+        compare<Dimension> smaller;
+        for (range_iterator it = max_it + 1; it != boost::end(ring); ++it)
+        {
+            if (smaller(*max_it, *it) && right_turn(ring, it))
+            {
+                max_it = it;
+            }
+        }
+
+        if (max_it == boost::end(ring))
+        {
+            return false;
+        }
+
+        int const index = std::distance(boost::begin(ring), max_it);
+//std::cout << "Extreme point lies at " << index << " having " << geometry::wkt(*max_it) << std::endl;
+
+        geometry::ever_circling_range_iterator<Ring const> left(ring);
+        geometry::ever_circling_range_iterator<Ring const> right(ring);
+        left += index;
+        right += index;
+
+        // Collect all points (often 3) in a temporary vector
+        std::vector<point_type> points;
+        points.reserve(3);
+        if (! collect(ring, *max_it, points, left, right))
+        {
+            return false;
+        }
+
+//std::cout << "Built vector of " << points.size() << std::endl;
+
+        coordinate_type const front_value = geometry::get<Dimension>(points.front());
+        coordinate_type const back_value = geometry::get<Dimension>(points.back());
+        coordinate_type const base_value = (std::max)(front_value, back_value);
+        if (front_value < back_value)
+        {
+            move_along_vector<Dimension>(points.front(), *(points.begin() + 1), base_value);
+        }
+        else
+        {
+            move_along_vector<Dimension>(points.back(), *(points.rbegin() + 1), base_value);
+        }
+
+        std::copy(points.begin(), points.end(), std::back_inserter(extremes));
+
+        get_intruders(ring, left, right, extremes, intruders);
+
+        return true;
+    }
+};
+
+
+
+
+
+}} // namespace detail::extreme_points
+#endif // DOXYGEN_NO_DETAIL
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry,
+    std::size_t Dimension,
+    typename GeometryTag = typename tag<Geometry>::type
+>
+struct extreme_points
+{};
+
+
+template<typename Ring, std::size_t Dimension>
+struct extreme_points<Ring, Dimension, ring_tag>
+    : detail::extreme_points::extreme_points_on_ring<Ring, Dimension>
+{};
+
+
+template<typename Polygon, std::size_t Dimension>
+struct extreme_points<Polygon, Dimension, polygon_tag>
+{
+    template <typename Extremes, typename Intruders>
+    static inline bool apply(Polygon const& polygon, Extremes& extremes, Intruders& intruders)
+    {
+        typedef typename geometry::ring_type<Polygon>::type ring_type;
+        typedef detail::extreme_points::extreme_points_on_ring
+            <
+                ring_type, Dimension
+            > ring_implementation;
+
+        if (! ring_implementation::apply(geometry::exterior_ring(polygon), extremes, intruders))
+        {
+            return false;
+        }
+
+        // For a polygon, its interior rings can contain intruders
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(polygon);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
+        {
+            ring_implementation::get_intruders(*it, extremes,  intruders);
+        }
+
+        return true;
+    }
+};
+
+template<typename Box>
+struct extreme_points<Box, 1, box_tag>
+{
+    template <typename Extremes, typename Intruders>
+    static inline bool apply(Box const& box, Extremes& extremes, Intruders& )
+    {
+        extremes.resize(4);
+        geometry::detail::assign_box_corners_oriented<false>(box, extremes);
+        // ll,ul,ur,lr, contains too exactly the right info
+        return true;
+    }
+};
+
+template<typename Box>
+struct extreme_points<Box, 0, box_tag>
+{
+    template <typename Extremes, typename Intruders>
+    static inline bool apply(Box const& box, Extremes& extremes, Intruders& )
+    {
+        extremes.resize(4);
+        geometry::detail::assign_box_corners_oriented<false>(box, extremes);
+        // ll,ul,ur,lr, rotate one to start with UL and end with LL
+        std::rotate(extremes.begin(), extremes.begin() + 1, extremes.end());
+        return true;
+    }
+};
+
+template<typename MultiPolygon, std::size_t Dimension>
+struct extreme_points<MultiPolygon, Dimension, multi_polygon_tag>
+{
+    template <typename Extremes, typename Intruders>
+    static inline bool apply(MultiPolygon const& multi, Extremes& extremes, Intruders& intruders)
+    {
+        // Get one for the very first polygon, that is (for the moment) enough.
+        // It is not guaranteed the "extreme" then, but for the current purpose
+        // (point_on_surface) it can just be this point.
+        if (boost::size(multi) >= 1)
+        {
+            return extreme_points
+                <
+                    typename boost::range_value<MultiPolygon const>::type,
+                    Dimension,
+                    polygon_tag
+                >::apply(*boost::begin(multi), extremes, intruders);
+        }
+
+        return false;
+    }
+};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+/*!
+\brief Returns extreme points (for Edge=1 in dimension 1, so the top,
+       for Edge=0 in dimension 0, the right side)
+\note We could specify a strategy (less/greater) to get bottom/left side too. However, until now we don't need that.
+ */
+template <std::size_t Edge, typename Geometry, typename Extremes, typename Intruders>
+inline bool extreme_points(Geometry const& geometry, Extremes& extremes, Intruders& intruders)
+{
+    concept::check<Geometry const>();
+
+    // Extremes is not required to follow a geometry concept (but it should support an output iterator),
+    // but its elements should fulfil the point-concept
+    concept::check<typename boost::range_value<Extremes>::type>();
+
+    // Intruders should contain collections which value type is point-concept
+    // Extremes might be anything (supporting an output iterator), but its elements should fulfil the point-concept
+    concept::check
+        <
+            typename boost::range_value
+                <
+                    typename boost::range_value<Intruders>::type
+                >::type
+            const
+        >();
+
+    return dispatch::extreme_points<Geometry, Edge>::apply(geometry, extremes, intruders);
+}
+
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
diff --git a/include/boost/geometry/algorithms/detail/for_each_range.hpp b/include/boost/geometry/algorithms/detail/for_each_range.hpp
index 7cb01fa9b..e8c92160f 100644
--- a/include/boost/geometry/algorithms/detail/for_each_range.hpp
+++ b/include/boost/geometry/algorithms/detail/for_each_range.hpp
@@ -17,9 +17,13 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/concept/requires.hpp>
+#include <boost/range.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/util/add_const_if_c.hpp>
 #include <boost/geometry/views/box_view.hpp>
@@ -34,24 +38,20 @@ namespace detail { namespace for_each
 {
 
 
-template <typename Range, typename Actor, bool IsConst>
+template <typename Range, typename Actor>
 struct fe_range_range
 {
-    static inline void apply(
-                    typename add_const_if_c<IsConst, Range>::type& range,
-                    Actor& actor)
+    static inline void apply(Range & range, Actor & actor)
     {
         actor.apply(range);
     }
 };
 
 
-template <typename Polygon, typename Actor, bool IsConst>
+template <typename Polygon, typename Actor>
 struct fe_range_polygon
 {
-    static inline void apply(
-                    typename add_const_if_c<IsConst, Polygon>::type& polygon,
-                    Actor& actor)
+    static inline void apply(Polygon & polygon, Actor & actor)
     {
         actor.apply(exterior_ring(polygon));
 
@@ -60,17 +60,27 @@ struct fe_range_polygon
     }
 };
 
-template <typename Box, typename Actor, bool IsConst>
+template <typename Box, typename Actor>
 struct fe_range_box
 {
-    static inline void apply(
-                    typename add_const_if_c<IsConst, Box>::type& box,
-                    Actor& actor)
+    static inline void apply(Box & box, Actor & actor)
     {
-        actor.apply(box_view<Box>(box));
+        actor.apply(box_view<typename boost::remove_const<Box>::type>(box));
     }
 };
 
+template <typename Multi, typename Actor, typename SinglePolicy>
+struct fe_range_multi
+{
+    static inline void apply(Multi & multi, Actor & actor)
+    {
+        for ( typename boost::range_iterator<Multi>::type
+                it = boost::begin(multi); it != boost::end(multi); ++it)
+        {
+            SinglePolicy::apply(*it, actor);
+        }
+    }
+};
 
 }} // namespace detail::for_each
 #endif // DOXYGEN_NO_DETAIL
@@ -83,10 +93,9 @@ namespace dispatch
 
 template
 <
-    typename Tag,
     typename Geometry,
     typename Actor,
-    bool IsConst
+    typename Tag = typename tag<Geometry>::type
 >
 struct for_each_range
 {
@@ -98,26 +107,71 @@ struct for_each_range
 };
 
 
-template <typename Linestring, typename Actor, bool IsConst>
-struct for_each_range<linestring_tag, Linestring, Actor, IsConst>
-    : detail::for_each::fe_range_range<Linestring, Actor, IsConst>
+template <typename Linestring, typename Actor>
+struct for_each_range<Linestring, Actor, linestring_tag>
+    : detail::for_each::fe_range_range<Linestring, Actor>
 {};
 
 
-template <typename Ring, typename Actor, bool IsConst>
-struct for_each_range<ring_tag, Ring, Actor, IsConst>
-    : detail::for_each::fe_range_range<Ring, Actor, IsConst>
+template <typename Ring, typename Actor>
+struct for_each_range<Ring, Actor, ring_tag>
+    : detail::for_each::fe_range_range<Ring, Actor>
 {};
 
 
-template <typename Polygon, typename Actor, bool IsConst>
-struct for_each_range<polygon_tag, Polygon, Actor, IsConst>
-    : detail::for_each::fe_range_polygon<Polygon, Actor, IsConst>
+template <typename Polygon, typename Actor>
+struct for_each_range<Polygon, Actor, polygon_tag>
+    : detail::for_each::fe_range_polygon<Polygon, Actor>
 {};
 
-template <typename Box, typename Actor, bool IsConst>
-struct for_each_range<box_tag, Box, Actor, IsConst>
-    : detail::for_each::fe_range_box<Box, Actor, IsConst>
+
+template <typename Box, typename Actor>
+struct for_each_range<Box, Actor, box_tag>
+    : detail::for_each::fe_range_box<Box, Actor>
+{};
+
+
+template <typename MultiPoint, typename Actor>
+struct for_each_range<MultiPoint, Actor, multi_point_tag>
+    : detail::for_each::fe_range_range<MultiPoint, Actor>
+{};
+
+
+template <typename Geometry, typename Actor>
+struct for_each_range<Geometry, Actor, multi_linestring_tag>
+    : detail::for_each::fe_range_multi
+        <
+            Geometry,
+            Actor,
+            detail::for_each::fe_range_range
+                <
+                    typename add_const_if_c
+                        <
+                            boost::is_const<Geometry>::value,
+                            typename boost::range_value<Geometry>::type
+                        >::type,
+                    Actor
+                >
+        >
+{};
+
+
+template <typename Geometry, typename Actor>
+struct for_each_range<Geometry, Actor, multi_polygon_tag>
+    : detail::for_each::fe_range_multi
+        <
+            Geometry,
+            Actor,
+            detail::for_each::fe_range_polygon
+                <
+                    typename add_const_if_c
+                        <
+                            boost::is_const<Geometry>::value,
+                            typename boost::range_value<Geometry>::type
+                        >::type,
+                    Actor
+                >
+        >
 {};
 
 
@@ -128,14 +182,12 @@ namespace detail
 {
 
 template <typename Geometry, typename Actor>
-inline void for_each_range(Geometry const& geometry, Actor& actor)
+inline void for_each_range(Geometry const& geometry, Actor & actor)
 {
     dispatch::for_each_range
         <
-            typename tag<Geometry>::type,
-            Geometry,
-            Actor,
-            true
+            Geometry const,
+            Actor
         >::apply(geometry, actor);
 }
 
diff --git a/include/boost/geometry/algorithms/detail/get_left_turns.hpp b/include/boost/geometry/algorithms/detail/get_left_turns.hpp
index d23f1e4c2..4e91522b5 100644
--- a/include/boost/geometry/algorithms/detail/get_left_turns.hpp
+++ b/include/boost/geometry/algorithms/detail/get_left_turns.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2012-2014 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
@@ -9,7 +9,12 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_GET_LEFT_TURNS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_GET_LEFT_TURNS_HPP
 
+#include <boost/geometry/arithmetic/arithmetic.hpp>
+#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/iterators/closing_iterator.hpp>
 #include <boost/geometry/iterators/ever_circling_iterator.hpp>
+#include <boost/geometry/strategies/side.hpp>
 
 namespace boost { namespace geometry
 {
@@ -21,346 +26,261 @@ namespace detail
 
 // TODO: move this to /util/
 template <typename T>
-static inline std::pair<T, T> ordered_pair(T const& first, T const& second)
+inline std::pair<T, T> ordered_pair(T const& first, T const& second)
 {
     return first < second ? std::make_pair(first, second) : std::make_pair(second, first);
 }
 
-template <typename AngleInfo>
-inline void debug_left_turn(AngleInfo const& ai, AngleInfo const& previous)
+namespace left_turns
 {
-#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_OCCUPATION
-    std::cout << "Angle: " << (ai.incoming ? "i" : "o") 
-        << " " << si(ai.seg_id) 
-        << " " << (math::r2d * (ai.angle) )
-        << " turn: " << ai.turn_index << "[" << ai.operation_index << "]"
+
+template <typename Point>
+struct turn_angle_info
+{
+    bg::segment_identifier seg_id;
+    int turn_index;
+    Point points[2];
+
+    turn_angle_info(bg::segment_identifier const& id, Point const& from, Point const& to)
+        : seg_id(id)
+        , turn_index(-1)
+    {
+        points[0] = from;
+        points[1] = to;
+    }
+};
+
+
+template <typename Point>
+struct angle_info
+{
+    bg::segment_identifier seg_id;
+    Point point;
+    bool incoming;
+    bool blocked;
+
+    inline angle_info(bg::segment_identifier const& id, bool inc, Point const& p)
+        : seg_id(id)
+        , point(p)
+        , incoming(inc)
+        , blocked(false)
+    {
+    }
+};
+
+template <typename Vector>
+inline int get_quadrant(Vector const& vector)
+{
+    // Return quadrant as layouted in the code below:
+    // 3 | 0
+    // -----
+    // 2 | 1
+    return geometry::get<1>(vector) >= 0
+        ? (geometry::get<0>(vector)  < 0 ? 3 : 0)
+        : (geometry::get<0>(vector)  < 0 ? 2 : 1)
         ;
-
-    if (ai.turn_index != previous.turn_index
-        || ai.operation_index != previous.operation_index)
-    {
-        std::cout << " diff: " << math::r2d * math::abs(previous.angle - ai.angle);
-    }
-    std::cout << std::endl;
-#endif
 }
 
-template <typename AngleInfo>
-inline void debug_left_turn(std::string const& caption, AngleInfo const& ai, AngleInfo const& previous,
-            int code = -99, int code2 = -99, int code3 = -99, int code4 = -99)
+template <typename Vector>
+inline int squared_length(Vector const& vector)
 {
-#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_OCCUPATION
-    std::cout << " " << caption
-            << " turn: " << ai.turn_index << "[" << ai.operation_index << "]"
-            << " " << si(ai.seg_id) 
-            << " " << (ai.incoming ? "i" : "o") 
-            << " " << (math::r2d * (ai.angle) )
-            << " turn: " << previous.turn_index << "[" << previous.operation_index << "]"
-            << " " << si(previous.seg_id) 
-            << " " << (previous.incoming ? "i" : "o") 
-            << " " << (math::r2d * (previous.angle) )
+    return geometry::get<0>(vector) * geometry::get<0>(vector)
+         + geometry::get<1>(vector) * geometry::get<1>(vector)
+         ;
+}
+
+
+template <typename Point>
+struct angle_less
+{
+    typedef Point vector_type;
+    typedef typename strategy::side::services::default_strategy
+    <
+        typename cs_tag<Point>::type
+    >::type side_strategy_type;
+
+    angle_less(Point const& origin)
+        : m_origin(origin)
+    {}
+
+    template <typename Angle>
+    inline bool operator()(Angle const& p, Angle const& q) const
+    {
+        // Vector origin -> p and origin -> q
+        vector_type pv = p.point;
+        vector_type qv = q.point;
+        geometry::subtract_point(pv, m_origin);
+        geometry::subtract_point(qv, m_origin);
+
+        int const quadrant_p = get_quadrant(pv);
+        int const quadrant_q = get_quadrant(qv);
+        if (quadrant_p != quadrant_q)
+        {
+            return quadrant_p < quadrant_q;
+        }
+        // Same quadrant, check if p is located left of q
+        int const side = side_strategy_type::apply(m_origin, q.point,
+                    p.point);
+        if (side != 0)
+        {
+            return side == 1;
+        }
+        // Collinear, check if one is incoming
+        if (p.incoming != q.incoming)
+        {
+            return int(p.incoming) < int(q.incoming);
+        }
+        // Same quadrant/side/direction, return longest first
+        int const length_p = squared_length(pv);
+        int const length_q = squared_length(qv);
+        if (length_p != length_q)
+        {
+            return squared_length(pv) > squared_length(qv);
+        }
+        // They are still the same. Just compare on seg_id
+        return p.seg_id < q.seg_id;
+    }
+
+private:
+    Point m_origin;
+};
+
+template <typename Point>
+struct angle_equal_to
+{
+    typedef Point vector_type;
+    typedef typename strategy::side::services::default_strategy
+    <
+        typename cs_tag<Point>::type
+    >::type side_strategy_type;
+
+    inline angle_equal_to(Point const& origin)
+        : m_origin(origin)
+    {}
+
+    template <typename Angle>
+    inline bool operator()(Angle const& p, Angle const& q) const
+    {
+        // Vector origin -> p and origin -> q
+        vector_type pv = p.point;
+        vector_type qv = q.point;
+        geometry::subtract_point(pv, m_origin);
+        geometry::subtract_point(qv, m_origin);
+
+        if (get_quadrant(pv) != get_quadrant(qv))
+        {
+            return false;
+        }
+        // Same quadrant, check if p/q are collinear
+        int const side = side_strategy_type::apply(m_origin, q.point,
+                    p.point);
+        return side == 0;
+    }
+
+private:
+    Point m_origin;
+};
+
+struct left_turn
+{
+    segment_identifier from;
+    segment_identifier to;
+};
+
+
+template <typename Point, typename AngleCollection, typename OutputCollection>
+inline void get_left_turns(AngleCollection const& sorted_angles, Point const& origin,
+        OutputCollection& output_collection)
+{
+    angle_equal_to<Point> comparator(origin);
+    typedef geometry::closing_iterator<AngleCollection const> closing_iterator;
+    closing_iterator it(sorted_angles);
+    closing_iterator end(sorted_angles, true);
+
+    closing_iterator previous = it++;
+    for( ; it != end; previous = it++)
+    {
+        if (! it->blocked)
+        {
+            bool equal = comparator(*previous, *it);
+            bool include = ! equal
+                && previous->incoming
+                && !it->incoming;
+            if (include)
+            {
+                left_turn turn;
+                turn.from = previous->seg_id;
+                turn.to = it->seg_id;
+                output_collection.push_back(turn);
+            }
+        }
+    }
+}
+
+template <typename AngleTurnCollection, typename AngleCollection>
+inline void block_turns_on_right_sides(AngleTurnCollection const& turns,
+        AngleCollection& sorted)
+{
+    // Create a small (seg_id -> index) map for fast finding turns
+    std::map<segment_identifier, int> incoming;
+    std::map<segment_identifier, int> outgoing;
+    int index = 0;
+    for (typename boost::range_iterator<AngleCollection>::type it =
+        sorted.begin(); it != sorted.end(); ++it, ++index)
+    {
+        if (it->incoming)
+        {
+            incoming[it->seg_id] = index;
+        }
+        else
+        {
+            outgoing[it->seg_id] = index;
+        }
+    }
+
+    // Walk through turns and block every outgoing angle on the right side
+    for (typename boost::range_iterator<AngleTurnCollection const>::type it =
+        turns.begin(); it != turns.end(); ++it)
+    {
+        int incoming_index = incoming[it->seg_id];
+        int outgoing_index = outgoing[it->seg_id];
+        int index = incoming_index;
+        while(index != outgoing_index)
+        {
+            if (!sorted[index].incoming)
+            {
+                sorted[index].blocked = true;
+            }
+
+            // Go back (circular)
+            index--;
+            if (index == -1)
+            {
+                index = boost::size(sorted) - 1;
+            }
+        }
+    }
+}
+
+template <typename AngleCollection, typename Point>
+inline bool has_rounding_issues(AngleCollection const& angles, Point const& origin)
+{
+    for (typename boost::range_iterator<AngleCollection const>::type it =
+        angles.begin(); it != angles.end(); ++it)
+    {
+        // Vector origin -> p and origin -> q
+        typedef Point vector_type;
+        vector_type v = it->point;
+        geometry::subtract_point(v, origin);
+        return geometry::math::abs(geometry::get<0>(v)) <= 1
+            || geometry::math::abs(geometry::get<1>(v)) <= 1
             ;
-
-    if (code != -99)
-    {
-        std::cout << " code: " << code << " , " << code2 << " , " << code3 << " , " << code4;
-    }
-    std::cout << std::endl;
-#endif
-}
-
-
-template <typename Operation>
-inline bool include_operation(Operation const& op, 
-                segment_identifier const& outgoing_seg_id,
-                segment_identifier const& incoming_seg_id)
-{
-    return op.seg_id == outgoing_seg_id
-        && op.other_id == incoming_seg_id
-        && (op.operation == detail::overlay::operation_union
-            ||op.operation == detail::overlay::operation_continue)
-            ;
-}
-
-template <typename Turn>
-inline bool process_include(segment_identifier const& outgoing_seg_id, segment_identifier const& incoming_seg_id,
-                int turn_index, Turn& turn,
-                std::set<int>& keep_indices, int priority)
-{
-    bool result = false;
-    for (int i = 0; i < 2; i++)
-    {
-        if (include_operation(turn.operations[i], outgoing_seg_id, incoming_seg_id))
-        {
-            turn.operations[i].include_in_occupation_map = true;
-            if (priority > turn.priority)
-            {
-                turn.priority = priority;
-            }
-            keep_indices.insert(turn_index);
-            result = true;
-        }
-    }
-    return result;
-}
-
-template <typename AngleInfo, typename Turns, typename TurnSegmentIndices>
-inline bool include_left_turn_of_all(
-                AngleInfo const& outgoing, AngleInfo const& incoming,
-                Turns& turns, TurnSegmentIndices const& turn_segment_indices,
-                std::set<int>& keep_indices, int priority)
-{
-    segment_identifier const& outgoing_seg_id = turns[outgoing.turn_index].operations[outgoing.operation_index].seg_id;
-    segment_identifier const& incoming_seg_id = turns[incoming.turn_index].operations[incoming.operation_index].seg_id;
-
-    if (outgoing.turn_index == incoming.turn_index)
-    {
-        return process_include(outgoing_seg_id, incoming_seg_id, outgoing.turn_index, turns[outgoing.turn_index], keep_indices, priority);
-    }
-
-    bool result = false;
-    std::pair<segment_identifier, segment_identifier> pair = ordered_pair(outgoing_seg_id, incoming_seg_id);
-    typename boost::range_iterator<TurnSegmentIndices const>::type it = turn_segment_indices.find(pair);
-    if (it != turn_segment_indices.end())
-    {
-        for (std::set<int>::const_iterator sit = it->second.begin(); sit != it->second.end(); ++sit)
-        {
-            if (process_include(outgoing_seg_id, incoming_seg_id, *sit, turns[*sit], keep_indices, priority))
-            {
-                result = true;
-            }
-        }
-    }
-    return result;
-}
-
-template <std::size_t Index, typename Turn>
-inline bool corresponds(Turn const& turn, segment_identifier const& seg_id)
-{
-    return turn.operations[Index].operation == detail::overlay::operation_union
-        && turn.operations[Index].seg_id == seg_id;
-}
-
-
-template <typename Turns, typename TurnSegmentIndices>
-inline bool prefer_by_other(Turns const& turns,
-            TurnSegmentIndices const& turn_segment_indices,
-            std::set<int>& indices)
-{
-    std::map<segment_identifier, int> map;
-    for (std::set<int>::const_iterator sit = indices.begin();
-        sit != indices.end();
-        ++sit)
-    {
-        map[turns[*sit].operations[0].seg_id]++;
-        map[turns[*sit].operations[1].seg_id]++;
-    }
-
-    std::set<segment_identifier> segment_occuring_once;
-    for (std::map<segment_identifier, int>::const_iterator mit = map.begin(); 
-        mit != map.end();++mit)
-    {
-        if (mit->second == 1)
-        {
-            segment_occuring_once.insert(mit->first);
-        }
-#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_PREFER
-        std::cout << si(mit->first) << " " << mit->second << std::endl;
-#endif
-    }
-
-    if (segment_occuring_once.size() == 2)
-    {
-        // Try to find within all turns a turn with these two segments
-
-        std::set<segment_identifier>::const_iterator soo_it = segment_occuring_once.begin();
-        segment_identifier front = *soo_it;
-        soo_it++;
-        segment_identifier back = *soo_it;
-
-        std::pair<segment_identifier, segment_identifier> pair = ordered_pair(front, back);
-
-        typename boost::range_iterator<TurnSegmentIndices const>::type it = turn_segment_indices.find(pair);
-        if (it != turn_segment_indices.end())
-        {
-            // debug_turns_by_indices("Found", it->second);
-            // Check which is the union/continue
-            segment_identifier good;
-            for (std::set<int>::const_iterator sit = it->second.begin(); sit != it->second.end(); ++sit)
-            {
-                if (turns[*sit].operations[0].operation == detail::overlay::operation_union)
-                {
-                    good = turns[*sit].operations[0].seg_id;
-                }
-                else if (turns[*sit].operations[1].operation == detail::overlay::operation_union)
-                {
-                    good = turns[*sit].operations[1].seg_id;
-                }
-            }
-
-#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_PREFER
-            std::cout << "Good: " << si(good) << std::endl;
-#endif
-
-            // Find in indexes-to-keep this segment with the union. Discard the other one
-            std::set<int> ok_indices;
-            for (std::set<int>::const_iterator sit = indices.begin(); sit != indices.end(); ++sit)
-            {
-                if (corresponds<0>(turns[*sit], good) || corresponds<1>(turns[*sit], good))
-                {
-                    ok_indices.insert(*sit);
-                }
-            }
-            if (ok_indices.size() > 0 && ok_indices.size() < indices.size())
-            {
-                indices = ok_indices;
-                std::cout << "^";
-                return true;
-            }
-        }
     }
     return false;
 }
 
-template <typename Turns>
-inline void prefer_by_priority(Turns const& turns, std::set<int>& indices)
-{
-    // Find max prio
-    int min_prio = 1024, max_prio = 0;
-    for (std::set<int>::const_iterator sit = indices.begin(); sit != indices.end(); ++sit)
-    {
-        if (turns[*sit].priority > max_prio)
-        {
-            max_prio = turns[*sit].priority;
-        }
-        if (turns[*sit].priority < min_prio)
-        {
-            min_prio = turns[*sit].priority;
-        }
-    }
 
-    if (min_prio == max_prio)
-    {
-        return;
-    }
-
-    // Only keep indices with high prio
-    std::set<int> ok_indices;
-    for (std::set<int>::const_iterator sit = indices.begin(); sit != indices.end(); ++sit)
-    {
-        if (turns[*sit].priority >= max_prio)
-        {
-            ok_indices.insert(*sit);
-        }
-    }
-    if (ok_indices.size() > 0 && ok_indices.size() < indices.size())
-    {
-        indices = ok_indices;
-        std::cout << "%";
-    }
-}
-
-template <typename AngleInfo, typename Angles, typename Turns, typename TurnSegmentIndices>
-inline void calculate_left_turns(Angles const& angles, 
-                Turns& turns, TurnSegmentIndices const& turn_segment_indices,
-                std::set<int>& keep_indices)
-{
-    bool debug_indicate_size = false;
-
-    typedef typename strategy::side::services::default_strategy
-        <
-            typename cs_tag<typename AngleInfo::point_type>::type
-        >::type side_strategy;
-
-    std::size_t i = 0;
-    std::size_t n = boost::size(angles);
-
-    typedef geometry::ever_circling_range_iterator<Angles const> circling_iterator;
-    circling_iterator cit(angles);
-
-    debug_left_turn(*cit, *cit);
-    for(circling_iterator prev = cit++; i < n; prev = cit++, i++)
-    {
-        debug_left_turn(*cit, *prev);
-
-        bool const include = ! geometry::math::equals(prev->angle, cit->angle)
-            && ! prev->incoming
-            && cit->incoming;
-
-        if (include)
-        {
-            // Go back to possibly include more same left outgoing angles:
-            // Because we check on side too we can take a large "epsilon"
-            circling_iterator back = prev - 1;
-
-            typename AngleInfo::angle_type eps = 0.00001;
-            int b = 1;
-            for(std::size_t d = 0; 
-                    math::abs(prev->angle - back->angle) < eps 
-                        && ! back->incoming 
-                        && d < n;
-                d++)
-            {
-                --back;
-                ++b;
-            }
-
-            // Same but forward to possibly include more incoming angles
-            int f = 1;
-            circling_iterator forward = cit + 1;
-            for(std::size_t d = 0;
-                    math::abs(cit->angle - forward->angle) < eps 
-                        && forward->incoming 
-                        && d < n;
-                    d++)
-            {
-                ++forward;
-                ++f;
-            }
-
-#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_OCCUPATION
-            std::cout << "HANDLE " << b << "/" << f << " ANGLES" << std::endl;
-#endif
-            for(circling_iterator bit = prev; bit != back; --bit)
-            {
-                int code = side_strategy::apply(bit->direction_point, prev->intersection_point, prev->direction_point);
-                int code2 = side_strategy::apply(prev->direction_point, bit->intersection_point, bit->direction_point);
-                for(circling_iterator fit = cit; fit != forward; ++fit)
-                {
-                    int code3 = side_strategy::apply(fit->direction_point, cit->intersection_point, cit->direction_point);
-                    int code4 = side_strategy::apply(cit->direction_point, fit->intersection_point, fit->direction_point);
-
-                    int priority = 2;
-                    if (code == -1 && code2 == 1)
-                    {
-                        // This segment is lying right of the other one.
-                        // Cannot ignore it (because of robustness, see a.o. #rt_p21 from unit test).
-                        // But if we find more we can prefer later by priority
-                        // (a.o. necessary for #rt_o2 from unit test)
-                        priority = 1;
-                    }
-
-                    bool included = include_left_turn_of_all(*bit, *fit, turns, turn_segment_indices, keep_indices, priority);
-                    debug_left_turn(included ? "KEEP" : "SKIP", *fit, *bit, code, code2, code3, code4);
-                }
-            }
-        }
-    }
-
-    if (debug_indicate_size)
-    {
-        std::cout << " size=" << keep_indices.size();
-    }
-
-    if (keep_indices.size() >= 2)
-    {
-        prefer_by_other(turns, turn_segment_indices, keep_indices);
-    }
-    if (keep_indices.size() >= 2)
-    {
-            prefer_by_priority(turns, keep_indices);
-    }
-}
+}  // namespace left_turns
 
 } // namespace detail
 #endif // DOXYGEN_NO_DETAIL
diff --git a/include/boost/geometry/algorithms/detail/get_max_size.hpp b/include/boost/geometry/algorithms/detail/get_max_size.hpp
new file mode 100644
index 000000000..8ac43e78b
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/get_max_size.hpp
@@ -0,0 +1,64 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_GET_MAX_SIZE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_GET_MAX_SIZE_HPP
+
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <typename Box, std::size_t Dimension>
+struct get_max_size_box
+{
+    static inline typename coordinate_type<Box>::type apply(Box const& box)
+    {
+        typename coordinate_type<Box>::type s
+            = geometry::math::abs(geometry::get<1, Dimension>(box) - geometry::get<0, Dimension>(box));
+
+        return (std::max)(s, get_max_size_box<Box, Dimension - 1>::apply(box));
+    }
+};
+
+template <typename Box>
+struct get_max_size_box<Box, 0>
+{
+    static inline typename coordinate_type<Box>::type apply(Box const& box)
+    {
+        return geometry::math::abs(geometry::get<1, 0>(box) - geometry::get<0, 0>(box));
+    }
+};
+
+// This might be implemented later on for other geometries too.
+// Not dispatched yet.
+template <typename Box>
+inline typename coordinate_type<Box>::type get_max_size(Box const& box)
+{
+    return get_max_size_box<Box, dimension<Box>::value - 1>::apply(box);
+}
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_GET_MAX_SIZE_HPP
diff --git a/include/boost/geometry/algorithms/detail/has_self_intersections.hpp b/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
index 1e6215ed9..24746ac62 100644
--- a/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
+++ b/include/boost/geometry/algorithms/detail/has_self_intersections.hpp
@@ -17,7 +17,10 @@
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/policies/disjoint_interrupt_policy.hpp>
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
 #  include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
@@ -56,26 +59,33 @@ namespace detail { namespace overlay
 {
 
 
-template <typename Geometry>
-inline bool has_self_intersections(Geometry const& geometry)
+template <typename Geometry, typename RobustPolicy>
+inline bool has_self_intersections(Geometry const& geometry,
+        RobustPolicy const& robust_policy,
+        bool throw_on_self_intersection = true)
 {
     typedef typename point_type<Geometry>::type point_type;
-    typedef detail::overlay::turn_info<point_type> turn_info;
+    typedef turn_info
+    <
+        point_type,
+        typename segment_ratio_type<point_type, RobustPolicy>::type
+    > turn_info;
     std::deque<turn_info> turns;
     detail::disjoint::disjoint_interrupt_policy policy;
-    geometry::self_turns<detail::overlay::assign_null_policy>(geometry, turns, policy);
-    
+
+    geometry::self_turns<detail::overlay::assign_null_policy>(geometry, robust_policy, turns, policy);
+
 #ifdef BOOST_GEOMETRY_DEBUG_HAS_SELF_INTERSECTIONS
     bool first = true;
-#endif    
-    for(typename std::deque<turn_info>::const_iterator it = boost::begin(turns); 
+#endif
+    for(typename std::deque<turn_info>::const_iterator it = boost::begin(turns);
         it != boost::end(turns); ++it)
     {
         turn_info const& info = *it;
-        bool const both_union_turn = 
+        bool const both_union_turn =
             info.operations[0].operation == detail::overlay::operation_union
             && info.operations[1].operation == detail::overlay::operation_union;
-        bool const both_intersection_turn = 
+        bool const both_intersection_turn =
             info.operations[0].operation == detail::overlay::operation_intersection
             && info.operations[1].operation == detail::overlay::operation_intersection;
 
@@ -95,19 +105,40 @@ inline bool has_self_intersections(Geometry const& geometry)
             for (int i = 0; i < 2; i++)
             {
                 std::cout << " " << operation_char(info.operations[i].operation);
+                std::cout << " " << info.operations[i].seg_id;
             }
             std::cout << " " << geometry::dsv(info.point) << std::endl;
 #endif
 
 #if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
-            throw overlay_invalid_input_exception();
+            if (throw_on_self_intersection)
+            {
+                throw overlay_invalid_input_exception();
+            }
 #endif
+            return true;
         }
 
     }
     return false;
 }
 
+// For backward compatibility
+template <typename Geometry>
+inline bool has_self_intersections(Geometry const& geometry,
+                    bool throw_on_self_intersection = true)
+{
+    typedef typename geometry::point_type<Geometry>::type point_type;
+    typedef typename geometry::rescale_policy_type<point_type>::type
+        rescale_policy_type;
+
+    rescale_policy_type robust_policy
+            = geometry::get_rescale_policy<rescale_policy_type>(geometry);
+
+    return has_self_intersections(geometry, robust_policy,
+                throw_on_self_intersection);
+}
+
 
 }} // namespace detail::overlay
 #endif // DOXYGEN_NO_DETAIL
diff --git a/include/boost/geometry/algorithms/detail/interior_iterator.hpp b/include/boost/geometry/algorithms/detail/interior_iterator.hpp
new file mode 100644
index 000000000..3582773c3
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/interior_iterator.hpp
@@ -0,0 +1,71 @@
+// Boost.Geometry
+
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERIOR_ITERATOR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERIOR_ITERATOR_HPP
+
+#include <boost/range/iterator.hpp>
+#include <boost/range/value_type.hpp>
+
+#include <boost/geometry/core/interior_type.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+/*!
+\brief Structure defining the type of interior rings iterator
+\note If the Geometry is const, const iterator is defined.
+\tparam Geometry \tparam_geometry
+ */
+template <typename Geometry>
+struct interior_iterator
+{
+    typedef typename boost::range_iterator
+        <
+            typename geometry::interior_type<Geometry>::type        
+        >::type type;
+};
+
+template <typename BaseT, typename T>
+struct copy_const
+{
+    typedef T type;
+};
+
+template <typename BaseT, typename T>
+struct copy_const<BaseT const, T>
+{
+    typedef T const type;
+};
+
+template <typename Geometry>
+struct interior_ring_iterator
+{
+    typedef typename boost::range_iterator
+        <
+            typename copy_const
+                <
+                    typename geometry::interior_type<Geometry>::type,
+                    typename boost::range_value
+                        <
+                            typename geometry::interior_type<Geometry>::type
+                        >::type
+                >::type
+        >::type type;
+};
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_INTERIOR_ITERATOR_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp b/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp
new file mode 100644
index 000000000..54c6c2171
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_simple/always_simple.hpp
@@ -0,0 +1,83 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_ALWAYS_SIMPLE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_ALWAYS_SIMPLE_HPP
+
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_simple.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_simple
+{
+
+
+template <typename Geometry>
+struct always_simple
+{
+    static inline bool apply(Geometry const&)
+    {
+        return true;
+    }
+};
+
+
+}} // namespace detail::is_simple
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A point is always simple
+template <typename Point>
+struct is_simple<Point, point_tag>
+    : detail::is_simple::always_simple<Point>
+{};
+
+
+// A valid segment is always simple.
+// A segment is a curve.
+// A curve is simple if it does not pass through the same point twice,
+// with the possible exception of its two endpoints
+//
+// Reference: OGC 06-103r4 (§6.1.6.1)
+template <typename Segment>
+struct is_simple<Segment, segment_tag>
+    : detail::is_simple::always_simple<Segment>
+{};
+
+
+// A valid box is always simple
+// A box is a Polygon, and it satisfies the conditions for Polygon validity.
+//
+// Reference (for polygon validity): OGC 06-103r4 (§6.1.11.1)
+template <typename Box>
+struct is_simple<Box, box_tag>
+    : detail::is_simple::always_simple<Box>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_ALWAYS_SIMPLE_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_simple/areal.hpp b/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
new file mode 100644
index 000000000..678253c07
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_simple/areal.hpp
@@ -0,0 +1,141 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_AREAL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_AREAL_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/detail/check_iterator_range.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_simple.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_simple
+{
+
+
+template <typename Ring>
+struct is_simple_ring
+{
+    static inline bool apply(Ring const& ring)
+    {
+        return
+            !detail::is_valid::has_duplicates
+                <
+                    Ring, geometry::closure<Ring>::value
+                >::apply(ring);
+    }
+};
+
+
+template <typename Polygon>
+class is_simple_polygon
+{
+private:
+    template <typename InteriorRings>
+    static inline
+    bool are_simple_interior_rings(InteriorRings const& interior_rings)
+    {
+        return
+            detail::check_iterator_range
+                <
+                    is_simple_ring
+                        <
+                            typename boost::range_value<InteriorRings>::type
+                        >,
+                    true // allow the iterator range to be empty
+                >::apply(boost::begin(interior_rings),
+                         boost::end(interior_rings));
+    }
+
+public:
+    static inline bool apply(Polygon const& polygon)
+    {
+        return
+            is_simple_ring
+                <
+                    typename ring_type<Polygon>::type
+                >::apply(exterior_ring(polygon))
+            &&
+            are_simple_interior_rings(geometry::interior_rings(polygon));
+    }
+};
+
+
+}} // namespace detail::is_simple
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A Ring is a Polygon.
+// A Polygon is always a simple geometric object provided that it is valid.
+//
+// Reference (for polygon validity): OGC 06-103r4 (§6.1.11.1)
+template <typename Ring>
+struct is_simple<Ring, ring_tag>
+    : detail::is_simple::is_simple_ring<Ring>
+{};
+
+
+// A Polygon is always a simple geometric object provided that it is valid.
+//
+// Reference (for validity of Polygons): OGC 06-103r4 (§6.1.11.1)
+template <typename Polygon>
+struct is_simple<Polygon, polygon_tag>
+    : detail::is_simple::is_simple_polygon<Polygon>
+{};
+
+
+// Not clear what the definition is.
+// Right now we consider a MultiPolygon as simple if it is valid.
+//
+// Reference (for validity of MultiPolygons): OGC 06-103r4 (§6.1.14)
+template <typename MultiPolygon>
+struct is_simple<MultiPolygon, multi_polygon_tag>
+{
+    static inline bool apply(MultiPolygon const& multipolygon)
+    {
+        return
+            detail::check_iterator_range
+                <
+                    detail::is_simple::is_simple_polygon
+                        <
+                            typename boost::range_value<MultiPolygon>::type
+                        >
+                >::apply(boost::begin(multipolygon), boost::end(multipolygon));
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_AREAL_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_simple/debug_linear.hpp b/include/boost/geometry/algorithms/detail/is_simple/debug_linear.hpp
new file mode 100644
index 000000000..1e4f174a2
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_simple/debug_linear.hpp
@@ -0,0 +1,100 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_DEBUG_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_DEBUG_LINEAR_HPP
+
+#ifdef GEOMETRY_TEST_DEBUG
+#include <algorithm>
+#include <iostream>
+#include <vector>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/io/dsv/write.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#endif
+
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace is_simple
+{
+
+
+template <typename TurnIterator>
+inline void debug_print_turns(TurnIterator first, TurnIterator beyond)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "turns:";
+    for (TurnIterator tit = first; tit != beyond; ++tit)
+    {
+        std::cout << " ["
+                  << geometry::method_char(tit->method)
+                  << ","
+                  << geometry::operation_char(tit->operations[0].operation)
+                  << "/"
+                  << geometry::operation_char(tit->operations[1].operation)
+                  << " "
+                  << geometry::dsv(tit->point)
+                  << "] ";
+    }
+    std::cout << std::endl << std::endl;
+#endif // GEOMETRY_TEST_DEBUG
+}
+
+
+template <typename MultiLinestring>
+inline void debug_print_boundary_points(MultiLinestring const& multilinestring)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    typedef typename point_type<MultiLinestring>::type point_type;
+    typedef std::vector<point_type> point_vector;
+
+    point_vector boundary_points;
+    for (typename boost::range_iterator<MultiLinestring const>::type it
+             = boost::begin(multilinestring);
+         it != boost::end(multilinestring); ++it)
+    {
+        if ( boost::size(*it) > 1
+             && !geometry::equals(range::front(*it), range::back(*it)) )
+        {
+            boundary_points.push_back( range::front(*it) );
+            boundary_points.push_back( range::back(*it) );
+        }
+    }
+
+    std::sort(boundary_points.begin(), boundary_points.end(),
+              geometry::less<point_type>());
+
+    std::cout << "boundary points: ";
+    for (typename point_vector::const_iterator pit = boundary_points.begin();
+         pit != boundary_points.end(); ++pit)
+    {
+        std::cout << " " << geometry::dsv(*pit);
+    }
+    std::cout << std::endl << std::endl;
+#endif // GEOMETRY_TEST_DEBUG
+}
+
+
+}} // namespace detail::is_simple
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_DEBUG_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_simple/linear.hpp b/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
new file mode 100644
index 000000000..69ea9d6d0
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_simple/linear.hpp
@@ -0,0 +1,232 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_LINEAR_HPP
+
+#include <algorithm>
+#include <deque>
+
+#include <boost/assert.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/algorithms/detail/check_iterator_range.hpp>
+
+#include <boost/geometry/algorithms/detail/disjoint/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_spikes.hpp>
+
+#include <boost/geometry/algorithms/detail/is_simple/debug_linear.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_simple.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_simple
+{
+
+
+template <typename Linestring, bool CheckSelfIntersections = true>
+struct is_simple_linestring
+{
+    static inline bool apply(Linestring const& linestring)
+    {
+        return !detail::is_valid::has_duplicates
+                    <
+                        Linestring, closed
+                    >::apply(linestring)
+            && !detail::is_valid::has_spikes
+                    <
+                        Linestring, closed
+                    >::apply(linestring)
+            && !(CheckSelfIntersections && geometry::intersects(linestring));
+    }
+};
+
+
+
+template <typename MultiLinestring>
+class is_simple_multilinestring
+{
+private:
+    template <typename Point, typename Linestring>
+    static inline bool is_boundary_point_of(Point const& point,
+                                            Linestring const& linestring)
+    {
+        BOOST_ASSERT( boost::size(linestring) > 1 );
+        return
+            !geometry::equals(range::front(linestring),
+                              range::back(linestring))
+            &&
+            ( geometry::equals(point, range::front(linestring))
+              || geometry::equals(point, range::back(linestring)) );
+    }
+
+    template <typename Linestring1, typename Linestring2>
+    static inline bool have_same_boundary_points(Linestring1 const& ls1,
+                                                 Linestring2 const& ls2)
+    {
+        return
+            geometry::equals(range::front(ls1), range::front(ls2))
+            ?
+            geometry::equals(range::back(ls1), range::back(ls2))
+            :
+            (geometry::equals(range::front(ls1), range::back(ls2))
+             &&
+             geometry::equals(range::back(ls1), range::front(ls2))
+             )
+            ;
+    }
+
+
+public:
+    static inline bool apply(MultiLinestring const& multilinestring)
+    {
+        typedef typename boost::range_value<MultiLinestring>::type linestring;
+        typedef typename point_type<MultiLinestring>::type point_type;
+        typedef point_type point;
+
+
+        // check each of the linestrings for simplicity
+        if ( !detail::check_iterator_range
+                 <
+                     is_simple_linestring<linestring>
+                 >::apply(boost::begin(multilinestring),
+                          boost::end(multilinestring))
+             )
+        {
+            return false;
+        }
+
+
+        // compute self turns
+        typedef detail::overlay::turn_info
+            <
+                point_type,
+                geometry::segment_ratio
+                <
+                    typename geometry::coordinate_type<point>::type
+                >
+            > turn_info;
+
+        std::deque<turn_info> turns;
+
+        typedef detail::overlay::get_turn_info
+            <
+                detail::disjoint::assign_disjoint_policy
+            > turn_policy;
+
+        detail::self_get_turn_points::no_interrupt_policy
+            interrupt_policy;
+
+        detail::self_get_turn_points::get_turns
+            <
+                turn_policy
+            >::apply(multilinestring,
+                     detail::no_rescale_policy(),
+                     turns,
+                     interrupt_policy);
+
+        debug_print_turns(turns.begin(), turns.end());
+        debug_print_boundary_points(multilinestring);
+
+        // check if the generated turns are all boundary points of the
+        // linestrings in the multi-linestring
+        for (typename std::deque<turn_info>::const_iterator tit = turns.begin();
+             tit != turns.end(); ++tit)
+        {            
+            linestring const& ls1 =
+                range::at(multilinestring,
+                          tit->operations[0].seg_id.multi_index);
+
+            linestring const& ls2 =
+                range::at(multilinestring,
+                          tit->operations[0].other_id.multi_index);
+
+            if ( !is_boundary_point_of(tit->point, ls1)
+                 || !is_boundary_point_of(tit->point, ls2) )
+            {
+                return false;
+            }
+
+            if ( boost::size(ls1) == 2
+                 && boost::size(ls2) == 2
+                 && have_same_boundary_points(ls1, ls2) )
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+};
+
+
+
+}} // namespace detail::is_simple
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+// A linestring is a curve.
+// A curve is simple if it does not pass through the same point twice,
+// with the possible exception of its two endpoints
+//
+// Reference: OGC 06-103r4 (§6.1.6.1)
+template <typename Linestring>
+struct is_simple<Linestring, linestring_tag>
+    : detail::is_simple::is_simple_linestring<Linestring>
+{};
+
+
+// A MultiLinestring is a MultiCurve
+// A MultiCurve is simple if all of its elements are simple and the
+// only intersections between any two elements occur at Points that
+// are on the boundaries of both elements.
+//
+// Reference: OGC 06-103r4 (§6.1.8.1; Fig. 9)
+template <typename MultiLinestring>
+struct is_simple<MultiLinestring, multi_linestring_tag>
+    : detail::is_simple::is_simple_multilinestring<MultiLinestring>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp b/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
new file mode 100644
index 000000000..04070e989
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_simple/multipoint.hpp
@@ -0,0 +1,84 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_MULTIPOINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_MULTIPOINT_HPP
+
+#include <algorithm>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+
+#include <boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_simple.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_simple
+{
+
+
+template <typename MultiPoint>
+struct is_simple_multipoint
+{
+    static inline bool apply(MultiPoint const& multipoint)
+    {
+        if ( boost::size(multipoint) == 0 )
+        {
+            return false;
+        }
+
+        MultiPoint mp(multipoint);
+        std::sort(boost::begin(mp), boost::end(mp),
+                  geometry::less<typename point_type<MultiPoint>::type>());
+
+        return !detail::is_valid::has_duplicates<MultiPoint, closed>::apply(mp);
+    }
+};
+
+
+}} // namespace detail::is_simple
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A MultiPoint is simple if no two Points in the MultiPoint are equal
+// (have identical coordinate values in X and Y)
+//
+// Reference: OGC 06-103r4 (§6.1.5)
+template <typename MultiPoint>
+struct is_simple<MultiPoint, multi_point_tag>
+    : detail::is_simple::is_simple_multipoint<MultiPoint>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_SIMPLE_MULTIPOINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/box.hpp b/include/boost/geometry/algorithms/detail/is_valid/box.hpp
new file mode 100644
index 000000000..488c8c6ca
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/box.hpp
@@ -0,0 +1,86 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_BOX_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+template <typename Box, std::size_t I>
+struct has_valid_corners
+{
+    static inline bool apply(Box const& box)
+    {
+        if ( geometry::get<geometry::max_corner, I-1>(box)
+             <=
+             geometry::get<geometry::min_corner, I-1>(box) )
+        {
+            return false;
+        }
+        return has_valid_corners<Box, I-1>::apply(box);
+    }
+};
+
+
+template <typename Box>
+struct has_valid_corners<Box, 0>
+{
+    static inline bool apply(Box const& box)
+    {
+        return true;
+    }
+};
+
+}} // namespace detail::is_valid
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A box is always simple
+// A box is a Polygon, and it satisfies the conditions for Polygon validity.
+//
+// The only thing we have to check is whether the max corner lies in
+// the upper-right quadrant as defined by the min corner
+//
+// Reference (for polygon validity): OGC 06-103r4 (§6.1.11.1)
+template <typename Box>
+struct is_valid<Box, box_tag>
+    : detail::is_valid::has_valid_corners<Box, dimension<Box>::value>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp b/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp
new file mode 100644
index 000000000..741d10771
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/complement_graph.hpp
@@ -0,0 +1,271 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_COMPLEMENT_GRAPH_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_COMPLEMENT_GRAPH_HPP
+
+#include <cstddef>
+
+#include <iostream>
+#include <set>
+#include <stack>
+#include <utility>
+
+#include <boost/geometry/policies/compare.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace is_valid
+{
+
+
+template <typename TurnPoint>
+class graph_vertex
+{
+public:
+    struct nil_vertex {};
+
+    static const nil_vertex nil;
+
+    typedef typename std::set<graph_vertex<TurnPoint> >::iterator vertex_handle;
+
+    struct vertex_handle_less
+    {
+        bool operator()(vertex_handle v1, vertex_handle v2) const
+        {
+            return v1->id() < v2->id();
+        }
+    };
+
+    typedef std::set<vertex_handle, vertex_handle_less> neighbor_container;
+    typedef typename neighbor_container::iterator neighbor_iterator;
+
+    graph_vertex(int id, TurnPoint const& dummy = TurnPoint())
+        : m_is_ip(false)
+        , m_id(id)
+        , m_turn_point(dummy)
+        , m_neighbors()
+        , m_parent()
+        , m_visited(false)
+    {}
+
+    graph_vertex(TurnPoint const& turn_point)
+        : m_is_ip(true)
+        , m_id(-1)
+        , m_turn_point(turn_point)
+        , m_neighbors()
+        , m_parent()
+        , m_visited(false)
+    {}
+
+    int id() const { return m_id; }
+    void id(int id) const { m_id = id; }
+    int parent_id() const
+    {
+        if ( m_parent.second )
+        {
+            return m_parent.first->id();
+        }
+        return -1;
+    }
+
+    // for DFS -- start
+    bool visited() const { return m_visited; }
+    void visited(bool value) const { m_visited = value; }
+
+    vertex_handle parent() const { return m_parent.first; }
+    void parent(vertex_handle p) const { m_parent = std::make_pair(p, true); }
+    void parent(nil_vertex) const
+    {
+        m_parent = std::make_pair(vertex_handle(), false);
+    }
+    // for DFS -- end
+
+    void add_neighbor(vertex_handle v) const
+    {
+        m_neighbors.insert(v);
+    }
+
+    neighbor_iterator neighbors_begin() const
+    {
+        return m_neighbors.begin();
+    }
+
+    neighbor_iterator neighbors_end() const
+    {
+        return m_neighbors.end();
+    }
+
+    bool operator<(graph_vertex const& other) const
+    {
+        if ( m_is_ip && other.m_is_ip )
+        {
+            return geometry::less
+                <
+                    TurnPoint
+                >()(m_turn_point, other.m_turn_point);
+        }
+        if ( !m_is_ip && !other.m_is_ip )
+        {
+            return m_id < other.m_id;
+        }
+        return other.m_is_ip;
+    }
+
+private:
+    // the following bool determines the type of the vertex
+    // true : vertex corresponds to an IP
+    // false: vertex corresponds to a hole or outer space, and the id
+    //        is the ring id of the corresponding ring of the polygon
+    bool m_is_ip;
+    mutable int m_id;
+    TurnPoint const& m_turn_point;
+    mutable neighbor_container m_neighbors;
+    mutable std::pair<vertex_handle, bool> m_parent; // for DFS
+    mutable bool m_visited; // for DFS
+};
+
+
+template <typename Vertex>
+class complement_graph
+{
+private:
+    typedef std::set<Vertex> vertex_container;
+
+public:
+    typedef typename vertex_container::iterator vertex_handle;
+
+private:
+    // implement this with a stack rather than recursively
+    bool has_cycles(vertex_handle start_vertex) const
+    {
+        std::stack<vertex_handle> stack;
+        stack.push(start_vertex);
+
+        while ( !stack.empty() )
+        {
+            vertex_handle v = stack.top();
+            stack.pop();
+            
+            v->visited(true);
+            for (typename Vertex::neighbor_iterator nit = v->neighbors_begin();
+                 nit != v->neighbors_end(); ++nit)
+            {
+                if ( (*nit)->id() != v->parent_id() )
+                {
+                    if ( !(*nit)->visited() )
+                    {
+                        (*nit)->parent(v);
+                        stack.push(*nit);
+                    }
+                    else
+                    {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+public:
+    // num_rings: total number of rings, including the exterior ring
+    complement_graph(std::size_t num_rings)
+        : m_num_rings(num_rings)
+        , m_num_turns(0)
+        , m_vertices()
+    {}
+
+    // inserts a ring vertex in the graph and returns its id
+    vertex_handle add_vertex(int ring_id)
+    {
+        Vertex v(static_cast<std::size_t>(ring_id + 1));
+        return m_vertices.insert(v).first;
+    }
+
+    // inserts an IP in the graph and returns its id
+    template <typename TurnPoint>
+    vertex_handle add_vertex(TurnPoint const& turn_point)
+    {
+        Vertex v(turn_point);
+        std::pair<vertex_handle, bool> res = m_vertices.insert(v);
+        if ( res.second )
+        {
+            // a new element is inserted
+            res.first->id( m_num_rings + m_num_turns );
+            ++m_num_turns;
+        }
+        return res.first;
+    }
+
+    void add_edge(vertex_handle v1, vertex_handle v2)
+    {
+        BOOST_ASSERT( v1 != m_vertices.end() );
+        BOOST_ASSERT( v2 != m_vertices.end() );
+        v1->add_neighbor(v2);
+        v2->add_neighbor(v1);
+    }
+
+    bool has_cycles() const
+    {
+        for (vertex_handle it = m_vertices.begin();
+             it != m_vertices.end(); ++it)
+        {
+            it->visited(false);
+            it->parent(Vertex::nil);
+        }
+
+        for (vertex_handle it = m_vertices.begin();
+             it != m_vertices.end(); ++it)
+        {
+            if ( !it->visited() && has_cycles(it) )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void print(std::ostream& os = std::cout) const
+    {
+        os << "num rings: " << m_num_rings << std::endl;
+        os << "vertex ids: {";
+        for (vertex_handle it = m_vertices.begin();
+             it != m_vertices.end(); ++it)
+        {
+            os << " " << it->id();
+        }
+        os << " }" << std::endl;        
+
+        for (vertex_handle it = m_vertices.begin();
+             it != m_vertices.end(); ++it)
+        {
+            os << "neighbors of " << it->id() << ": {";
+            for (typename Vertex::neighbor_iterator nit = it->neighbors_begin();
+                 nit != it->neighbors_end(); ++nit)
+            {
+                os << " " << (*nit)->id();
+            }
+            os << "}" << std::endl;        
+        }
+    }
+
+private:
+    std::size_t m_num_rings, m_num_turns;
+    vertex_container m_vertices;
+};
+
+
+}} // namespace detail::is_valid
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_COMPLEMENT_GRAPH_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp b/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp
new file mode 100644
index 000000000..dd0922bb2
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp
@@ -0,0 +1,70 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_DUPLICATES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_DUPLICATES_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+
+#include <boost/geometry/views/closeable_view.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+template <typename Range, closure_selector Closure>
+struct has_duplicates
+{
+    static inline bool apply(Range const& range)
+    {
+        typedef typename closeable_view<Range const, Closure>::type view_type;
+        typedef typename boost::range_iterator<view_type const>::type iterator;
+
+        view_type view(range);
+
+        if ( boost::size(view) < 2 )
+        {
+            return false;
+        }
+
+        geometry::equal_to<typename boost::range_value<Range>::type> equal;
+
+        iterator it = boost::begin(view);
+        iterator next = ++boost::begin(view);
+        for (; next != boost::end(view); ++it, ++next)
+        {
+            if ( equal(*it, *next) )
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+
+
+}} // namespace detail::is_valid
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_DUPLICATES_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp b/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
new file mode 100644
index 000000000..9b9501748
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/has_spikes.hpp
@@ -0,0 +1,139 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_SPIKES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_SPIKES_HPP
+
+#include <algorithm>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/views/closeable_view.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+template <typename Point>
+struct equal_to
+{
+    Point const& m_point;
+
+    equal_to(Point const& point)
+        : m_point(point)
+    {}
+
+    template <typename OtherPoint>
+    inline bool operator()(OtherPoint const& other) const
+    {
+        return geometry::equals(m_point, other);
+    }
+};
+
+template <typename Point>
+struct not_equal_to
+{
+    Point const& m_point;
+
+    not_equal_to(Point const& point)
+        : m_point(point)
+    {}
+
+    template <typename OtherPoint>
+    inline bool operator()(OtherPoint const& other) const
+    {
+        return !geometry::equals(other, m_point);
+    }
+};
+
+
+
+template <typename Range, closure_selector Closure>
+struct has_spikes
+{
+    static inline bool apply(Range const& range)
+    {
+        typedef not_equal_to<typename point_type<Range>::type> not_equal;
+
+        typedef typename closeable_view<Range const, Closure>::type view_type;
+        typedef typename boost::range_iterator<view_type const>::type iterator; 
+
+        view_type const view(range);
+
+        iterator prev = boost::begin(view);
+
+        iterator cur = std::find_if(prev, boost::end(view), not_equal(*prev));
+        if ( cur == boost::end(view) )
+        {
+            // the range has only one distinct point, so it
+            // cannot have a spike
+            return false;
+        }
+
+        iterator next = std::find_if(cur, boost::end(view), not_equal(*cur));
+        if ( next == boost::end(view) )
+        {
+            // the range has only two distinct points, so it
+            // cannot have a spike
+            return false;
+        }
+
+        while ( next != boost::end(view) )
+        {
+            if ( geometry::detail::point_is_spike_or_equal(*prev,
+                                                           *next,
+                                                           *cur) )
+            {
+                return true;
+            }
+            prev = cur;
+            cur = next;
+            next = std::find_if(cur, boost::end(view), not_equal(*cur));
+        }
+
+        if ( geometry::equals(range::front(view), range::back(view)) )
+        {
+            iterator cur = boost::begin(view);
+            typename boost::range_reverse_iterator
+                <
+                    view_type const
+                >::type prev = std::find_if(boost::rbegin(view),
+                                            boost::rend(view),
+                                            not_equal(range::back(view)));
+            iterator next =
+                std::find_if(cur, boost::end(view), not_equal(*cur));
+            return detail::point_is_spike_or_equal(*prev, *next, *cur);
+        }
+
+        return false;
+    }
+};
+
+
+
+}} // namespace detail::is_valid
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_HAS_SPIKES_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/linear.hpp b/include/boost/geometry/algorithms/detail/is_valid/linear.hpp
new file mode 100644
index 000000000..8286d1a5c
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/linear.hpp
@@ -0,0 +1,168 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_LINEAR_HPP
+
+#include <cstddef>
+#include <algorithm>
+
+#include <boost/assert.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/detail/check_iterator_range.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_spikes.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+
+// returns the number of distinct points in the range;
+// return values are zero, one, two, three_or_more
+template <typename Range>
+struct number_of_distinct_points
+{
+    static inline std::size_t apply(Range const& range)
+    {
+        typedef typename point_type<Range>::type point;
+        typedef typename boost::range_iterator<Range const>::type iterator;
+
+        std::size_t size = boost::size(range);
+
+        if ( size < 2u )
+        {
+            return size;
+        }
+
+        iterator it1 =
+            std::find_if(boost::begin(range),
+                         boost::end(range),
+                         not_equal_to<point>(range::front(range)));
+
+        if ( it1 == boost::end(range) )
+        {
+            return 1u;
+        }
+
+        iterator it2 = 
+            std::find_if(it1, boost::end(range), not_equal_to<point>(*it1));
+
+        return
+            ( it2 == boost::end(range)
+              || geometry::equals(range::front(range), *it2) )
+            ?
+            2u
+            :
+            3u
+            ;
+    }
+};
+
+
+template <typename Linestring, bool AllowSpikes>
+struct is_valid_linestring
+{
+    static inline bool apply(Linestring const& linestring)
+    {
+        typedef number_of_distinct_points<Linestring> num_distinct;
+
+        std::size_t linestring_size = num_distinct::apply(linestring);
+
+        if ( linestring_size < 2u )
+        {
+            return false;
+        }
+
+        if ( !AllowSpikes && linestring_size == 2u )
+        {
+            return !geometry::equals(range::front(linestring),
+                                     range::back(linestring));
+        }
+
+        return AllowSpikes
+            || !has_spikes<Linestring, closed>::apply(linestring);
+    }
+};
+
+
+}} // namespace detail::is_valid
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A linestring is a curve.
+// A curve is 1-dimensional so it has to have at least two distinct
+// points.
+// A curve is simple if it does not pass through the same point twice,
+// with the possible exception of its two endpoints
+//
+// There is an option here as to whether spikes are allowed for linestrings; 
+// here we pass this as an additional template parameter: allow_spikes
+// If allow_spikes is set to true, spikes are allowed, false otherwise.
+// By default, spikes are disallowed
+//
+// Reference: OGC 06-103r4 (§6.1.6.1)
+template <typename Linestring, bool AllowSpikes>
+struct is_valid<Linestring, linestring_tag, AllowSpikes>
+    : detail::is_valid::is_valid_linestring<Linestring, AllowSpikes>
+{};
+
+
+// A MultiLinestring is a MultiCurve
+// A MultiCurve is simple if all of its elements are simple and the
+// only intersections between any two elements occur at Points that
+// are on the boundaries of both elements.
+//
+// Reference: OGC 06-103r4 (§6.1.8.1; Fig. 9)
+template <typename MultiLinestring, bool AllowSpikes>
+struct is_valid<MultiLinestring, multi_linestring_tag, AllowSpikes>
+{
+    static inline bool apply(MultiLinestring const& multilinestring)
+    {
+        return detail::check_iterator_range
+            <
+                detail::is_valid::is_valid_linestring
+                    <
+                        typename boost::range_value<MultiLinestring>::type,
+                        AllowSpikes
+                    >
+            >::apply(boost::begin(multilinestring),
+                     boost::end(multilinestring));
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp b/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
new file mode 100644
index 000000000..5063428f1
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/pointlike.hpp
@@ -0,0 +1,62 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POINTLIKE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POINTLIKE_HPP
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+// A point is always simple
+template <typename Point>
+struct is_valid<Point, point_tag>
+{
+    static inline bool apply(Point const&)
+    {
+        return true;
+    }
+};
+
+
+
+// A MultiPoint is simple if no two Points in the MultiPoint are equal
+// (have identical coordinate values in X and Y)
+//
+// Reference: OGC 06-103r4 (§6.1.5)
+template <typename MultiPoint>
+struct is_valid<MultiPoint, multi_point_tag>
+{
+    static inline bool apply(MultiPoint const& multipoint)
+    {
+        return boost::size(multipoint) > 0;
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POINTLIKE_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp b/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
new file mode 100644
index 000000000..2d43076bd
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/polygon.hpp
@@ -0,0 +1,369 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POLYGON_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POLYGON_HPP
+
+#include <algorithm>
+#include <deque>
+#include <set>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio.hpp>
+
+#include <boost/geometry/algorithms/num_interior_rings.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+
+#include <boost/geometry/algorithms/detail/check_iterator_range.hpp>
+
+#include <boost/geometry/algorithms/detail/disjoint/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
+
+#include <boost/geometry/algorithms/detail/is_valid/ring.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/complement_graph.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+#ifdef GEOMETRY_TEST_DEBUG
+#include <boost/geometry/io/dsv/write.hpp>
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#endif
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+
+template <order_selector Order /* counterclockwise */>
+struct acceptable_operation
+{
+    static const detail::overlay::operation_type value =
+        detail::overlay::operation_union;
+};
+
+template <>
+struct acceptable_operation<clockwise>
+{
+    static const detail::overlay::operation_type value =
+        detail::overlay::operation_intersection;
+};
+
+
+
+template <typename Polygon, bool AllowDuplicates>
+class is_valid_polygon
+{
+private:
+    template <typename RingIterator, typename ExteriorRing, typename IndexSet>
+    static inline bool are_holes_inside(RingIterator first,
+                                        RingIterator beyond,
+                                        ExteriorRing const& exterior_ring,
+                                        IndexSet const& rings_with_turns)
+    {
+        int idx = 0;
+        for (RingIterator it = first; it != beyond; ++it, ++idx)
+        {
+            // check only rings whose index is not associated to any turn
+            if ( rings_with_turns.find(idx) == rings_with_turns.end()
+                 && !geometry::within(range::front(*it), exterior_ring) )
+            {
+                return false;
+            }
+        }
+
+        // for those rings that do not have any associated turns,
+        // check if they lie inside another ring
+        idx = 0;
+        for (RingIterator it1 = first; it1 != beyond; ++it1, ++idx)
+        {
+            if ( rings_with_turns.find(idx) == rings_with_turns.end() )
+            {
+                for (RingIterator it2 = first; it2 != beyond; ++it2)
+                {
+                    if ( it1 != it2
+                         && geometry::within(range::front(*it1), *it2) )
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    template <typename InteriorRings, typename ExteriorRing, typename IndexSet>
+    static inline bool are_holes_inside(InteriorRings const& interior_rings,
+                                        ExteriorRing const& exterior_ring,
+                                        IndexSet const& rings_with_turns)
+    {
+        return are_holes_inside(boost::begin(interior_rings),
+                                boost::end(interior_rings),
+                                exterior_ring,
+                                rings_with_turns);
+    }
+
+
+    template <typename Turn, typename Method, typename Operation>
+    static inline bool check_turn(Turn const& turn,
+                                  Method method,
+                                  Operation operation)
+    {
+        return turn.method == method
+            && turn.operations[0].operation == operation
+            && turn.operations[1].operation == operation;
+    }
+
+    template <typename Turn>
+    static inline bool is_acceptable_turn(Turn const& turn)
+    {
+        if ( turn.operations[0].seg_id.ring_index
+             == turn.operations[0].other_id.ring_index )
+        {
+            return false;
+        }
+
+        detail::overlay::operation_type const op = acceptable_operation
+            <
+                geometry::point_order<Polygon>::value
+            >::value;
+
+        return check_turn(turn, detail::overlay::method_touch_interior, op)
+            || check_turn(turn, detail::overlay::method_touch, op)
+            ;
+    }
+
+
+
+    template <typename InteriorRings>
+    static bool are_valid_interior_rings(InteriorRings const& interior_rings)
+    {
+        return
+            detail::check_iterator_range
+                <
+                    detail::is_valid::is_valid_ring
+                        <
+                            typename boost::range_value<InteriorRings>::type,
+                            AllowDuplicates,
+                            false, // do not check self-intersections
+                            true // indicate that the ring is interior
+                        >,
+                    true // allow the iterator range to be empty
+                >::apply(boost::begin(interior_rings),
+                         boost::end(interior_rings));
+    }
+
+
+
+public:
+    static inline bool apply(Polygon const& polygon)
+    {
+        typedef typename point_type<Polygon>::type point_type;
+        typedef typename ring_type<Polygon>::type ring_type;
+
+        // check validity of exterior ring
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "checking exterior ring..." << std::endl;
+#endif
+        if ( !detail::is_valid::is_valid_ring
+                 <
+                     ring_type,
+                     AllowDuplicates,
+                     false // do not check self intersections
+                 >::apply(exterior_ring(polygon)) )
+        {
+            return false;
+        }
+
+
+        // check validity of interior rings
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "checking interior rings..." << std::endl;
+#endif
+        if ( !are_valid_interior_rings(geometry::interior_rings(polygon)) )
+        {
+            return false;
+        }
+
+
+        // compute turns and check if all are acceptable
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "computing and analyzing turns..." << std::endl;
+#endif
+        typedef detail::overlay::turn_info
+            <
+                point_type,
+                geometry::segment_ratio
+                    <
+                        typename geometry::coordinate_type<point_type>::type
+                    >
+            > turn_info;
+
+        typedef detail::overlay::get_turn_info
+            <
+                detail::disjoint::assign_disjoint_policy
+            > turn_policy;
+
+
+        std::deque<turn_info> turns;
+        detail::self_get_turn_points::no_interrupt_policy interrupt_policy;
+
+        // MK:: change the no_rescale_policy to rescale-to-integer
+        geometry::self_turns<turn_policy>(polygon,
+                                          detail::no_rescale_policy(),
+                                          turns,
+                                          interrupt_policy);
+#if GEOMETRY_TEST_DEBUG
+        std::cout << "turns:";
+        for (typename std::deque<turn_info>::const_iterator tit = turns.begin();
+             tit != turns.end(); ++tit)
+        {
+            std::cout << " [" << geometry::method_char(tit->method);
+            std::cout << ","
+                      << geometry::operation_char(tit->operations[0].operation);
+            std::cout << "/"
+                      << geometry::operation_char(tit->operations[1].operation);
+            std::cout << " {" << tit->operations[0].seg_id.ring_index
+                      << ", " << tit->operations[0].other_id.ring_index
+                      << "}";
+            std::cout << " " << geometry::dsv(tit->point);
+            std::cout << "] ";
+        }
+        std::cout << std::endl << std::endl;
+#endif
+
+        std::set<int> rings_with_turns;
+        for (typename std::deque<turn_info>::const_iterator tit = turns.begin();
+             tit != turns.end(); ++tit)
+        {
+            if ( !is_acceptable_turn(*tit) )
+            {
+                return false;
+            }
+            rings_with_turns.insert(tit->operations[0].seg_id.ring_index);
+            rings_with_turns.insert(tit->operations[0].other_id.ring_index);
+        }
+
+
+        // check if all interior rings are inside the exterior ring
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "checking if holes are inside the exterior ring..."
+                  << std::endl;
+#endif
+        if ( !are_holes_inside(geometry::interior_rings(polygon),
+                               geometry::exterior_ring(polygon),
+                               rings_with_turns) )
+        {
+            return false;
+        }
+
+
+        // check whether the interior of the polygon is a connected set
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "checking connectivity of interior..." << std::endl;
+#endif
+        typedef graph_vertex<typename turn_info::point_type> graph_vertex;
+        typedef complement_graph<graph_vertex> graph;
+
+        graph g(geometry::num_interior_rings(polygon) + 1);
+        for (typename std::deque<turn_info>::const_iterator tit = turns.begin();
+             tit != turns.end(); ++tit)
+        {
+            typename graph::vertex_handle v1
+                = g.add_vertex(tit->operations[0].seg_id.ring_index);
+            typename graph::vertex_handle v2
+                = g.add_vertex(tit->operations[0].other_id.ring_index);
+            typename graph::vertex_handle vip = g.add_vertex(tit->point);
+
+            g.add_edge(v1, vip);
+            g.add_edge(v2, vip);
+        }
+
+#ifdef GEOMETRY_TEST_DEBUG
+        g.print();
+#endif
+        return !g.has_cycles();
+    }
+};
+
+
+}} // namespace dispatch
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A Polygon is always a simple geometric object provided that it is valid.
+//
+// Reference (for validity of Polygons): OGC 06-103r4 (§6.1.11.1)
+template <typename Polygon, bool AllowSpikes, bool AllowDuplicates>
+struct is_valid<Polygon, polygon_tag, AllowSpikes, AllowDuplicates>
+    : detail::is_valid::is_valid_polygon<Polygon, AllowDuplicates>
+{};
+
+
+// Not clear what the definition is.
+// Right now we check that each element is simple (in fact valid), and
+// that the MultiPolygon is also valid.
+//
+// Reference (for validity of MultiPolygons): OGC 06-103r4 (§6.1.14)
+template <typename MultiPolygon, bool AllowSpikes, bool AllowDuplicates>
+struct is_valid<MultiPolygon, multi_polygon_tag, AllowSpikes, AllowDuplicates>
+{
+    static inline bool apply(MultiPolygon const& multipolygon)
+    {
+        if ( !detail::check_iterator_range
+                  <
+                      detail::is_valid::is_valid_polygon
+                          <
+                              typename boost::range_value<MultiPolygon>::type,
+                              AllowDuplicates
+                          >
+                  >::apply(boost::begin(multipolygon),
+                           boost::end(multipolygon)) )
+        {
+            return false;
+        }
+
+        // MK::need to check that they are (almost) disjoint
+        return true;
+    }
+
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_POLYGON_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/ring.hpp b/include/boost/geometry/algorithms/detail/is_valid/ring.hpp
new file mode 100644
index 000000000..9791785d2
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/ring.hpp
@@ -0,0 +1,173 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_RING_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_RING_HPP
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/point_order.hpp>
+
+#include <boost/geometry/util/order_as_direction.hpp>
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+
+#include <boost/geometry/views/reversible_view.hpp>
+#include <boost/geometry/views/closeable_view.hpp>
+
+#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_spikes.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/has_duplicates.hpp>
+
+#include <boost/geometry/strategies/area.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace is_valid
+{
+
+
+// struct to check whether a ring is topologically closed
+template <typename Ring, closure_selector Closure /* open */>
+struct is_topologically_closed
+{
+    static inline bool apply(Ring const&)
+    {
+        return true;
+    }
+};
+
+template <typename Ring>
+struct is_topologically_closed<Ring, closed>
+{
+    static inline bool apply(Ring const& ring)
+    {
+        return geometry::equals(range::front(ring), range::back(ring));
+    }
+};
+
+
+
+template <typename ResultType, bool IsInteriorRing /* false */>
+struct ring_area_predicate
+{
+    typedef std::greater<ResultType> type;
+};
+
+template <typename ResultType>
+struct ring_area_predicate<ResultType, true>
+{
+    typedef std::less<ResultType> type;
+};
+
+
+
+template <typename Ring, bool IsInteriorRing>
+struct is_properly_oriented
+{
+    typedef typename point_type<Ring>::type point_type;
+
+    typedef typename strategy::area::services::default_strategy
+        <
+            typename cs_tag<point_type>::type,
+            point_type
+        >::type strategy_type;
+
+    typedef detail::area::ring_area
+        <
+            order_as_direction<geometry::point_order<Ring>::value>::value,
+            geometry::closure<Ring>::value
+        > ring_area_type;
+
+    typedef typename default_area_result<Ring>::type area_result_type;
+
+    static inline bool apply(Ring const& ring)
+    {
+        typename ring_area_predicate
+            <
+                area_result_type, IsInteriorRing
+            >::type predicate;
+
+        // Check area
+        area_result_type const zero = area_result_type();
+        return predicate(ring_area_type::apply(ring, strategy_type()), zero);
+    }
+};
+
+
+
+template
+<
+    typename Ring,
+    bool AllowDuplicates,
+    bool CheckSelfIntersections = true,
+    bool IsInteriorRing = false
+>
+struct is_valid_ring
+{
+    static inline bool apply(Ring const& ring)
+    {
+        // return invalid if any of the following condition holds:
+        // (a) the ring's size is below the minimal one
+        // (b) the ring is not topologically closed
+        // (c) the ring has spikes
+        // (d) the ring has duplicate points (if AllowDuplicates is false)
+        // (e) the boundary of the ring has self-intersections
+        // (f) the order of the points is inconsistent with the defined order
+        //
+        // Note: no need to check if the area is zero. If this is the
+        // case, then the ring must have at least two spikes, which is
+        // checked by condition (c).
+
+        closure_selector const closure = geometry::closure<Ring>::value;
+
+        return 
+            ( boost::size(ring)
+              >= core_detail::closure::minimum_ring_size<closure>::value )
+            && is_topologically_closed<Ring, closure>::apply(ring) 
+            && (AllowDuplicates || !has_duplicates<Ring, closure>::apply(ring))
+            && !has_spikes<Ring, closure>::apply(ring)
+            && !(CheckSelfIntersections && geometry::intersects(ring))
+            && is_properly_oriented<Ring, IsInteriorRing>::apply(ring);
+    }
+};
+
+
+}} // namespace dispatch
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+// A Ring is a Polygon with exterior boundary only.
+// The Ring's boundary must be a LinearRing (see OGC 06-103-r4,
+// §6.1.7.1, for the definition of LinearRing)
+//
+// Reference (for polygon validity): OGC 06-103r4 (§6.1.11.1)
+template <typename Ring, bool AllowSpikes, bool AllowDuplicates>
+struct is_valid<Ring, ring_tag, AllowSpikes, AllowDuplicates>
+    : detail::is_valid::is_valid_ring<Ring, AllowDuplicates>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_RING_HPP
diff --git a/include/boost/geometry/algorithms/detail/is_valid/segment.hpp b/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
new file mode 100644
index 000000000..ccbe49d4f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/is_valid/segment.hpp
@@ -0,0 +1,61 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_SEGMENT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_SEGMENT_HPP
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// A segment is a curve.
+// A curve is simple if it does not pass through the same point twice,
+// with the possible exception of its two endpoints
+// A curve is 1-dimensional, hence we have to check is the two
+// endpoints of the segment coincide, since in this case it is
+// 0-dimensional.
+//
+// Reference: OGC 06-103r4 (§6.1.6.1)
+template <typename Segment>
+struct is_valid<Segment, segment_tag>
+{
+    static inline bool apply(Segment const& segment)
+    {
+        typename point_type<Segment>::type p[2];
+        detail::assign_point_from_index<0>(segment, p[0]);
+        detail::assign_point_from_index<1>(segment, p[1]);
+
+        return !geometry::equals(p[0], p[1]);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_IS_VALID_SEGMENT_HPP
diff --git a/include/boost/geometry/algorithms/detail/multi_modify.hpp b/include/boost/geometry/algorithms/detail/multi_modify.hpp
new file mode 100644
index 000000000..f0b9ddd3e
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/multi_modify.hpp
@@ -0,0 +1,53 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_HPP
+
+
+#include <boost/range.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+
+template <typename MultiGeometry, typename Policy>
+struct multi_modify
+{
+    static inline void apply(MultiGeometry& multi)
+    {
+        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
+        for (iterator_type it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            Policy::apply(*it);
+        }
+    }
+};
+
+
+} // namespace detail
+#endif
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_HPP
diff --git a/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp b/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp
new file mode 100644
index 000000000..c3787f9a1
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp
@@ -0,0 +1,52 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_WITH_PREDICATE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_WITH_PREDICATE_HPP
+
+
+#include <boost/range.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <typename MultiGeometry, typename Predicate, typename Policy>
+struct multi_modify_with_predicate
+{
+    static inline void apply(MultiGeometry& multi, Predicate const& predicate)
+    {
+        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
+        for (iterator_type it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            Policy::apply(*it, predicate);
+        }
+    }
+};
+
+
+} // namespace detail
+#endif
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_MODIFY_WITH_PREDICATE_HPP
diff --git a/include/boost/geometry/algorithms/detail/multi_sum.hpp b/include/boost/geometry/algorithms/detail/multi_sum.hpp
new file mode 100644
index 000000000..af3f425c9
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/multi_sum.hpp
@@ -0,0 +1,52 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_SUM_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_SUM_HPP
+
+#include <boost/range.hpp>
+
+
+namespace boost { namespace geometry
+{
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+struct multi_sum
+{
+    template <typename ReturnType, typename Policy, typename MultiGeometry, typename Strategy>
+    static inline ReturnType apply(MultiGeometry const& geometry, Strategy const& strategy)
+    {
+        ReturnType sum = ReturnType();
+        for (typename boost::range_iterator
+                <
+                    MultiGeometry const
+                >::type it = boost::begin(geometry);
+            it != boost::end(geometry);
+            ++it)
+        {
+            sum += Policy::apply(*it, strategy);
+        }
+        return sum;
+    }
+};
+
+
+} // namespace detail
+#endif
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_MULTI_SUM_HPP
diff --git a/include/boost/geometry/algorithms/detail/occupation_info.hpp b/include/boost/geometry/algorithms/detail/occupation_info.hpp
index f4d5adac8..dd42519b4 100644
--- a/include/boost/geometry/algorithms/detail/occupation_info.hpp
+++ b/include/boost/geometry/algorithms/detail/occupation_info.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2012-2014 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
@@ -9,17 +9,13 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OCCUPATION_INFO_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OCCUPATION_INFO_HPP
 
-#if ! defined(NDEBUG)
-//  #define BOOST_GEOMETRY_DEBUG_BUFFER_OCCUPATION
-#endif
-
 #include <algorithm>
 #include <boost/range.hpp>
 
 #include <boost/geometry/core/coordinate_type.hpp>
 #include <boost/geometry/core/point_type.hpp>
 
-#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/policies/compare.hpp>
 #include <boost/geometry/iterators/closing_iterator.hpp>
 
 #include <boost/geometry/algorithms/detail/get_left_turns.hpp>
@@ -33,80 +29,6 @@ namespace boost { namespace geometry
 namespace detail
 {
 
-template <typename P>
-class relaxed_less
-{
-    typedef typename geometry::coordinate_type<P>::type coordinate_type;
-
-    coordinate_type epsilon;
-
-public :
-
-    inline relaxed_less()
-    {
-        // TODO: adapt for ttmath, and maybe build the map in another way 
-        // (e.g. exact constellations of segment-id's), maybe adaptive.
-        epsilon = std::numeric_limits<double>::epsilon() * 100.0;
-    }
-
-    inline bool operator()(P const& a, P const& b) const
-    {
-        coordinate_type const dx = math::abs(geometry::get<0>(a) - geometry::get<0>(b));
-        coordinate_type const dy = math::abs(geometry::get<1>(a) - geometry::get<1>(b));
-
-
-        if (dx < epsilon && dy < epsilon)
-        {
-            return false;
-        }
-        if (dx < epsilon)
-        {
-            return geometry::get<1>(a) < geometry::get<1>(b);
-        }
-
-        return geometry::get<0>(a) < geometry::get<0>(b);
-    }
-
-    inline bool equals(P const& a, P const& b) const
-    {
-        typedef typename geometry::coordinate_type<P>::type coordinate_type;
-
-        coordinate_type const dx = math::abs(geometry::get<0>(a) - geometry::get<0>(b));
-        coordinate_type const dy = math::abs(geometry::get<1>(a) - geometry::get<1>(b));
-
-        return dx < epsilon && dy < epsilon;
-    };
-};
-
-
-template <typename T, typename P1, typename P2>
-inline T calculate_angle(P1 const& from_point, P2 const& to_point)
-{
-    typedef P1 vector_type;
-    vector_type v = from_point;
-    geometry::subtract_point(v, to_point);
-    return atan2(geometry::get<1>(v), geometry::get<0>(v));
-}
-
-template <typename Iterator, typename Vector>
-inline Iterator advance_circular(Iterator it, Vector const& vector, segment_identifier& seg_id, bool forward = true)
-{
-    int const increment = forward ? 1 : -1;
-    if (it == boost::begin(vector) && increment < 0)
-    {
-        it = boost::end(vector);
-        seg_id.segment_index = boost::size(vector);
-    }
-    it += increment;
-    seg_id.segment_index += increment;
-    if (it == boost::end(vector))
-    {
-        seg_id.segment_index = 0;
-        it = boost::begin(vector);
-    }
-    return it;
-}
-
 template <typename Point, typename T>
 struct angle_info
 {
@@ -117,207 +39,159 @@ struct angle_info
     int turn_index;
     int operation_index;
     Point intersection_point;
-    Point direction_point;
-    T angle;
+    Point point; // either incoming or outgoing point
     bool incoming;
+    bool blocked;
+    bool included;
+
+    inline angle_info()
+        : blocked(false)
+        , included(false)
+    {}
 };
 
 template <typename AngleInfo>
 class occupation_info
 {
+public :
     typedef std::vector<AngleInfo> collection_type;
+    typedef std::vector
+        <
+            detail::left_turns::turn_angle_info<typename AngleInfo::point_type>
+        > turn_vector_type;
 
-    struct angle_sort
-    {
-        inline bool operator()(AngleInfo const& left, AngleInfo const& right) const
-        {
-            // In this case we can compare even double using equals
-            // return geometry::math::equals(left.angle, right.angle)
-            return left.angle == right.angle
-                ? int(left.incoming) < int(right.incoming)
-                : left.angle < right.angle
-                ;
-        }
-    };
+    collection_type angles; // each turn splitted in incoming/outgoing vectors
+    turn_vector_type turns;
+    int count;
 
-public :
-    collection_type angles;
-private :
-    bool m_occupied;
-    bool m_calculated;
 
-    inline bool is_occupied()
-    {
-        if (boost::size(angles) <= 1)
-        {
-            return false;
-        }
-
-        std::sort(angles.begin(), angles.end(), angle_sort());
-
-        typedef geometry::closing_iterator<collection_type const> closing_iterator;
-        closing_iterator vit(angles);
-        closing_iterator end(angles, true);
-
-        closing_iterator prev = vit++;
-        for( ; vit != end; prev = vit++)
-        {
-            if (! geometry::math::equals(prev->angle, vit->angle)
-                && ! prev->incoming
-                && vit->incoming)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-public :
     inline occupation_info()
-        : m_occupied(false)
-        , m_calculated(false)
+        : count(0)
     {}
 
-    template <typename PointC, typename Point1, typename Point2>
-    inline void add(PointC const& map_point, Point1 const& direction_point, Point2 const& intersection_point,
+    template <typename RobustPoint>
+    inline void add(RobustPoint const& incoming_point,
+                    RobustPoint const& outgoing_point,
+                    RobustPoint const& intersection_point,
                     int turn_index, int operation_index,
-                    segment_identifier const& seg_id, bool incoming)
+                    segment_identifier const& seg_id)
     {
-        //std::cout << "-> adding angle " << geometry::wkt(direction_point) << " .. " << geometry::wkt(intersection_point) << " " << int(incoming) << std::endl;
-        if (geometry::equals(direction_point, intersection_point))
+        geometry::equal_to<RobustPoint> comparator;
+        if (comparator(incoming_point, intersection_point))
+        {
+            return;
+        }
+        if (comparator(outgoing_point, intersection_point))
         {
-            //std::cout << "EQUAL! Skipping" << std::endl;
             return;
         }
 
         AngleInfo info;
-        info.incoming = incoming;
-        info.angle = calculate_angle<typename AngleInfo::angle_type>(direction_point, map_point);
         info.seg_id = seg_id;
         info.turn_index = turn_index;
         info.operation_index = operation_index;
         info.intersection_point = intersection_point;
-        info.direction_point = direction_point;
-        angles.push_back(info);
 
-        m_calculated = false;
-    }
-
-    inline bool occupied()
-    {
-        if (! m_calculated)
         {
-            m_occupied = is_occupied();
-            m_calculated = true;
+            info.point = incoming_point;
+            info.incoming = true;
+            angles.push_back(info);
         }
-        return m_occupied;
+        {
+            info.point = outgoing_point;
+            info.incoming = false;
+            angles.push_back(info);
+        }
+        detail::left_turns::turn_angle_info<typename AngleInfo::point_type> turn(seg_id, incoming_point, outgoing_point);
+        turn.turn_index = turn_index;
+        turns.push_back(turn);
     }
 
-    template <typename Turns, typename TurnSegmentIndices>
-    inline void get_left_turns(
-                    Turns& turns, TurnSegmentIndices const& turn_segment_indices,
-                    std::set<int>& keep_indices)
+    template <typename RobustPoint>
+    inline void get_left_turns(RobustPoint const& origin,
+                    std::vector<detail::left_turns::left_turn>& turns_to_keep)
     {
-        std::sort(angles.begin(), angles.end(), angle_sort());
-        calculate_left_turns<AngleInfo>(angles, turns, turn_segment_indices, keep_indices);
+        // Sort on angle
+        std::sort(angles.begin(), angles.end(),
+                detail::left_turns::angle_less<typename AngleInfo::point_type>(origin));
+
+        // Block all turns on the right side of any turn
+        detail::left_turns::block_turns_on_right_sides(turns, angles);
+
+        detail::left_turns::get_left_turns(angles, origin, turns_to_keep);
+    }
+
+    template <typename RobustPoint>
+    inline bool has_rounding_issues(RobustPoint const& origin) const
+    {
+        return detail::left_turns::has_rounding_issues(angles, origin);
     }
 };
 
+template<typename Pieces>
+inline void move_index(Pieces const& pieces, int& index, int& piece_index, int direction)
+{
+    BOOST_ASSERT(direction == 1 || direction == -1);
+    BOOST_ASSERT(piece_index >= 0 && piece_index < boost::size(pieces));
+    BOOST_ASSERT(index >= 0 && index < boost::size(pieces[piece_index].robust_ring));
 
-template <typename Point, typename Ring, typename Info>
-inline void add_incoming_and_outgoing_angles(Point const& map_point, Point const& intersection_point,
-                Ring const& ring, 
+    index += direction;
+    if (direction == -1 && index < 0)
+    {
+        piece_index--;
+        if (piece_index < 0)
+        {
+            piece_index = boost::size(pieces) - 1;
+        }
+        index = boost::size(pieces[piece_index].robust_ring) - 1;
+    }
+    if (direction == 1 && index >= boost::size(pieces[piece_index].robust_ring))
+    {
+        piece_index++;
+        if (piece_index >= boost::size(pieces))
+        {
+            piece_index = 0;
+        }
+        index = 0;
+    }
+}
+
+
+template
+<
+    typename RobustPoint,
+    typename Turn,
+    typename Pieces,
+    typename Info
+>
+inline void add_incoming_and_outgoing_angles(
+                RobustPoint const& intersection_point, // rescaled
+                Turn const& turn,
+                Pieces const& pieces, // using rescaled offsets of it
                 int turn_index,
                 int operation_index,
                 segment_identifier seg_id,
                 Info& info)
 {
-    typedef typename boost::range_iterator
-        <
-            Ring const
-        >::type iterator_type;
-
-    int const n = boost::size(ring);
-    if (seg_id.segment_index >= n || seg_id.segment_index < 0)
-    {
-        return;
-    }
-
     segment_identifier real_seg_id = seg_id;
-    iterator_type it = boost::begin(ring) + seg_id.segment_index;
+    geometry::equal_to<RobustPoint> comparator;
 
-    // TODO: if we use turn-info ("to", "middle"), we know if to advance without resorting to equals
-    relaxed_less<Point> comparator;
-
-    if (comparator.equals(intersection_point, *it))
+    // Move backward and forward
+    RobustPoint direction_points[2];
+    for (int i = 0; i < 2; i++)
     {
-        // It should be equal only once. But otherwise we skip it (in "add")
-        it = advance_circular(it, ring, seg_id, false);
-    }
-
-    info.add(map_point, *it, intersection_point, turn_index, operation_index, real_seg_id, true);
-
-    if (comparator.equals(intersection_point, *it))
-    {
-        it = advance_circular(it, ring, real_seg_id);
-    }
-    else
-    {
-        // Don't upgrade the ID
-        it = advance_circular(it, ring, seg_id);
-    }
-    for (int defensive_check = 0; 
-        comparator.equals(intersection_point, *it) && defensive_check < n; 
-        defensive_check++)
-    {
-        it = advance_circular(it, ring, real_seg_id);
-    }
-
-    info.add(map_point, *it, intersection_point, turn_index, operation_index, real_seg_id, false);
-}
-
-
-// Map in two senses of the word: it is a std::map where the key is a point.
-// Per point an "occupation_info" record is kept
-// Used for the buffer (but will also be used for intersections/unions having complex self-tangencies)
-template <typename Point, typename OccupationInfo>
-class occupation_map
-{
-public :
-    typedef std::map<Point, OccupationInfo, relaxed_less<Point> > map_type;
-
-    map_type map;
-    std::set<int> turn_indices;
-
-    inline OccupationInfo& find_or_insert(Point const& point, Point& mapped_point)
-    {
-        typename map_type::iterator it = map.find(point);
-        if (it == boost::end(map))
+        int index = turn.operations[operation_index].index_in_robust_ring;
+        int piece_index = turn.operations[operation_index].piece_index;
+        while(comparator(pieces[piece_index].robust_ring[index], intersection_point))
         {
-            std::pair<typename map_type::iterator, bool> pair 
-                        = map.insert(std::make_pair(point, OccupationInfo()));
-            it = pair.first;
+            move_index(pieces, index, piece_index, i == 0 ? -1 : 1);
         }
-        mapped_point = it->first;
-        return it->second;
+        direction_points[i] = pieces[piece_index].robust_ring[index];
     }
 
-    inline bool contains(Point const& point) const
-    {
-        typename map_type::const_iterator it = map.find(point);
-        return it != boost::end(map);
-    }
-
-    inline bool contains_turn_index(int index) const
-    {
-        return turn_indices.count(index) > 0;
-    }
-
-    inline void insert_turn_index(int index)
-    {
-        turn_indices.insert(index);
-    }
-};
+    info.add(direction_points[0], direction_points[1], intersection_point,
+        turn_index, operation_index, real_seg_id);
+}
 
 
 } // namespace detail
diff --git a/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp b/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
index 2c0f88e2a..0fd1fe4de 100644
--- a/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp
@@ -13,7 +13,7 @@
 #include <boost/range.hpp>
 
 #include <boost/geometry/algorithms/append.hpp>
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
 
 
 
@@ -29,7 +29,7 @@ template <typename Range, typename Point>
 inline void append_no_duplicates(Range& range, Point const& point, bool force = false)
 {
     if (boost::size(range) == 0
-        || force 
+        || force
         || ! geometry::detail::equals::equals_point_point(*(boost::end(range)-1), point))
     {
 #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
diff --git a/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp b/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
index 29094de90..f7d48fa95 100644
--- a/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/geometry/algorithms/append.hpp>
 #include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
 
 
 namespace boost { namespace geometry
@@ -24,35 +24,118 @@ namespace boost { namespace geometry
 namespace detail { namespace overlay
 {
 
-template <typename Range, typename Point>
-inline void append_no_dups_or_spikes(Range& range, Point const& point)
+// TODO: move this / rename this
+template <typename Point1, typename Point2, typename RobustPolicy>
+inline bool points_equal_or_close(Point1 const& point1,
+        Point2 const& point2,
+        RobustPolicy const& robust_policy)
+{
+    if (detail::equals::equals_point_point(point1, point2))
+    {
+        return true;
+    }
+
+    if (! RobustPolicy::enabled)
+    {
+        return false;
+    }
+
+    // Try using specified robust policy
+    typedef typename geometry::robust_point_type
+    <
+        Point1,
+        RobustPolicy
+    >::type robust_point_type;
+
+    robust_point_type point1_rob, point2_rob;
+    geometry::recalculate(point1_rob, point1, robust_policy);
+    geometry::recalculate(point2_rob, point2, robust_policy);
+
+    return detail::equals::equals_point_point(point1_rob, point2_rob);
+}
+
+
+template <typename Range, typename Point, typename RobustPolicy>
+inline void append_no_dups_or_spikes(Range& range, Point const& point,
+        RobustPolicy const& robust_policy)
 {
 #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
     std::cout << "  add: ("
         << geometry::get<0>(point) << ", " << geometry::get<1>(point) << ")"
         << std::endl;
 #endif
+    // The code below thies condition checks all spikes/dups
+    // for geometries >= 3 points.
+    // So we have to check the first potential duplicate differently
+    if (boost::size(range) == 1
+        && points_equal_or_close(*(boost::begin(range)), point, robust_policy))
+    {
+        return;
+    }
 
     traits::push_back<Range>::apply(range, point);
 
-    // If a point is equal, or forming a spike, remove the pen-ultimate point because this one caused the spike.
-    // If so, the now-new-pen-ultimate point can again cause a spike (possibly at a corner). So keep doing this.
-    // Besides spikes it will also avoid duplicates.
-    while(boost::size(range) >= 3 
-            && point_is_spike_or_equal(point, *(boost::end(range) - 3), *(boost::end(range) - 2)))
+    // If a point is equal, or forming a spike, remove the pen-ultimate point
+    // because this one caused the spike.
+    // If so, the now-new-pen-ultimate point can again cause a spike
+    // (possibly at a corner). So keep doing this.
+    // Besides spikes it will also avoid adding duplicates.
+    while(boost::size(range) >= 3
+            && point_is_spike_or_equal(point,
+                *(boost::end(range) - 3),
+                *(boost::end(range) - 2),
+                robust_policy))
     {
         // Use the Concept/traits, so resize and append again
         traits::resize<Range>::apply(range, boost::size(range) - 2);
         traits::push_back<Range>::apply(range, point);
     }
+}
 
-    // There might still be one duplicate not catched by the condition above
-    if (boost::size(range) == 2
-        && geometry::detail::equals::equals_point_point(*boost::begin(range), point))
+template <typename Range, typename RobustPolicy>
+inline void clean_closing_dups_and_spikes(Range& range,
+                RobustPolicy const& robust_policy)
+{
+    std::size_t const minsize
+        = core_detail::closure::minimum_ring_size
+            <
+                geometry::closure<Range>::value
+            >::value;
+
+    if (boost::size(range) <= minsize)
     {
-        traits::clear<Range>::apply(range);
-        traits::push_back<Range>::apply(range, point);
+        return;
     }
+
+    typedef typename boost::range_iterator<Range>::type iterator_type;
+    const bool closed = geometry::closure<Range>::value == geometry::closed;
+    bool found = false;
+    do
+    {
+        found = false;
+        iterator_type first = boost::begin(range);
+        iterator_type second = first + 1;
+        iterator_type ultimate = boost::end(range) - 1;
+        if (closed)
+        {
+            ultimate--;
+        }
+
+        // Check if closing point is a spike (this is so if the second point is
+        // considered as a spike w.r.t. the last segment)
+        if (point_is_spike_or_equal(*second, *ultimate, *first, robust_policy))
+        {
+            range.erase(first);
+            if (closed)
+            {
+                // Remove closing last point
+                traits::resize<Range>::apply(range, boost::size(range) - 1);
+                // Add new closing point
+                traits::push_back<Range>::apply(range, *boost::begin(range));
+            }
+            found = true;
+        }
+    } while(found && boost::size(range) > minsize);
 }
 
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp b/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
index ef840d86a..90901dee7 100644
--- a/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp
@@ -55,8 +55,8 @@ inline void clear_visit_info(Turns& turns)
 struct backtrack_state
 {
     bool m_good;
-    
-    inline backtrack_state() : m_good(true) {}         
+
+    inline backtrack_state() : m_good(true) {}
     inline void reset() { m_good = true; }
     inline bool good() const { return m_good; }
 };
@@ -79,24 +79,25 @@ class backtrack_check_self_intersections
 public :
     typedef state state_type;
 
-    template <typename Operation, typename Rings, typename Turns>
-    static inline void apply(std::size_t size_at_start, 
-                Rings& rings, typename boost::range_value<Rings>::type& ring,
+    template <typename Operation, typename Rings, typename Ring, typename Turns, typename RobustPolicy>
+    static inline void apply(std::size_t size_at_start,
+                Rings& rings, Ring& ring,
                 Turns& turns, Operation& operation,
                 std::string const& ,
                 Geometry1 const& geometry1,
                 Geometry2 const& geometry2,
+                RobustPolicy const& robust_policy,
                 state_type& state
                 )
     {
         state.m_good = false;
-        
+
         // Check self-intersections and throw exception if appropriate
         if (! state.m_checked)
         {
             state.m_checked = true;
-            has_self_intersections(geometry1);
-            has_self_intersections(geometry2);
+            has_self_intersections(geometry1, robust_policy);
+            has_self_intersections(geometry2, robust_policy);
         }
 
         // Make bad output clean
@@ -123,7 +124,7 @@ public :
     typedef backtrack_state state_type;
 
     template <typename Operation, typename Rings, typename Turns>
-    static inline void apply(std::size_t size_at_start, 
+    static inline void apply(std::size_t size_at_start,
                 Rings& rings, typename boost::range_value<Rings>::type& ring,
                 Turns& turns, Operation& operation,
                 std::string const& reason,
@@ -133,7 +134,7 @@ public :
                 )
     {
         std::cout << " REJECT " << reason << std::endl;
-        
+
         state.m_good = false;
 
         rings.resize(size_at_start);
diff --git a/include/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp b/include/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp
deleted file mode 100644
index a365ccf90..000000000
--- a/include/boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-
-// Copyright (c) 2007-2012 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)
-
-#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CALCULATE_DISTANCE_POLICY_HPP
-#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CALCULATE_DISTANCE_POLICY_HPP
-
-
-#include <boost/geometry/algorithms/comparable_distance.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay
-{
-
-
-/*!
-    \brief Policy calculating distance
-    \details get_turn_info has an optional policy to get some
-        extra information.
-        This policy calculates the distance (using default distance strategy)
- */
-struct calculate_distance_policy
-{
-    static bool const include_no_turn = false;
-    static bool const include_degenerate = false;
-    static bool const include_opposite = false;
-
-    template 
-    <
-        typename Info,
-        typename Point1,
-        typename Point2,
-        typename IntersectionInfo,
-        typename DirInfo
-    >
-    static inline void apply(Info& info, Point1 const& p1, Point2 const& p2,
-                IntersectionInfo const&, DirInfo const&)
-    {
-        info.operations[0].enriched.distance
-                    = geometry::comparable_distance(info.point, p1);
-        info.operations[1].enriched.distance
-                    = geometry::comparable_distance(info.point, p2);
-    }
-
-};
-
-
-}} // namespace detail::overlay
-#endif //DOXYGEN_NO_DETAIL
-
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_CALCULATE_DISTANCE_POLICY_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp b/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
index 5e18d0453..4040fbe6b 100644
--- a/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp
@@ -17,6 +17,7 @@
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
@@ -124,6 +125,30 @@ struct copy_segment_point_box
 };
 
 
+template
+<
+    typename MultiGeometry,
+    typename SegmentIdentifier,
+    typename PointOut,
+    typename Policy
+>
+struct copy_segment_point_multi
+{
+    static inline bool apply(MultiGeometry const& multi,
+                             SegmentIdentifier const& seg_id, bool second,
+                             PointOut& point)
+    {
+
+        BOOST_ASSERT
+            (
+                seg_id.multi_index >= 0
+                && seg_id.multi_index < int(boost::size(multi))
+            );
+
+        // Call the single-version
+        return Policy::apply(multi[seg_id.multi_index], seg_id, second, point);
+    }
+};
 
 
 }} // namespace detail::copy_segments
@@ -188,6 +213,66 @@ struct copy_segment_point<box_tag, Box, Reverse, SegmentIdentifier, PointOut>
 {};
 
 
+template
+<
+    typename MultiGeometry,
+    bool Reverse,
+    typename SegmentIdentifier,
+    typename PointOut
+>
+struct copy_segment_point
+    <
+        multi_polygon_tag,
+        MultiGeometry,
+        Reverse,
+        SegmentIdentifier,
+        PointOut
+    >
+    : detail::copy_segments::copy_segment_point_multi
+        <
+            MultiGeometry,
+            SegmentIdentifier,
+            PointOut,
+            detail::copy_segments::copy_segment_point_polygon
+                <
+                    typename boost::range_value<MultiGeometry>::type,
+                    Reverse,
+                    SegmentIdentifier,
+                    PointOut
+                >
+        >
+{};
+
+template
+<
+    typename MultiGeometry,
+    bool Reverse,
+    typename SegmentIdentifier,
+    typename PointOut
+>
+struct copy_segment_point
+    <
+        multi_linestring_tag,
+        MultiGeometry,
+        Reverse,
+        SegmentIdentifier,
+        PointOut
+    >
+    : detail::copy_segments::copy_segment_point_multi
+        <
+            MultiGeometry,
+            SegmentIdentifier,
+            PointOut,
+            detail::copy_segments::copy_segment_point_range
+                <
+                    typename boost::range_value<MultiGeometry>::type,
+                    Reverse,
+                    SegmentIdentifier,
+                    PointOut
+                >
+        >
+{};
+
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
diff --git a/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp b/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
index 8d487d599..d4bf0a90f 100644
--- a/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/copy_segments.hpp
@@ -1,6 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,25 +15,31 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
 
 
-#include <boost/array.hpp>
-#include <boost/mpl/assert.hpp>
 #include <vector>
 
+#include <boost/array.hpp>
 #include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
+#include <boost/type_traits/integral_constant.hpp>
 
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/iterators/ever_circling_iterator.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/views/reversible_view.hpp>
 
+#include <boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp>
 #include <boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp>
 
+
 namespace boost { namespace geometry
 {
 
@@ -38,34 +49,37 @@ namespace detail { namespace copy_segments
 {
 
 
-template
-<
-    typename Ring,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
+template <bool Reverse>
 struct copy_segments_ring
 {
-    typedef typename closeable_view
+    template
+    <
+        typename Ring,
+        typename SegmentIdentifier,
+        typename RobustPolicy,
+        typename RangeOut
+    >
+    static inline void apply(Ring const& ring,
+            SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
+            RangeOut& current_output)
+    {
+        typedef typename closeable_view
         <
             Ring const,
             closure<Ring>::value
         >::type cview_type;
 
-    typedef typename reversible_view
+        typedef typename reversible_view
         <
             cview_type const,
             Reverse ? iterate_reverse : iterate_forward
         >::type rview_type;
 
-    typedef typename boost::range_iterator<rview_type const>::type iterator;
-    typedef geometry::ever_circling_iterator<iterator> ec_iterator;
+        typedef typename boost::range_iterator<rview_type const>::type iterator;
+        typedef geometry::ever_circling_iterator<iterator> ec_iterator;
+
 
-    static inline void apply(Ring const& ring,
-            SegmentIdentifier const& seg_id, int to_index,
-            RangeOut& current_output)
-    {
         cview_type cview(ring);
         rview_type view(cview);
 
@@ -93,31 +107,55 @@ struct copy_segments_ring
 
         for (size_type i = 0; i < count; ++i, ++it)
         {
-            detail::overlay::append_no_dups_or_spikes(current_output, *it);
+            detail::overlay::append_no_dups_or_spikes(current_output, *it, robust_policy);
         }
     }
 };
 
-template
-<
-    typename LineString,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments_linestring
+template <bool Reverse, bool RemoveSpikes = true>
+class copy_segments_linestring
 {
+private:
+    // remove spikes
+    template <typename RangeOut, typename Point, typename RobustPolicy>
+    static inline void append_to_output(RangeOut& current_output,
+                                        Point const& point,
+                                        RobustPolicy const& robust_policy,
+                                        boost::true_type const&)
+    {
+        detail::overlay::append_no_dups_or_spikes(current_output, point,
+                                                  robust_policy);
+    }
 
-    typedef typename boost::range_iterator<LineString const>::type iterator;
+    // keep spikes
+    template <typename RangeOut, typename Point, typename RobustPolicy>
+    static inline void append_to_output(RangeOut& current_output,
+                                        Point const& point,
+                                        RobustPolicy const&,
+                                        boost::false_type const&)
+    {
+        detail::overlay::append_no_duplicates(current_output, point);
+    }
 
+public:
+    template
+    <
+        typename LineString,
+        typename SegmentIdentifier,
+        typename RobustPolicy,
+        typename RangeOut
+    >
     static inline void apply(LineString const& ls,
             SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         int const from_index = seg_id.segment_index + 1;
 
         // Sanity check
-        if (from_index > to_index || from_index < 0 || to_index >= int(boost::size(ls)))
+        if ( from_index > to_index
+          || from_index < 0
+          || to_index >= int(boost::size(ls)) )
         {
             return;
         }
@@ -125,58 +163,59 @@ struct copy_segments_linestring
         typedef typename boost::range_difference<LineString>::type size_type;
         size_type const count = to_index - from_index + 1;
 
-        typename boost::range_iterator<LineString const>::type it = boost::begin(ls) + from_index;
+        typename boost::range_iterator<LineString const>::type
+            it = boost::begin(ls) + from_index;
 
         for (size_type i = 0; i < count; ++i, ++it)
         {
-            detail::overlay::append_no_dups_or_spikes(current_output, *it);
+            append_to_output(current_output, *it, robust_policy,
+                             boost::integral_constant<bool, RemoveSpikes>());
         }
     }
 };
 
-template
-<
-    typename Polygon,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
+template <bool Reverse>
 struct copy_segments_polygon
 {
+    template
+    <
+        typename Polygon,
+        typename SegmentIdentifier,
+        typename RobustPolicy,
+        typename RangeOut
+    >
     static inline void apply(Polygon const& polygon,
             SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         // Call ring-version with the right ring
-        copy_segments_ring
-            <
-                typename geometry::ring_type<Polygon>::type,
-                Reverse,
-                SegmentIdentifier,
-                RangeOut
-            >::apply
-                (
-                    seg_id.ring_index < 0
-                    ? geometry::exterior_ring(polygon)
-                    : geometry::interior_rings(polygon)[seg_id.ring_index],
-                    seg_id, to_index,
-                    current_output
-                );
+        copy_segments_ring<Reverse>::apply
+            (
+                seg_id.ring_index < 0
+                ? geometry::exterior_ring(polygon)
+                : geometry::interior_rings(polygon)[seg_id.ring_index],
+                seg_id, to_index,
+                robust_policy,
+                current_output
+            );
     }
 };
 
 
-template
-<
-    typename Box,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
+template <bool Reverse>
 struct copy_segments_box
 {
+    template
+    <
+        typename Box,
+        typename SegmentIdentifier,
+        typename RobustPolicy,
+        typename RangeOut
+    >
     static inline void apply(Box const& box,
             SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
             RangeOut& current_output)
     {
         int index = seg_id.segment_index + 1;
@@ -195,13 +234,45 @@ struct copy_segments_box
         //    (see comments in ring-version)
         for (int i = 0; i < count; i++, index++)
         {
-            detail::overlay::append_no_dups_or_spikes(current_output, bp[index % 5]);
+            detail::overlay::append_no_dups_or_spikes(current_output,
+                bp[index % 5], robust_policy);
 
         }
     }
 };
 
 
+template<typename Policy>
+struct copy_segments_multi
+{
+    template
+    <
+        typename MultiGeometry,
+        typename SegmentIdentifier,
+        typename RobustPolicy,
+        typename RangeOut
+    >
+    static inline void apply(MultiGeometry const& multi_geometry,
+            SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
+            RangeOut& current_output)
+    {
+
+        BOOST_ASSERT
+            (
+                seg_id.multi_index >= 0
+                && seg_id.multi_index < int(boost::size(multi_geometry))
+            );
+
+        // Call the single-version
+        Policy::apply(multi_geometry[seg_id.multi_index],
+                    seg_id, to_index,
+                    robust_policy,
+                    current_output);
+    }
+};
+
+
 }} // namespace detail::copy_segments
 #endif // DOXYGEN_NO_DETAIL
 
@@ -213,80 +284,42 @@ namespace dispatch
 template
 <
     typename Tag,
-    typename GeometryIn,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
+    bool Reverse
 >
-struct copy_segments
-{
-    BOOST_MPL_ASSERT_MSG
-        (
-            false, NOT_OR_NOT_YET_IMPLEMENTED_FOR_THIS_GEOMETRY_TYPE
-            , (types<GeometryIn>)
-        );
-};
-
-
-template
-<
-    typename Ring,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments<ring_tag, Ring, Reverse, SegmentIdentifier, RangeOut>
-    : detail::copy_segments::copy_segments_ring
-        <
-            Ring, Reverse, SegmentIdentifier, RangeOut
-        >
+struct copy_segments : not_implemented<Tag>
 {};
 
 
-
-template
-<
-    typename LineString,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments<linestring_tag, LineString, Reverse, SegmentIdentifier, RangeOut>
-    : detail::copy_segments::copy_segments_linestring
-        <
-            LineString, Reverse, SegmentIdentifier, RangeOut
-        >
-{};
-
-template
-<
-    typename Polygon,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments<polygon_tag, Polygon, Reverse, SegmentIdentifier, RangeOut>
-    : detail::copy_segments::copy_segments_polygon
-        <
-            Polygon, Reverse, SegmentIdentifier, RangeOut
-        >
+template <bool Reverse>
+struct copy_segments<ring_tag, Reverse>
+    : detail::copy_segments::copy_segments_ring<Reverse>
 {};
 
 
-template
-<
-    typename Box,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments<box_tag, Box, Reverse, SegmentIdentifier, RangeOut>
-    : detail::copy_segments::copy_segments_box
-        <
-            Box, Reverse, SegmentIdentifier, RangeOut
-        >
+template <bool Reverse>
+struct copy_segments<linestring_tag, Reverse>
+    : detail::copy_segments::copy_segments_linestring<Reverse>
 {};
 
+template <bool Reverse>
+struct copy_segments<polygon_tag, Reverse>
+    : detail::copy_segments::copy_segments_polygon<Reverse>
+{};
+
+
+template <bool Reverse>
+struct copy_segments<box_tag, Reverse>
+    : detail::copy_segments::copy_segments_box<Reverse>
+{};
+
+
+template<bool Reverse>
+struct copy_segments<multi_polygon_tag, Reverse>
+    : detail::copy_segments::copy_segments_multi
+        <
+            detail::copy_segments::copy_segments_polygon<Reverse>
+        >
+{};
 
 
 } // namespace dispatch
@@ -303,10 +336,12 @@ template
     bool Reverse,
     typename Geometry,
     typename SegmentIdentifier,
+    typename RobustPolicy,
     typename RangeOut
 >
 inline void copy_segments(Geometry const& geometry,
             SegmentIdentifier const& seg_id, int to_index,
+            RobustPolicy const& robust_policy,
             RangeOut& range_out)
 {
     concept::check<Geometry const>();
@@ -314,11 +349,8 @@ inline void copy_segments(Geometry const& geometry,
     dispatch::copy_segments
         <
             typename tag<Geometry>::type,
-            Geometry,
-            Reverse,
-            SegmentIdentifier,
-            RangeOut
-        >::apply(geometry, seg_id, to_index, range_out);
+            Reverse
+        >::apply(geometry, seg_id, to_index, robust_policy, range_out);
 }
 
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp b/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp
new file mode 100644
index 000000000..15100f8d0
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/do_reverse.hpp
@@ -0,0 +1,47 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DO_REVERSE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DO_REVERSE_HPP
+
+#include <boost/geometry/core/point_order.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+// Metafunction helper for intersection and union
+template <order_selector Selector, bool Reverse = false>
+struct do_reverse {};
+
+template <>
+struct do_reverse<clockwise, false> : boost::false_type {};
+
+template <>
+struct do_reverse<clockwise, true> : boost::true_type {};
+
+template <>
+struct do_reverse<counterclockwise, false> : boost::true_type {};
+
+template <>
+struct do_reverse<counterclockwise, true> : boost::false_type {};
+
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_DO_REVERSE_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp b/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
index 00b7a5c3a..9c984f0b8 100644
--- a/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp
@@ -29,6 +29,8 @@
 #include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_relative_order.hpp>
 #include <boost/geometry/algorithms/detail/overlay/handle_tangencies.hpp>
+#include <boost/geometry/algorithms/detail/zoom_to_robust.hpp>
+#include <boost/geometry/policies/robustness/robust_type.hpp>
 #ifdef BOOST_GEOMETRY_DEBUG_ENRICH
 #  include <boost/geometry/algorithms/detail/overlay/check_enrich.hpp>
 #endif
@@ -78,9 +80,9 @@ template
     bool Reverse1, bool Reverse2,
     typename Strategy
 >
-struct sort_on_segment_and_distance
+struct sort_on_segment_and_ratio
 {
-    inline sort_on_segment_and_distance(TurnPoints const& turn_points
+    inline sort_on_segment_and_ratio(TurnPoints const& turn_points
             , Geometry1 const& geometry1
             , Geometry2 const& geometry2
             , Strategy const& strategy
@@ -101,11 +103,22 @@ private :
     Strategy const& m_strategy;
     mutable bool* m_clustered;
 
-    inline bool consider_relative_order(Indexed const& left,
-                    Indexed const& right) const
+    typedef model::point
+        <
+            typename detail::robust_type
+                <
+                    typename select_coordinate_type<Geometry1, Geometry2>::type
+                >::type,
+            geometry::dimension<Geometry1>::value,
+            typename geometry::coordinate_system<Geometry1>::type
+        > robust_point_type;
+
+    inline void get_situation_map(Indexed const& left, Indexed const& right,
+                              robust_point_type& pi_rob, robust_point_type& pj_rob,
+                              robust_point_type& ri_rob, robust_point_type& rj_rob,
+                              robust_point_type& si_rob, robust_point_type& sj_rob) const
     {
-        typedef typename geometry::point_type<Geometry1>::type point_type;
-        point_type pi, pj, ri, rj, si, sj;
+        typename geometry::point_type<Geometry1>::type pi, pj, ri, rj, si, sj;
 
         geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
             left.subject.seg_id,
@@ -116,11 +129,19 @@ private :
         geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
             right.subject.other_id,
             si, sj);
+        detail::zoom_to_robust(pi, pj, ri, rj, si, sj,
+                                    pi_rob, pj_rob, ri_rob, rj_rob, si_rob, sj_rob);
+    }
 
+    inline bool consider_relative_order(Indexed const& left,
+                    Indexed const& right) const
+    {
+        robust_point_type pi, pj, ri, rj, si, sj;
+        get_situation_map(left, right, pi, pj, ri, rj, si, sj);
         int const order = get_relative_order
             <
-                point_type
-            >::apply(pi, pj,ri, rj, si, sj);
+                robust_point_type
+            >::apply(pi, pj, ri, rj, si, sj);
         //debug("r/o", order == -1);
         return order == -1;
     }
@@ -137,9 +158,7 @@ public :
         if (sl == sr)
         {
             // Both left and right are located on the SAME segment.
-            typedef typename geometry::coordinate_type<Geometry1>::type coordinate_type;
-            coordinate_type diff = geometry::math::abs(left.subject.enriched.distance - right.subject.enriched.distance);
-            if (diff < geometry::math::relaxed_epsilon<coordinate_type>(10))
+            if (left.subject.fraction == right.subject.fraction)
             {
                 // First check "real" intersection (crosses)
                 // -> distance zero due to precision, solve it by sorting
@@ -153,13 +172,12 @@ public :
                 // Indicate that this is necessary.
                 *m_clustered = true;
 
-                return left.subject.enriched.distance < right.subject.enriched.distance;
+                return left.subject.fraction < right.subject.fraction;
             }
         }
         return sl == sr
-            ? left.subject.enriched.distance < right.subject.enriched.distance
+            ? left.subject.fraction < right.subject.fraction
             : sl < sr;
-
     }
 };
 
@@ -197,12 +215,14 @@ template
     typename Container,
     typename TurnPoints,
     typename Geometry1, typename Geometry2,
+    typename RobustPolicy,
     typename Strategy
 >
 inline void enrich_sort(Container& operations,
             TurnPoints& turn_points,
             operation_type for_operation,
             Geometry1 const& geometry1, Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
             Strategy const& strategy)
 {
     typedef typename IndexType::type operations_type;
@@ -210,7 +230,7 @@ inline void enrich_sort(Container& operations,
     bool clustered = false;
     std::sort(boost::begin(operations),
                 boost::end(operations),
-                sort_on_segment_and_distance
+                sort_on_segment_and_ratio
                     <
                         TurnPoints,
                         IndexType,
@@ -240,8 +260,7 @@ inline void enrich_sort(Container& operations,
             if (prev_op.seg_id == op.seg_id
                 && (turn_points[prev->index].method != method_crosses
                     || turn_points[it->index].method != method_crosses)
-                && geometry::math::equals(prev_op.enriched.distance,
-                        op.enriched.distance))
+                && prev_op.fraction == op.fraction)
             {
                 if (begin_cluster == boost::end(operations))
                 {
@@ -251,14 +270,14 @@ inline void enrich_sort(Container& operations,
             else if (begin_cluster != boost::end(operations))
             {
                 handle_cluster<IndexType, Reverse1, Reverse2>(begin_cluster, it, turn_points,
-                        for_operation, geometry1, geometry2, strategy);
+                        for_operation, geometry1, geometry2, robust_policy, strategy);
                 begin_cluster = boost::end(operations);
             }
         }
         if (begin_cluster != boost::end(operations))
         {
             handle_cluster<IndexType, Reverse1, Reverse2>(begin_cluster, it, turn_points,
-                    for_operation, geometry1, geometry2, strategy);
+                    for_operation, geometry1, geometry2, robust_policy, strategy);
         }
     }
 
@@ -348,7 +367,7 @@ inline void enrich_assign(Container& operations,
             std::cout << it->index
                 << " meth: " << method_char(turn_points[it->index].method)
                 << " seg: " << op.seg_id
-                << " dst: " << boost::numeric_cast<double>(op.enriched.distance)
+                << " dst: " << op.fraction // needs define
                 << " op: " << operation_char(turn_points[it->index].operations[0].operation)
                 << operation_char(turn_points[it->index].operations[1].operation)
                 << " dsc: " << (turn_points[it->index].discarded ? "T" : "F")
@@ -424,6 +443,7 @@ inline void create_map(TurnPoints const& turn_points, MappedVector& mapped_vecto
 \param for_operation operation_type (union or intersection)
 \param geometry1 \param_geometry
 \param geometry2 \param_geometry
+\param robust_policy policy to handle robustness issues
 \param strategy strategy
  */
 template
@@ -431,11 +451,13 @@ template
     bool Reverse1, bool Reverse2,
     typename TurnPoints,
     typename Geometry1, typename Geometry2,
+    typename RobustPolicy,
     typename Strategy
 >
 inline void enrich_intersection_points(TurnPoints& turn_points,
     detail::overlay::operation_type for_operation,
     Geometry1 const& geometry1, Geometry2 const& geometry2,
+    RobustPolicy const& robust_policy,
     Strategy const& strategy)
 {
     typedef typename boost::range_value<TurnPoints>::type turn_point_type;
@@ -464,6 +486,10 @@ inline void enrich_intersection_points(TurnPoints& turn_points,
         {
             it->discarded = true;
         }
+        if (it->both(detail::overlay::operation_none))
+        {
+            it->discarded = true;
+        }
     }
 
 
@@ -486,7 +512,7 @@ inline void enrich_intersection_points(TurnPoints& turn_points,
         << mit->first << std::endl;
 #endif
         detail::overlay::enrich_sort<indexed_turn_operation, Reverse1, Reverse2>(mit->second, turn_points, for_operation,
-                    geometry1, geometry2, strategy);
+                    geometry1, geometry2, robust_policy, strategy);
     }
 
     for (typename mapped_vector_type::iterator mit
diff --git a/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp b/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
index d92a0a969..6668c9924 100644
--- a/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/enrichment_info.hpp
@@ -10,9 +10,6 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_ENRICHMENT_INFO_HPP
 
 
-#include <boost/geometry/strategies/distance.hpp>
-
-
 namespace boost { namespace geometry
 {
 
@@ -31,24 +28,10 @@ namespace detail { namespace overlay
 template<typename P>
 struct enrichment_info
 {
-    typedef typename strategy::distance::services::return_type
-        <
-            typename strategy::distance::services::comparable_type
-                <
-                    typename strategy::distance::services::default_strategy
-                        <
-                            point_tag,
-                            P
-                        >::type
-                >::type,
-            P, P
-        >::type distance_type;
-
     inline enrichment_info()
         : travels_to_vertex_index(-1)
         , travels_to_ip_index(-1)
         , next_ip_index(-1)
-        , distance(distance_type())
     {}
 
     // vertex to which is free travel after this IP,
@@ -61,8 +44,6 @@ struct enrichment_info
 
     // index of next IP on this segment, -1 if there is no one
     int next_ip_index;
-
-    distance_type distance; // distance-measurement from segment.first to IP
 };
 
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/follow.hpp b/include/boost/geometry/algorithms/detail/overlay/follow.hpp
index b110cc960..632f79f40 100644
--- a/include/boost/geometry/algorithms/detail/overlay/follow.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/follow.hpp
@@ -1,6 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -20,6 +25,7 @@
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 
 #include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/clear.hpp>
 
 
 namespace boost { namespace geometry
@@ -32,7 +38,7 @@ namespace detail { namespace overlay
 
 namespace following
 {
-    
+
 template <typename Turn, typename Operation>
 static inline bool is_entering(Turn const& /* TODO remove this parameter */, Operation const& op)
 {
@@ -44,43 +50,43 @@ static inline bool is_entering(Turn const& /* TODO remove this parameter */, Ope
         ;
 }
 
-template 
+template
 <
-    typename Turn, 
-    typename Operation, 
-    typename LineString, 
+    typename Turn,
+    typename Operation,
+    typename LineString,
     typename Polygon
 >
-static inline bool last_covered_by(Turn const& turn, Operation const& op, 
+static inline bool last_covered_by(Turn const& turn, Operation const& op,
                 LineString const& linestring, Polygon const& polygon)
 {
-    // Check any point between the this one and the first IP 
+    // Check any point between the this one and the first IP
     typedef typename geometry::point_type<LineString>::type point_type;
     point_type point_in_between;
     detail::point_on_border::midpoint_helper
         <
             point_type,
             0, dimension<point_type>::value
-        >::apply(point_in_between, linestring[op.seg_id.segment_index], turn.point);
+        >::apply(point_in_between, *(::boost::begin(linestring) + op.seg_id.segment_index), turn.point);
 
     return geometry::covered_by(point_in_between, polygon);
 }
 
 
-template 
+template
 <
-    typename Turn, 
-    typename Operation, 
-    typename LineString, 
+    typename Turn,
+    typename Operation,
+    typename LineString,
     typename Polygon
 >
-static inline bool is_leaving(Turn const& turn, Operation const& op, 
-                bool entered, bool first, 
+static inline bool is_leaving(Turn const& turn, Operation const& op,
+                bool entered, bool first,
                 LineString const& linestring, Polygon const& polygon)
 {
     if (op.operation == operation_union)
     {
-        return entered 
+        return entered
             || turn.method == method_crosses
             || (first && last_covered_by(turn, op, linestring, polygon))
             ;
@@ -89,20 +95,20 @@ static inline bool is_leaving(Turn const& turn, Operation const& op,
 }
 
 
-template 
+template
 <
-    typename Turn, 
-    typename Operation, 
-    typename LineString, 
+    typename Turn,
+    typename Operation,
+    typename LineString,
     typename Polygon
 >
-static inline bool is_staying_inside(Turn const& turn, Operation const& op, 
-                bool entered, bool first, 
+static inline bool is_staying_inside(Turn const& turn, Operation const& op,
+                bool entered, bool first,
                 LineString const& linestring, Polygon const& polygon)
 {
     if (turn.method == method_crosses)
     {
-        // The normal case, this is completely covered with entering/leaving 
+        // The normal case, this is completely covered with entering/leaving
         // so stay out of this time consuming "covered_by"
         return false;
     }
@@ -115,11 +121,11 @@ static inline bool is_staying_inside(Turn const& turn, Operation const& op,
     return false;
 }
 
-template 
+template
 <
-    typename Turn, 
-    typename Operation, 
-    typename Linestring, 
+    typename Turn,
+    typename Operation,
+    typename Linestring,
     typename Polygon
 >
 static inline bool was_entered(Turn const& turn, Operation const& op, bool first,
@@ -134,7 +140,7 @@ static inline bool was_entered(Turn const& turn, Operation const& op, bool first
 
 
 // Template specialization structure to call the right actions for the right type
-template<overlay_type OverlayType>
+template <overlay_type OverlayType, bool RemoveSpikes = true>
 struct action_selector
 {
     // If you get here the overlay type is not intersection or difference
@@ -142,51 +148,86 @@ struct action_selector
 };
 
 // Specialization for intersection, containing the implementation
-template<>
-struct action_selector<overlay_intersection>
+template <bool RemoveSpikes>
+struct action_selector<overlay_intersection, RemoveSpikes>
 {
     template
     <
-        typename OutputIterator, 
-        typename LineStringOut, 
-        typename LineString, 
-        typename Point, 
-        typename Operation
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation,
+        typename RobustPolicy
     >
     static inline void enter(LineStringOut& current_piece,
-                LineString const& , 
+                LineString const& ,
                 segment_identifier& segment_id,
                 int , Point const& point,
-                Operation const& operation, OutputIterator& )
+                Operation const& operation,
+                RobustPolicy const& ,
+                OutputIterator& )
     {
         // On enter, append the intersection point and remember starting point
+        // TODO: we don't check on spikes for linestrings (?). Consider this.
         detail::overlay::append_no_duplicates(current_piece, point);
         segment_id = operation.seg_id;
     }
 
     template
     <
-        typename OutputIterator, 
-        typename LineStringOut, 
-        typename LineString, 
-        typename Point, 
-        typename Operation
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation,
+        typename RobustPolicy
     >
     static inline void leave(LineStringOut& current_piece,
                 LineString const& linestring,
                 segment_identifier& segment_id,
                 int index, Point const& point,
-                Operation const& , OutputIterator& out)
+                Operation const& ,
+                RobustPolicy const& robust_policy,
+                OutputIterator& out)
     {
         // On leave, copy all segments from starting point, append the intersection point
         // and add the output piece
-        geometry::copy_segments<false>(linestring, segment_id, index, current_piece);
+        detail::copy_segments::copy_segments_linestring
+            <
+                false, RemoveSpikes
+            >::apply(linestring, segment_id, index, robust_policy, current_piece);
         detail::overlay::append_no_duplicates(current_piece, point);
-        if (current_piece.size() > 1)
+        if (::boost::size(current_piece) > 1)
         {
             *out++ = current_piece;
         }
-        current_piece.clear();
+
+        geometry::clear(current_piece);
+    }
+
+    template
+    <
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation
+    >
+    static inline void isolated_point(LineStringOut&,
+                LineString const&,
+                segment_identifier&,
+                int, Point const& point,
+                Operation const& , OutputIterator& out)
+    {
+        LineStringOut isolated_point_ls;
+        geometry::append(isolated_point_ls, point);
+
+#ifndef BOOST_GEOMETRY_ALLOW_ONE_POINT_LINESTRINGS
+        geometry::append(isolated_point_ls, point);
+#endif // BOOST_GEOMETRY_ALLOW_ONE_POINT_LINESTRINGS
+
+        *out++ = isolated_point_ls;
     }
 
     static inline bool is_entered(bool entered)
@@ -194,8 +235,15 @@ struct action_selector<overlay_intersection>
         return entered;
     }
 
-    template <typename Point, typename Geometry>
-    static inline bool included(Point const& point, Geometry const& geometry)
+    template
+    <
+        typename Point,
+        typename Geometry,
+        typename RobustPolicy
+    >
+    static inline bool included(Point const& point,
+            Geometry const& geometry,
+            RobustPolicy const& )
     {
         return geometry::covered_by(point, geometry);
     }
@@ -203,45 +251,67 @@ struct action_selector<overlay_intersection>
 };
 
 // Specialization for difference, which reverses these actions
-template<>
-struct action_selector<overlay_difference>
+template <bool RemoveSpikes>
+struct action_selector<overlay_difference, RemoveSpikes>
 {
-    typedef action_selector<overlay_intersection> normal_action;
+    typedef action_selector<overlay_intersection, RemoveSpikes> normal_action;
 
     template
     <
-        typename OutputIterator, 
-        typename LineStringOut, 
-        typename LineString, 
-        typename Point, 
-        typename Operation
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation,
+        typename RobustPolicy
     >
-    static inline void enter(LineStringOut& current_piece, 
-                LineString const& linestring, 
-                segment_identifier& segment_id, 
-                int index, Point const& point, 
-                Operation const& operation, OutputIterator& out)
+    static inline void enter(LineStringOut& current_piece,
+                LineString const& linestring,
+                segment_identifier& segment_id,
+                int index, Point const& point,
+                Operation const& operation,
+                RobustPolicy const& robust_policy,
+                OutputIterator& out)
     {
-        normal_action::leave(current_piece, linestring, segment_id, index, 
-                    point, operation, out);
+        normal_action::leave(current_piece, linestring, segment_id, index,
+                    point, operation, robust_policy, out);
     }
 
     template
     <
-        typename OutputIterator, 
-        typename LineStringOut, 
-        typename LineString, 
-        typename Point, 
-        typename Operation
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation,
+        typename RobustPolicy
     >
     static inline void leave(LineStringOut& current_piece,
                 LineString const& linestring,
                 segment_identifier& segment_id,
                 int index, Point const& point,
-                Operation const& operation, OutputIterator& out)
+                Operation const& operation,
+                RobustPolicy const& robust_policy,
+                OutputIterator& out)
     {
         normal_action::enter(current_piece, linestring, segment_id, index,
-                    point, operation, out);
+                    point, operation, robust_policy, out);
+    }
+
+    template
+    <
+        typename OutputIterator,
+        typename LineStringOut,
+        typename LineString,
+        typename Point,
+        typename Operation
+    >
+    static inline void isolated_point(LineStringOut&,
+                LineString const&,
+                segment_identifier&,
+                int, Point const&,
+                Operation const&, OutputIterator&)
+    {
     }
 
     static inline bool is_entered(bool entered)
@@ -249,10 +319,17 @@ struct action_selector<overlay_difference>
         return ! normal_action::is_entered(entered);
     }
 
-    template <typename Point, typename Geometry>
-    static inline bool included(Point const& point, Geometry const& geometry)
+    template
+    <
+        typename Point,
+        typename Geometry,
+        typename RobustPolicy
+    >
+    static inline bool included(Point const& point,
+        Geometry const& geometry,
+        RobustPolicy const& robust_policy)
     {
-        return ! normal_action::included(point, geometry);
+        return ! normal_action::included(point, geometry, robust_policy);
     }
 
 };
@@ -269,12 +346,13 @@ template
     typename LineStringOut,
     typename LineString,
     typename Polygon,
-    overlay_type OverlayType
+    overlay_type OverlayType,
+    bool RemoveSpikes = true
 >
 class follow
 {
 
-    template<typename Turn>
+    template <typename Turn>
     struct sort_on_segment
     {
         // In case of turn point at the same location, we want to have continue/blocked LAST
@@ -296,15 +374,15 @@ class follow
 
         inline bool use_operation(Turn const& left, Turn const& right) const
         {
-            // If they are the same, OK. 
+            // If they are the same, OK.
             return operation_order(left) < operation_order(right);
         }
 
         inline bool use_distance(Turn const& left, Turn const& right) const
         {
-            return geometry::math::equals(left.operations[0].enriched.distance, right.operations[0].enriched.distance)
+            return left.operations[0].fraction == right.operations[0].fraction
                 ? use_operation(left, right)
-                : left.operations[0].enriched.distance < right.operations[0].enriched.distance
+                : left.operations[0].fraction < right.operations[0].fraction
                 ;
         }
 
@@ -325,16 +403,33 @@ class follow
 
 public :
 
-    template <typename Point, typename Geometry>
-    static inline bool included(Point const& point, Geometry const& geometry)
+    template
+    <
+        typename Point,
+        typename Geometry,
+        typename RobustPolicy
+    >
+    static inline bool included(Point const& point,
+            Geometry const& geometry,
+            RobustPolicy const& robust_policy)
     {
-        return following::action_selector<OverlayType>::included(point, geometry);
+        return following::action_selector
+            <
+                OverlayType, RemoveSpikes
+            >::included(point, geometry, robust_policy);
     }
 
-    template<typename Turns, typename OutputIterator>
+    template
+    <
+        typename Turns,
+        typename OutputIterator,
+        typename RobustPolicy
+    >
     static inline OutputIterator apply(LineString const& linestring, Polygon const& polygon,
                 detail::overlay::operation_type ,  // TODO: this parameter might be redundant
-                Turns& turns, OutputIterator out)
+                Turns& turns,
+                RobustPolicy const& robust_policy,
+                OutputIterator out)
     {
         typedef typename boost::range_iterator<Turns>::type turn_iterator;
         typedef typename boost::range_value<Turns>::type turn_type;
@@ -343,7 +438,7 @@ public :
                 typename turn_type::container_type
             >::type turn_operation_iterator_type;
 
-        typedef following::action_selector<OverlayType> action;
+        typedef following::action_selector<OverlayType, RemoveSpikes> action;
 
         // Sort intersection points on segments-along-linestring, and distance
         // (like in enrich is done for poly/poly)
@@ -376,27 +471,36 @@ public :
                 debug_traverse(*it, *iit, "-> Entering");
 
                 entered = true;
-                action::enter(current_piece, linestring, current_segment_id, iit->seg_id.segment_index, it->point, *iit, out);
+                action::enter(current_piece, linestring, current_segment_id,
+                    iit->seg_id.segment_index, it->point, *iit,
+                    robust_policy,
+                    out);
             }
             else if (following::is_leaving(*it, *iit, entered, first, linestring, polygon))
             {
                 debug_traverse(*it, *iit, "-> Leaving");
 
                 entered = false;
-                action::leave(current_piece, linestring, current_segment_id, iit->seg_id.segment_index, it->point, *iit, out);
+                action::leave(current_piece, linestring, current_segment_id,
+                    iit->seg_id.segment_index, it->point, *iit,
+                    robust_policy,
+                    out);
             }
             first = false;
         }
 
         if (action::is_entered(entered))
         {
-            geometry::copy_segments<false>(linestring, current_segment_id,
-                    boost::size(linestring) - 1,
-                    current_piece);
+            detail::copy_segments::copy_segments_linestring
+                <
+                    false, RemoveSpikes
+                >::apply(linestring, current_segment_id,
+                         boost::size(linestring) - 1, robust_policy,
+                         current_piece);
         }
 
         // Output the last one, if applicable
-        if (current_piece.size() > 1)
+        if (::boost::size(current_piece) > 1)
         {
             *out++ = current_piece;
         }
diff --git a/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp b/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
new file mode 100644
index 000000000..e93978bb4
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp
@@ -0,0 +1,542 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_FOLLOW_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_FOLLOW_LINEAR_LINEAR_HPP
+
+#include <cstddef>
+#include <algorithm>
+#include <iterator>
+
+#include <boost/assert.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/follow.hpp>
+#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
+#include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+
+#include <boost/geometry/algorithms/detail/turns/debug_turn.hpp>
+
+#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+namespace following { namespace linear
+{
+
+
+
+
+// follower for linear/linear geometries set operations
+
+template <typename Turn, typename Operation>
+static inline bool is_entering(Turn const& turn,
+                               Operation const& operation)
+{
+    if ( turn.method != method_touch && turn.method != method_touch_interior )
+    {
+        return false;
+    }
+    return operation.operation == operation_intersection;
+}
+
+
+
+template <typename Turn, typename Operation>
+static inline bool is_staying_inside(Turn const& turn,
+                                     Operation const& operation, 
+                                     bool entered)
+{
+    if ( !entered )
+    {
+        return false;
+    }
+
+    if ( turn.method != method_equal && turn.method != method_collinear )
+    {
+        return false;
+    }
+    return operation.operation == operation_continue;
+}
+
+
+
+template <typename Turn, typename Operation>
+static inline bool is_leaving(Turn const& turn,
+                              Operation const& operation,
+                              bool entered)
+{
+    if ( !entered )
+    {
+        return false;
+    }
+
+    if ( turn.method != method_touch
+         && turn.method != method_touch_interior
+         && turn.method != method_equal
+         && turn.method != method_collinear )
+    {
+        return false;
+    }
+
+    if ( operation.operation == operation_blocked )
+    {
+        return true;
+    }
+
+    if ( operation.operation != operation_union )
+    {
+        return false;
+    }
+
+    return operation.is_collinear;
+}
+
+
+
+template <typename Turn, typename Operation>
+static inline bool is_isolated_point(Turn const& turn,
+                                     Operation const& operation,
+                                     bool entered)
+{
+    if ( entered )
+    {
+        return false;
+    }
+
+    if ( turn.method == method_none )
+    {
+        BOOST_ASSERT( operation.operation == operation_continue );
+        return true;
+    }
+
+    if ( turn.method == method_crosses )
+    {
+        return true;
+    }
+
+    if ( turn.method != method_touch && turn.method != method_touch_interior )
+    {
+        return false;
+    }
+
+    if ( operation.operation == operation_blocked )
+    {
+        return true;
+    }
+
+    if ( operation.operation != operation_union )
+    {
+        return false;
+    }
+
+    return !operation.is_collinear;
+}
+
+
+
+
+
+
+
+
+
+template
+<
+    typename LinestringOut,
+    typename Linestring,
+    typename Linear,
+    overlay_type OverlayType,
+    bool FollowIsolatedPoints,
+    bool FollowContinueTurns
+>
+class follow_linestring_linear_linestring
+{
+protected:
+    // allow spikes (false indicates: do not remove spikes)
+    typedef following::action_selector<OverlayType, false> action;
+
+    template
+    <
+        typename TurnIterator,
+        typename TurnOperationIterator,
+        typename SegmentIdentifier,
+        typename OutputIterator
+    >
+    static inline OutputIterator
+    process_turn(TurnIterator it,
+                 TurnOperationIterator op_it,
+                 bool& entered,
+                 std::size_t& enter_count,
+                 Linestring const& linestring,
+                 LinestringOut& current_piece,
+                 SegmentIdentifier& current_segment_id,
+                 OutputIterator oit)
+    {
+        // We don't rescale linear/linear
+        detail::no_rescale_policy robust_policy;
+
+        if ( is_entering(*it, *op_it) )
+        {
+#ifdef GEOMETRY_TEST_DEBUG
+            detail::turns::debug_turn(*it, *op_it, "-> Entering");
+#endif
+
+            entered = true;
+            if ( enter_count == 0 )
+            {
+                action::enter(current_piece, linestring,
+                              current_segment_id,
+                              op_it->seg_id.segment_index,
+                              it->point, *op_it, robust_policy, oit);
+            }
+            ++enter_count;
+        }
+        else if ( is_leaving(*it, *op_it, entered) )
+        {
+#ifdef GEOMETRY_TEST_DEBUG
+            detail::turns::debug_turn(*it, *op_it, "-> Leaving");
+#endif
+
+            --enter_count;
+            if ( enter_count == 0 )
+            {
+                entered = false;
+                action::leave(current_piece, linestring,
+                              current_segment_id,
+                              op_it->seg_id.segment_index,
+                              it->point, *op_it, robust_policy, oit);
+            }
+        }
+        else if ( FollowIsolatedPoints
+                  && is_isolated_point(*it, *op_it, entered) )
+        {
+#ifdef GEOMETRY_TEST_DEBUG
+            detail::turns::debug_turn(*it, *op_it, "-> Isolated point");
+#endif
+
+            action::isolated_point(current_piece, linestring,
+                                   current_segment_id,
+                                   op_it->seg_id.segment_index,
+                                   it->point, *op_it, oit);
+        }
+        else if ( FollowContinueTurns
+                  && is_staying_inside(*it, *op_it, entered) )
+        {
+#ifdef GEOMETRY_TEST_DEBUG
+            detail::turns::debug_turn(*it, *op_it, "-> Staying inside");
+#endif
+
+            entered = true;
+        }
+        return oit;
+    }
+
+    template
+    <
+        typename SegmentIdentifier,
+        typename OutputIterator
+    >
+    static inline OutputIterator
+    process_end(bool entered,
+                Linestring const& linestring,
+                SegmentIdentifier const& current_segment_id,
+                LinestringOut& current_piece,
+                OutputIterator oit)
+    {
+        if ( action::is_entered(entered) )
+        {
+            // We don't rescale linear/linear
+            detail::no_rescale_policy robust_policy;
+
+            detail::copy_segments::copy_segments_linestring
+                <
+                    false, false // do not reverse; do not remove spikes
+                >::apply(linestring, current_segment_id,
+                         boost::size(linestring) - 1, robust_policy,
+                         current_piece);
+        }
+
+        // Output the last one, if applicable
+        if (::boost::size(current_piece) > 1)
+        {
+            *oit++ = current_piece;
+        }
+
+        return oit;
+    }
+
+public:
+    template <typename TurnIterator, typename OutputIterator>
+    static inline OutputIterator
+    apply(Linestring const& linestring, Linear const&,
+          TurnIterator first, TurnIterator beyond,
+          OutputIterator oit)
+    {
+        // Iterate through all intersection points (they are
+        // ordered along the each line)
+
+        LinestringOut current_piece;
+        geometry::segment_identifier current_segment_id(0, -1, -1, -1);
+
+        bool entered = false;
+        std::size_t enter_count = 0;
+
+        for (TurnIterator it = first; it != beyond; ++it)
+        {
+            oit = process_turn(it, boost::begin(it->operations),
+                               entered, enter_count, 
+                               linestring,
+                               current_piece, current_segment_id,
+                               oit);
+        }
+
+        BOOST_ASSERT( enter_count == 0 );
+
+        return process_end(entered, linestring,
+                           current_segment_id, current_piece,
+                           oit);
+    }
+};
+
+
+
+
+template
+<
+    typename LinestringOut,
+    typename MultiLinestring,
+    typename Linear,
+    overlay_type OverlayType,
+    bool FollowIsolatedPoints,
+    bool FollowContinueTurns
+>
+class follow_multilinestring_linear_linestring
+    : follow_linestring_linear_linestring
+        <
+            LinestringOut,
+            typename boost::range_value<MultiLinestring>::type,
+            Linear,
+            OverlayType,
+            FollowIsolatedPoints,
+            FollowContinueTurns
+        >
+{
+protected:
+    typedef typename boost::range_value<MultiLinestring>::type Linestring;
+
+    typedef follow_linestring_linear_linestring
+        <
+            LinestringOut, Linestring, Linear,
+            OverlayType, FollowIsolatedPoints, FollowContinueTurns
+        > Base;
+
+    typedef following::action_selector<OverlayType> action;
+
+    typedef typename boost::range_iterator
+        <
+            MultiLinestring const
+        >::type linestring_iterator;
+
+
+    template <typename OutputIt, overlay_type OT>
+    struct copy_linestrings_in_range
+    {
+        static inline OutputIt
+        apply(linestring_iterator, linestring_iterator, OutputIt oit)
+        {
+            return oit;
+        }
+    };
+
+    template <typename OutputIt>
+    struct copy_linestrings_in_range<OutputIt, overlay_difference>
+    {
+        static inline OutputIt
+        apply(linestring_iterator first, linestring_iterator beyond,
+              OutputIt oit)
+        {
+            for (linestring_iterator ls_it = first; ls_it != beyond; ++ls_it)
+            {
+                LinestringOut line_out;
+                geometry::convert(*ls_it, line_out);
+                *oit++ = line_out;
+            }
+            return oit;
+        }
+    };
+
+    template <typename TurnIterator>
+    static inline int get_multi_index(TurnIterator it)
+    {
+        return boost::begin(it->operations)->seg_id.multi_index;
+    }
+
+    class has_other_multi_id
+    {
+    private:
+        int m_multi_id;
+
+    public:
+        has_other_multi_id(int multi_id)
+            : m_multi_id(multi_id) {}
+
+        template <typename Turn>
+        bool operator()(Turn const& turn) const
+        {
+            return boost::begin(turn.operations)->seg_id.multi_index
+                != m_multi_id;
+        }
+    };
+
+public:
+    template <typename TurnIterator, typename OutputIterator>
+    static inline OutputIterator
+    apply(MultiLinestring const& multilinestring, Linear const& linear,
+          TurnIterator first, TurnIterator beyond,
+          OutputIterator oit)
+    {
+        BOOST_ASSERT( first != beyond );
+
+        typedef copy_linestrings_in_range
+            <
+                OutputIterator, OverlayType
+            > copy_linestrings;
+
+        linestring_iterator ls_first = boost::begin(multilinestring);
+        linestring_iterator ls_beyond = boost::end(multilinestring);
+
+        // Iterate through all intersection points (they are
+        // ordered along the each linestring)
+
+        int current_multi_id = get_multi_index(first);
+
+        oit = copy_linestrings::apply(ls_first,
+                                      ls_first + current_multi_id,
+                                      oit);
+
+        TurnIterator per_ls_next = first;
+        do {
+            TurnIterator per_ls_current = per_ls_next;
+
+            // find turn with different multi-index
+            per_ls_next = std::find_if(per_ls_current, beyond,
+                                       has_other_multi_id(current_multi_id));
+
+            oit = Base::apply(*(ls_first + current_multi_id),
+                              linear, per_ls_current, per_ls_next, oit);
+
+            int next_multi_id(-1);
+            linestring_iterator ls_next = ls_beyond;
+            if ( per_ls_next != beyond )
+            {
+                next_multi_id = get_multi_index(per_ls_next);
+                ls_next = ls_first + next_multi_id;
+            }
+            oit = copy_linestrings::apply(ls_first + current_multi_id + 1,
+                                          ls_next,
+                                          oit);
+
+            current_multi_id = next_multi_id;
+        }
+        while ( per_ls_next != beyond );
+
+        return oit;
+    }
+};
+
+
+
+
+
+
+template
+<
+    typename LinestringOut,
+    typename Geometry1,
+    typename Geometry2,
+    overlay_type OverlayType,
+    bool FollowIsolatedPoints,
+    bool FollowContinueTurns,
+    typename TagOut = typename tag<LinestringOut>::type,
+    typename TagIn1 = typename tag<Geometry1>::type
+>
+struct follow
+    : not_implemented<LinestringOut, Geometry1>
+{};
+
+
+
+template
+<
+    typename LinestringOut,
+    typename Linestring,
+    typename Linear,
+    overlay_type OverlayType,
+    bool FollowIsolatedPoints,
+    bool FollowContinueTurns
+>
+struct follow
+    <
+        LinestringOut, Linestring, Linear,
+        OverlayType, FollowIsolatedPoints, FollowContinueTurns,
+        linestring_tag, linestring_tag
+    > : follow_linestring_linear_linestring
+        <
+            LinestringOut, Linestring, Linear,
+            OverlayType, FollowIsolatedPoints, FollowContinueTurns
+        >
+{};
+
+
+template
+<
+    typename LinestringOut,
+    typename MultiLinestring,
+    typename Linear,
+    overlay_type OverlayType,
+    bool FollowIsolatedPoints,
+    bool FollowContinueTurns
+>
+struct follow
+    <
+        LinestringOut, MultiLinestring, Linear,
+        OverlayType, FollowIsolatedPoints, FollowContinueTurns,
+        linestring_tag, multi_linestring_tag
+    > : follow_multilinestring_linear_linestring
+        <
+            LinestringOut, MultiLinestring, Linear,
+            OverlayType, FollowIsolatedPoints, FollowContinueTurns
+        >
+{};
+
+
+
+}} // namespace following::linear
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_FOLLOW_LINEAR_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp b/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
index 019c3ba3f..63011c7d4 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_intersection_points.hpp
@@ -17,6 +17,7 @@
 
 #include <boost/geometry/geometries/segment.hpp>
 
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
 
 namespace boost { namespace geometry
 {
@@ -35,32 +36,45 @@ template
 >
 struct get_turn_without_info
 {
-    typedef strategy_intersection
-        <
-            typename cs_tag<typename TurnInfo::point_type>::type,
-            Point1,
-            Point2,
-            typename TurnInfo::point_type
-        > si;
-
-    typedef typename si::segment_intersection_strategy_type strategy;
-
-
-
-    template <typename OutputIterator>
+    template <typename RobustPolicy, typename OutputIterator>
     static inline OutputIterator apply(
-                Point1 const& pi, Point1 const& pj, Point1 const& pk,
-                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                Point1 const& pi, Point1 const& pj, Point1 const& /*pk*/,
+                Point2 const& qi, Point2 const& qj, Point2 const& /*qk*/,
+                bool /*is_p_first*/, bool /*is_p_last*/,
+                bool /*is_q_first*/, bool /*is_q_last*/,
                 TurnInfo const& ,
+                RobustPolicy const& robust_policy,
                 OutputIterator out)
     {
+        typedef strategy_intersection
+            <
+                typename cs_tag<typename TurnInfo::point_type>::type,
+                Point1,
+                Point2,
+                typename TurnInfo::point_type,
+                RobustPolicy
+            > si;
+
+        typedef typename si::segment_intersection_strategy_type strategy;
+
         typedef model::referring_segment<Point1 const> segment_type1;
         typedef model::referring_segment<Point1 const> segment_type2;
-        segment_type1 p1(pi, pj), p2(pj, pk);
-        segment_type2 q1(qi, qj), q2(qj, qk);
+        segment_type1 p1(pi, pj);
+        segment_type2 q1(qi, qj);
 
-        //
-        typename strategy::return_type result = strategy::apply(p1, q1);
+        typedef typename geometry::robust_point_type
+            <
+                Point1, RobustPolicy
+            >::type robust_point_type;
+
+        robust_point_type pi_rob, pj_rob, qi_rob, qj_rob;
+        geometry::recalculate(pi_rob, pi, robust_policy);
+        geometry::recalculate(pj_rob, pj, robust_policy);
+        geometry::recalculate(qi_rob, qi, robust_policy);
+        geometry::recalculate(qj_rob, qj, robust_policy);
+        typename strategy::return_type result
+            = strategy::apply(p1, q1, robust_policy,
+                              pi_rob, pj_rob, qi_rob, qj_rob);
 
         for (std::size_t i = 0; i < result.template get<0>().count; i++)
         {
@@ -84,10 +98,12 @@ template
 <
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename Turns
 >
 inline void get_intersection_points(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
             Turns& turns)
 {
     concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2 const>();
@@ -99,14 +115,6 @@ inline void get_intersection_points(Geometry1 const& geometry1,
                             typename boost::range_value<Turns>::type
                         > TurnPolicy;
 
-    typedef typename strategy_intersection
-        <
-            typename cs_tag<Geometry1>::type,
-            Geometry1,
-            Geometry2,
-            typename boost::range_value<Turns>::type
-        >::segment_intersection_strategy_type segment_intersection_strategy_type;
-
     detail::get_turns::no_interrupt_policy interrupt_policy;
 
     boost::mpl::if_c
@@ -118,9 +126,7 @@ inline void get_intersection_points(Geometry1 const& geometry1,
                 typename tag<Geometry2>::type,
                 Geometry1, Geometry2,
                 false, false,
-                Turns, TurnPolicy,
-                //segment_intersection_strategy_type,
-                detail::get_turns::no_interrupt_policy
+                TurnPolicy
             >,
             dispatch::get_turns
             <
@@ -128,13 +134,12 @@ inline void get_intersection_points(Geometry1 const& geometry1,
                 typename tag<Geometry2>::type,
                 Geometry1, Geometry2,
                 false, false,
-                Turns, TurnPolicy,
-                //segment_intersection_strategy_type,
-                detail::get_turns::no_interrupt_policy
+                TurnPolicy
             >
         >::type::apply(
             0, geometry1,
             1, geometry2,
+            robust_policy,
             turns, interrupt_policy);
 }
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp b/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
index 522ef6838..d71f4ad51 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_relative_order.hpp
@@ -10,8 +10,6 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_RELATIVE_ORDER_HPP
 
 
-#include <boost/geometry/algorithms/distance.hpp>
-
 #include <boost/geometry/strategies/intersection.hpp>
 
 
@@ -36,15 +34,10 @@ namespace detail { namespace overlay
 template <typename Point1>
 struct get_relative_order
 {
-    typedef strategy_intersection
+    typedef typename strategy::side::services::default_strategy
         <
-            typename cs_tag<Point1>::type,
-            Point1,
-            Point1,
-            Point1
-        > si;
-
-    typedef typename si::side_strategy_type strategy;
+            typename cs_tag<Point1>::type
+        >::type strategy;
 
     template <typename Point>
     static inline int value_via_product(Point const& ti, Point const& tj,
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp b/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
index c2c698057..ab9219a3d 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_ring.hpp
@@ -13,11 +13,12 @@
 #include <boost/assert.hpp>
 #include <boost/range.hpp>
 
-
-#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
@@ -92,6 +93,25 @@ struct get_ring<polygon_tag>
 };
 
 
+template<>
+struct get_ring<multi_polygon_tag>
+{
+    template<typename MultiPolygon>
+    static inline typename ring_type<MultiPolygon>::type const& apply(
+                ring_identifier const& id,
+                MultiPolygon const& multi_polygon)
+    {
+        BOOST_ASSERT
+            (
+                id.multi_index >= 0
+                && id.multi_index < int(boost::size(multi_polygon))
+            );
+        return get_ring<polygon_tag>::apply(id,
+                    multi_polygon[id.multi_index]);
+    }
+};
+
+
 }} // namespace detail::overlay
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
index 68aa62bb4..6a7b92306 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info.hpp
@@ -16,14 +16,17 @@
 
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/geometries/segment.hpp>
 
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp>
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
 
 
@@ -37,7 +40,7 @@ class turn_info_exception : public geometry::exception
 public:
 
     // NOTE: "char" will be replaced by enum in future version
-    inline turn_info_exception(char const method) 
+    inline turn_info_exception(char const method)
     {
         message = "Boost.Geometry Turn exception: ";
         message += method;
@@ -57,7 +60,6 @@ public:
 namespace detail { namespace overlay
 {
 
-
 struct base_turn_handler
 {
     // Returns true if both sides are opposite
@@ -98,13 +100,32 @@ struct base_turn_handler
     {
         both(ti, condition ? operation_union : operation_intersection);
     }
+
+    template <typename TurnInfo, typename IntersectionInfo>
+    static inline void assign_point(TurnInfo& ti,
+                method_type method,
+                IntersectionInfo const& info, int index)
+    {
+        ti.method = method;
+        BOOST_ASSERT(index >= 0 && unsigned(index) < info.count); // TODO  remove this
+        geometry::convert(info.intersections[index], ti.point);
+        ti.operations[0].fraction = info.fractions[index].robust_ra;
+        ti.operations[1].fraction = info.fractions[index].robust_rb;
+    }
+
+    template <typename IntersectionInfo>
+    static inline int non_opposite_to_index(IntersectionInfo const& info)
+    {
+        return info.fractions[0].robust_rb < info.fractions[1].robust_rb
+            ? 1 : 0;
+    }
+
 };
 
 
 template
 <
-    typename TurnInfo,
-    typename SideStrategy
+    typename TurnInfo
 >
 struct touch_interior : public base_turn_handler
 {
@@ -115,17 +136,18 @@ struct touch_interior : public base_turn_handler
         typename Point1,
         typename Point2,
         typename IntersectionInfo,
-        typename DirInfo
+        typename DirInfo,
+        typename SidePolicy
     >
     static inline void apply(
-                Point1 const& pi, Point1 const& pj, Point1 const& ,
-                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                Point1 const& , Point1 const& , Point1 const& ,
+                Point2 const& , Point2 const& , Point2 const& ,
                 TurnInfo& ti,
                 IntersectionInfo const& intersection_info,
-                DirInfo const& dir_info)
+                DirInfo const& dir_info,
+                SidePolicy const& side)
     {
-        ti.method = method_touch_interior;
-        geometry::convert(intersection_info.intersections[0], ti.point);
+        assign_point(ti, method_touch_interior, intersection_info, 0);
 
         // Both segments of q touch segment p somewhere in its interior
         // 1) We know: if q comes from LEFT or RIGHT
@@ -137,7 +159,7 @@ struct touch_interior : public base_turn_handler
         static int const index_q = 1 - Index;
 
         int const side_qi_p = dir_info.sides.template get<index_q, 0>();
-        int const side_qk_p = SideStrategy::apply(pi, pj, qk);
+        int const side_qk_p = side.qk_wrt_p1();
 
         if (side_qi_p == -side_qk_p)
         {
@@ -150,7 +172,7 @@ struct touch_interior : public base_turn_handler
             return;
         }
 
-        int const side_qk_q = SideStrategy::apply(qi, qj, qk);
+        int const side_qk_q = side.qk_wrt_q1();
 
         if (side_qi_p == -1 && side_qk_p == -1 && side_qk_q == 1)
         {
@@ -210,8 +232,7 @@ struct touch_interior : public base_turn_handler
 
 template
 <
-    typename TurnInfo,
-    typename SideStrategy
+    typename TurnInfo
 >
 struct touch : public base_turn_handler
 {
@@ -234,37 +255,34 @@ struct touch : public base_turn_handler
         typename Point1,
         typename Point2,
         typename IntersectionInfo,
-        typename DirInfo
+        typename DirInfo,
+        typename SidePolicy
     >
     static inline void apply(
-                Point1 const& pi, Point1 const& pj, Point1 const& pk,
-                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                Point1 const& , Point1 const& , Point1 const& ,
+                Point2 const& , Point2 const& , Point2 const& ,
                 TurnInfo& ti,
                 IntersectionInfo const& intersection_info,
-                DirInfo const& dir_info)
+                DirInfo const& dir_info,
+                SidePolicy const& side)
     {
-        ti.method = method_touch;
-        geometry::convert(intersection_info.intersections[0], ti.point);
+        assign_point(ti, method_touch, intersection_info, 0);
 
         int const side_qi_p1 = dir_info.sides.template get<1, 0>();
-        int const side_qk_p1 = SideStrategy::apply(pi, pj, qk);
+        int const side_qk_p1 = side.qk_wrt_p1();
 
 
         // If Qi and Qk are both at same side of Pi-Pj,
         // or collinear (so: not opposite sides)
         if (! opposite(side_qi_p1, side_qk_p1))
         {
-            int const side_pk_q2 = SideStrategy::apply(qj, qk, pk);
-            int const side_pk_p  = SideStrategy::apply(pi, pj, pk);
-            int const side_qk_q  = SideStrategy::apply(qi, qj, qk);
-
-            bool const both_continue = side_pk_p == 0 && side_qk_q == 0;
-            bool const robustness_issue_in_continue = both_continue && side_pk_q2 != 0;
+            int const side_pk_q2 = side.pk_wrt_q2();
+            int const side_pk_p  = side.pk_wrt_p1();
+            int const side_qk_q  = side.qk_wrt_q1();
 
             bool const q_turns_left = side_qk_q == 1;
             bool const block_q = side_qk_p1 == 0
                         && ! same(side_qi_p1, side_qk_q)
-                        && ! robustness_issue_in_continue
                         ;
 
             // If Pk at same side as Qi/Qk
@@ -283,7 +301,7 @@ struct touch : public base_turn_handler
                     return;
                 }
 
-                int const side_pk_q1 = SideStrategy::apply(qi, qj, pk);
+                int const side_pk_q1 = side.pk_wrt_q1();
 
 
                 // Collinear opposite case -> block P
@@ -336,7 +354,7 @@ struct touch : public base_turn_handler
             else
             {
                 // Pk at other side than Qi/Pk
-                int const side_qk_q = SideStrategy::apply(qi, qj, qk);
+                int const side_qk_q = side.qk_wrt_q1();
                 bool const q_turns_left = side_qk_q == 1;
 
                 ti.operations[0].operation = q_turns_left
@@ -354,13 +372,13 @@ struct touch : public base_turn_handler
         else
         {
             // From left to right or from right to left
-            int const side_pk_p  = SideStrategy::apply(pi, pj, pk);
+            int const side_pk_p = side.pk_wrt_p1();
             bool const right_to_left = side_qk_p1 == 1;
 
             // If p turns into direction of qi (1,2)
             if (side_pk_p == side_qi_p1)
             {
-                int const side_pk_q1 = SideStrategy::apply(qi, qj, pk);
+                int const side_pk_q1 = side.pk_wrt_q1();
 
                 // Collinear opposite case -> block P
                 if (side_pk_q1 == 0)
@@ -381,7 +399,7 @@ struct touch : public base_turn_handler
             // If p turns into direction of qk (4,5)
             if (side_pk_p == side_qk_p1)
             {
-                int const side_pk_q2 = SideStrategy::apply(qj, qk, pk);
+                int const side_pk_q2 = side.pk_wrt_q2();
 
                 // Collinear case -> lines join, continue
                 if (side_pk_q2 == 0)
@@ -420,8 +438,7 @@ struct touch : public base_turn_handler
 
 template
 <
-    typename TurnInfo,
-    typename SideStrategy
+    typename TurnInfo
 >
 struct equal : public base_turn_handler
 {
@@ -430,22 +447,24 @@ struct equal : public base_turn_handler
         typename Point1,
         typename Point2,
         typename IntersectionInfo,
-        typename DirInfo
+        typename DirInfo,
+        typename SidePolicy
     >
     static inline void apply(
-                Point1 const& pi, Point1 const& pj, Point1 const& pk,
-                Point2 const& , Point2 const& qj, Point2 const& qk,
+                Point1 const& , Point1 const& , Point1 const& ,
+                Point2 const& , Point2 const& , Point2 const& ,
                 TurnInfo& ti,
-                IntersectionInfo const& intersection_info,
-                DirInfo const& )
+                IntersectionInfo const& info,
+                DirInfo const&  ,
+                SidePolicy const& side)
     {
-        ti.method = method_equal;
-        // Copy the SECOND intersection point
-        geometry::convert(intersection_info.intersections[1], ti.point);
+        // Copy the intersection point in TO direction
+        assign_point(ti, method_equal, info, non_opposite_to_index(info));
+
+        int const side_pk_q2 = side.pk_wrt_q2();
+        int const side_pk_p = side.pk_wrt_p1();
+        int const side_qk_p = side.qk_wrt_p1();
 
-        int const side_pk_q2  = SideStrategy::apply(qj, qk, pk);
-        int const side_pk_p = SideStrategy::apply(pi, pj, pk);
-        int const side_qk_p = SideStrategy::apply(pi, pj, qk);
 
         // If pk is collinear with qj-qk, they continue collinearly.
         // This can be on either side of p1 (== q1), or collinear
@@ -454,6 +473,7 @@ struct equal : public base_turn_handler
         if (side_pk_q2 == 0 && side_pk_p == side_qk_p)
         {
             both(ti, operation_continue);
+
             return;
         }
 
@@ -461,7 +481,7 @@ struct equal : public base_turn_handler
         // If they turn to same side (not opposite sides)
         if (! opposite(side_pk_p, side_qk_p))
         {
-            int const side_pk_q2 = SideStrategy::apply(qj, qk, pk);
+            int const side_pk_q2 = side.pk_wrt_q2();
 
             // If pk is left of q2 or collinear: p: union, q: intersection
             ui_else_iu(side_pk_q2 != -1, ti);
@@ -507,7 +527,7 @@ struct equal_opposite : public base_turn_handler
             }
             for (unsigned int i = 0; i < intersection_info.count; i++)
             {
-                geometry::convert(intersection_info.intersections[i], tp.point);
+                assign_point(tp, method_none, intersection_info, i);
                 AssignPolicy::apply(tp, pi, qi, intersection_info, dir_info);
                 *out++ = tp;
             }
@@ -517,8 +537,7 @@ struct equal_opposite : public base_turn_handler
 
 template
 <
-    typename TurnInfo,
-    typename SideStrategy
+    typename TurnInfo
 >
 struct collinear : public base_turn_handler
 {
@@ -550,7 +569,7 @@ struct collinear : public base_turn_handler
          ROBUSTNESS: p and q are collinear, so you would expect
          that side qk//p1 == pk//q1. But that is not always the case
          in near-epsilon ranges. Then decision logic is different.
-         If p arrives, q is further, so the angle qk//p1 is (normally) 
+         If p arrives, q is further, so the angle qk//p1 is (normally)
          more precise than pk//p1
 
     */
@@ -559,24 +578,26 @@ struct collinear : public base_turn_handler
         typename Point1,
         typename Point2,
         typename IntersectionInfo,
-        typename DirInfo
+        typename DirInfo,
+        typename SidePolicy
     >
     static inline void apply(
-                Point1 const& pi, Point1 const& pj, Point1 const& pk,
-                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                Point1 const& , Point1 const& , Point1 const& ,
+                Point2 const& , Point2 const& , Point2 const& ,
                 TurnInfo& ti,
-                IntersectionInfo const& intersection_info,
-                DirInfo const& dir_info)
+                IntersectionInfo const& info,
+                DirInfo const& dir_info,
+                SidePolicy const& side)
     {
-        ti.method = method_collinear;
-        geometry::convert(intersection_info.intersections[1], ti.point);
+        // Copy the intersection point in TO direction
+        assign_point(ti, method_collinear, info, non_opposite_to_index(info));
 
         int const arrival = dir_info.arrival[0];
         // Should not be 0, this is checked before
         BOOST_ASSERT(arrival != 0);
 
-        int const side_p = SideStrategy::apply(pi, pj, pk);
-        int const side_q = SideStrategy::apply(qi, qj, qk);
+        int const side_p = side.pk_wrt_p1();
+        int const side_q = side.qk_wrt_q1();
 
         // If p arrives, use p, else use q
         int const side_p_or_q = arrival == 1
@@ -584,9 +605,6 @@ struct collinear : public base_turn_handler
             : side_q
             ;
 
-        int const side_pk = SideStrategy::apply(qi, qj, pk);
-        int const side_qk = SideStrategy::apply(pi, pj, qk);
-
         // See comments above,
         // resulting in a strange sort of mathematic rule here:
         // The arrival-info multiplied by the relevant side
@@ -594,15 +612,7 @@ struct collinear : public base_turn_handler
 
         int const product = arrival * side_p_or_q;
 
-        // Robustness: side_p is supposed to be equal to side_pk (because p/q are collinear)
-        // and side_q to side_qk
-        bool const robustness_issue = side_pk != side_p || side_qk != side_q;
-
-        if (robustness_issue)
-        {
-            handle_robustness(ti, arrival, side_p, side_q, side_pk, side_qk);
-        }
-        else if(product == 0)
+        if(product == 0)
         {
             both(ti, operation_continue);
         }
@@ -612,43 +622,11 @@ struct collinear : public base_turn_handler
         }
     }
 
-    static inline void handle_robustness(TurnInfo& ti, int arrival, 
-                    int side_p, int side_q, int side_pk, int side_qk)
-    {
-        // We take the longer one, i.e. if q arrives in p (arrival == -1),
-        // then p exceeds q and we should take p for a union...
-
-        bool use_p_for_union = arrival == -1;
-
-        // ... unless one of the sides consistently directs to the other side
-        int const consistent_side_p = side_p == side_pk ? side_p : 0;
-        int const consistent_side_q = side_q == side_qk ? side_q : 0;
-        if (arrival == -1 && (consistent_side_p == -1 || consistent_side_q == 1))
-        {
-            use_p_for_union = false;
-        }
-        if (arrival == 1 && (consistent_side_p == 1 || consistent_side_q == -1))
-        {
-            use_p_for_union = true;
-        }
-
-        //std::cout << "ROBUSTNESS -> Collinear " 
-        //    << " arr: " << arrival
-        //    << " dir: " << side_p << " " << side_q
-        //    << " rev: " << side_pk << " " << side_qk
-        //    << " cst: " << cside_p << " " << cside_q
-        //    << std::boolalpha << " " << use_p_for_union
-        //    << std::endl;
-
-        ui_else_iu(use_p_for_union, ti);
-    }
-
 };
 
 template
 <
     typename TurnInfo,
-    typename SideStrategy,
     typename AssignPolicy
 >
 struct collinear_opposite : public base_turn_handler
@@ -684,26 +662,13 @@ private :
         typename Point,
         typename IntersectionInfo
     >
-    static inline bool set_tp(Point const& ri, Point const& rj, Point const& rk,
-                bool const handle_robustness, Point const& si, Point const& sj,
+    static inline bool set_tp(Point const& , Point const& , Point const& , int side_rk_r,
+                bool const handle_robustness,
+                Point const& , Point const& , int side_rk_s,
                 TurnInfo& tp, IntersectionInfo const& intersection_info)
     {
-        int side_rk_r = SideStrategy::apply(ri, rj, rk);
-
-        if (handle_robustness)
-        {
-            int const side_rk_s = SideStrategy::apply(si, sj, rk);
-
-            // For Robustness: also calculate rk w.r.t. the other line. Because they are collinear opposite, that direction should be the reverse of the first direction.
-            // If this is not the case, we make it all-collinear, so zero
-            if (side_rk_r != 0 && side_rk_r != -side_rk_s)
-            {
-#ifdef BOOST_GEOMETRY_DEBUG_ROBUSTNESS
-                std::cout << "Robustness correction: " << side_rk_r << " / " << side_rk_s << std::endl;
-#endif
-                side_rk_r = 0;
-            }
-        }
+        boost::ignore_unused_variable_warning(handle_robustness);
+        boost::ignore_unused_variable_warning(side_rk_s);
 
         operation_type blocked = operation_blocked;
         switch(side_rk_r)
@@ -741,18 +706,21 @@ private :
         // If P arrives within Q, set info on P (which is done above, index=0),
         // this turn-info belongs to the second intersection point, index=1
         // (see e.g. figure CLO1)
-        geometry::convert(intersection_info.intersections[1 - Index], tp.point);
+        assign_point(tp, method_collinear, intersection_info, 1 - Index);
         return true;
     }
 
 public:
+    static inline void empty_transformer(TurnInfo &) {}
+
     template
     <
         typename Point1,
         typename Point2,
         typename OutputIterator,
         typename IntersectionInfo,
-        typename DirInfo
+        typename DirInfo,
+        typename SidePolicy
     >
     static inline void apply(
                 Point1 const& pi, Point1 const& pj, Point1 const& pk,
@@ -763,24 +731,57 @@ public:
                 OutputIterator& out,
 
                 IntersectionInfo const& intersection_info,
-                DirInfo const& dir_info)
+                DirInfo const& dir_info,
+                SidePolicy const& side)
+    {
+        apply(pi, pj, pk, qi, qj, qk, tp_model, out, intersection_info, dir_info, side, empty_transformer);
+    }
+
+public:
+    template
+    <
+        typename Point1,
+        typename Point2,
+        typename OutputIterator,
+        typename IntersectionInfo,
+        typename DirInfo,
+        typename SidePolicy,
+        typename TurnTransformer
+    >
+    static inline void apply(
+                Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+
+                // Opposite collinear can deliver 2 intersection points,
+                TurnInfo const& tp_model,
+                OutputIterator& out,
+
+                IntersectionInfo const& intersection_info,
+                DirInfo const& dir_info,
+                SidePolicy const& side,
+                TurnTransformer turn_transformer,
+                bool const is_pk_valid = true, bool const is_qk_valid = true)
     {
         TurnInfo tp = tp_model;
 
-        tp.method = method_collinear;
-
         // If P arrives within Q, there is a turn dependent on P
-        if (dir_info.arrival[0] == 1
-            && set_tp<0>(pi, pj, pk, true, qi, qj, tp, intersection_info))
+        if ( dir_info.arrival[0] == 1
+          && is_pk_valid
+          && set_tp<0>(pi, pj, pk, side.pk_wrt_p1(), true, qi, qj, side.pk_wrt_q1(), tp, intersection_info) )
         {
+            turn_transformer(tp);
+
             AssignPolicy::apply(tp, pi, qi, intersection_info, dir_info);
             *out++ = tp;
         }
 
         // If Q arrives within P, there is a turn dependent on Q
-        if (dir_info.arrival[1] == 1
-            && set_tp<1>(qi, qj, qk, false, pi, pj, tp, intersection_info))
+        if ( dir_info.arrival[1] == 1
+          && is_qk_valid
+          && set_tp<1>(qi, qj, qk, side.qk_wrt_q1(), false, pi, pj, side.qk_wrt_p1(), tp, intersection_info) )
         {
+            turn_transformer(tp);
+
             AssignPolicy::apply(tp, pi, qi, intersection_info, dir_info);
             *out++ = tp;
         }
@@ -797,7 +798,7 @@ public:
                 }
                 for (unsigned int i = 0; i < intersection_info.count; i++)
                 {
-                    geometry::convert(intersection_info.intersections[i], tp.point);
+                    assign_point(tp, method_collinear, intersection_info, i);
                     AssignPolicy::apply(tp, pi, qi, intersection_info, dir_info);
                     *out++ = tp;
                 }
@@ -810,8 +811,7 @@ public:
 
 template
 <
-    typename TurnInfo,
-    typename SideStrategy
+    typename TurnInfo
 >
 struct crosses : public base_turn_handler
 {
@@ -829,8 +829,7 @@ struct crosses : public base_turn_handler
                 IntersectionInfo const& intersection_info,
                 DirInfo const& dir_info)
     {
-        ti.method = method_crosses;
-        geometry::convert(intersection_info.intersections[0], ti.point);
+        assign_point(ti, method_crosses, intersection_info, 0);
 
         // In all casees:
         // If Q crosses P from left to right
@@ -844,14 +843,12 @@ struct crosses : public base_turn_handler
     }
 };
 
-template<typename TurnInfo>
-struct only_convert
+struct only_convert : public base_turn_handler
 {
-    template<typename IntersectionInfo>
+    template<typename TurnInfo, typename IntersectionInfo>
     static inline void apply(TurnInfo& ti, IntersectionInfo const& intersection_info)
     {
-        ti.method = method_collinear;
-        geometry::convert(intersection_info.intersections[0], ti.point);
+        assign_point(ti, method_none, intersection_info, 0); // was collinear
         ti.operations[0].operation = operation_continue;
         ti.operations[1].operation = operation_continue;
     }
@@ -869,7 +866,7 @@ struct assign_null_policy
     static bool const include_degenerate = false;
     static bool const include_opposite = false;
 
-    template 
+    template
     <
         typename Info,
         typename Point1,
@@ -897,48 +894,39 @@ struct assign_null_policy
         It also defines if a certain class of points
         (degenerate, non-turns) should be included.
  */
-template
-<
-    typename Point1,
-    typename Point2,
-    typename TurnInfo,
-    typename AssignPolicy
->
+template<typename AssignPolicy>
 struct get_turn_info
 {
-    typedef strategy_intersection
-        <
-            typename cs_tag<typename TurnInfo::point_type>::type,
-            Point1,
-            Point2,
-            typename TurnInfo::point_type
-        > si;
-
-    typedef typename si::segment_intersection_strategy_type strategy;
-
     // Intersect pi-pj with qi-qj
-    // The points pk and qk are only used do determine more information
-    // about the turn.
-    template <typename OutputIterator>
+    // The points pk and qk are used do determine more information
+    // about the turn (turn left/right)
+    template
+    <
+        typename Point1,
+        typename Point2,
+        typename TurnInfo,
+        typename RobustPolicy,
+        typename OutputIterator
+    >
     static inline OutputIterator apply(
                 Point1 const& pi, Point1 const& pj, Point1 const& pk,
                 Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                bool /*is_p_first*/, bool /*is_p_last*/,
+                bool /*is_q_first*/, bool /*is_q_last*/,
                 TurnInfo const& tp_model,
+                RobustPolicy const& robust_policy,
                 OutputIterator out)
     {
-        typedef model::referring_segment<Point1 const> segment_type1;
-        typedef model::referring_segment<Point1 const> segment_type2;
-        segment_type1 p1(pi, pj), p2(pj, pk);
-        segment_type2 q1(qi, qj), q2(qj, qk);
+        typedef intersection_info<Point1, Point2, typename TurnInfo::point_type, RobustPolicy>
+            inters_info;
 
-        typename strategy::return_type result = strategy::apply(p1, q1);
+        inters_info inters(pi, pj, pk, qi, qj, qk, robust_policy);
 
-        char const method = result.template get<1>().how;
+        char const method = inters.d_info().how;
 
         // Copy, to copy possibly extended fields
         TurnInfo tp = tp_model;
 
-
         // Select method and apply
         switch(method)
         {
@@ -946,11 +934,10 @@ struct get_turn_info
             case 'f' : // collinear, "from"
             case 's' : // starts from the middle
                 if (AssignPolicy::include_no_turn
-                    && result.template get<0>().count > 0)
+                    && inters.i_info().count > 0)
                 {
-                    only_convert<TurnInfo>::apply(tp,
-                                result.template get<0>());
-                    AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                    only_convert::apply(tp, inters.i_info());
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                     *out++ = tp;
                 }
                 break;
@@ -962,70 +949,59 @@ struct get_turn_info
             {
                 typedef touch_interior
                     <
-                        TurnInfo,
-                        typename si::side_strategy_type
+                        TurnInfo
                     > policy;
 
                 // If Q (1) arrives (1)
-                if (result.template get<1>().arrival[1] == 1)
+                if ( inters.d_info().arrival[1] == 1 )
                 {
                     policy::template apply<0>(pi, pj, pk, qi, qj, qk,
-                                tp, result.template get<0>(), result.template get<1>());
+                                tp, inters.i_info(), inters.d_info(),
+                                inters.sides());
                 }
                 else
                 {
                     // Swap p/q
+                    side_calculator
+                        <
+                            typename inters_info::robust_point2_type,
+                            typename inters_info::robust_point1_type
+                        > swapped_side_calc(inters.rqi(), inters.rqj(), inters.rqk(),
+                                            inters.rpi(), inters.rpj(), inters.rpk());
                     policy::template apply<1>(qi, qj, qk, pi, pj, pk,
-                                tp, result.template get<0>(), result.template get<1>());
+                                tp, inters.i_info(), inters.d_info(),
+                                swapped_side_calc);
                 }
-                AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                 *out++ = tp;
             }
             break;
             case 'i' :
             {
-                typedef crosses
-                    <
-                        TurnInfo,
-                        typename si::side_strategy_type
-                    > policy;
-
-                policy::apply(pi, pj, pk, qi, qj, qk,
-                    tp, result.template get<0>(), result.template get<1>());
-                AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                crosses<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                    tp, inters.i_info(), inters.d_info());
+                AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                 *out++ = tp;
             }
             break;
             case 't' :
             {
                 // Both touch (both arrive there)
-                typedef touch
-                    <
-                        TurnInfo,
-                        typename si::side_strategy_type
-                    > policy;
-
-                policy::apply(pi, pj, pk, qi, qj, qk,
-                    tp, result.template get<0>(), result.template get<1>());
-                AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                touch<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                    tp, inters.i_info(), inters.d_info(), inters.sides());
+                AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                 *out++ = tp;
             }
             break;
             case 'e':
             {
-                if (! result.template get<1>().opposite)
+                if ( ! inters.d_info().opposite )
                 {
                     // Both equal
                     // or collinear-and-ending at intersection point
-                    typedef equal
-                        <
-                            TurnInfo,
-                            typename si::side_strategy_type
-                        > policy;
-
-                    policy::apply(pi, pj, pk, qi, qj, qk,
-                        tp, result.template get<0>(), result.template get<1>());
-                    AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                    equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                        tp, inters.i_info(), inters.d_info(), inters.sides());
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                     *out++ = tp;
                 }
                 else
@@ -1035,40 +1011,32 @@ struct get_turn_info
                             TurnInfo,
                             AssignPolicy
                         >::apply(pi, qi,
-                            tp, out, result.template get<0>(), result.template get<1>());
+                            tp, out, inters.i_info(), inters.d_info());
                 }
             }
             break;
             case 'c' :
             {
                 // Collinear
-                if (! result.template get<1>().opposite)
+                if ( ! inters.d_info().opposite )
                 {
 
-                    if (result.template get<1>().arrival[0] == 0)
+                    if ( inters.d_info().arrival[0] == 0 )
                     {
                         // Collinear, but similar thus handled as equal
-                        equal
-                            <
-                                TurnInfo,
-                                typename si::side_strategy_type
-                            >::apply(pi, pj, pk, qi, qj, qk,
-                                tp, result.template get<0>(), result.template get<1>());
+                        equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                tp, inters.i_info(), inters.d_info(), inters.sides());
 
                         // override assigned method
                         tp.method = method_collinear;
                     }
                     else
                     {
-                        collinear
-                            <
-                                TurnInfo,
-                                typename si::side_strategy_type
-                            >::apply(pi, pj, pk, qi, qj, qk,
-                                tp, result.template get<0>(), result.template get<1>());
+                        collinear<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                tp, inters.i_info(), inters.d_info(), inters.sides());
                     }
 
-                    AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                     *out++ = tp;
                 }
                 else
@@ -1076,10 +1044,9 @@ struct get_turn_info
                     collinear_opposite
                         <
                             TurnInfo,
-                            typename si::side_strategy_type,
                             AssignPolicy
                         >::apply(pi, pj, pk, qi, qj, qk,
-                            tp, out, result.template get<0>(), result.template get<1>());
+                            tp, out, inters.i_info(), inters.d_info(), inters.sides());
                 }
             }
             break;
@@ -1088,14 +1055,17 @@ struct get_turn_info
                 // degenerate points
                 if (AssignPolicy::include_degenerate)
                 {
-                    only_convert<TurnInfo>::apply(tp, result.template get<0>());
-                    AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+                    only_convert::apply(tp, inters.i_info());
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
                     *out++ = tp;
                 }
             }
             break;
             default :
             {
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+                std::cout << "TURN: Unknown method: " << method << std::endl;
+#endif
 #if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
                 throw turn_info_exception(method);
 #endif
@@ -1116,7 +1086,7 @@ struct get_turn_info
 
 
 #if defined(_MSC_VER)
-#pragma warning(pop)  
+#pragma warning(pop)
 #endif
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
new file mode 100644
index 000000000..e7df458fa
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp
@@ -0,0 +1,662 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_FOR_ENDPOINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_FOR_ENDPOINT_HPP
+
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay {
+
+// SEGMENT_INTERSECTION RESULT
+
+//                   C  H0  H1  A0  A1   O              IP1 IP2
+
+// D0 and D1 == 0
+
+// |-------->        2   0   0   0   0   F              i/i x/x
+// |-------->
+//
+// |-------->        2   0   0   0   0   T              i/x x/i
+// <--------|
+//
+// |----->           1   0   0   0   0   T              x/x
+//       <-----|
+//
+
+// |--------->       2   0   0   0   1   T              i/x x/i
+//      <----|
+//
+// |--------->       2   0   0   0   0   F              i/i x/x
+//      |---->
+//
+// |--------->       2   0   0  -1   1   F              i/i u/x
+// |---->
+//
+// |--------->       2   0   0  -1   0   T              i/x u/i
+// <----|
+
+// |------->         2   0   0   1  -1   F   and        i/i x/u
+//     |------->     2   0   0  -1   1   F   symetric   i/i u/x
+// |------->
+//
+//     |------->     2   0   0  -1  -1   T              i/u u/i
+// <-------|
+//
+// |------->         2   0   0   1   1   T              i/x x/i
+//     <-------|
+//
+// |-------->        2   0   0  -1   1   F              i/i u/x
+//   |---->
+//
+// |-------->        2   0   0  -1   1   T              i/x u/i
+//   <----|
+
+//       |----->     1  -1  -1  -1  -1   T              u/u
+// <-----|
+//
+//       |----->     1  -1   0  -1   0   F   and        u/x
+// |----->           1   0  -1   0  -1   F   symetric   x/u
+//       |----->
+
+// D0 or D1 != 0
+
+//          ^
+//          |
+//          +        1  -1   1  -1   1   F   and        u/x  (P is vertical)
+// |-------->        1   1  -1   1  -1   F   symetric   x/u  (P is horizontal)
+// ^
+// |
+// +
+//
+//          +
+//          |
+//          v
+// |-------->        1   1   1   1   1   F              x/x  (P is vertical)
+//
+// ^
+// |
+// +
+// |-------->        1  -1  -1  -1  -1   F              u/u  (P is vertical)
+//
+//      ^
+//      |
+//      +
+// |-------->        1   0  -1   0  -1   F              u/u  (P is vertical)
+//
+//      +
+//      |
+//      v
+// |-------->        1   0   1   0   1   F              u/x  (P is vertical)
+//
+
+class linear_intersections
+{
+public:
+    template <typename Point1, typename Point2, typename IntersectionResult>
+    linear_intersections(Point1 const& pi,
+                         Point2 const& qi,
+                         IntersectionResult const& result,
+                         bool is_p_last, bool is_q_last)
+    {
+        int arrival_a = result.template get<1>().arrival[0];
+        int arrival_b = result.template get<1>().arrival[1];
+        bool same_dirs = result.template get<1>().dir_a == 0
+                      && result.template get<1>().dir_b == 0;
+
+        if ( same_dirs )
+        {
+            if ( result.template get<0>().count == 2 )
+            {
+                if ( ! result.template get<1>().opposite )
+                {
+                    ips[0].p_operation = operation_intersection;
+                    ips[0].q_operation = operation_intersection;
+                    ips[1].p_operation = union_or_blocked_same_dirs(arrival_a, is_p_last);
+                    ips[1].q_operation = union_or_blocked_same_dirs(arrival_b, is_q_last);
+
+                    ips[0].is_pi
+                        = equals::equals_point_point(
+                            pi, result.template get<0>().intersections[0]);
+                    ips[0].is_qi
+                        = equals::equals_point_point(
+                            qi, result.template get<0>().intersections[0]);
+                    ips[1].is_pj = arrival_a != -1;
+                    ips[1].is_qj = arrival_b != -1;
+                }
+                else
+                {
+                    ips[0].p_operation = operation_intersection;
+                    ips[0].q_operation = union_or_blocked_same_dirs(arrival_b, is_q_last);
+                    ips[1].p_operation = union_or_blocked_same_dirs(arrival_a, is_p_last);
+                    ips[1].q_operation = operation_intersection;
+
+                    ips[0].is_pi = arrival_b != 1;
+                    ips[0].is_qj = arrival_b != -1;
+                    ips[1].is_pj = arrival_a != -1;
+                    ips[1].is_qi = arrival_a != 1;
+                }
+            }
+            else
+            {
+                BOOST_ASSERT(result.template get<0>().count == 1);
+                ips[0].p_operation = union_or_blocked_same_dirs(arrival_a, is_p_last);
+                ips[0].q_operation = union_or_blocked_same_dirs(arrival_b, is_q_last);
+
+                ips[0].is_pi = arrival_a == -1;
+                ips[0].is_qi = arrival_b == -1;
+                ips[0].is_pj = arrival_a == 0;
+                ips[0].is_qj = arrival_b == 0;
+            }
+        }
+        else
+        {
+            ips[0].p_operation = union_or_blocked_different_dirs(arrival_a, is_p_last);
+            ips[0].q_operation = union_or_blocked_different_dirs(arrival_b, is_q_last);
+
+            ips[0].is_pi = arrival_a == -1;
+            ips[0].is_qi = arrival_b == -1;
+            ips[0].is_pj = arrival_a == 1;
+            ips[0].is_qj = arrival_b == 1;
+        }
+    }
+
+    struct ip_info
+    {
+        inline ip_info()
+            : p_operation(operation_none), q_operation(operation_none)
+            , is_pi(false), is_pj(false), is_qi(false), is_qj(false)
+        {}
+
+        operation_type p_operation, q_operation;
+        bool is_pi, is_pj, is_qi, is_qj;
+    };
+
+    template <std::size_t I>
+    ip_info const& get() const
+    {
+        BOOST_STATIC_ASSERT(I < 2);
+        return ips[I];
+    }
+    
+private:
+
+    // only if collinear (same_dirs)
+    static inline operation_type union_or_blocked_same_dirs(int arrival, bool is_last)
+    {
+        if ( arrival == 1 )
+            return operation_blocked;
+        else if ( arrival == -1 )
+            return operation_union;
+        else
+            return is_last ? operation_blocked : operation_union;
+            //return operation_blocked;
+    }
+
+    // only if not collinear (!same_dirs)
+    static inline operation_type union_or_blocked_different_dirs(int arrival, bool is_last)
+    {
+        if ( arrival == 1 )
+            //return operation_blocked;
+            return is_last ? operation_blocked : operation_union;
+        else
+            return operation_union;
+    }
+
+    ip_info ips[2];
+};
+
+template <typename AssignPolicy, bool EnableFirst, bool EnableLast>
+struct get_turn_info_for_endpoint
+{
+    BOOST_STATIC_ASSERT(EnableFirst || EnableLast);
+
+    template<typename Point1,
+             typename Point2,
+             typename TurnInfo,
+             typename IntersectionInfo,
+             typename OutputIterator
+    >
+    static inline bool apply(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                             Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                             bool is_p_first, bool is_p_last,
+                             bool is_q_first, bool is_q_last,
+                             TurnInfo const& tp_model,
+                             IntersectionInfo const& inters,
+                             method_type /*method*/,
+                             OutputIterator out)
+    {
+        std::size_t ip_count = inters.i_info().count;
+        // no intersection points
+        if ( ip_count == 0 )
+            return false;
+
+        int segment_index0 = tp_model.operations[0].seg_id.segment_index;
+        int segment_index1 = tp_model.operations[1].seg_id.segment_index;
+        BOOST_ASSERT(segment_index0 >= 0 && segment_index1 >= 0);
+
+        if ( !is_p_first && !is_p_last && !is_q_first && !is_q_last )
+            return false;
+
+        linear_intersections intersections(pi, qi, inters.result(), is_p_last, is_q_last);
+
+        bool append0_last
+            = analyse_segment_and_assign_ip(pi, pj, pk, qi, qj, qk,
+                                            is_p_first, is_p_last, is_q_first, is_q_last,
+                                            intersections.template get<0>(),
+                                            tp_model, inters, 0, out);
+
+        // NOTE: opposite && ip_count == 1 may be true!
+        bool opposite = inters.d_info().opposite;
+
+        // don't ignore only for collinear opposite
+        bool result_ignore_ip0 = append0_last && ( ip_count == 1 || !opposite );
+
+        if ( intersections.template get<1>().p_operation == operation_none )
+            return result_ignore_ip0;
+        
+        bool append1_last
+            = analyse_segment_and_assign_ip(pi, pj, pk, qi, qj, qk,
+                                            is_p_first, is_p_last, is_q_first, is_q_last,
+                                            intersections.template get<1>(),
+                                            tp_model, inters, 1, out);
+
+        // don't ignore only for collinear opposite
+        bool result_ignore_ip1 = append1_last && !opposite /*&& ip_count == 2*/;
+
+        return result_ignore_ip0 || result_ignore_ip1;
+    }
+
+    template <typename Point1,
+              typename Point2,
+              typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutputIterator>
+    static inline
+    bool analyse_segment_and_assign_ip(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                                       Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                                       bool is_p_first, bool is_p_last,
+                                       bool is_q_first, bool is_q_last,
+                                       linear_intersections::ip_info const& ip_info,
+                                       TurnInfo const& tp_model,
+                                       IntersectionInfo const& inters,
+                                       int ip_index,
+                                       OutputIterator out)
+    {
+#ifdef BOOST_GEOMETRY_DEBUG_GET_TURNS_LINEAR_LINEAR
+        // may this give false positives for INTs?
+        typename IntersectionResult::point_type const&
+            inters_pt = result.template get<0>().intersections[ip_index];
+        BOOST_ASSERT(ip_info.is_pi == equals::equals_point_point(pi, inters_pt));
+        BOOST_ASSERT(ip_info.is_qi == equals::equals_point_point(qi, inters_pt));
+        BOOST_ASSERT(ip_info.is_pj == equals::equals_point_point(pj, inters_pt));
+        BOOST_ASSERT(ip_info.is_qj == equals::equals_point_point(qj, inters_pt));
+#endif
+
+        // TODO - calculate first/last only if needed
+        bool is_p_first_ip = is_p_first && ip_info.is_pi;
+        bool is_p_last_ip = is_p_last && ip_info.is_pj;
+        bool is_q_first_ip = is_q_first && ip_info.is_qi;
+        bool is_q_last_ip = is_q_last && ip_info.is_qj;
+        bool append_first = EnableFirst && (is_p_first_ip || is_q_first_ip);
+        bool append_last = EnableLast && (is_p_last_ip || is_q_last_ip);
+
+        operation_type p_operation = ip_info.p_operation;
+        operation_type q_operation = ip_info.q_operation;
+
+        if ( append_first || append_last )
+        {
+            bool handled = handle_internal<0>(pi, pj, pk, qi, qj, qk,
+                                              inters.rpi(), inters.rpj(), inters.rpk(),
+                                              inters.rqi(), inters.rqj(), inters.rqk(),
+                                              is_p_first_ip, is_p_last_ip,
+                                              is_q_first_ip, is_q_last_ip,
+                                              ip_info.is_qi, ip_info.is_qj,
+                                              tp_model, inters, ip_index,
+                                              p_operation, q_operation);
+            if ( !handled )
+            {
+                handle_internal<1>(qi, qj, qk, pi, pj, pk,
+                                   inters.rqi(), inters.rqj(), inters.rqk(),
+                                   inters.rpi(), inters.rpj(), inters.rpk(),
+                                   is_q_first_ip, is_q_last_ip,
+                                   is_p_first_ip, is_p_last_ip,
+                                   ip_info.is_pi, ip_info.is_pj,
+                                   tp_model, inters, ip_index,
+                                   q_operation, p_operation);
+            }
+
+            if ( p_operation != operation_none )
+            {
+                method_type method = endpoint_ip_method(ip_info.is_pi, ip_info.is_pj,
+                                                        ip_info.is_qi, ip_info.is_qj);
+                turn_position p_pos = ip_position(is_p_first_ip, is_p_last_ip);
+                turn_position q_pos = ip_position(is_q_first_ip, is_q_last_ip);
+
+                // handle spikes
+
+                // P is spike and should be handled
+                if ( !is_p_last
+                  && ip_info.is_pj // this check is redundant (also in is_spike_p) but faster
+                  && inters.i_info().count == 2
+                  && inters.is_spike_p() )
+                {
+                    assign(pi, qi, inters.result(), ip_index, method, operation_blocked, q_operation,
+                           p_pos, q_pos, is_p_first_ip, is_q_first_ip, true, false, tp_model, out);
+                    assign(pi, qi, inters.result(), ip_index, method, operation_intersection, q_operation,
+                           p_pos, q_pos, is_p_first_ip, is_q_first_ip, true, false, tp_model, out);
+                }
+                // Q is spike and should be handled
+                else if ( !is_q_last
+                       && ip_info.is_qj // this check is redundant (also in is_spike_q) but faster
+                       && inters.i_info().count == 2
+                       && inters.is_spike_q() )
+                {
+                    assign(pi, qi, inters.result(), ip_index, method, p_operation, operation_blocked,
+                           p_pos, q_pos, is_p_first_ip, is_q_first_ip, false, true, tp_model, out);
+                    assign(pi, qi, inters.result(), ip_index, method, p_operation, operation_intersection,
+                           p_pos, q_pos, is_p_first_ip, is_q_first_ip, false, true, tp_model, out);
+                }
+                // no spikes
+                else
+                {
+                    assign(pi, qi, inters.result(), ip_index, method, p_operation, q_operation,
+                           p_pos, q_pos, is_p_first_ip, is_q_first_ip, false, false, tp_model, out);
+                }
+            }
+        }
+
+        return append_last;
+    }
+
+    // TODO: IT'S ALSO PROBABLE THAT ALL THIS FUNCTION COULD BE INTEGRATED WITH handle_segment
+    //       however now it's lazily calculated and then it would be always calculated
+
+    template<std::size_t G1Index,
+             typename Point1,
+             typename Point2,
+             typename RobustPoint1,
+             typename RobustPoint2,
+             typename TurnInfo,
+             typename IntersectionInfo
+    >
+    static inline bool handle_internal(Point1 const& /*i1*/, Point1 const& /*j1*/, Point1 const& /*k1*/,
+                                       Point2 const& i2, Point2 const& j2, Point2 const& /*k2*/,
+                                       RobustPoint1 const& ri1, RobustPoint1 const& rj1, RobustPoint1 const& /*rk1*/,
+                                       RobustPoint2 const& ri2, RobustPoint2 const& rj2, RobustPoint2 const& rk2,
+                                       bool first1, bool last1, bool first2, bool last2,
+                                       bool ip_i2, bool ip_j2, TurnInfo const& tp_model,
+                                       IntersectionInfo const& inters, int ip_index,
+                                       operation_type & op1, operation_type & op2)
+    {
+        boost::ignore_unused_variable_warning(i2);
+        boost::ignore_unused_variable_warning(j2);
+        boost::ignore_unused_variable_warning(ip_index);
+        boost::ignore_unused_variable_warning(tp_model);
+
+        if ( !first2 && !last2 )
+        {
+            if ( first1 )
+            {
+#ifdef BOOST_GEOMETRY_DEBUG_GET_TURNS_LINEAR_LINEAR
+                // may this give false positives for INTs?
+                typename IntersectionResult::point_type const&
+                    inters_pt = inters.i_info().intersections[ip_index];
+                BOOST_ASSERT(ip_i2 == equals::equals_point_point(i2, inters_pt));
+                BOOST_ASSERT(ip_j2 == equals::equals_point_point(j2, inters_pt));
+#endif
+                if ( ip_i2 )
+                {
+                    // don't output this IP - for the first point of other geometry segment
+                    op1 = operation_none;
+                    op2 = operation_none;
+                    return true;
+                }
+                else if ( ip_j2 )
+                {
+                    side_calculator<RobustPoint1, RobustPoint2, RobustPoint2>
+                        side_calc(ri2, ri1, rj1, ri2, rj2, rk2);
+
+                    std::pair<operation_type, operation_type>
+                        operations = operations_of_equal(side_calc);
+
+// TODO: must the above be calculated?
+// wouldn't it be enough to check if segments are collinear?
+
+                    if ( operations_both(operations, operation_continue) )
+                    {
+                        if ( op1 != operation_union 
+                          || op2 != operation_union
+                          || ! ( G1Index == 0 ? inters.is_spike_q() : inters.is_spike_p() ) )
+                        {
+                            // THIS IS WRT THE ORIGINAL SEGMENTS! NOT THE ONES ABOVE!
+                            bool opposite = inters.d_info().opposite;
+
+                            op1 = operation_intersection;
+                            op2 = opposite ? operation_union : operation_intersection;
+                        }
+                    }
+                    else
+                    {
+                        BOOST_ASSERT(operations_combination(operations, operation_intersection, operation_union));
+                        //op1 = operation_union;
+                        //op2 = operation_union;
+                    }
+
+                    return true;
+                }
+                // else do nothing - shouldn't be handled this way
+            }
+            else if ( last1 )
+            {
+#ifdef BOOST_GEOMETRY_DEBUG_GET_TURNS_LINEAR_LINEAR
+                // may this give false positives for INTs?
+                typename IntersectionResult::point_type const&
+                    inters_pt = inters.i_info().intersections[ip_index];
+                BOOST_ASSERT(ip_i2 == equals::equals_point_point(i2, inters_pt));
+                BOOST_ASSERT(ip_j2 == equals::equals_point_point(j2, inters_pt));
+#endif
+                if ( ip_i2 )
+                {
+                    // don't output this IP - for the first point of other geometry segment
+                    op1 = operation_none;
+                    op2 = operation_none;
+                    return true;
+                }
+                else if ( ip_j2 )
+                {
+                    side_calculator<RobustPoint1, RobustPoint2, RobustPoint2>
+                        side_calc(ri2, rj1, ri1, ri2, rj2, rk2);
+                    
+                    std::pair<operation_type, operation_type>
+                        operations = operations_of_equal(side_calc);
+
+// TODO: must the above be calculated?
+// wouldn't it be enough to check if segments are collinear?
+
+                    if ( operations_both(operations, operation_continue) )
+                    {
+                        if ( op1 != operation_blocked
+                          || op2 != operation_union
+                          || ! ( G1Index == 0 ? inters.is_spike_q() : inters.is_spike_p() ) )
+                        {
+                            // THIS IS WRT THE ORIGINAL SEGMENTS! NOT THE ONES ABOVE!
+                            bool second_going_out = inters.i_info().count > 1;
+
+                            op1 = operation_blocked;
+                            op2 = second_going_out ? operation_union : operation_intersection;
+                        }
+                    }
+                    else
+                    {
+                        BOOST_ASSERT(operations_combination(operations, operation_intersection, operation_union));
+                        //op1 = operation_blocked;
+                        //op2 = operation_union;
+                    }
+
+                    return true;
+                }
+                // else do nothing - shouldn't be handled this way
+            }
+            // else do nothing - shouldn't be handled this way
+        }
+
+        return false;
+    }
+
+    static inline method_type endpoint_ip_method(bool ip_pi, bool ip_pj, bool ip_qi, bool ip_qj)
+    {
+        if ( (ip_pi || ip_pj) && (ip_qi || ip_qj) )
+            return method_touch;
+        else
+            return method_touch_interior;
+    }
+
+    static inline turn_position ip_position(bool is_ip_first_i, bool is_ip_last_j)
+    {
+        return is_ip_first_i ? position_front :
+               ( is_ip_last_j ? position_back : position_middle );
+    }
+
+    template <typename Point1,
+              typename Point2,
+              typename IntersectionResult,
+              typename TurnInfo,
+              typename OutputIterator>
+    static inline void assign(Point1 const& pi, Point2 const& qi,
+                              IntersectionResult const& result,
+                              int ip_index,
+                              method_type method,
+                              operation_type op0, operation_type op1,
+                              turn_position pos0, turn_position pos1,
+                              bool is_p_first_ip, bool is_q_first_ip,
+                              bool is_p_spike, bool is_q_spike,
+                              TurnInfo const& tp_model,
+                              OutputIterator out)
+    {
+        TurnInfo tp = tp_model;
+        
+        //geometry::convert(ip, tp.point);
+        //tp.method = method;
+        base_turn_handler::assign_point(tp, method, result.template get<0>(), ip_index);
+
+        tp.operations[0].operation = op0;
+        tp.operations[1].operation = op1;
+        tp.operations[0].position = pos0;
+        tp.operations[1].position = pos1;
+
+        if ( result.template get<0>().count > 1 )
+        {
+            // NOTE: is_collinear is NOT set for the first endpoint
+            // for which there is no preceding segment
+
+            //BOOST_ASSERT( result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0 );
+            if ( ! is_p_first_ip )
+            {
+                tp.operations[0].is_collinear = op0 != operation_intersection
+                                             || is_p_spike;
+            }
+
+            if ( ! is_q_first_ip )
+            {
+                tp.operations[1].is_collinear = op1 != operation_intersection
+                                             || is_q_spike;
+            }
+        }
+        else //if ( result.template get<0>().count == 1 )
+        {
+            if ( op0 == operation_blocked && op1 == operation_intersection )
+            {
+                tp.operations[0].is_collinear = true;
+            }
+            else if ( op0 == operation_intersection && op1 == operation_blocked )
+            {
+                tp.operations[1].is_collinear = true;
+            }
+        }
+
+        AssignPolicy::apply(tp, pi, qi, result.template get<0>(), result.template get<1>());
+        *out++ = tp;
+    }
+
+    template <typename SidePolicy>
+    static inline std::pair<operation_type, operation_type> operations_of_equal(SidePolicy const& side)
+    {
+        int const side_pk_q2 = side.pk_wrt_q2();
+        int const side_pk_p = side.pk_wrt_p1();
+        int const side_qk_p = side.qk_wrt_p1();
+
+        // If pk is collinear with qj-qk, they continue collinearly.
+        // This can be on either side of p1 (== q1), or collinear
+        // The second condition checks if they do not continue
+        // oppositely
+        if ( side_pk_q2 == 0 && side_pk_p == side_qk_p )
+        {
+            return std::make_pair(operation_continue, operation_continue);
+        }
+
+        // If they turn to same side (not opposite sides)
+        if ( ! base_turn_handler::opposite(side_pk_p, side_qk_p) )
+        {
+            int const side_pk_q2 = side.pk_wrt_q2();
+            // If pk is left of q2 or collinear: p: union, q: intersection
+            if ( side_pk_q2 != -1 )
+            {
+                return std::make_pair(operation_union, operation_intersection);
+            }
+            else
+            {
+               return std::make_pair(operation_intersection, operation_union);
+            }
+        }
+        else
+        {
+            // They turn opposite sides. If p turns left (or collinear),
+           // p: union, q: intersection
+            if ( side_pk_p != -1 )
+            {
+                return std::make_pair(operation_union, operation_intersection);
+            }
+           else
+            {
+                return std::make_pair(operation_intersection, operation_union);
+            }
+        }
+   }
+
+    static inline bool operations_both(
+                            std::pair<operation_type, operation_type> const& operations,
+                            operation_type const op)
+    {
+        return operations.first == op && operations.second == op;
+    }
+
+    static inline bool operations_combination(
+                            std::pair<operation_type, operation_type> const& operations,
+                            operation_type const op1, operation_type const op2)
+    {
+        return ( operations.first == op1 && operations.second == op2 )
+            || ( operations.first == op2 && operations.second == op1 );
+    }
+};
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_FOR_ENDPOINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
new file mode 100644
index 000000000..3f0d5da1f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_helpers.hpp
@@ -0,0 +1,336 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_HELPERS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_HELPERS_HPP
+
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay {
+
+enum turn_position { position_middle, position_front, position_back };
+
+template <typename SegmentRatio>
+struct turn_operation_linear
+    : public turn_operation<SegmentRatio>
+{
+    turn_operation_linear()
+        : position(position_middle)
+        , is_collinear(false)
+    {}
+
+    turn_position position;
+    bool is_collinear; // valid only for Linear geometry
+};
+
+template <typename PointP, typename PointQ,
+          typename Pi = PointP, typename Pj = PointP, typename Pk = PointP,
+          typename Qi = PointQ, typename Qj = PointQ, typename Qk = PointQ
+>
+struct side_calculator
+{
+    typedef boost::geometry::strategy::side::side_by_triangle<> side; // todo: get from coordinate system
+
+    inline side_calculator(Pi const& pi, Pj const& pj, Pk const& pk,
+                           Qi const& qi, Qj const& qj, Qk const& qk)
+        : m_pi(pi), m_pj(pj), m_pk(pk)
+        , m_qi(qi), m_qj(qj), m_qk(qk)
+    {}
+
+    inline int pk_wrt_p1() const { return side::apply(m_pi, m_pj, m_pk); }
+    inline int pk_wrt_q1() const { return side::apply(m_qi, m_qj, m_pk); }
+    inline int qk_wrt_p1() const { return side::apply(m_pi, m_pj, m_qk); }
+    inline int qk_wrt_q1() const { return side::apply(m_qi, m_qj, m_qk); }
+
+    inline int pk_wrt_q2() const { return side::apply(m_qj, m_qk, m_pk); }
+    inline int qk_wrt_p2() const { return side::apply(m_pj, m_pk, m_qk); }
+
+    Pi const& m_pi;
+    Pj const& m_pj;
+    Pk const& m_pk;
+    Qi const& m_qi;
+    Qj const& m_qj;
+    Qk const& m_qk;
+};
+
+template <typename Point1, typename Point2, typename RobustPolicy>
+struct robust_points
+{
+    typedef typename geometry::robust_point_type
+        <
+        Point1, RobustPolicy
+        >::type robust_point1_type;
+    // TODO: define robust_point2_type using Point2?
+    typedef robust_point1_type robust_point2_type;
+
+    inline robust_points(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                         Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                         RobustPolicy const& robust_policy)
+    {
+        geometry::recalculate(m_rpi, pi, robust_policy);
+        geometry::recalculate(m_rpj, pj, robust_policy);
+        geometry::recalculate(m_rpk, pk, robust_policy);
+        geometry::recalculate(m_rqi, qi, robust_policy);
+        geometry::recalculate(m_rqj, qj, robust_policy);
+        geometry::recalculate(m_rqk, qk, robust_policy);
+    }
+
+    robust_point1_type m_rpi, m_rpj, m_rpk;
+    robust_point2_type m_rqi, m_rqj, m_rqk;
+};
+
+template <typename Point1, typename Point2, typename RobustPolicy>
+class intersection_info_base
+    : private robust_points<Point1, Point2, RobustPolicy>
+{
+    typedef robust_points<Point1, Point2, RobustPolicy> base_t;
+
+public:
+    typedef Point1 point1_type;
+    typedef Point2 point2_type;
+
+    typedef typename base_t::robust_point1_type robust_point1_type;
+    typedef typename base_t::robust_point2_type robust_point2_type;
+
+    typedef side_calculator<robust_point1_type, robust_point2_type> side_calculator_type;
+    
+    intersection_info_base(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                           Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                           RobustPolicy const& robust_policy)
+        : base_t(pi, pj, pk, qi, qj, qk, robust_policy)
+        , m_side_calc(base_t::m_rpi, base_t::m_rpj, base_t::m_rpk,
+                      base_t::m_rqi, base_t::m_rqj, base_t::m_rqk)
+        , m_pi(pi), m_pj(pj), m_pk(pk)
+        , m_qi(qi), m_qj(qj), m_qk(qk)
+    {}
+
+    inline Point1 const& pi() const { return m_pi; }
+    inline Point1 const& pj() const { return m_pj; }
+    inline Point1 const& pk() const { return m_pk; }
+
+    inline Point2 const& qi() const { return m_qi; }
+    inline Point2 const& qj() const { return m_qj; }
+    inline Point2 const& qk() const { return m_qk; }
+
+    inline robust_point1_type const& rpi() const { return base_t::m_rpi; }
+    inline robust_point1_type const& rpj() const { return base_t::m_rpj; }
+    inline robust_point1_type const& rpk() const { return base_t::m_rpk; }
+
+    inline robust_point2_type const& rqi() const { return base_t::m_rqi; }
+    inline robust_point2_type const& rqj() const { return base_t::m_rqj; }
+    inline robust_point2_type const& rqk() const { return base_t::m_rqk; }
+
+    inline side_calculator_type const& sides() const { return m_side_calc; }
+    
+private:
+    side_calculator_type m_side_calc;
+
+    point1_type const& m_pi;
+    point1_type const& m_pj;
+    point1_type const& m_pk;
+    point2_type const& m_qi;
+    point2_type const& m_qj;
+    point2_type const& m_qk;
+};
+
+template <typename Point1, typename Point2>
+class intersection_info_base<Point1, Point2, detail::no_rescale_policy>
+{
+public:
+    typedef Point1 point1_type;
+    typedef Point2 point2_type;
+
+    typedef Point1 robust_point1_type;
+    typedef Point2 robust_point2_type;
+
+    typedef side_calculator<Point1, Point2> side_calculator_type;
+    
+    intersection_info_base(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                           Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                           no_rescale_policy const& /*robust_policy*/)
+        : m_side_calc(pi, pj, pk, qi, qj, qk)
+    {}
+
+    inline Point1 const& pi() const { return m_side_calc.m_pi; }
+    inline Point1 const& pj() const { return m_side_calc.m_pj; }
+    inline Point1 const& pk() const { return m_side_calc.m_pk; }
+
+    inline Point2 const& qi() const { return m_side_calc.m_qi; }
+    inline Point2 const& qj() const { return m_side_calc.m_qj; }
+    inline Point2 const& qk() const { return m_side_calc.m_qk; }
+
+    inline Point1 const& rpi() const { return pi(); }
+    inline Point1 const& rpj() const { return pj(); }
+    inline Point1 const& rpk() const { return pk(); }
+
+    inline Point2 const& rqi() const { return qi(); }
+    inline Point2 const& rqj() const { return qj(); }
+    inline Point2 const& rqk() const { return qk(); }
+
+    inline side_calculator_type const& sides() const { return m_side_calc; }
+    
+private:
+    side_calculator_type m_side_calc;
+};
+
+
+template <typename Point1, typename Point2, typename TurnPoint, typename RobustPolicy>
+class intersection_info
+    : public intersection_info_base<Point1, Point2, RobustPolicy>
+{
+    typedef intersection_info_base<Point1, Point2, RobustPolicy> base_t;
+
+    typedef typename strategy_intersection
+        <
+            typename cs_tag<TurnPoint>::type,
+            Point1,
+            Point2,
+            TurnPoint,
+            RobustPolicy
+        >::segment_intersection_strategy_type strategy;
+
+public:
+    typedef model::referring_segment<Point1 const> segment_type1;
+    typedef model::referring_segment<Point2 const> segment_type2;
+    typedef typename base_t::side_calculator_type side_calculator_type;
+    
+    typedef typename strategy::return_type result_type;
+    typedef typename boost::tuples::element<0, result_type>::type i_info_type; // intersection_info
+    typedef typename boost::tuples::element<1, result_type>::type d_info_type; // dir_info
+
+    intersection_info(Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                      Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                      RobustPolicy const& robust_policy)
+        : base_t(pi, pj, pk, qi, qj, qk, robust_policy)
+        , m_result(strategy::apply(segment_type1(pi, pj),
+                                   segment_type2(qi, qj),
+                                   robust_policy))
+        , m_robust_policy(robust_policy)
+    {}
+
+    inline result_type const& result() const { return m_result; }
+    inline i_info_type const& i_info() const { return m_result.template get<0>(); }
+    inline d_info_type const& d_info() const { return m_result.template get<1>(); }
+
+    // TODO: it's more like is_spike_ip_p
+    inline bool is_spike_p() const
+    {
+        if ( base_t::sides().pk_wrt_p1() == 0 )
+        {
+            if ( ! is_ip_j<0>() )
+                return false;
+
+            int const qk_p1 = base_t::sides().qk_wrt_p1();
+            int const qk_p2 = base_t::sides().qk_wrt_p2();
+                
+            if ( qk_p1 == -qk_p2 )
+            {
+                if ( qk_p1 == 0 )
+                {
+                    return is_spike_of_collinear(base_t::pi(), base_t::pj(), base_t::pk());
+                }
+                        
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+    // TODO: it's more like is_spike_ip_q
+    inline bool is_spike_q() const
+    {
+        if ( base_t::sides().qk_wrt_q1() == 0 )
+        {
+            if ( ! is_ip_j<1>() )
+                return false;
+
+            int const pk_q1 = base_t::sides().pk_wrt_q1();
+            int const pk_q2 = base_t::sides().pk_wrt_q2();
+                
+            if ( pk_q1 == -pk_q2 )
+            {
+                if ( pk_q1 == 0 )
+                {
+                    return is_spike_of_collinear(base_t::qi(), base_t::qj(), base_t::qk());
+                }
+                        
+                return true;
+            }
+        }
+        
+        return false;
+    }
+
+private:
+    template <typename Point>
+    inline bool is_spike_of_collinear(Point const& i, Point const& j, Point const& k) const
+    {
+        typedef model::referring_segment<Point const> seg_t;
+
+        typedef strategy_intersection
+            <
+                typename cs_tag<Point>::type, Point, Point, Point, RobustPolicy
+            > si;
+        
+        typedef typename si::segment_intersection_strategy_type strategy;
+        
+        typename strategy::return_type result
+            = strategy::apply(seg_t(i, j), seg_t(j, k), m_robust_policy);
+        
+        return result.template get<0>().count == 2;
+    }
+
+    template <std::size_t OpId>
+    bool is_ip_j() const
+    {
+        int arrival = d_info().arrival[OpId];
+        bool same_dirs = d_info().dir_a == 0 && d_info().dir_b == 0;
+
+        if ( same_dirs )
+        {
+            if ( i_info().count == 2 )
+            {
+                if ( ! d_info().opposite )
+                {
+                    return arrival != -1;
+                }
+                else
+                {
+                    return arrival != -1;
+                }
+            }
+            else
+            {
+                return arrival == 0;
+            }
+        }
+        else
+        {
+            return arrival == 1;
+        }
+    }
+
+    result_type m_result;
+    RobustPolicy const& m_robust_policy;
+};
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_HELPERS_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
new file mode 100644
index 000000000..20340a608
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp
@@ -0,0 +1,809 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LA_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LA_HPP
+
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp>
+
+// TEMP, for spikes detector
+//#include <boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay {
+
+template<typename AssignPolicy>
+struct get_turn_info_linear_areal
+{
+    static const bool handle_spikes = true;
+
+    template
+    <
+        typename Point1,
+        typename Point2,
+        typename TurnInfo,
+        typename RobustPolicy,
+        typename OutputIterator
+    >
+    static inline OutputIterator apply(
+                Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                bool is_p_first, bool is_p_last,
+                bool is_q_first, bool is_q_last,
+                TurnInfo const& tp_model,
+                RobustPolicy const& robust_policy,
+                OutputIterator out)
+    {
+        typedef intersection_info<Point1, Point2, typename TurnInfo::point_type, RobustPolicy>
+            inters_info;
+
+        inters_info inters(pi, pj, pk, qi, qj, qk, robust_policy);
+
+        char const method = inters.d_info().how;
+
+        // Copy, to copy possibly extended fields
+        TurnInfo tp = tp_model;
+
+        // Select method and apply
+        switch(method)
+        {
+            case 'a' : // collinear, "at"
+            case 'f' : // collinear, "from"
+            case 's' : // starts from the middle
+                get_turn_info_for_endpoint<true, true>(
+                    pi, pj, pk, qi, qj, qk,
+                    is_p_first, is_p_last, is_q_first, is_q_last,
+                    tp_model, inters, method_none, out);
+                break;
+
+            case 'd' : // disjoint: never do anything
+                break;
+
+            case 'm' :
+            {
+                if ( get_turn_info_for_endpoint<false, true>(
+                        pi, pj, pk, qi, qj, qk,
+                        is_p_first, is_p_last, is_q_first, is_q_last,
+                        tp_model, inters, method_touch_interior, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    typedef touch_interior
+                        <
+                            TurnInfo
+                        > policy;
+
+                    // If Q (1) arrives (1)
+                    if ( inters.d_info().arrival[1] == 1 )
+                    {
+                        policy::template apply<0>(pi, pj, pk, qi, qj, qk,
+                                    tp, inters.i_info(), inters.d_info(),
+                                    inters.sides());
+                    }
+                    else
+                    {
+                        // Swap p/q
+                        side_calculator
+                            <
+                                typename inters_info::robust_point2_type,
+                                typename inters_info::robust_point1_type
+                            > swapped_side_calc(inters.rqi(), inters.rqj(), inters.rqk(),
+                                                inters.rpi(), inters.rpj(), inters.rpk());
+                        policy::template apply<1>(qi, qj, qk, pi, pj, pk,
+                                    tp, inters.i_info(), inters.d_info(),
+                                    swapped_side_calc);
+                    }
+
+                    if ( tp.operations[1].operation == operation_blocked )
+                    {
+                        tp.operations[0].is_collinear = true;
+                    }
+
+                    replace_method_and_operations_tm(tp.method,
+                                                     tp.operations[0].operation,
+                                                     tp.operations[1].operation);
+                    
+                    // this function assumes that 'u' must be set for a spike
+                    calculate_spike_operation(tp.operations[0].operation,
+                                              inters, is_p_last);
+                    
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+
+                    *out++ = tp;
+                }
+            }
+            break;
+            case 'i' :
+            {
+                crosses<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                         tp, inters.i_info(), inters.d_info());
+
+                replace_operations_i(tp.operations[0].operation, tp.operations[1].operation);
+
+                AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                *out++ = tp;
+            }
+            break;
+            case 't' :
+            {
+                // Both touch (both arrive there)
+                if ( get_turn_info_for_endpoint<false, true>(
+                        pi, pj, pk, qi, qj, qk,
+                        is_p_first, is_p_last, is_q_first, is_q_last,
+                        tp_model, inters, method_touch, out) )
+                {
+                    // do nothing
+                }
+                else 
+                {
+                    touch<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                            tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                    if ( tp.operations[1].operation == operation_blocked )
+                    {
+                        tp.operations[0].is_collinear = true;
+                    }
+
+                    // workarounds for touch<> not taking spikes into account starts here
+                    // those was discovered empirically
+                    // touch<> is not symmetrical!
+                    // P spikes and Q spikes may produce various operations!
+                    // Only P spikes are valid for L/A
+                    // TODO: this is not optimal solution - think about rewriting touch<>
+
+                    if ( tp.operations[0].operation == operation_blocked )
+                    {
+                        // a spike on P on the same line with Q1
+                        if ( inters.is_spike_p() )
+                        {
+                            if ( inters.sides().qk_wrt_p1() == 0 )
+                            {
+                                tp.operations[0].is_collinear = true;
+                            }
+                            else
+                            {
+                                tp.operations[0].operation = operation_union;                                
+                            }
+                        }
+                    }
+                    else if ( tp.operations[0].operation == operation_continue
+                           && tp.operations[1].operation == operation_continue )
+                    {
+                        // P spike on the same line with Q2 (opposite)
+                        if ( inters.sides().pk_wrt_q1() == -inters.sides().qk_wrt_q1()
+                          && inters.is_spike_p() )
+                        {
+                            tp.operations[0].operation = operation_union;
+                            tp.operations[1].operation = operation_union;
+                        }
+                    }
+                    else if ( tp.operations[0].operation == operation_none
+                           && tp.operations[1].operation == operation_none )
+                    {
+                        // spike not handled by touch<>
+                        if ( inters.is_spike_p() )
+                        {
+                            tp.operations[0].operation = operation_intersection;
+                            tp.operations[1].operation = operation_union;
+
+                            if ( inters.sides().pk_wrt_q2() == 0 )
+                            {
+                                tp.operations[0].operation = operation_continue; // will be converted to i
+                                tp.operations[0].is_collinear = true;
+                            }
+                        }
+                    }
+
+                    // workarounds for touch<> not taking spikes into account ends here
+
+                    replace_method_and_operations_tm(tp.method,
+                                                     tp.operations[0].operation,
+                                                     tp.operations[1].operation);
+
+                    bool ignore_spike
+                        = calculate_spike_operation(tp.operations[0].operation,
+                                                    inters, is_p_last);
+
+// TODO: move this into the append_xxx and call for each turn?
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+
+                    if ( ! handle_spikes
+                      || ignore_spike
+                      || ! append_opposite_spikes<append_touches>( // for 'i' or 'c' i???
+                                tp, inters, is_p_last, is_q_last, out) )
+                    {
+                        *out++ = tp;
+                    }
+                }
+            }
+            break;
+            case 'e':
+            {
+                if ( get_turn_info_for_endpoint<true, true>(
+                        pi, pj, pk, qi, qj, qk,
+                        is_p_first, is_p_last, is_q_first, is_q_last,
+                        tp_model, inters, method_equal, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    tp.operations[0].is_collinear = true;
+
+                    if ( ! inters.d_info().opposite )
+                    {
+                        // Both equal
+                        // or collinear-and-ending at intersection point
+                        equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                            tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                        turn_transformer_ec<false> transformer(method_touch);
+                        transformer(tp);
+                    
+// TODO: move this into the append_xxx and call for each turn?
+                        AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                        
+                        // conditionally handle spikes
+                        if ( ! handle_spikes
+                          || ! append_collinear_spikes(tp, inters, is_p_last, is_q_last,
+                                                       method_touch, append_equal, out) )
+                        {
+                            *out++ = tp; // no spikes
+                        }
+                    }
+                    else
+                    {
+                        equal_opposite
+                            <
+                                TurnInfo,
+                                AssignPolicy
+                            >::apply(pi, qi,
+                                     tp, out, inters.i_info(), inters.d_info());
+                    }
+                }
+            }
+            break;
+            case 'c' :
+            {
+                // Collinear
+                if ( get_turn_info_for_endpoint<true, true>(
+                        pi, pj, pk, qi, qj, qk,
+                        is_p_first, is_p_last, is_q_first, is_q_last,
+                        tp_model, inters, method_collinear, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    tp.operations[0].is_collinear = true;
+
+                    if ( ! inters.d_info().opposite )
+                    {
+                        method_type method_replace = method_touch_interior;
+                        append_version_c version = append_collinear;
+
+                        if ( inters.d_info().arrival[0] == 0 )
+                        {
+                            // Collinear, but similar thus handled as equal
+                            equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                    tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                            method_replace = method_touch;
+                            version = append_equal;
+                        }
+                        else
+                        {
+                            collinear<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                    tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                            //method_replace = method_touch_interior;
+                            //version = append_collinear;
+                        }
+
+                        turn_transformer_ec<false> transformer(method_replace);
+                        transformer(tp);
+
+// TODO: move this into the append_xxx and call for each turn?
+                        AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                        
+                        // conditionally handle spikes
+                        if ( ! handle_spikes
+                          || ! append_collinear_spikes(tp, inters, is_p_last, is_q_last,
+                                                       method_replace, version, out) )
+                        {
+                            // no spikes
+                            *out++ = tp;
+                        }
+                    }
+                    else
+                    {
+                        // Is this always 'm' ?
+                        turn_transformer_ec<false> transformer(method_touch_interior);
+
+                        // conditionally handle spikes
+                        if ( handle_spikes )
+                        {
+                            append_opposite_spikes<append_collinear_opposite>(
+                                    tp, inters, is_p_last, is_q_last, out);
+                        }
+
+                        // TODO: ignore for spikes?
+                        //       E.g. pass is_p_valid = !is_p_last && !is_pj_spike,
+                        //       the same with is_q_valid
+
+                        collinear_opposite
+                            <
+                                TurnInfo,
+                                AssignPolicy
+                            >::apply(pi, pj, pk, qi, qj, qk,
+                                tp, out, inters.i_info(), inters.d_info(),
+                                inters.sides(), transformer);
+                    }
+                }
+            }
+            break;
+            case '0' :
+            {
+                // degenerate points
+                if (AssignPolicy::include_degenerate)
+                {
+                    only_convert::apply(tp, inters.i_info());
+
+                    if ( is_p_first
+                      && equals::equals_point_point(pi, tp.point) )
+                    {
+                        tp.operations[0].position = position_front;
+                    }
+                    else if ( is_p_last
+                           && equals::equals_point_point(pj, tp.point) )
+                    {
+                        tp.operations[0].position = position_back;
+                    }
+                    // tp.operations[1].position = position_middle;
+
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                    *out++ = tp;
+                }
+            }
+            break;
+            default :
+            {
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+                std::cout << "TURN: Unknown method: " << method << std::endl;
+#endif
+#if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
+                throw turn_info_exception(method);
+#endif
+            }
+            break;
+        }
+
+        return out;
+    }
+
+    template <typename Operation,
+              typename IntersectionInfo>
+    static inline bool calculate_spike_operation(Operation & op,
+                                                 IntersectionInfo const& inters,
+                                                 bool is_p_last)
+    {
+        bool is_p_spike = ( op == operation_union || op == operation_intersection )
+                       && ! is_p_last
+                       && inters.is_spike_p();
+
+        if ( is_p_spike )
+        {
+            bool going_in = false, going_out = false;
+                
+            int const pk_q1 = inters.sides().pk_wrt_q1();
+            int const pk_q2 = inters.sides().pk_wrt_q2();
+
+            if ( inters.sides().qk_wrt_q1() <= 0 ) // Q turning R or C
+            { 
+                going_in = pk_q1 < 0 && pk_q2 < 0; // Pk on the right of both
+                going_out = pk_q1 > 0 || pk_q2 > 0; // Pk on the left of one of them
+            }
+            else
+            {
+                going_in = pk_q1 < 0 || pk_q2 < 0; // Pk on the right of one of them
+                going_out = pk_q1 > 0 && pk_q2 > 0; // Pk on the left of both
+            }
+
+            if ( going_in )
+            {
+                op = operation_intersection;
+                return true;
+            }
+            else if ( going_out )
+            {
+                op = operation_union;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    enum append_version_c { append_equal, append_collinear };
+
+    template <typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutIt>
+    static inline bool append_collinear_spikes(TurnInfo & tp,
+                                               IntersectionInfo const& inters,
+                                               bool is_p_last, bool /*is_q_last*/,
+                                               method_type method, append_version_c version,
+                                               OutIt out)
+    {
+        // method == touch || touch_interior
+        // both position == middle
+
+        bool is_p_spike = ( version == append_equal ?
+                            ( tp.operations[0].operation == operation_union
+                           || tp.operations[0].operation == operation_intersection ) :
+                            tp.operations[0].operation == operation_continue )
+                       && ! is_p_last
+                       && inters.is_spike_p();
+
+        // TODO: throw an exception for spike in Areal?
+        /*bool is_q_spike = tp.operations[1].operation == spike_op
+                       && ! is_q_last
+                       && inters.is_spike_q();*/
+
+        if ( is_p_spike )
+        {
+            tp.method = method;
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[1].operation = operation_union;
+            *out++ = tp;
+            tp.operations[0].operation = operation_continue; // boundary
+            //tp.operations[1].operation = operation_union;
+            *out++ = tp;
+
+            return true;
+        }
+        
+        return false;
+    }
+
+    enum append_version_o { append_touches, append_collinear_opposite };
+
+    template <append_version_o Version,
+              typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutIt>
+    static inline bool append_opposite_spikes(TurnInfo & tp,
+                                              IntersectionInfo const& inters,
+                                              bool is_p_last, bool /*is_q_last*/,
+                                              OutIt out)
+    {
+        bool is_p_spike = ( Version == append_touches ?
+                            ( tp.operations[0].operation == operation_continue
+                           || tp.operations[0].operation == operation_intersection ) : // i ???
+                            true )
+                       && ! is_p_last
+                       && inters.is_spike_p();
+        // TODO: throw an exception for spike in Areal?
+        /*bool is_q_spike = ( Version == append_touches ?
+                            ( tp.operations[1].operation == operation_continue
+                           || tp.operations[1].operation == operation_intersection ) :
+                            true )
+                       && ! is_q_last
+                       && inters.is_spike_q();*/
+
+        if ( is_p_spike && ( Version == append_touches || inters.d_info().arrival[0] == 1 ) )
+        {
+            if ( Version == append_touches )
+            {
+                tp.operations[0].is_collinear = true;
+                //tp.operations[1].is_collinear = false;
+                tp.method = method_touch;
+            }
+            else
+            {
+                tp.operations[0].is_collinear = true;
+                //tp.operations[1].is_collinear = false;
+                
+                BOOST_ASSERT(inters.i_info().count > 1);
+                base_turn_handler::assign_point(tp, method_touch_interior, inters.i_info(), 1);
+
+                AssignPolicy::apply(tp, inters.pi(), inters.qi(), inters.i_info(), inters.d_info());
+            }
+
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[1].operation = operation_continue; // boundary
+            *out++ = tp;
+            tp.operations[0].operation = operation_continue; // boundary
+            //tp.operations[1].operation = operation_continue; // boundary
+            *out++ = tp;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    static inline void replace_method_and_operations_tm(method_type & method,
+                                                        operation_type & op0,
+                                                        operation_type & op1)
+    {
+        if ( op0 == operation_blocked && op1 == operation_blocked )
+        {
+            // NOTE: probably only if methods are WRT IPs, not segments!
+            method = (method == method_touch ? method_equal : method_collinear);
+        }
+
+        // Assuming G1 is always Linear
+        if ( op0 == operation_blocked )
+        {
+            op0 = operation_continue;
+        }
+
+        if ( op1 == operation_blocked )
+        {
+            op1 = operation_continue;
+        }
+        else if ( op1 == operation_intersection )
+        {
+            op1 = operation_union;
+        }
+
+        // spikes in 'm'
+        if ( method == method_error )
+        {
+            method = method_touch_interior;
+            op0 = operation_union;
+            op1 = operation_union;
+        }
+    }
+
+    template <bool IsFront>
+    class turn_transformer_ec
+    {
+    public:
+        explicit turn_transformer_ec(method_type method_t_or_m)
+            : m_method(method_t_or_m)
+        {}
+
+        template <typename Turn>
+        void operator()(Turn & turn) const
+        {
+            operation_type & op0 = turn.operations[0].operation;
+            operation_type & op1 = turn.operations[1].operation;
+
+            // NOTE: probably only if methods are WRT IPs, not segments!
+            if ( IsFront
+              || op0 == operation_intersection || op0 == operation_union
+              || op1 == operation_intersection || op1 == operation_union )
+            {
+                turn.method = m_method;
+            }
+
+            turn.operations[0].is_collinear = op0 != operation_blocked;
+
+            // Assuming G1 is always Linear
+            if ( op0 == operation_blocked )
+            {
+                op0 = operation_continue;
+            }
+
+            if ( op1 == operation_blocked )
+            {
+                op1 = operation_continue;
+            }
+            else if ( op1 == operation_intersection )
+            {
+                op1 = operation_union;
+            }
+        }
+
+    private:
+        method_type m_method;
+    };
+
+    static inline void replace_operations_i(operation_type & /*op0*/, operation_type & op1)
+    {
+        // assuming Linear is always the first one
+        op1 = operation_union;
+    }
+
+    // NOTE: Spikes may NOT be handled for Linear endpoints because it's not
+    //       possible to define a spike on an endpoint. Areal geometries must
+    //       NOT have spikes at all. One thing that could be done is to throw
+    //       an exception when spike is detected in Areal geometry.
+    
+    template <bool EnableFirst,
+              bool EnableLast,
+              typename Point1,
+              typename Point2,
+              typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutputIterator>
+    static inline bool get_turn_info_for_endpoint(
+                            Point1 const& pi, Point1 const& /*pj*/, Point1 const& /*pk*/,
+                            Point2 const& qi, Point2 const& /*qj*/, Point2 const& /*qk*/,
+                            bool is_p_first, bool is_p_last,
+                            bool /*is_q_first*/, bool is_q_last,
+                            TurnInfo const& tp_model,
+                            IntersectionInfo const& inters,
+                            method_type /*method*/,
+                            OutputIterator out)
+    {
+        namespace ov = overlay;
+        typedef ov::get_turn_info_for_endpoint<AssignPolicy, EnableFirst, EnableLast> get_info_e;
+
+        const std::size_t ip_count = inters.i_info().count;
+        // no intersection points
+        if ( ip_count == 0 )
+            return false;
+
+        const int segment_index0 = tp_model.operations[0].seg_id.segment_index;
+        const int segment_index1 = tp_model.operations[1].seg_id.segment_index;
+        BOOST_ASSERT(segment_index0 >= 0 && segment_index1 >= 0);
+
+        if ( !is_p_first && !is_p_last )
+            return false;
+
+// TODO: is_q_last could probably be replaced by false and removed from parameters
+
+        linear_intersections intersections(pi, qi, inters.result(), is_p_last, is_q_last);
+        linear_intersections::ip_info const& ip0 = intersections.template get<0>();
+        linear_intersections::ip_info const& ip1 = intersections.template get<1>();
+
+        const bool opposite = inters.d_info().opposite;
+
+        // ANALYSE AND ASSIGN FIRST
+
+        // IP on the first point of Linear Geometry
+        if ( EnableFirst && is_p_first && ip0.is_pi && !ip0.is_qi ) // !q0i prevents duplication
+        {
+            TurnInfo tp = tp_model;
+            tp.operations[0].position = position_front;
+            tp.operations[1].position = position_middle;
+
+            if ( opposite ) // opposite -> collinear
+            {
+                tp.operations[0].operation = operation_continue;
+                tp.operations[1].operation = operation_union;
+                tp.method = ip0.is_qj ? method_touch : method_touch_interior;
+            }
+            else
+            {
+                method_type replaced_method = method_touch_interior;
+
+                if ( ip0.is_qj )
+                {
+                    side_calculator
+                        <
+                            typename IntersectionInfo::robust_point1_type,
+                            typename IntersectionInfo::robust_point2_type,
+                            typename IntersectionInfo::robust_point2_type
+                        > side_calc(inters.rqi(), inters.rpi(), inters.rpj(),
+                                    inters.rqi(), inters.rqj(), inters.rqk());
+
+                    std::pair<operation_type, operation_type>
+                        operations = get_info_e::operations_of_equal(side_calc);
+
+                    tp.operations[0].operation = operations.first;
+                    tp.operations[1].operation = operations.second;
+
+                    replaced_method = method_touch;
+                }
+                else
+                {
+                    side_calculator
+                        <
+                            typename IntersectionInfo::robust_point1_type,
+                            typename IntersectionInfo::robust_point2_type,
+                            typename IntersectionInfo::robust_point2_type,
+                            typename IntersectionInfo::robust_point1_type,
+                            typename IntersectionInfo::robust_point1_type,
+                            typename IntersectionInfo::robust_point2_type,
+                            typename IntersectionInfo::robust_point1_type,
+                            typename IntersectionInfo::robust_point2_type
+                        > side_calc(inters.rqi(), inters.rpi(), inters.rpj(),
+                                    inters.rqi(), inters.rpi(), inters.rqj());
+
+                    std::pair<operation_type, operation_type>
+                        operations = get_info_e::operations_of_equal(side_calc);
+
+                    tp.operations[0].operation = operations.first;
+                    tp.operations[1].operation = operations.second;
+                }
+
+                turn_transformer_ec<true> transformer(replaced_method);
+                transformer(tp);
+            }
+
+            // equals<> or collinear<> will assign the second point,
+            // we'd like to assign the first one
+            base_turn_handler::assign_point(tp, tp.method, inters.i_info(), 0);
+
+            // NOTE: is_collinear is not set for the first endpoint of L
+            // for which there is no preceding segment
+            // here is_p_first_ip == true
+            tp.operations[0].is_collinear = false;
+
+            AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+            *out++ = tp;
+        }
+
+        // ANALYSE AND ASSIGN LAST
+
+        // IP on the last point of Linear Geometry
+        if ( EnableLast
+          && is_p_last
+          && ( ip_count > 1 ? (ip1.is_pj && !ip1.is_qi) : (ip0.is_pj && !ip0.is_qi) ) ) // prevents duplication
+        {
+            TurnInfo tp = tp_model;
+            
+            if ( inters.i_info().count > 1 )
+            {
+                //BOOST_ASSERT( result.template get<1>().dir_a == 0 && result.template get<1>().dir_b == 0 );
+                tp.operations[0].is_collinear = true;
+                tp.operations[1].operation = opposite ? operation_continue : operation_union;
+            }
+            else //if ( result.template get<0>().count == 1 )
+            {
+                side_calculator
+                    <
+                        typename IntersectionInfo::robust_point1_type,
+                        typename IntersectionInfo::robust_point2_type,
+                        typename IntersectionInfo::robust_point2_type
+                    > side_calc(inters.rqi(), inters.rpj(), inters.rpi(),
+                                inters.rqi(), inters.rqj(), inters.rqk());
+
+                std::pair<operation_type, operation_type>
+                    operations = get_info_e::operations_of_equal(side_calc);
+
+                tp.operations[0].operation = operations.first;
+                tp.operations[1].operation = operations.second;
+
+                turn_transformer_ec<false> transformer(method_none);
+                transformer(tp);
+
+                tp.operations[0].is_collinear = tp.both(operation_continue);
+            }
+
+            tp.method = ( ip_count > 1 ? ip1.is_qj : ip0.is_qj ) ? method_touch : method_touch_interior;
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[0].position = position_back;
+            tp.operations[1].position = position_middle;
+            
+            // equals<> or collinear<> will assign the second point,
+            // we'd like to assign the first one
+            int ip_index = ip_count > 1 ? 1 : 0;
+            base_turn_handler::assign_point(tp, tp.method, inters.i_info(), ip_index);
+
+            AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+            *out++ = tp;
+
+            return true;
+        }
+
+        // don't ignore anything for now
+        return false;
+    }
+};
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LA_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
new file mode 100644
index 000000000..4f0384877
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp
@@ -0,0 +1,720 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LL_HPP
+
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info_for_endpoint.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay {
+
+template<typename AssignPolicy>
+struct get_turn_info_linear_linear
+{
+    static const bool handle_spikes = true;
+
+    template
+    <
+        typename Point1,
+        typename Point2,
+        typename TurnInfo,
+        typename RobustPolicy,
+        typename OutputIterator
+    >
+    static inline OutputIterator apply(
+                Point1 const& pi, Point1 const& pj, Point1 const& pk,
+                Point2 const& qi, Point2 const& qj, Point2 const& qk,
+                bool is_p_first, bool is_p_last,
+                bool is_q_first, bool is_q_last,
+                TurnInfo const& tp_model,
+                RobustPolicy const& robust_policy,
+                OutputIterator out)
+    {
+        typedef intersection_info<Point1, Point2, typename TurnInfo::point_type, RobustPolicy>
+            inters_info;
+
+        inters_info inters(pi, pj, pk, qi, qj, qk, robust_policy);
+
+        char const method = inters.d_info().how;
+
+        // Copy, to copy possibly extended fields
+        TurnInfo tp = tp_model;
+
+        // Select method and apply
+        switch(method)
+        {
+            case 'a' : // collinear, "at"
+            case 'f' : // collinear, "from"
+            case 's' : // starts from the middle
+                get_turn_info_for_endpoint<AssignPolicy, true, true>
+                    ::apply(pi, pj, pk, qi, qj, qk,
+                            is_p_first, is_p_last, is_q_first, is_q_last,
+                            tp_model, inters, method_none, out);
+                break;
+
+            case 'd' : // disjoint: never do anything
+                break;
+
+            case 'm' :
+            {
+                if ( get_turn_info_for_endpoint<AssignPolicy, false, true>
+                        ::apply(pi, pj, pk, qi, qj, qk,
+                                is_p_first, is_p_last, is_q_first, is_q_last,
+                                tp_model, inters, method_touch_interior, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    typedef touch_interior
+                        <
+                            TurnInfo
+                        > policy;
+
+                    // If Q (1) arrives (1)
+                    if ( inters.d_info().arrival[1] == 1)
+                    {
+                        policy::template apply<0>(pi, pj, pk, qi, qj, qk,
+                                                  tp, inters.i_info(), inters.d_info(),
+                                                  inters.sides());
+                    }
+                    else
+                    {
+                        // Swap p/q
+                        side_calculator
+                            <
+                                typename inters_info::robust_point2_type,
+                                typename inters_info::robust_point1_type
+                            > swapped_side_calc(inters.rqi(), inters.rqj(), inters.rqk(),
+                                                inters.rpi(), inters.rpj(), inters.rpk());
+
+                        policy::template apply<1>(qi, qj, qk, pi, pj, pk,
+                                                  tp, inters.i_info(), inters.d_info(),
+                                                  swapped_side_calc);
+                    }
+                    
+                    if ( tp.operations[0].operation == operation_blocked )
+                    {
+                        tp.operations[1].is_collinear = true;
+                    }
+                    if ( tp.operations[1].operation == operation_blocked )
+                    {
+                        tp.operations[0].is_collinear = true;
+                    }
+
+                    replace_method_and_operations_tm(tp.method,
+                                                     tp.operations[0].operation,
+                                                     tp.operations[1].operation);
+                    
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                    *out++ = tp;
+                }
+            }
+            break;
+            case 'i' :
+            {
+                crosses<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                         tp, inters.i_info(), inters.d_info());
+
+                replace_operations_i(tp.operations[0].operation, tp.operations[1].operation);
+
+                AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                *out++ = tp;
+            }
+            break;
+            case 't' :
+            {
+                // Both touch (both arrive there)
+                if ( get_turn_info_for_endpoint<AssignPolicy, false, true>
+                        ::apply(pi, pj, pk, qi, qj, qk,
+                                is_p_first, is_p_last, is_q_first, is_q_last,
+                                tp_model, inters, method_touch, out) )
+                {
+                    // do nothing
+                }
+                else 
+                {
+                    touch<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                           tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                    // workarounds for touch<> not taking spikes into account starts here
+                    // those was discovered empirically
+                    // touch<> is not symmetrical!
+                    // P spikes and Q spikes may produce various operations!
+                    // TODO: this is not optimal solution - think about rewriting touch<>
+
+                    if ( tp.operations[0].operation == operation_blocked
+                      && tp.operations[1].operation == operation_blocked )
+                    {
+                        // two touching spikes on the same line
+                        if ( inters.is_spike_p() && inters.is_spike_q() )
+                        {
+                            tp.operations[0].operation = operation_union;
+                            tp.operations[1].operation = operation_union; 
+                        }
+                        else
+                        {
+                            tp.operations[0].is_collinear = true;
+                            tp.operations[1].is_collinear = true;
+                        }
+                    }
+                    else if ( tp.operations[0].operation == operation_blocked )
+                    {
+                        // a spike on P on the same line with Q1
+                        if ( inters.is_spike_p() )
+                        {
+                            if ( inters.sides().qk_wrt_p1() == 0 )
+                            {
+                                tp.operations[0].is_collinear = true;
+                            }
+                            else
+                            {
+                                tp.operations[0].operation = operation_union;                                
+                            }
+                        }
+                        else
+                        {
+                            tp.operations[1].is_collinear = true;
+                        }
+                    }
+                    else if ( tp.operations[1].operation == operation_blocked )
+                    {
+                        // a spike on Q on the same line with P1
+                        if ( inters.is_spike_q() )
+                        {
+                            if ( inters.sides().pk_wrt_q1() == 0 )
+                            {
+                                tp.operations[1].is_collinear = true;
+                            }
+                            else
+                            {
+                                tp.operations[1].operation = operation_union;                                
+                            }
+                        }
+                        else
+                        {
+                            tp.operations[0].is_collinear = true;
+                        }
+                    }
+                    else if ( tp.operations[0].operation == operation_continue
+                           && tp.operations[1].operation == operation_continue )
+                    {
+                        // P spike on the same line with Q2 (opposite)
+                        if ( inters.sides().pk_wrt_q1() == -inters.sides().qk_wrt_q1()
+                          && inters.is_spike_p() )
+                        {
+                            tp.operations[0].operation = operation_union;
+                            tp.operations[1].operation = operation_union; 
+                        }
+                    }
+                    else if ( tp.operations[0].operation == operation_none
+                           && tp.operations[1].operation == operation_none )
+                    {
+                        // spike not handled by touch<>
+                        bool const is_p = inters.is_spike_p();
+                        bool const is_q = inters.is_spike_q();
+
+                        if ( is_p || is_q )
+                        {
+                            tp.operations[0].operation = operation_union;
+                            tp.operations[1].operation = operation_union;
+
+                            if ( inters.sides().pk_wrt_q2() == 0 )
+                            {
+                                tp.operations[0].operation = operation_continue; // will be converted to i
+                                if ( is_p )
+                                {
+                                    tp.operations[0].is_collinear = true;
+                                }
+                            }
+
+                            if ( inters.sides().qk_wrt_p2() == 0 )
+                            {
+                                tp.operations[1].operation = operation_continue; // will be converted to i
+                                if ( is_q )
+                                {
+                                    tp.operations[1].is_collinear = true;
+                                }
+                            }
+                        }
+                    }
+
+                    // workarounds for touch<> not taking spikes into account ends here
+
+                    replace_method_and_operations_tm(tp.method,
+                                                     tp.operations[0].operation,
+                                                     tp.operations[1].operation);
+
+// TODO: move this into the append_xxx and call for each turn?
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+
+                    if ( ! handle_spikes
+                      || ! append_opposite_spikes<append_touches>(tp, inters,
+                                                                  is_p_last, is_q_last,
+                                                                  out) )
+                    {
+                        *out++ = tp;
+                    }
+                }
+            }
+            break;
+            case 'e':
+            {
+                if ( get_turn_info_for_endpoint<AssignPolicy, true, true>
+                        ::apply(pi, pj, pk, qi, qj, qk,
+                                is_p_first, is_p_last, is_q_first, is_q_last,
+                                tp_model, inters, method_equal, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    tp.operations[0].is_collinear = true;
+                    tp.operations[1].is_collinear = true;
+
+                    if ( ! inters.d_info().opposite )
+                    {
+                        // Both equal
+                        // or collinear-and-ending at intersection point
+                        equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                            tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                        // transform turn
+                        turn_transformer_ec transformer(method_touch);
+                        transformer(tp);
+
+// TODO: move this into the append_xxx and call for each turn?
+                        AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+
+                        // conditionally handle spikes
+                        if ( ! handle_spikes
+                          || ! append_collinear_spikes(tp, inters,
+                                                       is_p_last, is_q_last,
+                                                       method_touch, operation_union,
+                                                       out) )
+                        {
+                            *out++ = tp; // no spikes
+                        }
+                    }
+                    else
+                    {
+                        // TODO: ignore for spikes or generate something else than opposite?
+
+                        equal_opposite
+                            <
+                                TurnInfo,
+                                AssignPolicy
+                            >::apply(pi, qi, tp, out, inters.i_info(), inters.d_info());
+                    }
+                }
+            }
+            break;
+            case 'c' :
+            {
+                // Collinear
+                if ( get_turn_info_for_endpoint<AssignPolicy, true, true>
+                        ::apply(pi, pj, pk, qi, qj, qk,
+                                is_p_first, is_p_last, is_q_first, is_q_last,
+                                tp_model, inters, method_collinear, out) )
+                {
+                    // do nothing
+                }
+                else
+                {
+                    // NOTE: this is for spikes since those are set in the turn_transformer_ec
+                    tp.operations[0].is_collinear = true;
+                    tp.operations[1].is_collinear = true;
+
+                    if ( ! inters.d_info().opposite )
+                    {
+                        method_type method_replace = method_touch_interior;
+                        operation_type spike_op = operation_continue;
+
+                        if ( inters.d_info().arrival[0] == 0 )
+                        {
+                            // Collinear, but similar thus handled as equal
+                            equal<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                    tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                            method_replace = method_touch;
+                            spike_op = operation_union;
+                        }
+                        else
+                        {
+                            collinear<TurnInfo>::apply(pi, pj, pk, qi, qj, qk,
+                                    tp, inters.i_info(), inters.d_info(), inters.sides());
+
+                            //method_replace = method_touch_interior;
+                            //spike_op = operation_continue;
+                        }
+
+                        // transform turn
+                        turn_transformer_ec transformer(method_replace);
+                        transformer(tp);
+                        
+// TODO: move this into the append_xxx and call for each turn?
+                        AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+
+                        // conditionally handle spikes
+                        if ( ! handle_spikes
+                          || ! append_collinear_spikes(tp, inters,
+                                                       is_p_last, is_q_last,
+                                                       method_replace, spike_op,
+                                                       out) )
+                        {
+                            // no spikes
+                            *out++ = tp;
+                        }
+                    }
+                    else
+                    {
+                        // If this always 'm' ?
+                        turn_transformer_ec transformer(method_touch_interior);
+
+                        // conditionally handle spikes
+                        if ( handle_spikes )
+                        {
+                            append_opposite_spikes<append_collinear_opposite>(tp, inters,
+                                                                              is_p_last, is_q_last,
+                                                                              out);
+                        }
+
+                        // TODO: ignore for spikes?
+                        //       E.g. pass is_p_valid = !is_p_last && !is_pj_spike,
+                        //       the same with is_q_valid
+
+                        collinear_opposite
+                            <
+                                TurnInfo,
+                                AssignPolicy
+                            >::apply(pi, pj, pk, qi, qj, qk,
+                                tp, out, inters.i_info(), inters.d_info(), inters.sides(),
+                                transformer, !is_p_last, !is_q_last);
+                    }
+                }
+            }
+            break;
+            case '0' :
+            {
+                // degenerate points
+                if (AssignPolicy::include_degenerate)
+                {
+                    only_convert::apply(tp, inters.i_info());
+
+                    // if any, only one of those should be true
+                    if ( is_p_first
+                      && equals::equals_point_point(pi, tp.point) )
+                    {
+                        tp.operations[0].position = position_front;
+                    }
+                    else if ( is_p_last
+                           && equals::equals_point_point(pj, tp.point) )
+                    {
+                        tp.operations[0].position = position_back;
+                    }
+                    else if ( is_q_first
+                           && equals::equals_point_point(qi, tp.point) )
+                    {
+                        tp.operations[1].position = position_front;
+                    }
+                    else if ( is_q_last
+                           && equals::equals_point_point(qj, tp.point) )
+                    {
+                        tp.operations[1].position = position_back;
+                    }
+
+                    AssignPolicy::apply(tp, pi, qi, inters.i_info(), inters.d_info());
+                    *out++ = tp;
+                }
+            }
+            break;
+            default :
+            {
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+                std::cout << "TURN: Unknown method: " << method << std::endl;
+#endif
+#if ! defined(BOOST_GEOMETRY_OVERLAY_NO_THROW)
+                throw turn_info_exception(method);
+#endif
+            }
+            break;
+        }
+
+        return out;
+    }
+
+    template <typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutIt>
+    static inline bool append_collinear_spikes(TurnInfo & tp,
+                                               IntersectionInfo const& inters_info,
+                                               bool is_p_last, bool is_q_last,
+                                               method_type method, operation_type spike_op,
+                                               OutIt out)
+    {
+        // method == touch || touch_interior
+        // both position == middle
+
+        bool is_p_spike = tp.operations[0].operation == spike_op
+                       && ! is_p_last
+                       && inters_info.is_spike_p();
+        bool is_q_spike = tp.operations[1].operation == spike_op
+                       && ! is_q_last
+                       && inters_info.is_spike_q();
+
+        if ( is_p_spike && is_q_spike )
+        {
+            tp.method = method;
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[1].operation = operation_blocked;
+            *out++ = tp;
+            tp.operations[0].operation = operation_intersection;
+            tp.operations[1].operation = operation_intersection;
+            *out++ = tp;
+
+            return true;
+        }
+        else if ( is_p_spike )
+        {
+            tp.method = method;
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[1].operation = operation_union;
+            *out++ = tp;
+            tp.operations[0].operation = operation_intersection;
+            //tp.operations[1].operation = operation_union;
+            *out++ = tp;
+
+            return true;
+        }
+        else if ( is_q_spike )
+        {
+            tp.method = method;
+            tp.operations[0].operation = operation_union;
+            tp.operations[1].operation = operation_blocked;
+            *out++ = tp;
+            //tp.operations[0].operation = operation_union;
+            tp.operations[1].operation = operation_intersection;
+            *out++ = tp;
+
+            return true;
+        }
+        
+        return false;
+    }
+
+    enum append_version { append_touches, append_collinear_opposite };
+
+    template <append_version Version,
+              typename TurnInfo,
+              typename IntersectionInfo,
+              typename OutIt>
+    static inline bool append_opposite_spikes(TurnInfo & tp,
+                                              IntersectionInfo const& inters,
+                                              bool is_p_last, bool is_q_last,
+                                              OutIt out)
+    {
+        bool is_p_spike = ( Version == append_touches ?
+                            ( tp.operations[0].operation == operation_continue
+                           || tp.operations[0].operation == operation_intersection ) :
+                            true )
+                       && ! is_p_last
+                       && inters.is_spike_p();
+        bool is_q_spike = ( Version == append_touches ?
+                            ( tp.operations[1].operation == operation_continue
+                           || tp.operations[1].operation == operation_intersection ) :
+                            true )
+                       && ! is_q_last
+                       && inters.is_spike_q();
+
+        bool res = false;
+
+        if ( is_p_spike && ( Version == append_touches || inters.d_info().arrival[0] == 1 ) )
+        {
+            if ( Version == append_touches )
+            {
+                tp.operations[0].is_collinear = true;
+                tp.operations[1].is_collinear = false;
+                tp.method = method_touch;
+            }
+            else // Version == append_collinear_opposite
+            {
+                tp.operations[0].is_collinear = true;
+                tp.operations[1].is_collinear = false;
+                
+                BOOST_ASSERT(inters.i_info().count > 1);
+                
+                base_turn_handler::assign_point(tp, method_touch_interior,
+                                                inters.i_info(), 1);
+
+                AssignPolicy::apply(tp, inters.pi(), inters.qi(),
+                                    inters.i_info(), inters.d_info());
+            }
+
+            tp.operations[0].operation = operation_blocked;
+            tp.operations[1].operation = operation_intersection;
+            *out++ = tp;
+            tp.operations[0].operation = operation_intersection;
+            //tp.operations[1].operation = operation_intersection;
+            *out++ = tp;
+
+            res = true;
+        }
+
+        if ( is_q_spike && ( Version == append_touches || inters.d_info().arrival[1] == 1 ) )
+        {
+            if ( Version == append_touches )
+            {
+                tp.operations[0].is_collinear = false;
+                tp.operations[1].is_collinear = true;
+                tp.method = method_touch;
+            }
+            else // Version == append_collinear_opposite
+            {
+                tp.operations[0].is_collinear = false;
+                tp.operations[1].is_collinear = true;
+                
+                BOOST_ASSERT(inters.i_info().count > 0);
+
+                base_turn_handler::assign_point(tp, method_touch_interior, inters.i_info(), 0);
+
+                AssignPolicy::apply(tp, inters.pi(), inters.qi(),
+                                    inters.i_info(), inters.d_info());
+            }
+
+            tp.operations[0].operation = operation_intersection;
+            tp.operations[1].operation = operation_blocked;
+            *out++ = tp;
+            //tp.operations[0].operation = operation_intersection;
+            tp.operations[1].operation = operation_intersection;
+            *out++ = tp;
+
+            res = true;
+        }
+        
+        return res;
+    }
+
+    static inline void replace_method_and_operations_tm(method_type & method,
+                                                        operation_type & op0,
+                                                        operation_type & op1)
+    {
+        if ( op0 == operation_blocked && op1 == operation_blocked )
+        {
+            // NOTE: probably only if methods are WRT IPs, not segments!
+            method = (method == method_touch ? method_equal : method_collinear);
+            op0 = operation_continue;
+            op1 = operation_continue;
+        }
+        else
+        {
+            if ( op0 == operation_continue || op0 == operation_blocked )
+            {
+                op0 = operation_intersection;
+            }
+            else if ( op0 == operation_intersection )
+            {
+                op0 = operation_union;
+            }
+
+            if ( op1 == operation_continue || op1 == operation_blocked )
+            {
+                op1 = operation_intersection;
+            }
+            else if ( op1 == operation_intersection )
+            {
+                op1 = operation_union;
+            }
+
+            // spikes in 'm'
+            if ( method == method_error )
+            {
+                method = method_touch_interior;
+                op0 = operation_union;
+                op1 = operation_union;
+            }
+        }
+    }
+
+    class turn_transformer_ec
+    {
+    public:
+        explicit turn_transformer_ec(method_type method_t_or_m)
+            : m_method(method_t_or_m)
+        {}
+
+        template <typename Turn>
+        void operator()(Turn & turn) const
+        {
+            operation_type & op0 = turn.operations[0].operation;
+            operation_type & op1 = turn.operations[1].operation;
+
+            BOOST_ASSERT(op0 != operation_blocked || op1 != operation_blocked );
+
+            if ( op0 == operation_blocked )
+            {
+                op0 = operation_intersection;
+            }
+            else if ( op0 == operation_intersection )
+            {
+                op0 = operation_union;
+            }
+
+            if ( op1 == operation_blocked )
+            {
+                op1 = operation_intersection;
+            }
+            else if ( op1 == operation_intersection )
+            {
+                op1 = operation_union;
+            }
+
+            if ( op0 == operation_intersection || op0 == operation_union
+              || op1 == operation_intersection || op1 == operation_union )
+            {
+                turn.method = m_method;
+            }
+
+// TODO: is this correct?
+//       it's equivalent to comparing to operation_blocked at the beginning of the function
+            turn.operations[0].is_collinear = op0 != operation_intersection;
+            turn.operations[1].is_collinear = op1 != operation_intersection;
+        }
+
+    private:
+        method_type m_method;
+    };
+
+    static inline void replace_operations_i(operation_type & op0, operation_type & op1)
+    {
+        if ( op0 == operation_intersection )
+        {
+            op0 = operation_union;
+        }
+
+        if ( op1 == operation_intersection )
+        {
+            op1 = operation_union;
+        }
+    }
+};
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURN_INFO_LL_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
index 23487872a..513bfd372 100644
--- a/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/get_turns.hpp
@@ -1,11 +1,17 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
 
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 
@@ -17,15 +23,14 @@
 #include <boost/concept_check.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/core/reverse_dispatch.hpp>
-
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
@@ -43,17 +48,22 @@
 #include <boost/geometry/strategies/intersection.hpp>
 #include <boost/geometry/strategies/intersection_result.hpp>
 
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
-#include <boost/geometry/algorithms/detail/partition.hpp>
-#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/point_point.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+#include <boost/geometry/algorithms/detail/partition.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info_ll.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info_la.hpp>
 #include <boost/geometry/algorithms/detail/overlay/segment_identifier.hpp>
 
-
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
 #include <boost/geometry/algorithms/expand.hpp>
-#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
 #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
 #  include <sstream>
@@ -66,10 +76,10 @@ namespace boost { namespace geometry
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
-    
+
 
 #ifndef DOXYGEN_NO_DETAIL
 namespace detail { namespace get_turns
@@ -93,9 +103,7 @@ template
     typename Geometry1, typename Geometry2,
     bool Reverse1, bool Reverse2,
     typename Section1, typename Section2,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 class get_turns_in_sections
 {
@@ -152,12 +160,12 @@ class get_turns_in_sections
                     <
                         typename tag_cast
                             <
-                                typename geometry::point_type<Geometry1>::type, 
+                                typename geometry::tag<Geometry>::type,
                                 areal_tag
-                            >::type, 
+                            >::type,
                         areal_tag
                     >::value
-               && index1 == 0 
+               && index1 == 0
                && index2 >= n - 2
                 ;
     }
@@ -165,15 +173,27 @@ class get_turns_in_sections
 
 public :
     // Returns true if terminated, false if interrupted
+    template <typename Turns, typename RobustPolicy, typename InterruptPolicy>
     static inline bool apply(
             int source_id1, Geometry1 const& geometry1, Section1 const& sec1,
             int source_id2, Geometry2 const& geometry2, Section2 const& sec2,
             bool skip_larger,
+            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
     {
         boost::ignore_unused_variable_warning(interrupt_policy);
 
+        if ((sec1.duplicate && (sec1.count + 1) < sec1.range_count)
+           || (sec2.duplicate && (sec2.count + 1) < sec2.range_count))
+        {
+            // Skip sections containig only duplicates.
+            // They are still important (can indicate non-disjointness)
+            // but they will be found processing adjacent sections.
+            // Do NOT skip if they are the ONLY section
+            return true;
+        }
+
         cview_type1 cview1(range_by_section(geometry1, sec1));
         cview_type2 cview2(range_by_section(geometry2, sec2));
         view_type1 view1(cview1);
@@ -198,7 +218,7 @@ public :
         range1_iterator prev1, it1, end1;
 
         get_start_point_iterator(sec1, view1, prev1, it1, end1,
-                    index1, ndi1, dir1, sec2.bounding_box);
+                    index1, ndi1, dir1, sec2.bounding_box, robust_policy);
 
         // We need a circular iterator because it might run through the closing point.
         // One circle is actually enough but this one is just convenient.
@@ -209,12 +229,12 @@ public :
         // section 2:    [--------------]
         // section 1: |----|---|---|---|---|
         for (prev1 = it1++, next1++;
-            it1 != end1 && ! exceeding<0>(dir1, *prev1, sec2.bounding_box);
+            it1 != end1 && ! exceeding<0>(dir1, *prev1, sec2.bounding_box, robust_policy);
             ++prev1, ++it1, ++index1, ++next1, ++ndi1)
         {
             ever_circling_iterator<range1_iterator> nd_next1(
                     begin_range_1, end_range_1, next1, true);
-            advance_to_non_duplicate_next(nd_next1, it1, sec1);
+            advance_to_non_duplicate_next(nd_next1, it1, sec1, robust_policy);
 
             int index2 = sec2.begin_index;
             int ndi2 = sec2.non_duplicate_index;
@@ -222,12 +242,12 @@ public :
             range2_iterator prev2, it2, end2;
 
             get_start_point_iterator(sec2, view2, prev2, it2, end2,
-                        index2, ndi2, dir2, sec1.bounding_box);
+                        index2, ndi2, dir2, sec1.bounding_box, robust_policy);
             ever_circling_iterator<range2_iterator> next2(begin_range_2, end_range_2, it2, true);
             next2++;
 
             for (prev2 = it2++, next2++;
-                it2 != end2 && ! exceeding<0>(dir2, *prev2, sec1.bounding_box);
+                it2 != end2 && ! exceeding<0>(dir2, *prev2, sec1.bounding_box, robust_policy);
                 ++prev2, ++it2, ++index2, ++next2, ++ndi2)
             {
                 bool skip = same_source;
@@ -253,7 +273,7 @@ public :
                     // Move to the "non duplicate next"
                     ever_circling_iterator<range2_iterator> nd_next2(
                             begin_range_2, end_range_2, next2, true);
-                    advance_to_non_duplicate_next(nd_next2, it2, sec2);
+                    advance_to_non_duplicate_next(nd_next2, it2, sec2, robust_policy);
 
                     typedef typename boost::range_value<Turns>::type turn_info;
 
@@ -268,8 +288,14 @@ public :
 
                     std::size_t const size_before = boost::size(turns);
 
+                    bool const is_1_first = sec1.is_non_duplicate_first && index1 == sec1.begin_index;
+                    bool const is_1_last = sec1.is_non_duplicate_last && index1+1 >= sec1.end_index;
+                    bool const is_2_first = sec2.is_non_duplicate_first && index2 == sec2.begin_index;
+                    bool const is_2_last = sec2.is_non_duplicate_last && index2+1 >= sec2.end_index;
+
                     TurnPolicy::apply(*prev1, *it1, *nd_next1, *prev2, *it2, *nd_next2,
-                            ti, std::back_inserter(turns));
+                                      is_1_first, is_1_last, is_2_first, is_2_last,
+                                      ti, robust_policy, std::back_inserter(turns));
 
                     if (InterruptPolicy::enabled)
                     {
@@ -294,24 +320,34 @@ private :
     typedef typename model::referring_segment<point2_type const> segment2_type;
 
 
-    template <size_t Dim, typename Point, typename Box>
-    static inline bool preceding(int dir, Point const& point, Box const& box)
+    template <size_t Dim, typename Point, typename Box, typename RobustPolicy>
+    static inline bool preceding(int dir, Point const& point, Box const& box, RobustPolicy const& robust_policy)
     {
-        return (dir == 1  && get<Dim>(point) < get<min_corner, Dim>(box))
-            || (dir == -1 && get<Dim>(point) > get<max_corner, Dim>(box));
+        typename robust_point_type<Point, RobustPolicy>::type robust_point;
+        geometry::recalculate(robust_point, point, robust_policy);
+        return (dir == 1  && get<Dim>(robust_point) < get<min_corner, Dim>(box))
+            || (dir == -1 && get<Dim>(robust_point) > get<max_corner, Dim>(box));
     }
 
-    template <size_t Dim, typename Point, typename Box>
-    static inline bool exceeding(int dir, Point const& point, Box const& box)
+    template <size_t Dim, typename Point, typename Box, typename RobustPolicy>
+    static inline bool exceeding(int dir, Point const& point, Box const& box, RobustPolicy const& robust_policy)
     {
-        return (dir == 1  && get<Dim>(point) > get<max_corner, Dim>(box))
-            || (dir == -1 && get<Dim>(point) < get<min_corner, Dim>(box));
+        typename robust_point_type<Point, RobustPolicy>::type robust_point;
+        geometry::recalculate(robust_point, point, robust_policy);
+        return (dir == 1  && get<Dim>(robust_point) > get<max_corner, Dim>(box))
+            || (dir == -1 && get<Dim>(robust_point) < get<min_corner, Dim>(box));
     }
 
-    template <typename Iterator, typename RangeIterator, typename Section>
+    template <typename Iterator, typename RangeIterator, typename Section, typename RobustPolicy>
     static inline void advance_to_non_duplicate_next(Iterator& next,
-            RangeIterator const& it, Section const& section)
+            RangeIterator const& it, Section const& section, RobustPolicy const& robust_policy)
     {
+        typedef typename robust_point_type<point1_type, RobustPolicy>::type robust_point_type;
+        robust_point_type robust_point_from_it;
+        robust_point_type robust_point_from_next;
+        geometry::recalculate(robust_point_from_it, *it, robust_policy);
+        geometry::recalculate(robust_point_from_next, *next, robust_policy);
+
         // To see where the next segments bend to, in case of touch/intersections
         // on end points, we need (in case of degenerate/duplicate points) an extra
         // iterator which moves to the REAL next point, so non duplicate.
@@ -322,10 +358,14 @@ private :
         // So advance to the "non duplicate next"
         // (the check is defensive, to avoid endless loops)
         std::size_t check = 0;
-        while(! detail::disjoint::disjoint_point_point(*it, *next)
+        while(! detail::disjoint::disjoint_point_point
+                (
+                    robust_point_from_it, robust_point_from_next
+                )
             && check++ < section.range_count)
         {
             next++;
+            geometry::recalculate(robust_point_from_next, *next, robust_policy);
         }
     }
 
@@ -333,14 +373,14 @@ private :
     // because of the logistics of "index" (the section-iterator automatically
     // skips to the begin-point, we loose the index or have to recalculate it)
     // So we mimic it here
-    template <typename Range, typename Section, typename Box>
+    template <typename Range, typename Section, typename Box, typename RobustPolicy>
     static inline void get_start_point_iterator(Section & section,
             Range const& range,
             typename boost::range_iterator<Range const>::type& it,
             typename boost::range_iterator<Range const>::type& prev,
             typename boost::range_iterator<Range const>::type& end,
             int& index, int& ndi,
-            int dir, Box const& other_bounding_box)
+            int dir, Box const& other_bounding_box, RobustPolicy const& robust_policy)
     {
         it = boost::begin(range) + section.begin_index;
         end = boost::begin(range) + section.end_index + 1;
@@ -348,7 +388,7 @@ private :
         // Mimic section-iterator:
         // Skip to point such that section interects other box
         prev = it++;
-        for(; it != end && preceding<0>(dir, *it, other_bounding_box);
+        for(; it != end && preceding<0>(dir, *it, other_bounding_box, robust_policy);
             prev = it++, index++, ndi++)
         {}
         // Go back one step because we want to start completely preceding
@@ -380,6 +420,7 @@ template
     bool Reverse1, bool Reverse2,
     typename Turns,
     typename TurnPolicy,
+    typename RobustPolicy,
     typename InterruptPolicy
 >
 struct section_visitor
@@ -388,14 +429,17 @@ struct section_visitor
     Geometry1 const& m_geometry1;
     int m_source_id2;
     Geometry2 const& m_geometry2;
+    RobustPolicy const& m_rescale_policy;
     Turns& m_turns;
     InterruptPolicy& m_interrupt_policy;
 
     section_visitor(int id1, Geometry1 const& g1,
             int id2, Geometry2 const& g2,
+            RobustPolicy const& robust_policy,
             Turns& turns, InterruptPolicy& ip)
         : m_source_id1(id1), m_geometry1(g1)
         , m_source_id2(id2), m_geometry2(g2)
+        , m_rescale_policy(robust_policy)
         , m_turns(turns)
         , m_interrupt_policy(ip)
     {}
@@ -411,13 +455,12 @@ struct section_visitor
                         Geometry2,
                         Reverse1, Reverse2,
                         Section, Section,
-                        Turns,
-                        TurnPolicy,
-                        InterruptPolicy
+                        TurnPolicy
                     >::apply(
                             m_source_id1, m_geometry1, sec1,
                             m_source_id2, m_geometry2, sec2,
                             false,
+                            m_rescale_policy,
                             m_turns, m_interrupt_policy);
         }
         return true;
@@ -429,37 +472,45 @@ template
 <
     typename Geometry1, typename Geometry2,
     bool Reverse1, bool Reverse2,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 class get_turns_generic
 {
 
 public:
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Geometry1 const& geometry1,
             int source_id2, Geometry2 const& geometry2,
-            Turns& turns, InterruptPolicy& interrupt_policy)
+            RobustPolicy const& robust_policy,
+            Turns& turns,
+            InterruptPolicy& interrupt_policy)
     {
         // First create monotonic sections...
         typedef typename boost::range_value<Turns>::type ip_type;
         typedef typename ip_type::point_type point_type;
-        typedef model::box<point_type> box_type;
+
+        typedef model::box
+            <
+                typename geometry::robust_point_type
+                <
+                    point_type, RobustPolicy
+                >::type
+            > box_type;
         typedef typename geometry::sections<box_type, 2> sections_type;
 
         sections_type sec1, sec2;
 
-        geometry::sectionalize<Reverse1>(geometry1, sec1, 0);
-        geometry::sectionalize<Reverse2>(geometry2, sec2, 1);
+        geometry::sectionalize<Reverse1>(geometry1, robust_policy, true, sec1, 0);
+        geometry::sectionalize<Reverse2>(geometry2, robust_policy, true, sec2, 1);
 
         // ... and then partition them, intersecting overlapping sections in visitor method
         section_visitor
             <
                 Geometry1, Geometry2,
                 Reverse1, Reverse2,
-                Turns, TurnPolicy, InterruptPolicy
-            > visitor(source_id1, geometry1, source_id2, geometry2, turns, interrupt_policy);
+                Turns, TurnPolicy, RobustPolicy, InterruptPolicy
+            > visitor(source_id1, geometry1, source_id2, geometry2, robust_policy, turns, interrupt_policy);
 
         geometry::partition
             <
@@ -474,13 +525,10 @@ template
 <
     typename Range, typename Box,
     bool ReverseRange, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns_cs
 {
-    typedef typename boost::range_value<Turns>::type turn_info;
     typedef typename geometry::point_type<Range>::type point_type;
     typedef typename geometry::point_type<Box>::type box_point_type;
 
@@ -502,14 +550,16 @@ struct get_turns_cs
         >::type iterator_type;
 
 
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline void apply(
                 int source_id1, Range const& range,
                 int source_id2, Box const& box,
+                RobustPolicy const& robust_policy,
                 Turns& turns,
                 InterruptPolicy& interrupt_policy,
                 int multi_index = -1, int ring_index = -1)
     {
-        if (boost::size(range) <= 1)
+        if ( boost::size(range) <= 1)
         {
             return;
         }
@@ -520,6 +570,8 @@ struct get_turns_cs
         cview_type cview(range);
         view_type view(cview);
 
+        typename boost::range_size<view_type>::type segments_count1 = boost::size(view) - 1;
+
         iterator_type it = boost::begin(view);
 
         ever_circling_iterator<iterator_type> next(
@@ -568,9 +620,13 @@ struct get_turns_cs
                 get_turns_with_box(seg_id, source_id2,
                         *prev, *it, *next,
                         bp[0], bp[1], bp[2], bp[3],
+                        // NOTE: some dummy values could be passed below since this would be called only for Polygons and Boxes
+                        index == 0,
+                        unsigned(index) == segments_count1,
+                        robust_policy,
                         turns, interrupt_policy);
-                // Future performance enhancement: 
-                // return if told by the interrupt policy 
+                // Future performance enhancement:
+                // return if told by the interrupt policy
             }
         }
     }
@@ -596,6 +652,7 @@ private:
         else return 0;
     }
 
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline void get_turns_with_box(segment_identifier const& seg_id, int source_id2,
             // Points from a range:
             point_type const& rp0,
@@ -606,6 +663,9 @@ private:
             box_point_type const& bp1,
             box_point_type const& bp2,
             box_point_type const& bp3,
+            bool const is_range_first,
+            bool const is_range_last,
+            RobustPolicy const& robust_policy,
             // Output
             Turns& turns,
             InterruptPolicy& interrupt_policy)
@@ -623,19 +683,27 @@ private:
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 0);
         TurnPolicy::apply(rp0, rp1, rp2, bp0, bp1, bp2,
-                ti, std::back_inserter(turns));
+                          is_range_first, is_range_last,
+                          true, false,
+                          ti, robust_policy, std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 1);
         TurnPolicy::apply(rp0, rp1, rp2, bp1, bp2, bp3,
-                ti, std::back_inserter(turns));
+                          is_range_first, is_range_last,
+                          false, false,
+                          ti, robust_policy, std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 2);
         TurnPolicy::apply(rp0, rp1, rp2, bp2, bp3, bp0,
-                ti, std::back_inserter(turns));
+                          is_range_first, is_range_last,
+                          false, false,
+                          ti, robust_policy, std::back_inserter(turns));
 
         ti.operations[1].seg_id = segment_identifier(source_id2, -1, -1, 3);
         TurnPolicy::apply(rp0, rp1, rp2, bp3, bp0, bp1,
-                ti, std::back_inserter(turns));
+                          is_range_first, is_range_last,
+                          false, true,
+                          ti, robust_policy, std::back_inserter(turns));
 
         if (InterruptPolicy::enabled)
         {
@@ -651,15 +719,15 @@ template
 <
     typename Polygon, typename Box,
     bool Reverse, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns_polygon_cs
 {
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Polygon const& polygon,
             int source_id2, Box const& box,
+            RobustPolicy const& robust_policy,
             Turns& turns, InterruptPolicy& interrupt_policy,
             int multi_index = -1)
     {
@@ -669,32 +737,118 @@ struct get_turns_polygon_cs
             <
                 ring_type, Box,
                 Reverse, ReverseBox,
-                Turns,
-                TurnPolicy,
-                InterruptPolicy
+                TurnPolicy
             > intersector_type;
 
         intersector_type::apply(
                 source_id1, geometry::exterior_ring(polygon),
-                source_id2, box, turns, interrupt_policy,
+                source_id2, box,
+                robust_policy,
+                turns, interrupt_policy,
                 multi_index, -1);
 
         int i = 0;
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings);
-            ++it, ++i)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(polygon);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it, ++i)
         {
             intersector_type::apply(
                     source_id1, *it,
-                    source_id2, box, turns, interrupt_policy,
+                    source_id2, box,
+                    robust_policy,
+                    turns, interrupt_policy,
                     multi_index, i);
         }
 
     }
 };
 
+
+template
+<
+    typename Multi, typename Box,
+    bool Reverse, bool ReverseBox,
+    typename TurnPolicy
+>
+struct get_turns_multi_polygon_cs
+{
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
+    static inline void apply(
+            int source_id1, Multi const& multi,
+            int source_id2, Box const& box,
+            RobustPolicy const& robust_policy,
+            Turns& turns, InterruptPolicy& interrupt_policy)
+    {
+        typedef typename boost::range_iterator
+            <
+                Multi const
+            >::type iterator_type;
+
+        int i = 0;
+        for (iterator_type it = boost::begin(multi);
+             it != boost::end(multi);
+             ++it, ++i)
+        {
+            // Call its single version
+            get_turns_polygon_cs
+                <
+                    typename boost::range_value<Multi>::type, Box,
+                    Reverse, ReverseBox,
+                    TurnPolicy
+                >::apply(source_id1, *it, source_id2, box,
+                            robust_policy, turns, interrupt_policy, i);
+        }
+    }
+};
+
+
+// GET_TURN_INFO_TYPE
+
+template <typename Geometry>
+struct topological_tag_base
+{
+    typedef typename tag_cast<typename tag<Geometry>::type, pointlike_tag, linear_tag, areal_tag>::type type;
+};
+
+template <typename Geometry1, typename Geometry2, typename AssignPolicy,
+          typename Tag1 = typename tag<Geometry1>::type, typename Tag2 = typename tag<Geometry2>::type,
+          typename TagBase1 = typename topological_tag_base<Geometry1>::type, typename TagBase2 = typename topological_tag_base<Geometry2>::type>
+struct get_turn_info_type
+    : overlay::get_turn_info<AssignPolicy>
+{};
+
+template <typename Geometry1, typename Geometry2, typename AssignPolicy, typename Tag1, typename Tag2>
+struct get_turn_info_type<Geometry1, Geometry2, AssignPolicy, Tag1, Tag2, linear_tag, linear_tag>
+    : overlay::get_turn_info_linear_linear<AssignPolicy>
+{};
+
+template <typename Geometry1, typename Geometry2, typename AssignPolicy, typename Tag1, typename Tag2>
+struct get_turn_info_type<Geometry1, Geometry2, AssignPolicy, Tag1, Tag2, linear_tag, areal_tag>
+    : overlay::get_turn_info_linear_areal<AssignPolicy>
+{};
+
+template <typename Geometry1, typename Geometry2, typename SegmentRatio,
+          typename Tag1 = typename tag<Geometry1>::type, typename Tag2 = typename tag<Geometry2>::type,
+          typename TagBase1 = typename topological_tag_base<Geometry1>::type, typename TagBase2 = typename topological_tag_base<Geometry2>::type>
+struct turn_operation_type
+{
+    typedef overlay::turn_operation<SegmentRatio> type;
+};
+
+template <typename Geometry1, typename Geometry2, typename SegmentRatio, typename Tag1, typename Tag2>
+struct turn_operation_type<Geometry1, Geometry2, SegmentRatio, Tag1, Tag2, linear_tag, linear_tag>
+{
+    typedef overlay::turn_operation_linear<SegmentRatio> type;
+};
+
+template <typename Geometry1, typename Geometry2, typename SegmentRatio, typename Tag1, typename Tag2>
+struct turn_operation_type<Geometry1, Geometry2, SegmentRatio, Tag1, Tag2, linear_tag, areal_tag>
+{
+    typedef overlay::turn_operation_linear<SegmentRatio> type;
+};
+
 }} // namespace detail::get_turns
 #endif // DOXYGEN_NO_DETAIL
 
@@ -710,18 +864,14 @@ template
     typename GeometryTag1, typename GeometryTag2,
     typename Geometry1, typename Geometry2,
     bool Reverse1, bool Reverse2,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns
     : detail::get_turns::get_turns_generic
         <
             Geometry1, Geometry2,
             Reverse1, Reverse2,
-            Turns,
-            TurnPolicy,
-            InterruptPolicy
+            TurnPolicy
         >
 {};
 
@@ -730,23 +880,19 @@ template
 <
     typename Polygon, typename Box,
     bool ReversePolygon, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns
     <
         polygon_tag, box_tag,
         Polygon, Box,
         ReversePolygon, ReverseBox,
-        Turns,
-        TurnPolicy,
-        InterruptPolicy
+        TurnPolicy
     > : detail::get_turns::get_turns_polygon_cs
             <
                 Polygon, Box,
                 ReversePolygon, ReverseBox,
-                Turns, TurnPolicy, InterruptPolicy
+                TurnPolicy
             >
 {};
 
@@ -755,51 +901,71 @@ template
 <
     typename Ring, typename Box,
     bool ReverseRing, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns
     <
         ring_tag, box_tag,
         Ring, Box,
         ReverseRing, ReverseBox,
-        Turns,
-        TurnPolicy,
-        InterruptPolicy
+        TurnPolicy
     > : detail::get_turns::get_turns_cs
             <
                 Ring, Box, ReverseRing, ReverseBox,
-                Turns, TurnPolicy, InterruptPolicy
+                TurnPolicy
             >
 
 {};
 
 
+template
+<
+    typename MultiPolygon,
+    typename Box,
+    bool ReverseMultiPolygon, bool ReverseBox,
+    typename TurnPolicy
+>
+struct get_turns
+    <
+        multi_polygon_tag, box_tag,
+        MultiPolygon, Box,
+        ReverseMultiPolygon, ReverseBox,
+        TurnPolicy
+    >
+    : detail::get_turns::get_turns_multi_polygon_cs
+        <
+            MultiPolygon, Box,
+            ReverseMultiPolygon, ReverseBox,
+            TurnPolicy
+        >
+{};
+
+
 template
 <
     typename GeometryTag1, typename GeometryTag2,
     typename Geometry1, typename Geometry2,
     bool Reverse1, bool Reverse2,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct get_turns_reversed
 {
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline void apply(
             int source_id1, Geometry1 const& g1,
             int source_id2, Geometry2 const& g2,
-            Turns& turns, InterruptPolicy& interrupt_policy)
+            RobustPolicy const& robust_policy,
+            Turns& turns,
+            InterruptPolicy& interrupt_policy)
     {
         get_turns
             <
                 GeometryTag2, GeometryTag1,
                 Geometry2, Geometry1,
                 Reverse2, Reverse1,
-                Turns, TurnPolicy,
-                InterruptPolicy
-            >::apply(source_id2, g2, source_id1, g1, turns, interrupt_policy);
+                TurnPolicy
+            >::apply(source_id2, g2, source_id1, g1, robust_policy,
+                    turns, interrupt_policy);
     }
 };
 
@@ -817,6 +983,7 @@ struct get_turns_reversed
 \tparam Turns type of turn-container (e.g. vector of "intersection/turn point"'s)
 \param geometry1 \param_geometry
 \param geometry2 \param_geometry
+\param robust_policy policy to handle robustness issues
 \param turns container which will contain turn points
 \param interrupt_policy policy determining if process is stopped
     when intersection is found
@@ -827,31 +994,20 @@ template
     typename AssignPolicy,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
 inline void get_turns(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
 {
     concept::check_concepts_and_equal_dimensions<Geometry1 const, Geometry2 const>();
 
-    //typedef typename strategy_intersection
-    //    <
-    //        typename cs_tag<Geometry1>::type,
-    //        Geometry1,
-    //        Geometry2,
-    //        typename boost::range_value<Turns>::type
-    //    >::segment_intersection_strategy_type segment_intersection_strategy_type;
-
-    typedef detail::overlay::get_turn_info
-        <
-            typename point_type<Geometry1>::type,
-            typename point_type<Geometry2>::type,
-            typename boost::range_value<Turns>::type,
-            AssignPolicy
-        > TurnPolicy;
+    typedef detail::overlay::get_turn_info<AssignPolicy> TurnPolicy;
+    //typedef detail::get_turns::get_turn_info_type<Geometry1, Geometry2, AssignPolicy> TurnPolicy;
 
     boost::mpl::if_c
         <
@@ -862,8 +1018,7 @@ inline void get_turns(Geometry1 const& geometry1,
                 typename tag<Geometry2>::type,
                 Geometry1, Geometry2,
                 Reverse1, Reverse2,
-                Turns, TurnPolicy,
-                InterruptPolicy
+                TurnPolicy
             >,
             dispatch::get_turns
             <
@@ -871,17 +1026,17 @@ inline void get_turns(Geometry1 const& geometry1,
                 typename tag<Geometry2>::type,
                 Geometry1, Geometry2,
                 Reverse1, Reverse2,
-                Turns, TurnPolicy,
-                InterruptPolicy
+                TurnPolicy
             >
         >::type::apply(
             0, geometry1,
             1, geometry2,
+            robust_policy,
             turns, interrupt_policy);
 }
 
 #if defined(_MSC_VER)
-#pragma warning(pop)  
+#pragma warning(pop)
 #endif
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/algorithms/detail/overlay/handle_tangencies.hpp b/include/boost/geometry/algorithms/detail/overlay/handle_tangencies.hpp
index 84ec16f23..92d162032 100644
--- a/include/boost/geometry/algorithms/detail/overlay/handle_tangencies.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/handle_tangencies.hpp
@@ -14,7 +14,18 @@
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
 #include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+#include <boost/geometry/policies/robustness/robust_type.hpp>
+#include <boost/geometry/algorithms/detail/zoom_to_robust.hpp>
+
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#endif
+
+#include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 
 
@@ -31,6 +42,7 @@ template
     typename TurnPoints,
     typename Indexed,
     typename Geometry1, typename Geometry2,
+    typename RobustPolicy,
     bool Reverse1, bool Reverse2,
     typename Strategy
 >
@@ -39,10 +51,12 @@ struct sort_in_cluster
     inline sort_in_cluster(TurnPoints const& turn_points
             , Geometry1 const& geometry1
             , Geometry2 const& geometry2
+            , RobustPolicy const& robust_policy
             , Strategy const& strategy)
         : m_turn_points(turn_points)
         , m_geometry1(geometry1)
         , m_geometry2(geometry2)
+        , m_rescale_policy(robust_policy)
         , m_strategy(strategy)
     {}
 
@@ -51,58 +65,32 @@ private :
     TurnPoints const& m_turn_points;
     Geometry1 const& m_geometry1;
     Geometry2 const& m_geometry2;
+    RobustPolicy const& m_rescale_policy;
     Strategy const& m_strategy;
 
     typedef typename Indexed::type turn_operation_type;
     typedef typename geometry::point_type<Geometry1>::type point_type;
-    typedef model::referring_segment<point_type const> segment_type;
 
-    // Determine how p/r and p/s are located.
-    template <typename P>
-    static inline void overlap_info(P const& pi, P const& pj,
-        P const& ri, P const& rj,
-        P const& si, P const& sj,
-        bool& pr_overlap, bool& ps_overlap, bool& rs_overlap)
+    typedef model::point
+    <
+            typename detail::robust_type
+                <
+                    typename select_coordinate_type<Geometry1, Geometry2>::type
+                >::type,
+            geometry::dimension<Geometry1>::value,
+            typename geometry::coordinate_system<Geometry1>::type
+        > robust_point_type;
+
+    // Still called by #case_102_multi, #case_107_multi
+    // #case_recursive_boxes_3
+    inline void get_situation_map(Indexed const& left, Indexed const& right,
+                              robust_point_type& pi_rob, robust_point_type& pj_rob,
+                              robust_point_type& ri_rob, robust_point_type& rj_rob,
+                              robust_point_type& si_rob, robust_point_type& sj_rob) const
     {
-        // Determine how p/r and p/s are located.
-        // One of them is coming from opposite direction.
-
-        typedef strategy::intersection::relate_cartesian_segments
-            <
-                policies::relate::segments_intersection_points
-                    <
-                        segment_type,
-                        segment_type,
-                        segment_intersection_points<point_type>
-                    >
-            > policy;
-
-        segment_type p(pi, pj);
-        segment_type r(ri, rj);
-        segment_type s(si, sj);
-
-        // Get the intersection point (or two points)
-        segment_intersection_points<point_type> pr = policy::apply(p, r);
-        segment_intersection_points<point_type> ps = policy::apply(p, s);
-        segment_intersection_points<point_type> rs = policy::apply(r, s);
-
-        // Check on overlap
-        pr_overlap = pr.count == 2;
-        ps_overlap = ps.count == 2;
-        rs_overlap = rs.count == 2;
-    }
-
-
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
-    inline void debug_consider(int order, Indexed const& left,
-            Indexed const& right, std::string const& header,
-            bool skip = true,
-            std::string const& extra = "", bool ret = false
-        ) const
-    {
-        if (skip) return;
-
+        typedef typename geometry::point_type<Geometry1>::type point_type;
         point_type pi, pj, ri, rj, si, sj;
+
         geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
             left.subject.seg_id,
             pi, pj);
@@ -113,8 +101,86 @@ private :
             right.subject.other_id,
             si, sj);
 
+        geometry::recalculate(pi_rob, pi, m_rescale_policy);
+        geometry::recalculate(pj_rob, pj, m_rescale_policy);
+        geometry::recalculate(ri_rob, ri, m_rescale_policy);
+        geometry::recalculate(rj_rob, rj, m_rescale_policy);
+        geometry::recalculate(si_rob, si, m_rescale_policy);
+        geometry::recalculate(sj_rob, sj, m_rescale_policy);
+    }
+
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
+    // This method was still called but did no effect whatsoever on the results,
+    // with or without robustness-rescaling.
+    // Probable cause: we rescale in this file ourselves, ignoring passed policy
+    // TODO: check this more.
+    // Besides this, it currently does not compile for yet unknown reasons
+    // (does not find specialization for segment_ratio_type)
+    // It is currently only called from the Unit Test "multi_intersection.cpp"
+
+    // Determine how p/r and p/s are located.
+    inline void overlap_info(
+        robust_point_type const& pi, robust_point_type const& pj,
+        robust_point_type const& ri, robust_point_type const& rj,
+        robust_point_type const& si, robust_point_type const& sj,
+        bool& pr_overlap, bool& ps_overlap, bool& rs_overlap) const
+    {
+        // Determine how p/r and p/s are located.
+        // One of them is coming from opposite direction.
+
+        typedef segment_intersection_points
+                <
+                    point_type,
+                    typename segment_ratio_type
+                    <
+                        point_type, RobustPolicy
+                    >::type
+                > intersection_return_type;
+
+        typedef strategy::intersection::relate_cartesian_segments
+            <
+                policies::relate::segments_intersection_points
+                    <
+                        intersection_return_type
+                    >
+            > policy;
+
+        typedef model::referring_segment<robust_point_type const> segment_type;
+        segment_type p(pi, pj);
+        segment_type r(ri, rj);
+        segment_type s(si, sj);
+
+        // Get the intersection point (or two points)
+        intersection_return_type pr = policy::apply(p, r, m_rescale_policy, pi, pj, ri, rj);
+        intersection_return_type ps = policy::apply(p, s, m_rescale_policy, pi, pj, si, sj);
+        intersection_return_type rs = policy::apply(r, s, m_rescale_policy, ri, rj, si, sj);
+
+        // Check on overlap
+        pr_overlap = pr.count == 2;
+        ps_overlap = ps.count == 2;
+        rs_overlap = rs.count == 2;
+    }
+#endif
+
+
+#ifdef BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES
+    inline void debug_consider(int order, Indexed const& left,
+            Indexed const& right, std::string const& header,
+            bool skip = true,
+            std::string const& extra = "", bool ret = false
+        ) const
+    {
+        if (skip) return;
+
+        std::cout << "Case: " << header << " for " << left.index << " / " << right.index << std::endl;
+
+        robust_point_type pi, pj, ri, rj, si, sj;
+        get_situation_map(left, right, pi, pj, ri, rj, si, sj);
+
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
         bool prc = false, psc = false, rsc = false;
         overlap_info(pi, pj, ri, rj, si, sj, prc, psc, rsc);
+#endif
 
         int const side_ri_p = m_strategy.apply(pi, pj, ri);
         int const side_rj_p = m_strategy.apply(pi, pj, rj);
@@ -123,8 +189,7 @@ private :
         int const side_si_r = m_strategy.apply(ri, rj, si);
         int const side_sj_r = m_strategy.apply(ri, rj, sj);
 
-        std::cout << "Case: " << header << " for " << left.index << " / " << right.index << std::endl;
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH_MORE
+#ifdef BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES_MORE
         std::cout << " Segment p:" << geometry::wkt(pi) << " .. " << geometry::wkt(pj) << std::endl;
         std::cout << " Segment r:" << geometry::wkt(ri) << " .. " << geometry::wkt(rj) << std::endl;
         std::cout << " Segment s:" << geometry::wkt(si) << " .. " << geometry::wkt(sj) << std::endl;
@@ -141,7 +206,9 @@ private :
                 << " ri//p: " << side_ri_p
                 << " si//p: " << side_si_p
                 << " si//r: " << side_si_r
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
                 << " cnts: " << int(prc) << ","  << int(psc) << "," << int(rsc)
+#endif
                 //<< " idx: " << left.index << "/" << right.index
                 ;
 
@@ -183,7 +250,7 @@ private :
         }
         else
         {
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
             std::cout << "ux/ux unhandled" << std::endl;
 #endif
         }
@@ -226,7 +293,7 @@ private :
         }
         else
         {
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
             // this still happens in the traverse.cpp test
             std::cout << " iu/ux unhandled" << std::endl;
 #endif
@@ -270,7 +337,7 @@ private :
 
         // Default case, should not occur
 
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
         std::cout << "ix/ix unhandled" << std::endl;
 #endif
         //debug_consider(0, left, right, header, false, "-> return", ret);
@@ -280,7 +347,7 @@ private :
 
 
     inline bool consider_iu_iu(Indexed const& left, Indexed const& right,
-                    std::string const& header) const
+                    std::string const& header, bool redo = false) const
     {
         //debug_consider(0, left, right, header);
 
@@ -298,16 +365,8 @@ private :
             return true;
         }
 
-        point_type pi, pj, ri, rj, si, sj;
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            left.subject.seg_id,
-            pi, pj);
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            left.subject.other_id,
-            ri, rj);
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            right.subject.other_id,
-            si, sj);
+        robust_point_type pi, pj, ri, rj, si, sj;
+        get_situation_map(left, right, pi, pj, ri, rj, si, sj);
 
         int const side_ri_p = m_strategy.apply(pi, pj, ri);
         int const side_si_p = m_strategy.apply(pi, pj, si);
@@ -337,14 +396,18 @@ private :
                 debug_consider(0, left, right, header, false, "opp.", ret);
                 return ret;
             }
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
             std::cout << " iu/iu coming from opposite unhandled" << std::endl;
 #endif
         }
 
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
         // We need EXTRA information here: are p/r/s overlapping?
         bool pr_ov = false, ps_ov = false, rs_ov = false;
         overlap_info(pi, pj, ri, rj, si, sj, pr_ov, ps_ov, rs_ov);
+#else
+        // std::cout << "Boost.Geometry: skipping overlap_info" << std::endl;
+#endif
 
         // One coming from right (#83,#90)
         // One coming from left (#90, #94, #95)
@@ -352,12 +415,14 @@ private :
         {
             bool ret = false;
 
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
             if (pr_ov || ps_ov)
             {
                 int r = side_ri_p != 0 ? side_ri_p : side_si_p;
                 ret = r * side_si_r == 1;
             }
             else
+#endif
             {
                 ret = side_si_r == 1;
             }
@@ -374,6 +439,7 @@ private :
             // Take the one NOT overlapping
             bool ret = false;
             bool found = false;
+#if BOOST_GEOMETRY_HANDLE_TANGENCIES_WITH_OVERLAP_INFO
             if (pr_ov && ! ps_ov)
             {
                 ret = true;
@@ -384,6 +450,7 @@ private :
                 ret = false;
                 found = true;
             }
+#endif
 
             debug_consider(0, left, right, header, false, "aligned", ret);
             if (found)
@@ -392,10 +459,17 @@ private :
             }
         }
 
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
         std::cout << " iu/iu unhandled" << std::endl;
         debug_consider(0, left, right, header, false, "unhandled", left.index < right.index);
 #endif
+        if (! redo)
+        {
+            // In some cases behaviour is not symmetrical. TODO: fix this properly
+            //   OR: alternatively we might consider calling all these functions one-way anyway
+            return ! consider_iu_iu(right, left, header, true);
+        }
+
         return left.index < right.index;
     }
 
@@ -404,16 +478,8 @@ private :
     {
         debug_consider(0, left, right, header);
 
-        point_type pi, pj, ri, rj, si, sj;
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            left.subject.seg_id,
-            pi, pj);
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            left.subject.other_id,
-            ri, rj);
-        geometry::copy_segment_points<Reverse1, Reverse2>(m_geometry1, m_geometry2,
-            right.subject.other_id,
-            si, sj);
+        robust_point_type pi, pj, ri, rj, si, sj;
+        get_situation_map(left, right, pi, pj, ri, rj, si, sj);
 
         int const side_ri_p = m_strategy.apply(pi, pj, ri);
         int const side_si_p = m_strategy.apply(pi, pj, si);
@@ -518,7 +584,7 @@ public :
 
         // Now we have no clue how to sort.
 
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
         std::cout << " Consider: " << operation_char(m_turn_points[left.index].operations[0].operation)
                 << operation_char(m_turn_points[left.index].operations[1].operation)
                 << "/" << operation_char(m_turn_points[right.index].operations[0].operation)
@@ -633,12 +699,14 @@ template
     typename TurnPoints,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename Strategy
 >
 inline void handle_cluster(Iterator begin_cluster, Iterator end_cluster,
             TurnPoints& turn_points,
             operation_type for_operation,
             Geometry1 const& geometry1, Geometry2 const& geometry2,
+            RobustPolicy& robust_policy,
             Strategy const& strategy)
 {
     // First inspect and (possibly) discard rows
@@ -653,17 +721,17 @@ inline void handle_cluster(Iterator begin_cluster, Iterator end_cluster,
                         TurnPoints,
                         IndexType,
                         Geometry1, Geometry2,
+                        RobustPolicy,
                         Reverse1, Reverse2,
                         Strategy
-                    >(turn_points, geometry1, geometry2, strategy));
+                    >(turn_points, geometry1, geometry2, robust_policy, strategy));
 
-
-#ifdef BOOST_GEOMETRY_DEBUG_ENRICH
+#if defined(BOOST_GEOMETRY_DEBUG_HANDLE_TANGENCIES)
     typedef typename IndexType::type operations_type;
     operations_type const& op = turn_points[begin_cluster->index].operations[begin_cluster->operation_index];
-    std::cout << "Clustered points on equal distance " << op.enriched.distance << std::endl;
-    std::cout << "->Indexes ";
+    std::cout << std::endl << "Clustered points on equal distance " << op.fraction << std::endl;
 
+    std::cout << "->Indexes ";
     for (Iterator it = begin_cluster; it != end_cluster; ++it)
     {
         std::cout << " " << it->index;
diff --git a/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp b/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
new file mode 100644
index 000000000..dd041b0d7
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp
@@ -0,0 +1,84 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP
+
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace intersection
+{
+
+template <std::size_t Dimension, std::size_t DimensionCount>
+struct intersection_box_box
+{
+    template
+    <
+        typename Box1, typename Box2,
+        typename RobustPolicy,
+        typename BoxOut,
+        typename Strategy
+    >
+    static inline bool apply(Box1 const& box1,
+            Box2 const& box2,
+            RobustPolicy const& robust_policy,
+            BoxOut& box_out,
+            Strategy const& strategy)
+    {
+        typedef typename coordinate_type<BoxOut>::type ct;
+
+        ct min1 = get<min_corner, Dimension>(box1);
+        ct min2 = get<min_corner, Dimension>(box2);
+        ct max1 = get<max_corner, Dimension>(box1);
+        ct max2 = get<max_corner, Dimension>(box2);
+
+        if (max1 < min2 || max2 < min1)
+        {
+            return false;
+        }
+        // Set dimensions of output coordinate
+        set<min_corner, Dimension>(box_out, min1 < min2 ? min2 : min1);
+        set<max_corner, Dimension>(box_out, max1 > max2 ? max2 : max1);
+
+        return intersection_box_box<Dimension + 1, DimensionCount>
+               ::apply(box1, box2, robust_policy, box_out, strategy);
+    }
+};
+
+template <std::size_t DimensionCount>
+struct intersection_box_box<DimensionCount, DimensionCount>
+{
+    template
+    <
+        typename Box1, typename Box2,
+        typename RobustPolicy,
+        typename BoxOut,
+        typename Strategy
+    >
+    static inline bool apply(Box1 const&, Box2 const&,
+            RobustPolicy const&, BoxOut&, Strategy const&)
+    {
+        return true;
+    }
+};
+
+
+}} // namespace detail::intersection
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_INTERSECTION_BOX_BOX_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp b/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
index f0307eaf8..a13a62745 100644
--- a/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
@@ -1,6 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -28,8 +33,17 @@
 #include <boost/geometry/algorithms/detail/overlay/overlay.hpp>
 #include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
 #include <boost/geometry/algorithms/detail/overlay/follow.hpp>
+
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
+
 #include <boost/geometry/views/segment_view.hpp>
 
+#include <boost/geometry/algorithms/detail/overlay/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp>
+
+
 #if defined(BOOST_GEOMETRY_DEBUG_FOLLOW)
 #include <boost/foreach.hpp>
 #endif
@@ -47,25 +61,58 @@ struct intersection_segment_segment_point
     template
     <
         typename Segment1, typename Segment2,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Segment1 const& segment1,
-            Segment2 const& segment2, OutputIterator out,
+            Segment2 const& segment2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& )
     {
         typedef typename point_type<PointOut>::type point_type;
 
+        typedef typename geometry::robust_point_type
+            <
+                typename geometry::point_type<Segment1>::type,
+                RobustPolicy
+            >::type robust_point_type;
+
+        // TODO: rescale segment -> robust points
+        robust_point_type pi_rob, pj_rob, qi_rob, qj_rob;
+        {
+            // Workaround:
+            point_type pi, pj, qi, qj;
+            assign_point_from_index<0>(segment1, pi);
+            assign_point_from_index<1>(segment1, pj);
+            assign_point_from_index<0>(segment2, qi);
+            assign_point_from_index<1>(segment2, qj);
+            geometry::recalculate(pi_rob, pi, robust_policy);
+            geometry::recalculate(pj_rob, pj, robust_policy);
+            geometry::recalculate(qi_rob, qi, robust_policy);
+            geometry::recalculate(qj_rob, qj, robust_policy);
+        }
+
         // Get the intersection point (or two points)
-        segment_intersection_points<point_type> is
-            = strategy::intersection::relate_cartesian_segments
+        typedef segment_intersection_points
+                <
+                    point_type,
+                    typename segment_ratio_type
+                    <
+                        point_type, RobustPolicy
+                    >::type
+                > intersection_return_type;
+
+        typedef strategy::intersection::relate_cartesian_segments
             <
                 policies::relate::segments_intersection_points
                     <
-                        Segment1,
-                        Segment2,
-                        segment_intersection_points<point_type>
+                        intersection_return_type
                     >
-            >::apply(segment1, segment2);
+            > policy;
+
+        intersection_return_type is = policy::apply(segment1, segment2,
+                        robust_policy, pi_rob, pj_rob, qi_rob, qj_rob);
 
         for (std::size_t i = 0; i < is.count; i++)
         {
@@ -83,18 +130,25 @@ struct intersection_linestring_linestring_point
     template
     <
         typename Linestring1, typename Linestring2,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Linestring1 const& linestring1,
-            Linestring2 const& linestring2, OutputIterator out,
+            Linestring2 const& linestring2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& )
     {
         typedef typename point_type<PointOut>::type point_type;
 
-        typedef detail::overlay::turn_info<point_type> turn_info;
+        typedef detail::overlay::turn_info
+            <
+                point_type,
+                typename segment_ratio_type<point_type, RobustPolicy>::type
+            > turn_info;
         std::deque<turn_info> turns;
 
-        geometry::get_intersection_points(linestring1, linestring2, turns);
+        geometry::get_intersection_points(linestring1, linestring2, robust_policy, turns);
 
         for (typename boost::range_iterator<std::deque<turn_info> const>::type
             it = boost::begin(turns); it != boost::end(turns); ++it)
@@ -120,7 +174,7 @@ struct intersection_of_linestring_with_areal
 {
 #if defined(BOOST_GEOMETRY_DEBUG_FOLLOW)
         template <typename Turn, typename Operation>
-        static inline void debug_follow(Turn const& turn, Operation op, 
+        static inline void debug_follow(Turn const& turn, Operation op,
                     int index)
         {
             std::cout << index
@@ -138,9 +192,11 @@ struct intersection_of_linestring_with_areal
     template
     <
         typename LineString, typename Areal,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(LineString const& linestring, Areal const& areal,
+            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& )
     {
@@ -158,8 +214,11 @@ struct intersection_of_linestring_with_areal
                 > follower;
 
         typedef typename point_type<LineStringOut>::type point_type;
-
-        typedef detail::overlay::traversal_turn_info<point_type> turn_info;
+        typedef detail::overlay::traversal_turn_info
+        <
+            point_type,
+            typename geometry::segment_ratio_type<point_type, RobustPolicy>::type
+        > turn_info;
         std::deque<turn_info> turns;
 
         detail::get_turns::no_interrupt_policy policy;
@@ -167,12 +226,12 @@ struct intersection_of_linestring_with_areal
             <
                 false,
                 (OverlayType == overlay_intersection ? ReverseAreal : !ReverseAreal),
-                detail::overlay::calculate_distance_policy
-            >(linestring, areal, turns, policy);
+                detail::overlay::assign_null_policy
+            >(linestring, areal, robust_policy, turns, policy);
 
         if (turns.empty())
         {
-            // No intersection points, it is either completely 
+            // No intersection points, it is either completely
             // inside (interior + borders)
             // or completely outside
 
@@ -184,8 +243,7 @@ struct intersection_of_linestring_with_areal
                 return out;
             }
 
-
-            if (follower::included(border_point, areal))
+            if (follower::included(border_point, areal, robust_policy))
             {
                 LineStringOut copy;
                 geometry::convert(linestring, copy);
@@ -206,7 +264,7 @@ struct intersection_of_linestring_with_areal
                 (
                     linestring, areal,
                     geometry::detail::overlay::operation_intersection,
-                    turns, out
+                    turns, robust_policy, out
                 );
     }
 };
@@ -335,22 +393,23 @@ template
 <
     typename Linestring, typename Box,
     typename GeometryOut,
-    overlay_type OverlayType,
     bool Reverse1, bool Reverse2, bool ReverseOut
 >
 struct intersection_insert
     <
         Linestring, Box,
         GeometryOut,
-        OverlayType,
+        overlay_intersection,
         Reverse1, Reverse2, ReverseOut,
         linestring_tag, box_tag, linestring_tag,
         false, true, false
     >
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Linestring const& linestring,
-            Box const& box, OutputIterator out, Strategy const& )
+            Box const& box,
+            RobustPolicy const& ,
+            OutputIterator out, Strategy const& )
     {
         typedef typename point_type<GeometryOut>::type point_type;
         strategy::intersection::liang_barsky<Box, point_type> lb_strategy;
@@ -424,9 +483,11 @@ struct intersection_insert
         false, true, false
     >
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Segment const& segment,
-            Box const& box, OutputIterator out, Strategy const& )
+            Box const& box,
+            RobustPolicy const& ,// TODO: propagate to clip_range_with_box
+            OutputIterator out, Strategy const& )
     {
         geometry::segment_view<Segment> range(segment);
 
@@ -456,19 +517,25 @@ struct intersection_insert
         Areal1, Areal2, false
     >
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& geometry1,
-            Geometry2 const& geometry2, OutputIterator out, Strategy const& )
+            Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out, Strategy const& )
     {
 
-        typedef detail::overlay::turn_info<PointOut> turn_info;
+        typedef detail::overlay::turn_info
+            <
+                PointOut,
+                typename segment_ratio_type<PointOut, RobustPolicy>::type
+            > turn_info;
         std::vector<turn_info> turns;
 
         detail::get_turns::no_interrupt_policy policy;
         geometry::get_turns
             <
                 false, false, detail::overlay::assign_null_policy
-            >(geometry1, geometry2, turns, policy);
+            >(geometry1, geometry2, robust_policy, turns, policy);
         for (typename std::vector<turn_info>::const_iterator it
             = turns.begin(); it != turns.end(); ++it)
         {
@@ -488,9 +555,11 @@ template
 >
 struct intersection_insert_reversed
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
-                Geometry2 const& g2, OutputIterator out,
+                Geometry2 const& g2,
+                RobustPolicy const& robust_policy,
+                OutputIterator out,
                 Strategy const& strategy)
     {
         return intersection_insert
@@ -498,12 +567,138 @@ struct intersection_insert_reversed
                 Geometry2, Geometry1, GeometryOut,
                 OverlayType,
                 Reverse2, Reverse1, ReverseOut
-            >::apply(g2, g1, out, strategy);
+            >::apply(g2, g1, robust_policy, out, strategy);
     }
 };
 
 
 
+// dispatch for non-areal geometries
+template
+<
+    typename Geometry1, typename Geometry2, typename GeometryOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut,
+    typename TagIn1, typename TagIn2
+>
+struct intersection_insert
+    <
+        Geometry1, Geometry2, GeometryOut,
+        OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        TagIn1, TagIn2, linestring_tag,
+        false, false, false
+    > : intersection_insert
+        <
+           Geometry1, Geometry2, GeometryOut,
+           OverlayType,
+           Reverse1, Reverse2, ReverseOut,
+           typename tag_cast<TagIn1, pointlike_tag, linear_tag>::type,
+           typename tag_cast<TagIn2, pointlike_tag, linear_tag>::type,
+           linestring_tag,
+           false, false, false
+        >
+{};
+
+
+// dispatch for difference/intersection of linear geometries
+template
+<
+    typename Linear1, typename Linear2, typename LineStringOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct intersection_insert
+    <
+        Linear1, Linear2, LineStringOut, OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        linear_tag, linear_tag, linestring_tag,
+        false, false, false
+    > : detail::overlay::linear_linear_linestring
+        <
+            Linear1, Linear2, LineStringOut, OverlayType
+        >
+{};
+
+
+// dispatch for difference/intersection of point-like geometries
+
+template
+<
+    typename Point1, typename Point2, typename PointOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct intersection_insert
+    <
+        Point1, Point2, PointOut, OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        point_tag, point_tag, point_tag,
+        false, false, false
+    > : detail::overlay::point_point_point
+        <
+            Point1, Point2, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename MultiPoint, typename Point, typename PointOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct intersection_insert
+    <
+        MultiPoint, Point, PointOut, OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        multi_point_tag, point_tag, point_tag,
+        false, false, false
+    > : detail::overlay::multipoint_point_point
+        <
+            MultiPoint, Point, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename Point, typename MultiPoint, typename PointOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct intersection_insert
+    <
+        Point, MultiPoint, PointOut, OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        point_tag, multi_point_tag, point_tag,
+        false, false, false
+    > : detail::overlay::point_multipoint_point
+        <
+            Point, MultiPoint, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename MultiPoint1, typename MultiPoint2, typename PointOut,
+    overlay_type OverlayType,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct intersection_insert
+    <
+        MultiPoint1, MultiPoint2, PointOut, OverlayType,
+        Reverse1, Reverse2, ReverseOut,
+        multi_point_tag, multi_point_tag, point_tag,
+        false, false, false
+    > : detail::overlay::multipoint_multipoint_point
+        <
+            MultiPoint1, MultiPoint2, PointOut, OverlayType
+        >
+{};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
@@ -519,35 +714,37 @@ template
     bool ReverseSecond,
     overlay_type OverlayType,
     typename Geometry1, typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator,
     typename Strategy
 >
 inline OutputIterator insert(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
+            RobustPolicy robust_policy,
             OutputIterator out,
             Strategy const& strategy)
 {
     return boost::mpl::if_c
+    <
+        geometry::reverse_dispatch<Geometry1, Geometry2>::type::value,
+        geometry::dispatch::intersection_insert_reversed
         <
-            geometry::reverse_dispatch<Geometry1, Geometry2>::type::value,
-            geometry::dispatch::intersection_insert_reversed
-            <
-                Geometry1, Geometry2,
-                GeometryOut,
-                OverlayType,
-                overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
-                overlay::do_reverse<geometry::point_order<Geometry2>::value, ReverseSecond>::value,
-                overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value
-            >,
-            geometry::dispatch::intersection_insert
-            <
-                Geometry1, Geometry2,
-                GeometryOut,
-                OverlayType,
-                geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
-                geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, ReverseSecond>::value
-            >
-        >::type::apply(geometry1, geometry2, out, strategy);
+            Geometry1, Geometry2,
+            GeometryOut,
+            OverlayType,
+            overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+            overlay::do_reverse<geometry::point_order<Geometry2>::value, ReverseSecond>::value,
+            overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value
+        >,
+        geometry::dispatch::intersection_insert
+        <
+            Geometry1, Geometry2,
+            GeometryOut,
+            OverlayType,
+            geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+            geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, ReverseSecond>::value
+        >
+    >::type::apply(geometry1, geometry2, robust_policy, out, strategy);
 }
 
 
@@ -586,10 +783,14 @@ inline OutputIterator intersection_insert(Geometry1 const& geometry1,
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
 
+    typedef typename Strategy::rescale_policy_type rescale_policy_type;
+    rescale_policy_type robust_policy
+            = geometry::get_rescale_policy<rescale_policy_type>(geometry1, geometry2);
+
     return detail::intersection::insert
         <
             GeometryOut, false, overlay_intersection
-        >(geometry1, geometry2, out, strategy);
+        >(geometry1, geometry2, robust_policy, out, strategy);
 }
 
 
@@ -623,12 +824,18 @@ inline OutputIterator intersection_insert(Geometry1 const& geometry1,
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
 
+    typedef typename geometry::rescale_policy_type
+        <
+            typename geometry::point_type<Geometry1>::type // TODO from both
+        >::type rescale_policy_type;
+
     typedef strategy_intersection
         <
             typename cs_tag<GeometryOut>::type,
             Geometry1,
             Geometry2,
-            typename geometry::point_type<GeometryOut>::type
+            typename geometry::point_type<GeometryOut>::type,
+            rescale_policy_type
         > strategy;
 
     return intersection_insert<GeometryOut>(geometry1, geometry2, out,
diff --git a/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp b/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
new file mode 100644
index 000000000..944c8fd56
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/linear_linear.hpp
@@ -0,0 +1,327 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_LINEAR_LINEAR_HPP
+
+#include <algorithm>
+#include <vector>
+
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+
+#include <boost/geometry/algorithms/detail/turns/compare_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/print_turns.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
+#include <boost/geometry/algorithms/detail/overlay/follow_linear_linear.hpp>
+
+#include <boost/geometry/algorithms/convert.hpp>
+
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+
+template
+<
+    typename LineStringOut,
+    overlay_type OverlayType,
+    typename Geometry,
+    typename GeometryTag
+>
+struct linear_linear_no_intersections;
+
+
+template <typename LineStringOut, typename LineString>
+struct linear_linear_no_intersections
+    <
+        LineStringOut, overlay_difference, LineString, linestring_tag
+    >
+{
+    template <typename OutputIterator>
+    static inline OutputIterator apply(LineString const& linestring,
+                                       OutputIterator oit)
+    {
+        LineStringOut ls_out;
+        geometry::convert(linestring, ls_out);
+        *oit++ = ls_out;
+        return oit;
+    }
+};
+
+
+template <typename LineStringOut, typename MultiLineString>
+struct linear_linear_no_intersections
+    <
+        LineStringOut,
+        overlay_difference,
+        MultiLineString,
+        multi_linestring_tag
+    >
+{
+    template <typename OutputIterator>
+    static inline OutputIterator apply(MultiLineString const& multilinestring,
+                                       OutputIterator oit)
+    {
+        for (typename boost::range_iterator<MultiLineString const>::type
+                 it = boost::begin(multilinestring);
+             it != boost::end(multilinestring); ++it)
+        {
+            LineStringOut ls_out;
+            geometry::convert(*it, ls_out);
+            *oit++ = ls_out;
+        }
+        return oit;
+    }
+};
+
+
+template <typename LineStringOut, typename Geometry, typename GeometryTag>
+struct linear_linear_no_intersections
+    <
+        LineStringOut, overlay_intersection, Geometry, GeometryTag
+    >
+{
+    template <typename OutputIterator>
+    static inline OutputIterator apply(Geometry const&,
+                                       OutputIterator oit)
+    {
+        return oit;
+    }
+};
+
+
+
+
+
+
+
+template
+<
+    typename Linear1,
+    typename Linear2,
+    typename LinestringOut,
+    overlay_type OverlayType,
+    bool EnableFilterContinueTurns = false,
+    bool EnableRemoveDuplicateTurns = false,
+    bool EnableDegenerateTurns = true,
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+    bool EnableFollowIsolatedPoints = false
+#else
+    bool EnableFollowIsolatedPoints = true
+#endif
+>
+class linear_linear_linestring
+{
+protected:
+    struct assign_policy
+    {
+        static bool const include_no_turn = false;
+        static bool const include_degenerate = EnableDegenerateTurns;
+        static bool const include_opposite = false;
+
+        template
+        <
+            typename Info,
+            typename Point1,
+            typename Point2,
+            typename IntersectionInfo,
+            typename DirInfo
+        >
+        static inline void apply(Info& , Point1 const& , Point2 const& ,
+                                 IntersectionInfo const& , DirInfo const& )
+        {
+        }
+    };
+
+
+    template
+    <
+        typename Turns,
+        typename LinearGeometry1,
+        typename LinearGeometry2
+    >
+    static inline void compute_turns(Turns& turns,
+                                     LinearGeometry1 const& linear1,
+                                     LinearGeometry2 const& linear2)
+    {
+        turns.clear();
+        geometry::detail::relate::turns::get_turns
+            <
+                LinearGeometry1,
+                LinearGeometry2,
+                detail::get_turns::get_turn_info_type
+                <
+                    LinearGeometry1,
+                    LinearGeometry2,
+                    assign_policy
+                >
+            >::apply(turns, linear1, linear2);
+    }
+
+
+    template
+    <
+        overlay_type OverlayTypeForFollow,
+        bool FollowIsolatedPoints,
+        typename Turns,
+        typename LinearGeometry1,
+        typename LinearGeometry2,
+        typename OutputIterator
+    >
+    static inline OutputIterator
+    sort_and_follow_turns(Turns& turns,
+                          LinearGeometry1 const& linear1,
+                          LinearGeometry2 const& linear2,
+                          OutputIterator oit)
+    {
+        // remove turns that have no added value
+        turns::filter_continue_turns
+            <
+                Turns,
+                EnableFilterContinueTurns && OverlayType != overlay_intersection
+            >::apply(turns);
+
+        // sort by seg_id, distance, and operation
+        std::sort(boost::begin(turns), boost::end(turns),
+                  detail::turns::less_seg_fraction_other_op<>());
+
+        // remove duplicate turns
+        turns::remove_duplicate_turns
+            <
+                Turns, EnableRemoveDuplicateTurns
+            >::apply(turns);
+
+        return detail::overlay::following::linear::follow
+            <
+                LinestringOut,
+                LinearGeometry1,
+                LinearGeometry2,
+                OverlayTypeForFollow,
+                FollowIsolatedPoints,
+                !EnableFilterContinueTurns || OverlayType == overlay_intersection
+            >::apply(linear1, linear2, boost::begin(turns), boost::end(turns),
+                     oit);
+    }
+
+public:
+    template
+    <
+        typename RobustPolicy, typename OutputIterator, typename Strategy
+    >
+    static inline OutputIterator apply(Linear1 const& linear1,
+                                       Linear2 const& linear2,
+                                       RobustPolicy const&,
+                                       OutputIterator oit,
+                                       Strategy const& )
+    {
+        typedef typename detail::relate::turns::get_turns
+            <
+                Linear1, Linear2
+            >::turn_info turn_info;
+
+        typedef std::vector<turn_info> turns_container;
+
+        turns_container turns;
+        compute_turns(turns, linear1, linear2);
+
+        if ( turns.empty() )
+        {
+            // the two linear geometries are disjoint
+            return linear_linear_no_intersections
+                <
+                    LinestringOut,
+                    OverlayType,
+                    Linear1,
+                    typename tag<Linear1>::type
+                >::apply(linear1, oit);
+        }
+
+        return sort_and_follow_turns
+            <
+                OverlayType,
+                EnableFollowIsolatedPoints
+                && OverlayType == overlay_intersection
+            >(turns, linear1, linear2, oit);
+    }
+};
+
+
+
+
+template
+<
+    typename Linear1,
+    typename Linear2,
+    typename LinestringOut,
+    bool EnableFilterContinueTurns,
+    bool EnableRemoveDuplicateTurns,
+    bool EnableDegenerateTurns,
+    bool EnableFollowIsolatedPoints
+>
+struct linear_linear_linestring
+    <
+        Linear1, Linear2, LinestringOut, overlay_union,
+        EnableFilterContinueTurns, EnableRemoveDuplicateTurns,
+        EnableDegenerateTurns, EnableFollowIsolatedPoints
+    >
+{
+    template
+    <
+        typename RobustPolicy, typename OutputIterator, typename Strategy
+    >
+    static inline OutputIterator apply(Linear1 const& linear1,
+                                       Linear2 const& linear2,
+                                       RobustPolicy const& robust_policy,
+                                       OutputIterator oit,
+                                       Strategy const& strategy)
+    {
+        oit = linear_linear_no_intersections
+            <
+                LinestringOut,
+                overlay_difference,
+                Linear1,
+                typename tag<Linear1>::type
+            >::apply(linear1, oit);
+
+        return linear_linear_linestring
+            <
+                Linear2, Linear1, LinestringOut, overlay_difference,
+                EnableFilterContinueTurns, EnableRemoveDuplicateTurns,
+                EnableDegenerateTurns, EnableFollowIsolatedPoints
+            >::apply(linear2, linear1, robust_policy, oit, strategy);
+    }
+};
+
+
+
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_LINEAR_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/overlay.hpp b/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
index 39432dc50..29e0dad0c 100644
--- a/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/overlay.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -17,7 +18,6 @@
 #include <boost/mpl/assert.hpp>
 
 
-#include <boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
@@ -26,6 +26,7 @@
 #include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/algorithms/num_points.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
@@ -34,6 +35,9 @@
 #include <boost/geometry/algorithms/detail/overlay/assign_parents.hpp>
 #include <boost/geometry/algorithms/detail/overlay/ring_properties.hpp>
 #include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
+#include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
+
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
 
 
 #ifdef BOOST_GEOMETRY_DEBUG_ASSEMBLE
@@ -116,8 +120,8 @@ inline OutputIterator return_if_one_input_is_empty(Geometry1 const& geometry1,
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
 
     // Union: return either of them
@@ -131,7 +135,7 @@ inline OutputIterator return_if_one_input_is_empty(Geometry1 const& geometry1,
     }
 
 #if defined(_MSC_VER)
-#pragma warning(pop)  
+#pragma warning(pop)
 #endif
 
 
@@ -154,20 +158,21 @@ template
 >
 struct overlay
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(
                 Geometry1 const& geometry1, Geometry2 const& geometry2,
+                RobustPolicy const& robust_policy,
                 OutputIterator out,
                 Strategy const& )
     {
-        if (geometry::num_points(geometry1) == 0
-            && geometry::num_points(geometry2) == 0)
+        if ( geometry::num_points(geometry1) == 0
+          && geometry::num_points(geometry2) == 0 )
         {
             return out;
         }
 
-        if (geometry::num_points(geometry1) == 0
-            || geometry::num_points(geometry2) == 0)
+        if ( geometry::num_points(geometry1) == 0
+          || geometry::num_points(geometry2) == 0 )
         {
             return return_if_one_input_is_empty
                 <
@@ -176,7 +181,11 @@ struct overlay
         }
 
         typedef typename geometry::point_type<GeometryOut>::type point_type;
-        typedef detail::overlay::traversal_turn_info<point_type> turn_info;
+        typedef detail::overlay::traversal_turn_info
+        <
+            point_type,
+            typename geometry::segment_ratio_type<point_type, RobustPolicy>::type
+        > turn_info;
         typedef std::deque<turn_info> container_type;
 
         typedef std::deque
@@ -197,8 +206,8 @@ std::cout << "get turns" << std::endl;
         geometry::get_turns
             <
                 Reverse1, Reverse2,
-                detail::overlay::calculate_distance_policy
-            >(geometry1, geometry2, turn_points, policy);
+                detail::overlay::assign_null_policy
+            >(geometry1, geometry2, robust_policy, turn_points, policy);
 
 #ifdef BOOST_GEOMETRY_TIME_OVERLAY
         std::cout << "get_turns: " << timer.elapsed() << std::endl;
@@ -213,6 +222,7 @@ std::cout << "enrich" << std::endl;
                     ? geometry::detail::overlay::operation_union
                     : geometry::detail::overlay::operation_intersection,
                     geometry1, geometry2,
+                    robust_policy,
                     side_strategy);
 
 #ifdef BOOST_GEOMETRY_TIME_OVERLAY
@@ -233,6 +243,7 @@ std::cout << "traverse" << std::endl;
                     Direction == overlay_union
                         ? geometry::detail::overlay::operation_union
                         : geometry::detail::overlay::operation_intersection,
+                    robust_policy,
                     turn_points, rings
                 );
 
@@ -263,8 +274,8 @@ std::cout << "traverse" << std::endl;
             ring_identifier id(2, 0, -1);
             for (typename boost::range_iterator<ring_container_type>::type
                     it = boost::begin(rings);
-                    it != boost::end(rings);
-                    ++it)
+                 it != boost::end(rings);
+                 ++it)
             {
                 selected[id] = properties(*it, true);
                 selected[id].reversed = ReverseOut;
@@ -288,24 +299,6 @@ std::cout << "traverse" << std::endl;
 };
 
 
-// Metafunction helper for intersection and union
-template <order_selector Selector, bool Reverse = false>
-struct do_reverse {};
-
-template <>
-struct do_reverse<clockwise, false> : boost::false_type {};
-
-template <>
-struct do_reverse<clockwise, true> : boost::true_type {};
-
-template <>
-struct do_reverse<counterclockwise, false> : boost::true_type {};
-
-template <>
-struct do_reverse<counterclockwise, true> : boost::false_type {};
-
-
-
 }} // namespace detail::overlay
 #endif // DOXYGEN_NO_DETAIL
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp b/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
new file mode 100644
index 000000000..0af062d27
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp
@@ -0,0 +1,435 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_POINTLIKE_POINTLIKE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_POINTLIKE_POINTLIKE_HPP
+
+#include <algorithm>
+#include <vector>
+
+#include <boost/assert.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/less.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+
+// struct for copying points of the pointlike geometries to output
+template
+<
+    typename PointOut,
+    typename GeometryIn,
+    typename TagIn = typename tag<GeometryIn>::type
+>
+struct copy_points
+    : not_implemented<PointOut, GeometryIn>
+{};
+
+template <typename PointOut, typename PointIn>
+struct copy_points<PointOut, PointIn, point_tag>
+{
+    template <typename OutputIterator>
+    static inline void apply(PointIn const& point_in,
+                             OutputIterator& oit)
+    {
+        PointOut point_out;
+        geometry::convert(point_in, point_out);
+        *oit++ = point_out;
+    }
+};
+
+
+template <typename PointOut, typename MultiPointIn>
+struct copy_points<PointOut, MultiPointIn, multi_point_tag>
+{
+    template <typename OutputIterator>
+    static inline void apply(MultiPointIn const& multi_point_in,
+                             OutputIterator& oit)
+    {
+        for (typename boost::range_iterator<MultiPointIn const>::type
+                 it = boost::begin(multi_point_in);
+             it != boost::end(multi_point_in); ++it)
+        {
+            PointOut point_out;
+            geometry::convert(*it, point_out);
+            *oit++ = point_out;
+        }
+    }
+};
+
+
+
+// action struct for difference/intersection
+template <typename PointOut, overlay_type OverlayType>
+struct action_selector_pl_pl
+{};
+
+template <typename PointOut>
+struct action_selector_pl_pl<PointOut, overlay_intersection>
+{
+    template
+    <
+        typename Point,
+        typename OutputIterator
+    >
+    static inline void apply(Point const& point,
+                             bool is_common,
+                             OutputIterator& oit)
+    {
+        if ( is_common )
+        {
+            copy_points<PointOut, Point>::apply(point, oit);
+        }
+    }
+};
+
+
+
+template <typename PointOut>
+struct action_selector_pl_pl<PointOut, overlay_difference>
+{
+    template
+    <
+        typename Point,
+        typename OutputIterator
+    >
+    static inline void apply(Point const& point,
+                             bool is_common,
+                             OutputIterator& oit)
+    {
+        if ( !is_common )
+        {
+            copy_points<PointOut, Point>::apply(point, oit);
+        }
+    }
+};
+
+
+//===========================================================================
+
+// difference/intersection of point-point
+template
+<
+    typename Point1,
+    typename Point2,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct point_point_point
+{
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(Point1 const& point1,
+                                       Point2 const& point2,
+                                       RobustPolicy const& ,
+                                       OutputIterator oit,
+                                       Strategy const&)
+    {
+        action_selector_pl_pl
+            <
+                PointOut, OverlayType
+            >::apply(point1,
+                     detail::equals::equals_point_point(point1, point2),
+                     oit);
+
+        return oit;
+    }
+};
+
+
+
+// difference of multipoint-point
+//
+// the apply method in the following struct is called only for
+// difference; for intersection the reversal will
+// always call the point-multipoint version
+template
+<
+    typename MultiPoint,
+    typename Point,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct multipoint_point_point
+{
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(MultiPoint const& multipoint,
+                                       Point const& point,
+                                       RobustPolicy const& ,
+                                       OutputIterator oit,
+                                       Strategy const&)
+    {
+        BOOST_ASSERT( OverlayType == overlay_difference );
+
+        for (typename boost::range_iterator<MultiPoint const>::type
+                 it = boost::begin(multipoint);
+             it != boost::end(multipoint); ++it)
+        {
+            action_selector_pl_pl
+                <
+                    PointOut, OverlayType
+                >::apply(*it,
+                         detail::equals::equals_point_point(*it, point),
+                         oit);
+        }
+
+        return oit;
+    }
+};
+
+
+// difference/intersection of point-multipoint
+template
+<
+    typename Point,
+    typename MultiPoint,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct point_multipoint_point
+{
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(Point const& point,
+                                       MultiPoint const& multipoint,
+                                       RobustPolicy const& ,
+                                       OutputIterator oit,
+                                       Strategy const&)
+    {
+        typedef action_selector_pl_pl<PointOut, OverlayType> action;
+
+        for (typename boost::range_iterator<MultiPoint const>::type
+                 it = boost::begin(multipoint);
+             it != boost::end(multipoint); ++it)
+        {
+            if ( detail::equals::equals_point_point(*it, point) )
+            {
+                action::apply(point, true, oit);
+                return oit;
+            }
+        }
+
+        action::apply(point, false, oit);
+        return oit;
+    }
+};
+
+
+
+// difference/intersection of multipoint-multipoint
+template
+<
+    typename MultiPoint1,
+    typename MultiPoint2,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct multipoint_multipoint_point
+{
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(MultiPoint1 const& multipoint1,
+                                       MultiPoint2 const& multipoint2,
+                                       RobustPolicy const& robust_policy,
+                                       OutputIterator oit,
+                                       Strategy const& strategy)
+    {
+        if ( OverlayType != overlay_difference
+             && boost::size(multipoint1) > boost::size(multipoint2) )
+        {
+            return multipoint_multipoint_point
+                <
+                    MultiPoint2, MultiPoint1, PointOut, OverlayType
+                >::apply(multipoint2, multipoint1, robust_policy, oit, strategy);
+        }
+
+        std::vector<typename point_type<MultiPoint2>::type>
+            points2(boost::begin(multipoint2), boost::end(multipoint2));
+
+        std::sort(points2.begin(), points2.end(), detail::relate::less());
+
+        for (typename boost::range_iterator<MultiPoint1 const>::type
+                 it1 = boost::begin(multipoint1);
+             it1 != boost::end(multipoint1); ++it1)
+        {
+            bool found = std::binary_search(points2.begin(), points2.end(),
+                                            *it1, detail::relate::less());
+
+            action_selector_pl_pl
+                <
+                    PointOut, OverlayType
+                >::apply(*it1, found, oit);
+        }
+        return oit;
+    }
+};
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+
+//===========================================================================
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace detail_dispatch { namespace overlay
+{
+
+// dispatch struct for pointlike-pointlike difference/intersection
+// computation
+template
+<
+    typename PointLike1,
+    typename PointLike2,
+    typename PointOut,
+    overlay_type OverlayType,
+    typename Tag1,
+    typename Tag2
+>
+struct pointlike_pointlike_point
+    : not_implemented<PointLike1, PointLike2, PointOut>
+{};
+
+
+template
+<
+    typename Point1,
+    typename Point2,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct pointlike_pointlike_point
+    <
+        Point1, Point2, PointOut, OverlayType,
+        point_tag, point_tag
+    > : detail::overlay::point_point_point
+        <
+            Point1, Point2, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename Point,
+    typename MultiPoint,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct pointlike_pointlike_point
+    <
+        Point, MultiPoint, PointOut, OverlayType,
+        point_tag, multi_point_tag
+    > : detail::overlay::point_multipoint_point
+        <
+            Point, MultiPoint, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename MultiPoint,
+    typename Point,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct pointlike_pointlike_point
+    <
+        MultiPoint, Point, PointOut, OverlayType,
+        multi_point_tag, point_tag
+    > : detail::overlay::multipoint_point_point
+        <
+            MultiPoint, Point, PointOut, OverlayType
+        >
+{};
+
+
+template
+<
+    typename MultiPoint1,
+    typename MultiPoint2,
+    typename PointOut,
+    overlay_type OverlayType
+>
+struct pointlike_pointlike_point
+    <
+        MultiPoint1, MultiPoint2, PointOut, OverlayType,
+        multi_point_tag, multi_point_tag
+    > : detail::overlay::multipoint_multipoint_point
+        <
+            MultiPoint1, MultiPoint2, PointOut, OverlayType
+        >
+{};
+
+
+}} // namespace detail_dispatch::overlay
+#endif // DOXYGEN_NO_DISPATCH
+
+
+//===========================================================================
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace overlay
+{
+
+
+// generic pointlike-pointlike union implementation
+template
+<
+    typename PointLike1,
+    typename PointLike2,
+    typename PointOut
+>
+struct union_pointlike_pointlike_point
+{
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
+    static inline OutputIterator apply(PointLike1 const& pointlike1,
+                                       PointLike2 const& pointlike2,
+                                       RobustPolicy const& robust_policy,
+                                       OutputIterator oit,
+                                       Strategy const& strategy)
+    {
+        copy_points<PointOut, PointLike1>::apply(pointlike1, oit);
+
+        return detail_dispatch::overlay::pointlike_pointlike_point
+            <
+                PointLike2, PointLike1, PointOut, overlay_difference,
+                typename tag<PointLike2>::type,
+                typename tag<PointLike1>::type
+            >::apply(pointlike2, pointlike1, robust_policy, oit, strategy);
+    }
+
+};
+
+
+}} // namespace detail::overlay
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_POINTLIKE_POINTLIKE_HPP
diff --git a/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp b/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
index f664b1951..385658a19 100644
--- a/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/select_rings.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,11 +10,16 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SELECT_RINGS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SELECT_RINGS_HPP
 
+
 #include <map>
 
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/algorithms/area.hpp>
 #include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
 #include <boost/geometry/algorithms/detail/overlay/ring_properties.hpp>
@@ -40,14 +46,14 @@ namespace dispatch
     struct select_rings<box_tag, Box>
     {
         template <typename Geometry, typename Map>
-        static inline void apply(Box const& box, Geometry const& , 
+        static inline void apply(Box const& box, Geometry const& ,
                 ring_identifier const& id, Map& map, bool midpoint)
         {
             map[id] = typename Map::mapped_type(box, midpoint);
         }
 
         template <typename Map>
-        static inline void apply(Box const& box, 
+        static inline void apply(Box const& box,
                 ring_identifier const& id, Map& map, bool midpoint)
         {
             map[id] = typename Map::mapped_type(box, midpoint);
@@ -68,7 +74,7 @@ namespace dispatch
         }
 
         template <typename Map>
-        static inline void apply(Ring const& ring, 
+        static inline void apply(Ring const& ring,
                     ring_identifier const& id, Map& map, bool midpoint)
         {
             if (boost::size(ring) > 0)
@@ -91,9 +97,10 @@ namespace dispatch
 
             per_ring::apply(exterior_ring(polygon), geometry, id, map, midpoint);
 
-            typename interior_return_type<Polygon const>::type rings
-                        = interior_rings(polygon);
-            for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+            typename interior_return_type<Polygon const>::type
+                rings = interior_rings(polygon);
+            for (typename detail::interior_iterator<Polygon const>::type
+                    it = boost::begin(rings); it != boost::end(rings); ++it)
             {
                 id.ring_index++;
                 per_ring::apply(*it, geometry, id, map, midpoint);
@@ -109,16 +116,42 @@ namespace dispatch
 
             per_ring::apply(exterior_ring(polygon), id, map, midpoint);
 
-            typename interior_return_type<Polygon const>::type rings
-                        = interior_rings(polygon);
-            for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+            typename interior_return_type<Polygon const>::type
+                rings = interior_rings(polygon);
+            for (typename detail::interior_iterator<Polygon const>::type
+                    it = boost::begin(rings); it != boost::end(rings); ++it)
             {
                 id.ring_index++;
                 per_ring::apply(*it, id, map, midpoint);
             }
         }
     };
-}
+
+    template <typename Multi>
+    struct select_rings<multi_polygon_tag, Multi>
+    {
+        template <typename Geometry, typename Map>
+        static inline void apply(Multi const& multi, Geometry const& geometry,
+                    ring_identifier id, Map& map, bool midpoint)
+        {
+            typedef typename boost::range_iterator
+                <
+                    Multi const
+                >::type iterator_type;
+
+            typedef select_rings<polygon_tag, typename boost::range_value<Multi>::type> per_polygon;
+
+            id.multi_index = 0;
+            for (iterator_type it = boost::begin(multi); it != boost::end(multi); ++it)
+            {
+                id.ring_index = -1;
+                per_polygon::apply(*it, geometry, id, map, midpoint);
+                id.multi_index++;
+            }
+        }
+    };
+
+} // namespace dispatch
 
 
 template<overlay_type OverlayType>
@@ -213,7 +246,7 @@ inline void update_selection_map(Geometry1 const& geometry1,
             typename SelectionMap::mapped_type properties = it->second; // Copy by value
 
             // Calculate the "within code" (previously this was done earlier but is
-            // must efficienter here - it can be even more efficient doing it all at once,
+            // much efficienter here - it can be even more efficient doing it all at once,
             // using partition, TODO)
             // So though this is less elegant than before, it avoids many unused point-in-poly calculations
             switch(id.source_index)
@@ -248,7 +281,7 @@ template
     typename IntersectionMap, typename SelectionMap
 >
 inline void select_rings(Geometry1 const& geometry1, Geometry2 const& geometry2,
-            IntersectionMap const& intersection_map, 
+            IntersectionMap const& intersection_map,
             SelectionMap& selection_map, bool midpoint)
 {
     typedef typename geometry::tag<Geometry1>::type tag1;
@@ -271,16 +304,16 @@ template
     typename IntersectionMap, typename SelectionMap
 >
 inline void select_rings(Geometry const& geometry,
-            IntersectionMap const& intersection_map, 
+            IntersectionMap const& intersection_map,
             SelectionMap& selection_map, bool midpoint)
 {
     typedef typename geometry::tag<Geometry>::type tag;
 
     SelectionMap map_with_all;
-    dispatch::select_rings<tag, Geometry>::apply(geometry, 
+    dispatch::select_rings<tag, Geometry>::apply(geometry,
                 ring_identifier(0, -1, -1), map_with_all, midpoint);
 
-    update_selection_map<OverlayType>(geometry, geometry, intersection_map, 
+    update_selection_map<OverlayType>(geometry, geometry, intersection_map,
                 map_with_all, selection_map);
 }
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp b/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
index e5f32d993..8dffeae28 100644
--- a/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/self_turn_points.hpp
@@ -9,16 +9,18 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 
+
 #include <cstddef>
 
 #include <boost/range.hpp>
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/box_box.hpp>
 #include <boost/geometry/algorithms/detail/partition.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 
@@ -55,17 +57,21 @@ template
     typename Geometry,
     typename Turns,
     typename TurnPolicy,
+    typename RobustPolicy,
     typename InterruptPolicy
 >
 struct self_section_visitor
 {
     Geometry const& m_geometry;
+    RobustPolicy const& m_rescale_policy;
     Turns& m_turns;
     InterruptPolicy& m_interrupt_policy;
 
     inline self_section_visitor(Geometry const& g,
+            RobustPolicy const& rp,
             Turns& turns, InterruptPolicy& ip)
         : m_geometry(g)
+        , m_rescale_policy(rp)
         , m_turns(turns)
         , m_interrupt_policy(ip)
     {}
@@ -82,12 +88,12 @@ struct self_section_visitor
                         Geometry, Geometry,
                         false, false,
                         Section, Section,
-                        Turns, TurnPolicy,
-                        InterruptPolicy
+                        TurnPolicy
                     >::apply(
                             0, m_geometry, sec1,
                             0, m_geometry, sec2,
                             false,
+                            m_rescale_policy,
                             m_turns, m_interrupt_policy);
         }
         if (m_interrupt_policy.has_intersections)
@@ -103,17 +109,13 @@ struct self_section_visitor
 
 
 
-template
-<
-    typename Geometry,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
->
+template<typename TurnPolicy>
 struct get_turns
 {
+    template <typename Geometry, typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline bool apply(
             Geometry const& geometry,
+            RobustPolicy const& robust_policy,
             Turns& turns,
             InterruptPolicy& interrupt_policy)
     {
@@ -127,20 +129,20 @@ struct get_turns
             > sections_type;
 
         sections_type sec;
-        geometry::sectionalize<false>(geometry, sec);
+        geometry::sectionalize<false>(geometry, robust_policy, false, sec);
 
         self_section_visitor
             <
                 Geometry,
-                Turns, TurnPolicy, InterruptPolicy
-            > visitor(geometry, turns, interrupt_policy);
+                Turns, TurnPolicy, RobustPolicy, InterruptPolicy
+            > visitor(geometry, robust_policy, turns, interrupt_policy);
 
         try
         {
             geometry::partition
                 <
-                    box_type, 
-                    detail::get_turns::get_section_box, 
+                    box_type,
+                    detail::get_turns::get_section_box,
                     detail::get_turns::ovelaps_section_box
                 >::apply(sec, visitor);
         }
@@ -166,9 +168,7 @@ template
 <
     typename GeometryTag,
     typename Geometry,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct self_get_turn_points
 {
@@ -178,44 +178,32 @@ struct self_get_turn_points
 template
 <
     typename Ring,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct self_get_turn_points
     <
         ring_tag, Ring,
-        Turns,
-        TurnPolicy,
-        InterruptPolicy
+        TurnPolicy
     >
-    : detail::self_get_turn_points::get_turns
-        <
-            Ring,
-            Turns,
-            TurnPolicy,
-            InterruptPolicy
-        >
+    : detail::self_get_turn_points::get_turns<TurnPolicy>
 {};
 
 
 template
 <
     typename Box,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct self_get_turn_points
     <
         box_tag, Box,
-        Turns,
-        TurnPolicy,
-        InterruptPolicy
+        TurnPolicy
     >
 {
+    template <typename RobustPolicy, typename Turns, typename InterruptPolicy>
     static inline bool apply(
             Box const& ,
+            RobustPolicy const& ,
             Turns& ,
             InterruptPolicy& )
     {
@@ -227,24 +215,28 @@ struct self_get_turn_points
 template
 <
     typename Polygon,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
+    typename TurnPolicy
 >
 struct self_get_turn_points
     <
         polygon_tag, Polygon,
-        Turns,
-        TurnPolicy,
-        InterruptPolicy
+        TurnPolicy
     >
-    : detail::self_get_turn_points::get_turns
-        <
-            Polygon,
-            Turns,
-            TurnPolicy,
-            InterruptPolicy
-        >
+    : detail::self_get_turn_points::get_turns<TurnPolicy>
+{};
+
+
+template
+<
+    typename MultiPolygon,
+    typename TurnPolicy
+>
+struct self_get_turn_points
+    <
+        multi_polygon_tag, MultiPolygon,
+        TurnPolicy
+    >
+    : detail::self_get_turn_points::get_turns<TurnPolicy>
 {};
 
 
@@ -259,6 +251,7 @@ struct self_get_turn_points
     \tparam Turns type of intersection container
                 (e.g. vector of "intersection/turn point"'s)
     \param geometry geometry
+    \param robust_policy policy to handle robustness issues
     \param turns container which will contain intersection points
     \param interrupt_policy policy determining if process is stopped
         when intersection is found
@@ -267,30 +260,24 @@ template
 <
     typename AssignPolicy,
     typename Geometry,
+    typename RobustPolicy,
     typename Turns,
     typename InterruptPolicy
 >
 inline void self_turns(Geometry const& geometry,
+            RobustPolicy const& robust_policy,
             Turns& turns, InterruptPolicy& interrupt_policy)
 {
     concept::check<Geometry const>();
 
-    typedef detail::overlay::get_turn_info
-                        <
-                            typename point_type<Geometry>::type,
-                            typename point_type<Geometry>::type,
-                            typename boost::range_value<Turns>::type,
-                            detail::overlay::assign_null_policy
-                        > TurnPolicy;
+    typedef detail::overlay::get_turn_info<detail::overlay::assign_null_policy> turn_policy;
 
     dispatch::self_get_turn_points
             <
                 typename tag<Geometry>::type,
                 Geometry,
-                Turns,
-                TurnPolicy,
-                InterruptPolicy
-            >::apply(geometry, turns, interrupt_policy);
+                turn_policy
+            >::apply(geometry, robust_policy, turns, interrupt_policy);
 }
 
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp b/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
index eebe38194..51fd1b3dc 100644
--- a/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/stream_info.hpp
@@ -35,7 +35,6 @@ namespace detail { namespace overlay
     template <typename P>
     std::ostream& operator<<(std::ostream &os, turn_info<P> const& info)
     {
-        typename geometry::coordinate_type<P>::type d = info.distance;
         os  << "\t"
             << " src " << info.seg_id.source_index
             << " seg " << info.seg_id.segment_index
@@ -54,7 +53,7 @@ namespace detail { namespace overlay
             << " nxt seg " << info.travels_to_vertex_index
             << " , ip " << info.travels_to_ip_index
             << " , or " << info.next_ip_index
-            << " dst " << double(d)
+            << " frac " << info.fraction
             << info.visit_state;
         if (info.flagged)
         {
diff --git a/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp b/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
index 810a27af0..6ee32c17c 100644
--- a/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp
@@ -24,15 +24,21 @@ namespace detail { namespace overlay
 {
 
 
-template <typename P>
-struct traversal_turn_operation : public turn_operation
+template <typename Point, typename SegmentRatio>
+struct traversal_turn_operation : public turn_operation<SegmentRatio>
 {
-    enrichment_info<P> enriched;
+    enrichment_info<Point> enriched;
     visit_info visited;
 };
 
-template <typename P>
-struct traversal_turn_info : public turn_info<P, traversal_turn_operation<P> >
+template <typename Point, typename SegmentRatio>
+struct traversal_turn_info
+    : public turn_info
+                <
+                    Point,
+                    SegmentRatio,
+                    traversal_turn_operation<Point, SegmentRatio>
+                >
 {};
 
 
diff --git a/include/boost/geometry/algorithms/detail/overlay/traverse.hpp b/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
index e41a01510..d3c9997e8 100644
--- a/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/traverse.hpp
@@ -13,7 +13,6 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp>
 #include <boost/geometry/algorithms/detail/overlay/backtrack_check_si.hpp>
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
@@ -40,7 +39,7 @@ namespace detail { namespace overlay
 
 template <typename Turn, typename Operation>
 #ifdef BOOST_GEOMETRY_DEBUG_TRAVERSE
-inline void debug_traverse(Turn const& turn, Operation op, 
+inline void debug_traverse(Turn const& turn, Operation op,
                 std::string const& header)
 {
     std::cout << header
@@ -94,14 +93,16 @@ template
     typename G1,
     typename G2,
     typename Turns,
-    typename IntersectionInfo
+    typename IntersectionInfo,
+    typename RobustPolicy
 >
 inline bool assign_next_ip(G1 const& g1, G2 const& g2,
             Turns& turns,
             typename boost::range_iterator<Turns>::type& ip,
             GeometryOut& current_output,
             IntersectionInfo& info,
-            segment_identifier& seg_id)
+            segment_identifier& seg_id,
+            RobustPolicy const& robust_policy)
 {
     info.visited.set_visited();
     set_visited_for_continue(*ip, info);
@@ -109,7 +110,7 @@ inline bool assign_next_ip(G1 const& g1, G2 const& g2,
     // If there is no next IP on this segment
     if (info.enriched.next_ip_index < 0)
     {
-        if (info.enriched.travels_to_vertex_index < 0 
+        if (info.enriched.travels_to_vertex_index < 0
             || info.enriched.travels_to_ip_index < 0)
         {
             return false;
@@ -122,12 +123,14 @@ inline bool assign_next_ip(G1 const& g1, G2 const& g2,
         {
             geometry::copy_segments<Reverse1>(g1, info.seg_id,
                     info.enriched.travels_to_vertex_index,
+                    robust_policy,
                     current_output);
         }
         else
         {
             geometry::copy_segments<Reverse2>(g2, info.seg_id,
                     info.enriched.travels_to_vertex_index,
+                    robust_policy,
                     current_output);
         }
         seg_id = info.seg_id;
@@ -139,7 +142,8 @@ inline bool assign_next_ip(G1 const& g1, G2 const& g2,
         seg_id = info.seg_id;
     }
 
-    detail::overlay::append_no_dups_or_spikes(current_output, ip->point);
+    detail::overlay::append_no_dups_or_spikes(current_output, ip->point,
+        robust_policy);
 
     return true;
 }
@@ -230,10 +234,11 @@ template
 class traverse
 {
 public :
-    template <typename Turns, typename Rings>
+    template <typename RobustPolicy, typename Turns, typename Rings>
     static inline void apply(Geometry1 const& geometry1,
                 Geometry2 const& geometry2,
                 detail::overlay::operation_type operation,
+                RobustPolicy const& robust_policy,
                 Turns& turns, Rings& rings)
     {
         typedef typename boost::range_value<Rings>::type ring_type;
@@ -278,7 +283,8 @@ public :
                             set_visited_for_continue(*it, *iit);
 
                             ring_type current_output;
-                            geometry::append(current_output, it->point);
+                            detail::overlay::append_no_dups_or_spikes(current_output,
+                                it->point, robust_policy);
 
                             turn_iterator current = it;
                             turn_operation_iterator_type current_iit = iit;
@@ -288,13 +294,14 @@ public :
                                         geometry1, geometry2,
                                         turns,
                                         current, current_output,
-                                        *iit, current_seg_id))
+                                        *iit, current_seg_id,
+                                        robust_policy))
                             {
                                 Backtrack::apply(
-                                    size_at_start, 
+                                    size_at_start,
                                     rings, current_output, turns, *current_iit,
                                     "No next IP",
-                                    geometry1, geometry2, state);
+                                    geometry1, geometry2, robust_policy, state);
                             }
 
                             if (! detail::overlay::select_next_ip(
@@ -304,10 +311,10 @@ public :
                                             current_iit))
                             {
                                 Backtrack::apply(
-                                    size_at_start, 
+                                    size_at_start,
                                     rings, current_output, turns, *iit,
                                     "Dead end at start",
-                                    geometry1, geometry2, state);
+                                    geometry1, geometry2, robust_policy, state);
                             }
                             else
                             {
@@ -326,10 +333,10 @@ public :
                                         // It visits a visited node again, without passing the start node.
                                         // This makes it suspicious for endless loops
                                         Backtrack::apply(
-                                            size_at_start, 
+                                            size_at_start,
                                             rings,  current_output, turns, *iit,
                                             "Visit again",
-                                            geometry1, geometry2, state);
+                                            geometry1, geometry2, robust_policy, state);
                                     }
                                     else
                                     {
@@ -348,7 +355,8 @@ public :
                                         detail::overlay::assign_next_ip<Reverse1, Reverse2>(
                                             geometry1, geometry2,
                                             turns, current, current_output,
-                                            *current_iit, current_seg_id);
+                                            *current_iit, current_seg_id,
+                                            robust_policy);
 
                                         if (! detail::overlay::select_next_ip(
                                                     operation,
@@ -360,10 +368,10 @@ public :
                                             // Should not occur in self-intersecting polygons without spikes
                                             // Might occur in polygons with spikes
                                             Backtrack::apply(
-                                                size_at_start, 
+                                                size_at_start,
                                                 rings,  current_output, turns, *iit,
                                                 "Dead end",
-                                                geometry1, geometry2, state);
+                                                geometry1, geometry2, robust_policy, state);
                                         }
                                         else
                                         {
@@ -376,10 +384,10 @@ public :
                                             // than turn points.
                                             // Turn points marked as "ii" can be visited twice.
                                             Backtrack::apply(
-                                                size_at_start, 
+                                                size_at_start,
                                                 rings,  current_output, turns, *iit,
                                                 "Endless loop",
-                                                geometry1, geometry2, state);
+                                                geometry1, geometry2, robust_policy, state);
                                         }
                                     }
                                 }
@@ -390,6 +398,7 @@ public :
                                     detail::overlay::debug_traverse(*current, *iit, "->Finished");
                                     if (geometry::num_points(current_output) >= min_num_points)
                                     {
+                                        clean_closing_dups_and_spikes(current_output, robust_policy);
                                         rings.push_back(current_output);
                                     }
                                 }
diff --git a/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp b/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
index 89a60b21a..9dd54d377 100644
--- a/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
+++ b/include/boost/geometry/algorithms/detail/overlay/turn_info.hpp
@@ -54,11 +54,13 @@ enum method_type
         The class is to be included in the turn_info class, either direct
         or a derived or similar class with more (e.g. enrichment) information.
  */
+template <typename SegmentRatio>
 struct turn_operation
 {
     operation_type operation;
     segment_identifier seg_id;
     segment_identifier other_id;
+    SegmentRatio fraction;
 
     inline turn_operation()
         : operation(operation_none)
@@ -78,7 +80,8 @@ struct turn_operation
 template
 <
     typename Point,
-    typename Operation = turn_operation,
+    typename SegmentRatio,
+    typename Operation = turn_operation<SegmentRatio>,
     typename Container = boost::array<Operation, 2>
 >
 struct turn_info
@@ -103,7 +106,7 @@ struct turn_info
     {
         return has12(type, type);
     }
-    
+
     inline bool has(operation_type type) const
     {
         return this->operations[0].operation == type
diff --git a/include/boost/geometry/algorithms/detail/partition.hpp b/include/boost/geometry/algorithms/detail/partition.hpp
index 45ff52ccb..8e5f5a15d 100644
--- a/include/boost/geometry/algorithms/detail/partition.hpp
+++ b/include/boost/geometry/algorithms/detail/partition.hpp
@@ -23,7 +23,7 @@ namespace detail { namespace partition
 typedef std::vector<std::size_t> index_vector_type;
 
 template <int Dimension, typename Box>
-inline void divide_box(Box const& box, Box& lower_box, Box& upper_box)
+void divide_box(Box const& box, Box& lower_box, Box& upper_box)
 {
     typedef typename coordinate_type<Box>::type ctype;
 
@@ -39,10 +39,10 @@ inline void divide_box(Box const& box, Box& lower_box, Box& upper_box)
 }
 
 // Divide collection into three subsets: lower, upper and oversized
-// (not-fitting) 
+// (not-fitting)
 // (lower == left or bottom, upper == right or top)
 template <typename OverlapsPolicy, typename InputCollection, typename Box>
-static inline void divide_into_subsets(Box const& lower_box,
+inline void divide_into_subsets(Box const& lower_box,
         Box const& upper_box,
         InputCollection const& collection,
         index_vector_type const& input,
@@ -86,7 +86,7 @@ static inline void divide_into_subsets(Box const& lower_box,
 
 // Match collection with itself
 template <typename InputCollection, typename Policy>
-static inline void handle_one(InputCollection const& collection,
+inline void handle_one(InputCollection const& collection,
         index_vector_type const& input,
         Policy& policy)
 {
@@ -106,10 +106,15 @@ static inline void handle_one(InputCollection const& collection,
 }
 
 // Match collection 1 with collection 2
-template <typename InputCollection, typename Policy>
-static inline void handle_two(
-        InputCollection const& collection1, index_vector_type const& input1,
-        InputCollection const& collection2, index_vector_type const& input2,
+template
+<
+    typename InputCollection1,
+    typename InputCollection2,
+    typename Policy
+>
+inline void handle_two(
+        InputCollection1 const& collection1, index_vector_type const& input1,
+        InputCollection2 const& collection2, index_vector_type const& input2,
         Policy& policy)
 {
     typedef boost::range_iterator
@@ -209,7 +214,8 @@ template
 <
     int Dimension,
     typename Box,
-    typename OverlapsPolicy,
+    typename OverlapsPolicy1,
+    typename OverlapsPolicy2,
     typename VisitBoxPolicy
 >
 class partition_two_collections
@@ -220,15 +226,21 @@ class partition_two_collections
             <
                 1 - Dimension,
                 Box,
-                OverlapsPolicy,
+                OverlapsPolicy1,
+                OverlapsPolicy2,
                 VisitBoxPolicy
             > sub_divide;
 
-    template <typename InputCollection, typename Policy>
+    template
+    <
+        typename InputCollection1,
+        typename InputCollection2,
+        typename Policy
+    >
     static inline void next_level(Box const& box,
-            InputCollection const& collection1,
+            InputCollection1 const& collection1,
             index_vector_type const& input1,
-            InputCollection const& collection2,
+            InputCollection2 const& collection2,
             index_vector_type const& input2,
             int level, std::size_t min_elements,
             Policy& policy, VisitBoxPolicy& box_policy)
@@ -252,10 +264,15 @@ class partition_two_collections
     }
 
 public :
-    template <typename InputCollection, typename Policy>
+    template
+    <
+        typename InputCollection1,
+        typename InputCollection2,
+        typename Policy
+    >
     static inline void apply(Box const& box,
-            InputCollection const& collection1, index_vector_type const& input1,
-            InputCollection const& collection2, index_vector_type const& input2,
+            InputCollection1 const& collection1, index_vector_type const& input1,
+            InputCollection2 const& collection2, index_vector_type const& input2,
             int level,
             std::size_t min_elements,
             Policy& policy, VisitBoxPolicy& box_policy)
@@ -267,9 +284,9 @@ public :
 
         index_vector_type lower1, upper1, exceeding1;
         index_vector_type lower2, upper2, exceeding2;
-        divide_into_subsets<OverlapsPolicy>(lower_box, upper_box, collection1,
+        divide_into_subsets<OverlapsPolicy1>(lower_box, upper_box, collection1,
                     input1, lower1, upper1, exceeding1);
-        divide_into_subsets<OverlapsPolicy>(lower_box, upper_box, collection2,
+        divide_into_subsets<OverlapsPolicy2>(lower_box, upper_box, collection2,
                     input2, lower2, upper2, exceeding2);
 
         if (boost::size(exceeding1) > 0)
@@ -308,15 +325,17 @@ struct visit_no_policy
 template
 <
     typename Box,
-    typename ExpandPolicy,
-    typename OverlapsPolicy,
+    typename ExpandPolicy1,
+    typename OverlapsPolicy1,
+    typename ExpandPolicy2 = ExpandPolicy1,
+    typename OverlapsPolicy2 = OverlapsPolicy1,
     typename VisitBoxPolicy = visit_no_policy
 >
 class partition
 {
     typedef std::vector<std::size_t> index_vector_type;
 
-    template <typename InputCollection>
+    template <typename ExpandPolicy, typename InputCollection>
     static inline void expand_to_collection(InputCollection const& collection,
                 Box& total, index_vector_type& index_vector)
     {
@@ -344,12 +363,12 @@ public :
             index_vector_type index_vector;
             Box total;
             assign_inverse(total);
-            expand_to_collection(collection, total, index_vector);
+            expand_to_collection<ExpandPolicy1>(collection, total, index_vector);
 
             detail::partition::partition_one_collection
                 <
                     0, Box,
-                    OverlapsPolicy,
+                    OverlapsPolicy1,
                     VisitBoxPolicy
                 >::apply(total, collection, index_vector, 0, min_elements,
                                 visitor, box_visitor);
@@ -373,9 +392,14 @@ public :
         }
     }
 
-    template <typename InputCollection, typename VisitPolicy>
-    static inline void apply(InputCollection const& collection1,
-                InputCollection const& collection2,
+    template
+    <
+        typename InputCollection1,
+        typename InputCollection2,
+        typename VisitPolicy
+    >
+    static inline void apply(InputCollection1 const& collection1,
+                InputCollection2 const& collection2,
                 VisitPolicy& visitor,
                 std::size_t min_elements = 16,
                 VisitBoxPolicy box_visitor = visit_no_policy()
@@ -387,12 +411,12 @@ public :
             index_vector_type index_vector1, index_vector2;
             Box total;
             assign_inverse(total);
-            expand_to_collection(collection1, total, index_vector1);
-            expand_to_collection(collection2, total, index_vector2);
+            expand_to_collection<ExpandPolicy1>(collection1, total, index_vector1);
+            expand_to_collection<ExpandPolicy2>(collection2, total, index_vector2);
 
             detail::partition::partition_two_collections
                 <
-                    0, Box, OverlapsPolicy, VisitBoxPolicy
+                    0, Box, OverlapsPolicy1, OverlapsPolicy2, VisitBoxPolicy
                 >::apply(total,
                     collection1, index_vector1,
                     collection2, index_vector2,
@@ -402,13 +426,17 @@ public :
         {
             typedef typename boost::range_iterator
                 <
-                    InputCollection const
-                >::type iterator_type;
-            for(iterator_type it1 = boost::begin(collection1);
+                    InputCollection1 const
+                >::type iterator_type1;
+            typedef typename boost::range_iterator
+                <
+                    InputCollection2 const
+                >::type iterator_type2;
+            for(iterator_type1 it1 = boost::begin(collection1);
                 it1 != boost::end(collection1);
                 ++it1)
             {
-                for(iterator_type it2 = boost::begin(collection2);
+                for(iterator_type2 it2 = boost::begin(collection2);
                     it2 != boost::end(collection2);
                     ++it2)
                 {
@@ -417,9 +445,9 @@ public :
             }
         }
     }
-
 };
 
+
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_PARTITION_HPP
diff --git a/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp b/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
index 23078bf64..cd3acb5ba 100644
--- a/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
+++ b/include/boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp
@@ -14,6 +14,8 @@
 
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
 #include <boost/geometry/strategies/side.hpp>
 #include <boost/geometry/util/math.hpp>
 
@@ -25,8 +27,18 @@ namespace boost { namespace geometry
 namespace detail
 {
 
+// Checks if a point ("last_point") causes a spike w.r.t.
+// the specified two other points (segment_a, segment_b)
+//
+//  x-------x------x
+//  a       lp     b
+//
+// Above, lp generates a spike w.r.t. segment(a,b)
+// So specify last point first, then (a,b) (this is unordered, so unintuitive)
 template <typename Point1, typename Point2, typename Point3>
-static inline bool point_is_spike_or_equal(Point1 const& last_point, Point2 const& segment_a, Point3 const& segment_b)
+static inline bool point_is_spike_or_equal(Point1 const& last_point,
+            Point2 const& segment_a,
+            Point3 const& segment_b)
 {
     typedef typename strategy::side::services::default_strategy
     <
@@ -62,6 +74,49 @@ static inline bool point_is_spike_or_equal(Point1 const& last_point, Point2 cons
     return false;
 }
 
+template
+<
+    typename Point1,
+    typename Point2,
+    typename Point3,
+    typename RobustPolicy
+>
+static inline bool point_is_spike_or_equal(Point1 const& last_point,
+            Point2 const& segment_a,
+            Point3 const& segment_b,
+            RobustPolicy const& robust_policy)
+{
+    if (point_is_spike_or_equal(last_point, segment_a, segment_b))
+    {
+        return true;
+    }
+
+    if (! RobustPolicy::enabled)
+    {
+        return false;
+    }
+
+    // Try using specified robust policy
+    typedef typename geometry::robust_point_type
+    <
+        Point1,
+        RobustPolicy
+    >::type robust_point_type;
+
+    robust_point_type last_point_rob, segment_a_rob, segment_b_rob;
+    geometry::recalculate(last_point_rob, last_point, robust_policy);
+    geometry::recalculate(segment_a_rob, segment_a, robust_policy);
+    geometry::recalculate(segment_b_rob, segment_b, robust_policy);
+
+    return point_is_spike_or_equal
+        (
+            last_point_rob,
+            segment_a_rob,
+            segment_b_rob
+        );
+}
+
+
 } // namespace detail
 #endif
 
diff --git a/include/boost/geometry/algorithms/detail/point_on_border.hpp b/include/boost/geometry/algorithms/detail/point_on_border.hpp
index 70113ab3a..24b88a8d1 100644
--- a/include/boost/geometry/algorithms/detail/point_on_border.hpp
+++ b/include/boost/geometry/algorithms/detail/point_on_border.hpp
@@ -19,6 +19,7 @@
 
 #include <boost/range.hpp>
 
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/ring_type.hpp>
 
@@ -26,7 +27,7 @@
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/detail/convert_point_to_point.hpp>
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
 
 
 namespace boost { namespace geometry
@@ -153,6 +154,35 @@ struct point_on_box
 };
 
 
+template
+<
+    typename Point,
+    typename MultiGeometry,
+    typename Policy
+>
+struct point_on_multi
+{
+    static inline bool apply(Point& point, MultiGeometry const& multi, bool midpoint)
+    {
+        // Take a point on the first multi-geometry
+        // (i.e. the first that is not empty)
+        for (typename boost::range_iterator
+                <
+                    MultiGeometry const
+                >::type it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            if (Policy::apply(point, *it, midpoint))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+};
+
+
 }} // namespace detail::point_on_border
 #endif // DOXYGEN_NO_DETAIL
 
@@ -203,6 +233,36 @@ struct point_on_border<box_tag, Point, Box>
 {};
 
 
+template<typename Point, typename Multi>
+struct point_on_border<multi_polygon_tag, Point, Multi>
+    : detail::point_on_border::point_on_multi
+        <
+            Point,
+            Multi,
+            detail::point_on_border::point_on_polygon
+                <
+                    Point,
+                    typename boost::range_value<Multi>::type
+                >
+        >
+{};
+
+
+template<typename Point, typename Multi>
+struct point_on_border<multi_linestring_tag, Point, Multi>
+    : detail::point_on_border::point_on_multi
+        <
+            Point,
+            Multi,
+            detail::point_on_border::point_on_range
+                <
+                    Point,
+                    typename boost::range_value<Multi>::type
+                >
+        >
+{};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
diff --git a/include/boost/geometry/algorithms/detail/recalculate.hpp b/include/boost/geometry/algorithms/detail/recalculate.hpp
new file mode 100644
index 000000000..2c3ea7413
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/recalculate.hpp
@@ -0,0 +1,231 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
+
+
+#include <cstddef>
+
+#include <boost/concept/requires.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/numeric/conversion/bounds.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/type_traits.hpp>
+
+#include <boost/geometry/arithmetic/arithmetic.hpp>
+#include <boost/geometry/algorithms/append.hpp>
+#include <boost/geometry/algorithms/clear.hpp>
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace recalculate
+{
+
+template <std::size_t Dimension>
+struct recalculate_point
+{
+    template <typename Point1, typename Point2, typename Strategy>
+    static inline void apply(Point1& point1, Point2 const& point2, Strategy const& strategy)
+    {
+        std::size_t const dim = Dimension - 1;
+        geometry::set<dim>(point1, strategy.template apply<dim>(geometry::get<dim>(point2)));
+        recalculate_point<dim>::apply(point1, point2, strategy);
+    }
+};
+
+template <>
+struct recalculate_point<0>
+{
+    template <typename Point1, typename Point2, typename Strategy>
+    static inline void apply(Point1&, Point2 const&, Strategy const&)
+    {
+    }
+};
+
+
+template <std::size_t Dimension>
+struct recalculate_indexed
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline void apply(Geometry1& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        // Do it for both indices in one dimension
+        static std::size_t const dim = Dimension - 1;
+        geometry::set<0, dim>(geometry1, strategy.template apply<dim>(geometry::get<0, dim>(geometry2)));
+        geometry::set<1, dim>(geometry1, strategy.template apply<dim>(geometry::get<1, dim>(geometry2)));
+        recalculate_indexed<dim>::apply(geometry1, geometry2, strategy);
+    }
+};
+
+template <>
+struct recalculate_indexed<0>
+{
+
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline void apply(Geometry1& , Geometry2 const& , Strategy const& )
+    {
+    }
+};
+
+struct range_to_range
+{
+    template
+    <
+        typename Range1,
+        typename Range2,
+        typename Strategy
+    >
+    static inline void apply(Range1& destination, Range2 const& source,
+            Strategy const& strategy)
+    {
+        typedef typename geometry::point_type<Range2>::type point_type;
+        typedef recalculate_point<geometry::dimension<point_type>::value> per_point;
+        geometry::clear(destination);
+
+        for (typename boost::range_iterator<Range2 const>::type it
+                = boost::begin(source);
+            it != boost::end(source);
+            ++it)
+        {
+            point_type p;
+            per_point::apply(p, *it, strategy);
+            geometry::append(destination, p);
+        }
+    }
+};
+
+struct polygon_to_polygon
+{
+private:
+    template
+    <
+        typename IteratorIn,
+        typename IteratorOut,
+        typename Strategy
+    >
+    static inline void iterate(IteratorIn begin, IteratorIn end,
+                    IteratorOut it_out,
+                    Strategy const& strategy)
+    {
+        for (IteratorIn it_in = begin; it_in != end;  ++it_in, ++it_out)
+        {
+            range_to_range::apply(*it_out, *it_in, strategy);
+        }
+    }
+
+    template
+    <
+        typename InteriorRingsOut,
+        typename InteriorRingsIn,
+        typename Strategy
+    >
+    static inline void apply_interior_rings(
+                    InteriorRingsOut& interior_rings_out,
+                    InteriorRingsIn const& interior_rings_in,
+                    Strategy const& strategy)
+    {
+        traits::resize<InteriorRingsOut>::apply(interior_rings_out,
+            boost::size(interior_rings_in));
+
+        iterate(
+            boost::begin(interior_rings_in), boost::end(interior_rings_in),
+            boost::begin(interior_rings_out),
+            strategy);
+    }
+
+public:
+    template
+    <
+        typename Polygon1,
+        typename Polygon2,
+        typename Strategy
+    >
+    static inline void apply(Polygon1& destination, Polygon2 const& source,
+            Strategy const& strategy)
+    {
+        range_to_range::apply(geometry::exterior_ring(destination),
+            geometry::exterior_ring(source), strategy);
+
+        apply_interior_rings(geometry::interior_rings(destination),
+            geometry::interior_rings(source), strategy);
+    }
+};
+
+}} // namespace detail::recalculate
+#endif // DOXYGEN_NO_DETAIL
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename Tag1 = typename geometry::tag<Geometry1>::type,
+    typename Tag2 = typename geometry::tag<Geometry2>::type
+>
+struct recalculate : not_implemented<Tag1, Tag2>
+{};
+
+template <typename Point1, typename Point2>
+struct recalculate<Point1, Point2, point_tag, point_tag>
+    : detail::recalculate::recalculate_point<geometry::dimension<Point1>::value>
+{};
+
+template <typename Box1, typename Box2>
+struct recalculate<Box1, Box2, box_tag, box_tag>
+    : detail::recalculate::recalculate_indexed<geometry::dimension<Box1>::value>
+{};
+
+template <typename Segment1, typename Segment2>
+struct recalculate<Segment1, Segment2, segment_tag, segment_tag>
+    : detail::recalculate::recalculate_indexed<geometry::dimension<Segment1>::value>
+{};
+
+template <typename Polygon1, typename Polygon2>
+struct recalculate<Polygon1, Polygon2, polygon_tag, polygon_tag>
+    : detail::recalculate::polygon_to_polygon
+{};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+inline void recalculate(Geometry1& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+{
+    concept::check<Geometry1>();
+    concept::check<Geometry2 const>();
+
+    // static assert dimensions (/types) are the same
+
+    dispatch::recalculate<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RECALCULATE_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp b/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
new file mode 100644
index 000000000..151f94ade
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/areal_areal.hpp
@@ -0,0 +1,823 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_AREAL_AREAL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_AREAL_AREAL_HPP
+
+#include <boost/geometry/core/topological_dimension.hpp>
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/num_interior_rings.hpp>
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+#include <boost/geometry/algorithms/detail/single_geometry.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+#include <boost/geometry/algorithms/detail/relate/boundary_checker.hpp>
+#include <boost/geometry/algorithms/detail/relate/follow_helpers.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+    
+// WARNING!
+// TODO: In the worst case calling this Pred in a loop for MultiPolygon/MultiPolygon may take O(NM)
+// Use the rtree in this case!
+
+// may be used to set EI and EB for an Areal geometry for which no turns were generated
+template <typename OtherAreal, typename Result, bool TransposeResult>
+class no_turns_aa_pred
+{
+public:
+    no_turns_aa_pred(OtherAreal const& other_areal, Result & res)
+        : m_result(res)
+        , m_other_areal(other_areal)
+        , m_flags(0)
+    {
+        // check which relations must be analysed
+
+        if ( ! may_update<interior, interior, '2', TransposeResult>(m_result)
+          && ! may_update<boundary, interior, '1', TransposeResult>(m_result)
+          && ! may_update<exterior, interior, '2', TransposeResult>(m_result) )
+        {
+            m_flags |= 1;
+        }
+
+        if ( ! may_update<interior, exterior, '2', TransposeResult>(m_result)
+          && ! may_update<boundary, exterior, '1', TransposeResult>(m_result) )
+        {
+            m_flags |= 2;
+        }
+    }
+
+    template <typename Areal>
+    bool operator()(Areal const& areal)
+    {
+        // if those flags are set nothing will change
+        if ( m_flags == 3 )
+        {
+            return false;
+        }
+
+        typedef typename geometry::point_type<Areal>::type point_type;
+        point_type pt;
+        bool ok = boost::geometry::point_on_border(pt, areal);
+
+        // TODO: for now ignore, later throw an exception?
+        if ( !ok )
+        {
+            return true;
+        }
+
+        // check if the areal is inside the other_areal
+        // TODO: This is O(N)
+        // Run in a loop O(NM) - optimize!
+        int pig = detail::within::point_in_geometry(pt, m_other_areal);
+        //BOOST_ASSERT( pig != 0 );
+        
+        // inside
+        if ( pig > 0 )
+        {
+            update<interior, interior, '2', TransposeResult>(m_result);
+            update<boundary, interior, '1', TransposeResult>(m_result);
+            update<exterior, interior, '2', TransposeResult>(m_result);
+            m_flags |= 1;
+
+            // TODO: OPTIMIZE!
+            // Only the interior rings of other ONE single geometry must be checked
+            // NOT all geometries
+
+            // Check if any interior ring is outside
+            ring_identifier ring_id(0, -1, 0);
+            int const irings_count = boost::numeric_cast<int>(
+                                        geometry::num_interior_rings(areal) );
+            for ( ; ring_id.ring_index < irings_count ; ++ring_id.ring_index )
+            {
+                typename detail::sub_range_return_type<Areal const>::type
+                    range_ref = detail::sub_range(areal, ring_id);
+
+                if ( boost::empty(range_ref) )
+                {
+                    // TODO: throw exception?
+                    continue; // ignore
+                }
+
+                // TODO: O(N)
+                // Optimize!
+                int pig = detail::within::point_in_geometry(range::front(range_ref), m_other_areal);
+
+                // hole outside
+                if ( pig < 0 )
+                {
+                    update<interior, exterior, '2', TransposeResult>(m_result);
+                    update<boundary, exterior, '1', TransposeResult>(m_result);
+                    m_flags |= 2;
+                    break;
+                }
+            }
+        }
+        // outside
+        else
+        {
+            update<interior, exterior, '2', TransposeResult>(m_result);
+            update<boundary, exterior, '1', TransposeResult>(m_result);
+            m_flags |= 2;
+
+            // Check if any interior ring is inside
+            ring_identifier ring_id(0, -1, 0);
+            int const irings_count = boost::numeric_cast<int>(
+                                        geometry::num_interior_rings(areal) );
+            for ( ; ring_id.ring_index < irings_count ; ++ring_id.ring_index )
+            {
+                typename detail::sub_range_return_type<Areal const>::type
+                    range_ref = detail::sub_range(areal, ring_id);
+
+                if ( boost::empty(range_ref) )
+                {
+                    // TODO: throw exception?
+                    continue; // ignore
+                }
+
+                // TODO: O(N)
+                // Optimize!
+                int pig = detail::within::point_in_geometry(range::front(range_ref), m_other_areal);
+
+                // hole inside
+                if ( pig > 0 )
+                {
+                    update<interior, interior, '2', TransposeResult>(m_result);
+                    update<boundary, interior, '1', TransposeResult>(m_result);
+                    update<exterior, interior, '2', TransposeResult>(m_result);
+                    m_flags |= 1;
+                    break;
+                }
+            }
+        }
+                    
+        return m_flags != 3 && !m_result.interrupt;
+    }
+
+private:
+    Result & m_result;
+    OtherAreal const& m_other_areal;
+    int m_flags;
+};
+
+// The implementation of an algorithm calculating relate() for A/A
+template <typename Geometry1, typename Geometry2>
+struct areal_areal
+{
+    // check Linear / Areal
+    BOOST_STATIC_ASSERT(topological_dimension<Geometry1>::value == 2
+                     && topological_dimension<Geometry2>::value == 2);
+
+    static const bool interruption_enabled = true;
+
+    typedef typename geometry::point_type<Geometry1>::type point1_type;
+    typedef typename geometry::point_type<Geometry2>::type point2_type;
+    
+    template <typename Result>
+    static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Result & result)
+    {
+// TODO: If Areal geometry may have infinite size, change the following line:
+
+        // The result should be FFFFFFFFF
+        relate::set<exterior, exterior, result_dimension<Geometry2>::value>(result);// FFFFFFFFd, d in [1,9] or T
+
+        if ( result.interrupt )
+            return;
+
+        // get and analyse turns
+        typedef typename turns::get_turns<Geometry1, Geometry2>::turn_info turn_type;
+        std::vector<turn_type> turns;
+
+        interrupt_policy_areal_areal<Result> interrupt_policy(geometry1, geometry2, result);
+
+        turns::get_turns<Geometry1, Geometry2>::apply(turns, geometry1, geometry2, interrupt_policy);
+        if ( result.interrupt )
+            return;
+
+        no_turns_aa_pred<Geometry2, Result, false> pred1(geometry2, result);
+        for_each_disjoint_geometry_if<0, Geometry1>::apply(turns.begin(), turns.end(), geometry1, pred1);
+        if ( result.interrupt )
+            return;
+
+        no_turns_aa_pred<Geometry1, Result, true> pred2(geometry1, result);
+        for_each_disjoint_geometry_if<1, Geometry2>::apply(turns.begin(), turns.end(), geometry2, pred2);
+        if ( result.interrupt )
+            return;
+        
+        if ( turns.empty() )
+            return;
+
+        if ( may_update<interior, interior, '2'>(result)
+          || may_update<interior, exterior, '2'>(result)
+          || may_update<boundary, interior, '1'>(result)
+          || may_update<boundary, exterior, '1'>(result)
+          || may_update<exterior, interior, '2'>(result) )
+        {
+            // sort turns
+            typedef turns::less<0, turns::less_op_areal_areal> less;
+            std::sort(turns.begin(), turns.end(), less());
+
+            /*if ( may_update<interior, exterior, '2'>(result)
+              || may_update<boundary, exterior, '1'>(result)
+              || may_update<boundary, interior, '1'>(result)
+              || may_update<exterior, interior, '2'>(result) )*/
+            {
+                // analyse sorted turns
+                turns_analyser<turn_type, 0> analyser;
+                analyse_each_turn(result, analyser, turns.begin(), turns.end());
+
+                if ( result.interrupt )
+                    return;
+            }
+
+            if ( may_update<interior, interior, '2'>(result)
+              || may_update<interior, exterior, '2'>(result)
+              || may_update<boundary, interior, '1'>(result)
+              || may_update<boundary, exterior, '1'>(result)
+              || may_update<exterior, interior, '2'>(result) )
+            {
+                // analyse rings for which turns were not generated
+                // or only i/i or u/u was generated
+                uncertain_rings_analyser<0, Result, Geometry1, Geometry2> rings_analyser(result, geometry1, geometry2);
+                analyse_uncertain_rings<0>::apply(rings_analyser, turns.begin(), turns.end());
+
+                if ( result.interrupt )
+                    return;
+            }
+        }
+
+        if ( may_update<interior, interior, '2', true>(result)
+          || may_update<interior, exterior, '2', true>(result)
+          || may_update<boundary, interior, '1', true>(result)
+          || may_update<boundary, exterior, '1', true>(result)
+          || may_update<exterior, interior, '2', true>(result) )
+        {
+            // sort turns
+            typedef turns::less<1, turns::less_op_areal_areal> less;
+            std::sort(turns.begin(), turns.end(), less());
+
+            /*if ( may_update<interior, exterior, '2', true>(result)
+              || may_update<boundary, exterior, '1', true>(result)
+              || may_update<boundary, interior, '1', true>(result)
+              || may_update<exterior, interior, '2', true>(result) )*/
+            {
+                // analyse sorted turns
+                turns_analyser<turn_type, 1> analyser;
+                analyse_each_turn(result, analyser, turns.begin(), turns.end());
+
+                if ( result.interrupt )
+                    return;
+            }
+
+            if ( may_update<interior, interior, '2', true>(result)
+              || may_update<interior, exterior, '2', true>(result)
+              || may_update<boundary, interior, '1', true>(result)
+              || may_update<boundary, exterior, '1', true>(result)
+              || may_update<exterior, interior, '2', true>(result) )
+            {
+                // analyse rings for which turns were not generated
+                // or only i/i or u/u was generated
+                uncertain_rings_analyser<1, Result, Geometry2, Geometry1> rings_analyser(result, geometry2, geometry1);
+                analyse_uncertain_rings<1>::apply(rings_analyser, turns.begin(), turns.end());
+
+                //if ( result.interrupt )
+                //    return;
+            }
+        }
+    }
+
+    // interrupt policy which may be passed to get_turns to interrupt the analysis
+    // based on the info in the passed result/mask
+    template <typename Result>
+    class interrupt_policy_areal_areal
+    {
+    public:
+        static bool const enabled = true;
+
+        interrupt_policy_areal_areal(Geometry1 const& geometry1,
+                                     Geometry2 const& geometry2,
+                                     Result & result)
+            : m_result(result)
+            , m_geometry1(geometry1)
+            , m_geometry2(geometry2)
+        {}
+
+        template <typename Range>
+        inline bool apply(Range const& turns)
+        {
+            typedef typename boost::range_iterator<Range const>::type iterator;
+            
+            for (iterator it = boost::begin(turns) ; it != boost::end(turns) ; ++it)
+            {
+                per_turn<0>(*it);
+                per_turn<1>(*it);
+            }
+
+            return m_result.interrupt;
+        }
+
+    private:
+        template <std::size_t OpId, typename Turn>
+        inline void per_turn(Turn const& turn)
+        {
+            static const std::size_t other_op_id = (OpId + 1) % 2;
+            static const bool transpose_result = OpId != 0;
+
+            overlay::operation_type op = turn.operations[OpId].operation;
+
+            if ( op == overlay::operation_union )
+            {
+                // ignore u/u
+                /*if ( turn.operations[other_op_id].operation != overlay::operation_union )
+                {
+                    update<interior, exterior, '2', transpose_result>(m_result);
+                    update<boundary, exterior, '1', transpose_result>(m_result);
+                }*/
+
+                update<boundary, boundary, '0', transpose_result>(m_result);
+            }
+            else if ( op == overlay::operation_intersection )
+            {
+                // ignore i/i
+                if ( turn.operations[other_op_id].operation != overlay::operation_intersection )
+                {
+                    update<interior, interior, '2', transpose_result>(m_result);
+                    //update<boundary, interior, '1', transpose_result>(m_result);
+                }
+
+                update<boundary, boundary, '0', transpose_result>(m_result);
+            }
+            else if ( op == overlay::operation_continue )
+            {
+                update<boundary, boundary, '1', transpose_result>(m_result);
+                update<interior, interior, '2', transpose_result>(m_result);
+            }
+            else if ( op == overlay::operation_blocked )
+            {
+                update<boundary, boundary, '1', transpose_result>(m_result);
+                update<interior, exterior, '2', transpose_result>(m_result);
+            }
+        }
+
+        Result & m_result;
+        Geometry1 const& m_geometry1;
+        Geometry2 const& m_geometry2;
+    };
+
+    // This analyser should be used like Input or SinglePass Iterator
+    // IMPORTANT! It should be called also for the end iterator - last
+    template <typename TurnInfo, std::size_t OpId>
+    class turns_analyser
+    {
+        typedef typename TurnInfo::point_type turn_point_type;
+
+        static const std::size_t op_id = OpId;
+        static const std::size_t other_op_id = (OpId + 1) % 2;
+        static const bool transpose_result = OpId != 0;
+
+    public:
+        turns_analyser()
+            : m_previous_turn_ptr(0)
+            , m_previous_operation(overlay::operation_none)
+            , m_enter_detected(false)
+            , m_exit_detected(false)
+        {}
+
+        template <typename Result,
+                  typename TurnIt>
+        void apply(Result & result, TurnIt it)
+        {
+            //BOOST_ASSERT( it != last );
+
+            overlay::operation_type op = it->operations[op_id].operation;
+
+            if ( op != overlay::operation_union
+              && op != overlay::operation_intersection
+              && op != overlay::operation_blocked
+              && op != overlay::operation_continue )
+            {
+                return;
+            }
+
+            segment_identifier const& seg_id = it->operations[op_id].seg_id;
+            //segment_identifier const& other_id = it->operations[other_op_id].seg_id;
+
+            const bool first_in_range = m_seg_watcher.update(seg_id);
+
+            if ( m_previous_turn_ptr )
+            {
+                if ( m_exit_detected /*m_previous_operation == overlay::operation_union*/ )
+                {
+                    // real exit point - may be multiple
+                    if ( first_in_range
+                      || ! turn_on_the_same_ip<op_id>(*m_previous_turn_ptr, *it) )
+                    {
+                        update_exit(result);
+                        m_exit_detected = false;
+                    }
+                    // fake exit point, reset state
+                    else if ( op != overlay::operation_union )
+                    {
+                        m_exit_detected = false;
+                    }
+                }                
+                /*else*/
+                if ( m_enter_detected /*m_previous_operation == overlay::operation_intersection*/ )
+                {
+                    // real entry point
+                    if ( first_in_range
+                      || ! turn_on_the_same_ip<op_id>(*m_previous_turn_ptr, *it) )
+                    {
+                        update_enter(result);
+                        m_enter_detected = false;
+                    }
+                    // fake entry point, reset state
+                    else if ( op != overlay::operation_intersection )
+                    {
+                        m_enter_detected = false;
+                    }
+                }
+            }
+
+            if ( op == overlay::operation_union )
+            {
+                // already set in interrupt policy
+                //update<boundary, boundary, '0', transpose_result>(m_result);
+
+                // ignore u/u
+                //if ( it->operations[other_op_id].operation != overlay::operation_union )
+                {
+                    m_exit_detected = true;
+                }
+            }
+            else if ( op == overlay::operation_intersection )
+            {
+                // ignore i/i
+                if ( it->operations[other_op_id].operation != overlay::operation_intersection )
+                {
+                    // already set in interrupt policy
+                    //update<interior, interior, '2', transpose_result>(result);
+                    //update<boundary, boundary, '0', transpose_result>(result);
+                    m_enter_detected = true;
+                }
+            }
+            else if ( op == overlay::operation_blocked )
+            {
+                // already set in interrupt policy
+            }
+            else // if ( op == overlay::operation_continue )
+            {
+                // already set in interrupt policy
+            }
+
+            // store ref to previously analysed (valid) turn
+            m_previous_turn_ptr = boost::addressof(*it);
+            // and previously analysed (valid) operation
+            m_previous_operation = op;
+        }
+
+        // it == last
+        template <typename Result>
+        void apply(Result & result)
+        {
+            //BOOST_ASSERT( first != last );
+
+            if ( m_exit_detected /*m_previous_operation == overlay::operation_union*/ )
+            {
+                update_exit(result);
+                m_exit_detected = false;
+            }
+
+            if ( m_enter_detected /*m_previous_operation == overlay::operation_intersection*/ )
+            {
+                update_enter(result);
+                m_enter_detected = false;
+            }
+        }
+
+        template <typename Result>
+        static inline void update_exit(Result & result)
+        {
+            update<interior, exterior, '2', transpose_result>(result);
+            update<boundary, exterior, '1', transpose_result>(result);
+        }
+
+        template <typename Result>
+        static inline void update_enter(Result & result)
+        {
+            update<boundary, interior, '1', transpose_result>(result);
+            update<exterior, interior, '2', transpose_result>(result);
+        }
+
+    private:
+        segment_watcher<same_ring> m_seg_watcher;
+        TurnInfo * m_previous_turn_ptr;
+        overlay::operation_type m_previous_operation;
+        bool m_enter_detected;
+        bool m_exit_detected;
+    };
+
+    // call analyser.apply() for each turn in range
+    // IMPORTANT! The analyser is also called for the end iterator - last
+    template <typename Result,
+              typename Analyser,
+              typename TurnIt>
+    static inline void analyse_each_turn(Result & res,
+                                         Analyser & analyser,
+                                         TurnIt first, TurnIt last)
+    {
+        if ( first == last )
+            return;
+
+        for ( TurnIt it = first ; it != last ; ++it )
+        {
+            analyser.apply(res, it);
+
+            if ( res.interrupt )
+                return;
+        }
+
+        analyser.apply(res);
+    }
+
+    template <std::size_t OpId, typename Result, typename Geometry, typename OtherGeometry>
+    class uncertain_rings_analyser
+    {
+        static const bool transpose_result = OpId != 0;
+        static const int other_id = (OpId + 1) % 2;
+
+    public:
+        inline uncertain_rings_analyser(Result & result,
+                                        Geometry const& geom,
+                                        OtherGeometry const& other_geom)
+            : geometry(geom), other_geometry(other_geom)
+            , interrupt(result.interrupt) // just in case, could be false as well
+            , m_result(result)
+            , m_flags(0)
+        {
+            // check which relations must be analysed
+
+            if ( ! may_update<interior, interior, '2', transpose_result>(m_result)
+              && ! may_update<boundary, interior, '1', transpose_result>(m_result) )
+            {
+                m_flags |= 1;
+            }
+
+            if ( ! may_update<interior, exterior, '2', transpose_result>(m_result)
+              && ! may_update<boundary, exterior, '1', transpose_result>(m_result) )
+            {
+                m_flags |= 2;
+            }
+
+            if ( ! may_update<boundary, interior, '1', transpose_result>(m_result)
+              && ! may_update<exterior, interior, '2', transpose_result>(m_result) )
+            {
+                m_flags |= 4;
+            }
+        }
+
+        inline void no_turns(segment_identifier const& seg_id)
+        {
+            // if those flags are set nothing will change
+            if ( (m_flags & 3) == 3 )
+            {
+                return;
+            }
+
+            typename detail::sub_range_return_type<Geometry const>::type
+                range_ref = detail::sub_range(geometry, seg_id);
+
+            if ( boost::empty(range_ref) )
+            {
+                // TODO: throw an exception?
+                return; // ignore
+            }
+                
+            // TODO: possible optimization
+            // if the range is an interior ring we may use other IPs generated for this single geometry
+            // to know which other single geometries should be checked
+
+            // TODO: optimize! e.g. use spatial index
+            // O(N) - running it in a loop would gives O(NM)
+            int pig = detail::within::point_in_geometry(range::front(range_ref), other_geometry);
+
+            //BOOST_ASSERT(pig != 0);
+            if ( pig > 0 )
+            {
+                update<boundary, interior, '1', transpose_result>(m_result);
+                update<interior, interior, '2', transpose_result>(m_result);
+                m_flags |= 1;
+            }
+            else
+            {
+                update<boundary, exterior, '1', transpose_result>(m_result);
+                update<interior, exterior, '2', transpose_result>(m_result);
+                m_flags |= 2;
+            }
+
+// TODO: break if all things are set
+// also some of them could be checked outside, before the analysis
+// In this case we shouldn't relay just on dummy flags
+// Flags should be initialized with proper values
+// or the result should be checked directly
+// THIS IS ALSO TRUE FOR OTHER ANALYSERS! in L/L and L/A
+
+            interrupt = m_flags == 7 || m_result.interrupt;
+        }
+
+        template <typename TurnIt>
+        inline void turns(TurnIt first, TurnIt last)
+        {
+            // if those flags are set nothing will change
+            if ( (m_flags & 6) == 6 )
+            {
+                return;
+            }
+
+            bool found_ii = false;
+            bool found_uu = false;
+
+            for ( TurnIt it = first ; it != last ; ++it )
+            {
+                if ( it->operations[0].operation == overlay::operation_intersection 
+                  && it->operations[1].operation == overlay::operation_intersection )
+                {
+                    // ignore exterior ring
+                    if ( it->operations[OpId].seg_id.ring_index >= 0 )
+                    {
+                        found_ii = true;
+                    }
+                }
+                else if ( it->operations[0].operation == overlay::operation_union 
+                       && it->operations[1].operation == overlay::operation_union )
+                {
+                    // ignore if u/u is for holes
+                    //if ( it->operations[OpId].seg_id.ring_index >= 0
+                    //  && it->operations[other_id].seg_id.ring_index >= 0 )
+                    {
+                        found_uu = true;
+                    }
+                }
+                else // ignore
+                {
+                    return; // don't interrupt
+                }
+            }
+
+            // only i/i was generated for this ring
+            if ( found_ii )
+            {
+                //update<interior, interior, '0', transpose_result>(m_result);
+                //update<boundary, boundary, '0', transpose_result>(m_result);
+                update<boundary, interior, '1', transpose_result>(m_result);
+                update<exterior, interior, '2', transpose_result>(m_result);
+                m_flags |= 4;
+            }
+
+            // only u/u was generated for this ring
+            if ( found_uu )
+            {
+                update<boundary, exterior, '1', transpose_result>(m_result);
+                update<interior, exterior, '2', transpose_result>(m_result);
+                m_flags |= 2;
+
+                // not necessary since this will be checked in the next iteration
+                // but increases the pruning strength
+                // WARNING: this is not reflected in flags
+                update<exterior, boundary, '1', transpose_result>(m_result);
+                update<exterior, interior, '2', transpose_result>(m_result);
+            }
+
+            interrupt = m_flags == 7 || m_result.interrupt; // interrupt if the result won't be changed in the future
+        }
+
+        Geometry const& geometry;
+        OtherGeometry const& other_geometry;
+        bool interrupt;
+
+    private:
+        Result & m_result;
+        int m_flags;
+    };
+
+    template <std::size_t OpId>
+    class analyse_uncertain_rings
+    {
+    public:
+        template <typename Analyser, typename TurnIt>
+        static inline void apply(Analyser & analyser, TurnIt first, TurnIt last)
+        {
+            if ( first == last )
+                return;
+
+            for_preceding_rings(analyser, *first);
+            //analyser.per_turn(*first);
+
+            TurnIt prev = first;
+            for ( ++first ; first != last ; ++first, ++prev )
+            {
+                // same multi
+                if ( prev->operations[OpId].seg_id.multi_index
+                  == first->operations[OpId].seg_id.multi_index )
+                {
+                    // same ring
+                    if ( prev->operations[OpId].seg_id.ring_index
+                      == first->operations[OpId].seg_id.ring_index )
+                    {
+                        //analyser.per_turn(*first);
+                    }
+                    // same multi, next ring
+                    else
+                    {
+                        //analyser.end_ring(*prev);
+                        analyser.turns(prev, first);
+
+                        //if ( prev->operations[OpId].seg_id.ring_index + 1
+                        //   < first->operations[OpId].seg_id.ring_index)
+                        {
+                            for_no_turns_rings(analyser,
+                                               *first,
+                                               prev->operations[OpId].seg_id.ring_index + 1,
+                                               first->operations[OpId].seg_id.ring_index);
+                        }
+
+                        //analyser.per_turn(*first);
+                    }
+                }
+                // next multi
+                else
+                {
+                    //analyser.end_ring(*prev);
+                    analyser.turns(prev, first);
+                    for_following_rings(analyser, *prev);
+                    for_preceding_rings(analyser, *first);
+                    //analyser.per_turn(*first);
+                }
+
+                if ( analyser.interrupt )
+                {
+                    return;
+                }
+            }
+
+            //analyser.end_ring(*prev);
+            analyser.turns(prev, first); // first == last
+            for_following_rings(analyser, *prev);
+        }
+
+    private:
+        template <typename Analyser, typename Turn>
+        static inline void for_preceding_rings(Analyser & analyser, Turn const& turn)
+        {
+            segment_identifier const& seg_id = turn.operations[OpId].seg_id;
+
+            for_no_turns_rings(analyser, turn, -1, seg_id.ring_index);
+        }
+
+        template <typename Analyser, typename Turn>
+        static inline void for_following_rings(Analyser & analyser, Turn const& turn)
+        {
+            segment_identifier const& seg_id = turn.operations[OpId].seg_id;
+
+            int count = boost::numeric_cast<int>(
+                            geometry::num_interior_rings(
+                                detail::single_geometry(analyser.geometry, seg_id)));
+            
+            for_no_turns_rings(analyser, turn, seg_id.ring_index + 1, count);
+        }
+
+        template <typename Analyser, typename Turn>
+        static inline void for_no_turns_rings(Analyser & analyser, Turn const& turn, int first, int last)
+        {
+            segment_identifier seg_id = turn.operations[OpId].seg_id;
+
+            for ( seg_id.ring_index = first ; seg_id.ring_index < last ; ++seg_id.ring_index )
+            {
+                analyser.no_turns(seg_id);
+            }
+        }
+    };
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_AREAL_AREAL_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp b/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
new file mode 100644
index 000000000..f98c3e9b8
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/boundary_checker.hpp
@@ -0,0 +1,134 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_BOUNDARY_CHECKER_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_BOUNDARY_CHECKER_HPP
+
+#include <boost/geometry/util/range.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+enum boundary_query { boundary_front, boundary_back, boundary_any };
+
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type>
+class boundary_checker {};
+
+template <typename Geometry>
+class boundary_checker<Geometry, linestring_tag>
+{
+    typedef typename point_type<Geometry>::type point_type;
+
+public:
+    boundary_checker(Geometry const& g)
+        : has_boundary( boost::size(g) >= 2
+                     && !detail::equals::equals_point_point(range::front(g), range::back(g)) )
+        , geometry(g)
+    {}
+
+    template <boundary_query BoundaryQuery>
+    bool is_endpoint_boundary(point_type const& pt) const
+    {
+        boost::ignore_unused_variable_warning(pt);
+#ifdef BOOST_GEOMETRY_DEBUG_RELATE_BOUNDARY_CHECKER
+        // may give false positives for INT
+        BOOST_ASSERT( (BoundaryQuery == boundary_front || BoundaryQuery == boundary_any)
+                   && detail::equals::equals_point_point(pt, range::front(geometry))
+                   || (BoundaryQuery == boundary_back || BoundaryQuery == boundary_any)
+                   && detail::equals::equals_point_point(pt, range::back(geometry)) );
+#endif
+        return has_boundary;
+    }
+
+private:
+    bool has_boundary;
+    Geometry const& geometry;
+};
+
+template <typename Geometry>
+class boundary_checker<Geometry, multi_linestring_tag>
+{
+    typedef typename point_type<Geometry>::type point_type;
+
+public:
+    boundary_checker(Geometry const& g)
+        : is_filled(false), geometry(g)
+    {}
+
+    // First call O(NlogN)
+    // Each next call O(logN)
+    template <boundary_query BoundaryQuery>
+    bool is_endpoint_boundary(point_type const& pt) const
+    {
+        typedef typename boost::range_size<Geometry>::type size_type;
+        size_type multi_count = boost::size(geometry);
+
+        if ( multi_count < 1 )
+            return false;
+
+        if ( ! is_filled )
+        {
+            //boundary_points.clear();
+            boundary_points.reserve(multi_count * 2);
+
+            typedef typename boost::range_iterator<Geometry const>::type multi_iterator;
+            for ( multi_iterator it = boost::begin(geometry) ;
+                  it != boost::end(geometry) ; ++ it )
+            {
+                // empty or point - no boundary
+                if ( boost::size(*it) < 2 )
+                    continue;
+
+                // linear ring or point - no boundary
+                if ( equals::equals_point_point(range::front(*it), range::back(*it)) )
+                    continue;
+
+                boundary_points.push_back(range::front(*it));
+                boundary_points.push_back(range::back(*it));
+            }
+
+            std::sort(boundary_points.begin(), boundary_points.end(), geometry::less<point_type>());
+
+            is_filled = true;
+        }
+
+        std::size_t equal_points_count
+            = boost::size(
+                std::equal_range(boundary_points.begin(),
+                                 boundary_points.end(),
+                                 pt,
+                                 geometry::less<point_type>())
+            );
+
+        return equal_points_count % 2 != 0;// && equal_points_count > 0; // the number is odd and > 0
+    }
+
+private:
+    mutable bool is_filled;
+    // TODO: store references/pointers instead of points?
+    mutable std::vector<point_type> boundary_points;
+
+    Geometry const& geometry;
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_BOUNDARY_CHECKER_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp b/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
new file mode 100644
index 000000000..78fa03798
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/follow_helpers.hpp
@@ -0,0 +1,401 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_FOLLOW_HELPERS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_FOLLOW_HELPERS_HPP
+
+#include <boost/geometry/util/range.hpp>
+//#include <boost/geometry/algorithms/detail/sub_range.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+// NOTE: This iterates through single geometries for which turns were not generated.
+//       It doesn't mean that the geometry is disjoint, only that no turns were detected.
+
+template <std::size_t OpId,
+          typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type,
+          bool IsMulti = boost::is_base_of<multi_tag, Tag>::value
+>
+struct for_each_disjoint_geometry_if
+    : public not_implemented<Tag>
+{};
+
+template <std::size_t OpId, typename Geometry, typename Tag>
+struct for_each_disjoint_geometry_if<OpId, Geometry, Tag, false>
+{
+    template <typename TurnIt, typename Pred>
+    static inline bool apply(TurnIt first, TurnIt last,
+                             Geometry const& geometry,
+                             Pred & pred)
+    {
+        if ( first != last )
+            return false;
+        pred(geometry);
+        return true;
+    }
+};
+
+template <std::size_t OpId, typename Geometry, typename Tag>
+struct for_each_disjoint_geometry_if<OpId, Geometry, Tag, true>
+{
+    template <typename TurnIt, typename Pred>
+    static inline bool apply(TurnIt first, TurnIt last,
+                             Geometry const& geometry,
+                             Pred & pred)
+    {
+        if ( first != last )
+            return for_turns(first, last, geometry, pred);
+        else
+            return for_empty(geometry, pred);
+    }
+
+    template <typename Pred>
+    static inline bool for_empty(Geometry const& geometry,
+                                 Pred & pred)
+    {
+        typedef typename boost::range_iterator<Geometry const>::type iterator;
+
+        // O(N)
+        // check predicate for each contained geometry without generated turn
+        for ( iterator it = boost::begin(geometry) ;
+              it != boost::end(geometry) ; ++it )
+        {
+            bool cont = pred(*it);
+            if ( !cont )
+                break;
+        }
+        
+        return !boost::empty(geometry);
+    }
+
+    template <typename TurnIt, typename Pred>
+    static inline bool for_turns(TurnIt first, TurnIt last,
+                                 Geometry const& geometry,
+                                 Pred & pred)
+    {
+        BOOST_ASSERT(first != last);
+
+        const std::size_t count = boost::size(geometry);
+        boost::ignore_unused_variable_warning(count);
+
+        // O(I)
+        // gather info about turns generated for contained geometries
+        std::vector<bool> detected_intersections(count, false);
+        for ( TurnIt it = first ; it != last ; ++it )
+        {
+            int multi_index = it->operations[OpId].seg_id.multi_index;
+            BOOST_ASSERT(multi_index >= 0);
+            std::size_t index = static_cast<std::size_t>(multi_index);
+            BOOST_ASSERT(index < count);
+            detected_intersections[index] = true;
+        }
+
+        bool found = false;
+
+        // O(N)
+        // check predicate for each contained geometry without generated turn
+        for ( std::vector<bool>::iterator it = detected_intersections.begin() ;
+              it != detected_intersections.end() ; ++it )
+        {
+            // if there were no intersections for this multi_index
+            if ( *it == false )
+            {
+                found = true;
+                bool cont = pred(range::at(geometry,
+                                           std::distance(detected_intersections.begin(), it)));
+                if ( !cont )
+                    break;
+            }
+        }
+        
+        return found;
+    }
+};
+
+// WARNING! This class stores pointers!
+// Passing a reference to local variable will result in undefined behavior!
+template <typename Point>
+class point_info
+{
+public:
+    point_info() : sid_ptr(NULL), pt_ptr(NULL) {}
+    point_info(Point const& pt, segment_identifier const& sid)
+        : sid_ptr(boost::addressof(sid))
+        , pt_ptr(boost::addressof(pt))
+    {}
+    segment_identifier const& seg_id() const
+    {
+        BOOST_ASSERT(sid_ptr);
+        return *sid_ptr;
+    }
+    Point const& point() const
+    {
+        BOOST_ASSERT(pt_ptr);
+        return *pt_ptr;
+    }
+
+    //friend bool operator==(point_identifier const& l, point_identifier const& r)
+    //{
+    //    return l.seg_id() == r.seg_id()
+    //        && detail::equals::equals_point_point(l.point(), r.point());
+    //}
+
+private:
+    const segment_identifier * sid_ptr;
+    const Point * pt_ptr;
+};
+
+// WARNING! This class stores pointers!
+// Passing a reference to local variable will result in undefined behavior!
+class same_single
+{
+public:
+    same_single(segment_identifier const& sid)
+        : sid_ptr(boost::addressof(sid))
+    {}
+
+    bool operator()(segment_identifier const& sid) const
+    {
+        return sid.multi_index == sid_ptr->multi_index;                
+    }
+
+    template <typename Point>
+    bool operator()(point_info<Point> const& pid) const
+    {
+        return operator()(pid.seg_id());
+    }
+
+private:
+    const segment_identifier * sid_ptr;
+};
+
+class same_ring
+{
+public:
+    same_ring(segment_identifier const& sid)
+        : sid_ptr(boost::addressof(sid))
+    {}
+
+    bool operator()(segment_identifier const& sid) const
+    {
+        return sid.multi_index == sid_ptr->multi_index
+            && sid.ring_index == sid_ptr->ring_index;
+    }
+
+private:
+    const segment_identifier * sid_ptr;
+};
+
+// WARNING! This class stores pointers!
+// Passing a reference to local variable will result in undefined behavior!
+template <typename SameRange = same_single>
+class segment_watcher
+{
+public:
+    segment_watcher()
+        : m_seg_id_ptr(NULL)
+    {}
+
+    bool update(segment_identifier const& seg_id)
+    {
+        bool result = m_seg_id_ptr == 0 || !SameRange(*m_seg_id_ptr)(seg_id);
+        m_seg_id_ptr = boost::addressof(seg_id);
+        return result;
+    }
+
+private:
+    const segment_identifier * m_seg_id_ptr;
+};
+
+// WARNING! This class stores pointers!
+// Passing a reference to local variable will result in undefined behavior!
+template <typename TurnInfo, std::size_t OpId>
+class exit_watcher
+{
+    static const std::size_t op_id = OpId;
+    static const std::size_t other_op_id = (OpId + 1) % 2;
+
+    typedef typename TurnInfo::point_type point_type;
+    typedef detail::relate::point_info<point_type> point_info;
+
+public:
+    exit_watcher()
+        : m_exit_operation(overlay::operation_none)
+        , m_exit_turn_ptr(NULL)
+    {}
+
+    void enter(TurnInfo const& turn)
+    {
+        m_other_entry_points.push_back(
+            point_info(turn.point, turn.operations[other_op_id].seg_id) );
+    }
+
+    // TODO: exit_per_geometry parameter looks not very safe
+    //       wrong value may be easily passed
+
+    void exit(TurnInfo const& turn, bool exit_per_geometry = true)
+    {
+        //segment_identifier const& seg_id = turn.operations[op_id].seg_id;
+        segment_identifier const& other_id = turn.operations[other_op_id].seg_id;
+        overlay::operation_type exit_op = turn.operations[op_id].operation;
+
+        typedef typename std::vector<point_info>::iterator point_iterator;
+        // search for the entry point in the same range of other geometry
+        point_iterator entry_it = std::find_if(m_other_entry_points.begin(),
+                                               m_other_entry_points.end(),
+                                               same_single(other_id));
+
+        // this end point has corresponding entry point
+        if ( entry_it != m_other_entry_points.end() )
+        {
+            // erase the corresponding entry point
+            m_other_entry_points.erase(entry_it);
+
+            if ( exit_per_geometry || m_other_entry_points.empty() )
+            {
+                // here we know that we possibly left LS
+                // we must still check if we didn't get back on the same point
+                m_exit_operation = exit_op;
+                m_exit_turn_ptr = boost::addressof(turn);
+            }
+        }
+    }
+
+    bool is_outside() const
+    {
+        // if we didn't entered anything in the past, we're outside
+        return m_other_entry_points.empty();
+    }
+
+    bool is_outside(TurnInfo const& turn) const
+    {
+        return m_other_entry_points.empty()
+            || std::find_if(m_other_entry_points.begin(),
+                            m_other_entry_points.end(),
+                            same_single(
+                                turn.operations[other_op_id].seg_id))
+                    == m_other_entry_points.end();
+    }
+
+    overlay::operation_type get_exit_operation() const
+    {
+        return m_exit_operation;
+    }
+
+    point_type const& get_exit_point() const
+    {
+        BOOST_ASSERT(m_exit_operation != overlay::operation_none);
+        BOOST_ASSERT(m_exit_turn_ptr);
+        return m_exit_turn_ptr->point;
+    }
+
+    TurnInfo const& get_exit_turn() const
+    {
+        BOOST_ASSERT(m_exit_operation != overlay::operation_none);
+        BOOST_ASSERT(m_exit_turn_ptr);
+        return *m_exit_turn_ptr;
+    }
+
+    void reset_detected_exit()
+    {
+        m_exit_operation = overlay::operation_none;
+    }
+
+    void reset()
+    {
+        m_exit_operation = overlay::operation_none;
+        m_other_entry_points.clear();
+    }
+
+private:
+    overlay::operation_type m_exit_operation;
+    const TurnInfo * m_exit_turn_ptr;
+    std::vector<point_info> m_other_entry_points; // TODO: use map here or sorted vector?
+};
+
+template <std::size_t OpId, typename Turn>
+inline bool turn_on_the_same_ip(Turn const& prev_turn, Turn const& curr_turn)
+{
+    segment_identifier const& prev_seg_id = prev_turn.operations[OpId].seg_id;
+    segment_identifier const& curr_seg_id = curr_turn.operations[OpId].seg_id;
+
+    if ( prev_seg_id.multi_index != curr_seg_id.multi_index
+      || prev_seg_id.ring_index != curr_seg_id.ring_index )
+    {
+        return false;
+    }
+
+    // TODO: will this work if between segments there will be some number of degenerated ones?
+
+    if ( prev_seg_id.segment_index != curr_seg_id.segment_index
+      && ( ! curr_turn.operations[OpId].fraction.is_zero()
+        || prev_seg_id.segment_index + 1 != curr_seg_id.segment_index ) )
+    {
+        return false;
+    }
+
+    return detail::equals::equals_point_point(prev_turn.point, curr_turn.point);
+}
+
+template <boundary_query BoundaryQuery,
+          typename Point,
+          typename BoundaryChecker>
+static inline bool is_endpoint_on_boundary(Point const& pt,
+                                           BoundaryChecker & boundary_checker)
+{
+    return boundary_checker.template is_endpoint_boundary<BoundaryQuery>(pt);
+}
+
+template <boundary_query BoundaryQuery,
+          typename IntersectionPoint,
+          typename OperationInfo,
+          typename BoundaryChecker>
+static inline bool is_ip_on_boundary(IntersectionPoint const& ip,
+                                     OperationInfo const& operation_info,
+                                     BoundaryChecker & boundary_checker,
+                                     segment_identifier const& seg_id)
+{
+    boost::ignore_unused_variable_warning(seg_id);
+
+    bool res = false;
+
+    // IP on the last point of the linestring
+    if ( (BoundaryQuery == boundary_back || BoundaryQuery == boundary_any)
+      && operation_info.position == overlay::position_back )
+    {
+        // check if this point is a boundary
+        res = boundary_checker.template is_endpoint_boundary<boundary_back>(ip);
+    }
+    // IP on the last point of the linestring
+    else if ( (BoundaryQuery == boundary_front || BoundaryQuery == boundary_any)
+           && operation_info.position == overlay::position_front )
+    {
+        // check if this point is a boundary
+        res = boundary_checker.template is_endpoint_boundary<boundary_front>(ip);
+    }
+            
+    return res;
+}
+
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_FOLLOW_HELPERS_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/less.hpp b/include/boost/geometry/algorithms/detail/relate/less.hpp
new file mode 100644
index 000000000..3f11d4e87
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/less.hpp
@@ -0,0 +1,79 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LESS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LESS_HPP
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace detail_dispatch { namespace relate {
+
+// TODO: Integrate it with geometry::less?
+
+template <typename Point1,
+          typename Point2,
+          std::size_t I = 0,
+          std::size_t D = geometry::dimension<Point1>::value>
+struct less
+{
+    static inline bool apply(Point1 const& left, Point2 const& right)
+    {
+        typename geometry::coordinate_type<Point1>::type
+            cleft = geometry::get<I>(left);
+        typename geometry::coordinate_type<Point2>::type
+            cright = geometry::get<I>(right);
+
+        if ( geometry::math::equals(cleft, cright) )
+        {
+            return less<Point1, Point2, I + 1, D>::apply(left, right);
+        }
+        else
+        {
+            return cleft < cright;
+        }
+    }
+};
+
+template <typename Point1, typename Point2, std::size_t D>
+struct less<Point1, Point2, D, D>
+{
+    static inline bool apply(Point1 const&, Point2 const&)
+    {
+        return false;
+    }
+};
+
+}} // namespace detail_dispatch::relate
+
+#endif
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+struct less
+{
+    template <typename Point1, typename Point2>
+    inline bool operator()(Point1 const& point1, Point2 const& point2) const
+    {
+        return detail_dispatch::relate::less<Point1, Point2>::apply(point1, point2);
+    }
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LESS_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp b/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
new file mode 100644
index 000000000..8d9f74e7f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/linear_areal.hpp
@@ -0,0 +1,1110 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_AREAL_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_AREAL_HPP
+
+#include <boost/geometry/core/topological_dimension.hpp>
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/num_interior_rings.hpp>
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+#include <boost/geometry/algorithms/detail/single_geometry.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+#include <boost/geometry/algorithms/detail/relate/boundary_checker.hpp>
+#include <boost/geometry/algorithms/detail/relate/follow_helpers.hpp>
+
+#include <boost/geometry/views/detail/normalized_view.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+// WARNING!
+// TODO: In the worst case calling this Pred in a loop for MultiLinestring/MultiPolygon may take O(NM)
+// Use the rtree in this case!
+
+// may be used to set IE and BE for a Linear geometry for which no turns were generated
+template <typename Geometry2, typename Result, typename BoundaryChecker, bool TransposeResult>
+class no_turns_la_linestring_pred
+{
+public:
+    no_turns_la_linestring_pred(Geometry2 const& geometry2,
+                                Result & res,
+                                BoundaryChecker const& boundary_checker)
+        : m_geometry2(geometry2)
+        , m_result(res)
+        , m_boundary_checker(boundary_checker)
+        , m_interrupt_flags(0)
+    {
+        if ( ! may_update<interior, interior, '1', TransposeResult>(m_result) )
+        {
+            m_interrupt_flags |= 1;
+        }
+
+        if ( ! may_update<interior, exterior, '1', TransposeResult>(m_result) )
+        {
+            m_interrupt_flags |= 2;
+        }
+
+        if ( ! may_update<boundary, interior, '0', TransposeResult>(m_result) )
+        {
+            m_interrupt_flags |= 4;
+        }
+
+        if ( ! may_update<boundary, exterior, '0', TransposeResult>(m_result) )
+        {
+            m_interrupt_flags |= 8;
+        }
+    }
+
+    template <typename Linestring>
+    bool operator()(Linestring const& linestring)
+    {
+        std::size_t count = boost::size(linestring);
+        
+        // invalid input
+        if ( count < 2 )
+        {
+            // ignore
+            // TODO: throw an exception?
+            return true;
+        }
+
+        // if those flags are set nothing will change
+        if ( m_interrupt_flags == 0xF )
+        {
+            return false;
+        }
+
+        int pig = detail::within::point_in_geometry(range::front(linestring), m_geometry2);
+        //BOOST_ASSERT_MSG(pig != 0, "There should be no IPs");
+
+        if ( pig > 0 )
+        {
+            update<interior, interior, '1', TransposeResult>(m_result);
+            m_interrupt_flags |= 1;
+        }
+        else
+        {
+            update<interior, exterior, '1', TransposeResult>(m_result);
+            m_interrupt_flags |= 2;
+        }
+
+        // check if there is a boundary
+        if ( ( m_interrupt_flags & 0xC ) != 0xC // if wasn't already set
+          && ( m_boundary_checker.template
+                is_endpoint_boundary<boundary_front>(range::front(linestring))
+            || m_boundary_checker.template
+                is_endpoint_boundary<boundary_back>(range::back(linestring)) ) )
+        {
+            if ( pig > 0 )
+            {
+                update<boundary, interior, '0', TransposeResult>(m_result);
+                m_interrupt_flags |= 4;
+            }
+            else
+            {
+                update<boundary, exterior, '0', TransposeResult>(m_result);
+                m_interrupt_flags |= 8;
+            }
+        }
+
+        return m_interrupt_flags != 0xF
+            && ! m_result.interrupt;
+    }
+
+private:
+    Geometry2 const& m_geometry2;
+    Result & m_result;
+    BoundaryChecker const& m_boundary_checker;
+    unsigned m_interrupt_flags;
+};
+
+// may be used to set EI and EB for an Areal geometry for which no turns were generated
+template <typename Result, bool TransposeResult>
+class no_turns_la_areal_pred
+{
+public:
+    no_turns_la_areal_pred(Result & res)
+        : m_result(res)
+        , interrupt(! may_update<interior, exterior, '2', TransposeResult>(m_result)
+                 && ! may_update<boundary, exterior, '1', TransposeResult>(m_result) )
+    {}
+
+    template <typename Areal>
+    bool operator()(Areal const& areal)
+    {
+        if ( interrupt )
+        {
+            return false;
+        }
+
+        // TODO:
+        // handle empty/invalid geometries in a different way than below?
+
+        typedef typename geometry::point_type<Areal>::type point_type;
+        point_type dummy;
+        bool ok = boost::geometry::point_on_border(dummy, areal);
+
+        // TODO: for now ignore, later throw an exception?
+        if ( !ok )
+        {
+            return true;
+        }
+
+        update<interior, exterior, '2', TransposeResult>(m_result);
+        update<boundary, exterior, '1', TransposeResult>(m_result);
+                    
+        return false;
+    }
+
+private:
+    Result & m_result;
+    bool const interrupt;
+};
+
+// The implementation of an algorithm calculating relate() for L/A
+template <typename Geometry1, typename Geometry2, bool TransposeResult = false>
+struct linear_areal
+{
+    // check Linear / Areal
+    BOOST_STATIC_ASSERT(topological_dimension<Geometry1>::value == 1
+                     && topological_dimension<Geometry2>::value == 2);
+
+    static const bool interruption_enabled = true;
+
+    typedef typename geometry::point_type<Geometry1>::type point1_type;
+    typedef typename geometry::point_type<Geometry2>::type point2_type;
+    
+    template <typename Result>
+    static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Result & result)
+    {
+// TODO: If Areal geometry may have infinite size, change the following line:
+
+        // The result should be FFFFFFFFF
+        relate::set<exterior, exterior, result_dimension<Geometry2>::value, TransposeResult>(result);// FFFFFFFFd, d in [1,9] or T
+
+        if ( result.interrupt )
+            return;
+
+        // get and analyse turns
+        typedef typename turns::get_turns<Geometry1, Geometry2>::turn_info turn_type;
+        std::vector<turn_type> turns;
+
+        interrupt_policy_linear_areal<Geometry2, Result> interrupt_policy(geometry2, result);
+
+        turns::get_turns<Geometry1, Geometry2>::apply(turns, geometry1, geometry2, interrupt_policy);
+        if ( result.interrupt )
+            return;
+
+        boundary_checker<Geometry1> boundary_checker1(geometry1);
+        no_turns_la_linestring_pred
+            <
+                Geometry2,
+                Result,
+                boundary_checker<Geometry1>,
+                TransposeResult
+            > pred1(geometry2, result, boundary_checker1);
+        for_each_disjoint_geometry_if<0, Geometry1>::apply(turns.begin(), turns.end(), geometry1, pred1);
+        if ( result.interrupt )
+            return;
+
+        no_turns_la_areal_pred<Result, !TransposeResult> pred2(result);
+        for_each_disjoint_geometry_if<1, Geometry2>::apply(turns.begin(), turns.end(), geometry2, pred2);
+        if ( result.interrupt )
+            return;
+        
+        if ( turns.empty() )
+            return;
+
+        // This is set here because in the case if empty Areal geometry were passed
+        // those shouldn't be set
+        relate::set<exterior, interior, '2', TransposeResult>(result);// FFFFFF2Fd
+        if ( result.interrupt )
+            return;
+
+        {
+            // for different multi or same ring id: x, u, i, c
+            // for same multi and different ring id: c, i, u, x
+            typedef turns::less<0, turns::less_op_linear_areal> less;
+            std::sort(turns.begin(), turns.end(), less());
+
+            turns_analyser<turn_type> analyser;
+            analyse_each_turn(result, analyser,
+                              turns.begin(), turns.end(),
+                              geometry1, geometry2,
+                              boundary_checker1);
+
+            if ( result.interrupt )
+                return;
+        }
+
+        // If 'c' (insersection_boundary) was not found we know that any Ls isn't equal to one of the Rings
+        if ( !interrupt_policy.is_boundary_found )
+        {
+            relate::set<exterior, boundary, '1', TransposeResult>(result);
+        }
+        // Don't calculate it if it's required
+        else if ( may_update<exterior, boundary, '1', TransposeResult>(result) )
+        {
+// TODO: REVISE THIS CODE AND PROBABLY REWRITE SOME PARTS TO BE MORE HUMAN-READABLE
+//       IN GENERAL IT ANALYSES THE RINGS OF AREAL GEOMETRY AND DETECTS THE ONES THAT
+//       MAY OVERLAP THE INTERIOR OF LINEAR GEOMETRY (NO IPs OR NON-FAKE 'u' OPERATION)
+// NOTE: For one case std::sort may be called again to sort data by operations for data already sorted by ring index
+//       In the worst case scenario the complexity will be O( NlogN + R*(N/R)log(N/R) )
+//       So always should remain O(NlogN) -> for R==1 <-> 1(N/1)log(N/1), for R==N <-> N(N/N)log(N/N)
+//       Some benchmarking should probably be done to check if only one std::sort should be used
+
+            // sort by multi_index and rind_index
+            std::sort(turns.begin(), turns.end(), less_ring());
+
+            typedef typename std::vector<turn_type>::iterator turn_iterator;
+
+            turn_iterator it = turns.begin();
+            segment_identifier * prev_seg_id_ptr = NULL;
+            // for each ring
+            for ( ; it != turns.end() ; )
+            {
+                // it's the next single geometry
+                if ( prev_seg_id_ptr == NULL
+                  || prev_seg_id_ptr->multi_index != it->operations[1].seg_id.multi_index )
+                {
+                    // if the first ring has no IPs
+                    if ( it->operations[1].seg_id.ring_index > -1 )
+                    {
+                        // we can be sure that the exterior overlaps the boundary
+                        relate::set<exterior, boundary, '1', TransposeResult>(result);                    
+                        break;
+                    }
+                    // if there was some previous ring
+                    if ( prev_seg_id_ptr != NULL )
+                    {
+                        int const next_ring_index = prev_seg_id_ptr->ring_index + 1;
+                        BOOST_ASSERT(next_ring_index >= 0);
+                        
+                        // if one of the last rings of previous single geometry was ommited
+                        if ( static_cast<std::size_t>(next_ring_index)
+                                < geometry::num_interior_rings(
+                                    single_geometry(geometry2, *prev_seg_id_ptr)) )
+                        {
+                            // we can be sure that the exterior overlaps the boundary
+                            relate::set<exterior, boundary, '1', TransposeResult>(result);
+                            break;
+                        }
+                    }
+                }
+                // if it's the same single geometry
+                else /*if ( previous_multi_index == it->operations[1].seg_id.multi_index )*/
+                {
+                    // and we jumped over one of the rings
+                    if ( prev_seg_id_ptr != NULL // just in case
+                      && prev_seg_id_ptr->ring_index + 1 < it->operations[1].seg_id.ring_index )
+                    {
+                        // we can be sure that the exterior overlaps the boundary
+                        relate::set<exterior, boundary, '1', TransposeResult>(result);                    
+                        break;
+                    }
+                }
+
+                prev_seg_id_ptr = boost::addressof(it->operations[1].seg_id);
+
+                // find the next ring first iterator and check if the analysis should be performed
+                has_boundary_intersection has_boundary_inters;
+                turn_iterator next = find_next_ring(it, turns.end(), has_boundary_inters);
+
+                // if there is no 1d overlap with the boundary
+                if ( !has_boundary_inters.result )
+                {
+                    // we can be sure that the exterior overlaps the boundary
+                    relate::set<exterior, boundary, '1', TransposeResult>(result);                    
+                    break;
+                }
+                // else there is 1d overlap with the boundary so we must analyse the boundary
+                else
+                {
+                    // u, c
+                    typedef turns::less<1, turns::less_op_areal_linear> less;
+                    std::sort(it, next, less());
+
+                    // analyse
+                    areal_boundary_analyser<turn_type> analyser;
+                    for ( turn_iterator rit = it ; rit != next ; ++rit )
+                    {
+                        // if the analyser requests, break the search
+                        if ( !analyser.apply(it, rit, next) )
+                            break;
+                    }
+
+                    // if the boundary of Areal goes out of the Linear
+                    if ( analyser.is_union_detected )
+                    {
+                        // we can be sure that the boundary of Areal overlaps the exterior of Linear
+                        relate::set<exterior, boundary, '1', TransposeResult>(result);
+                        break;
+                    }
+                }
+
+                it = next;
+            }
+
+            // if there was some previous ring
+            if ( prev_seg_id_ptr != NULL )
+            {
+                int const next_ring_index = prev_seg_id_ptr->ring_index + 1;
+                BOOST_ASSERT(next_ring_index >= 0);
+
+                // if one of the last rings of previous single geometry was ommited
+                if ( static_cast<std::size_t>(next_ring_index)
+                        < geometry::num_interior_rings(
+                            single_geometry(geometry2, *prev_seg_id_ptr)) )
+                {
+                    // we can be sure that the exterior overlaps the boundary
+                    relate::set<exterior, boundary, '1', TransposeResult>(result);
+                }
+            }
+        }
+    }
+
+    // interrupt policy which may be passed to get_turns to interrupt the analysis
+    // based on the info in the passed result/mask
+    template <typename Areal, typename Result>
+    class interrupt_policy_linear_areal
+    {
+    public:
+        static bool const enabled = true;
+
+        interrupt_policy_linear_areal(Areal const& areal, Result & result)
+            : m_result(result), m_areal(areal)
+            , is_boundary_found(false)
+        {}
+
+// TODO: since we update result for some operations here, we may not do it in the analyser!
+
+        template <typename Range>
+        inline bool apply(Range const& turns)
+        {
+            typedef typename boost::range_iterator<Range const>::type iterator;
+            
+            for (iterator it = boost::begin(turns) ; it != boost::end(turns) ; ++it)
+            {
+                if ( it->operations[0].operation == overlay::operation_intersection )
+                {
+                    bool const no_interior_rings
+                        = geometry::num_interior_rings(
+                                single_geometry(m_areal, it->operations[1].seg_id)) == 0;
+
+                    // WARNING! THIS IS TRUE ONLY IF THE POLYGON IS SIMPLE!
+                    // OR WITHOUT INTERIOR RINGS (AND OF COURSE VALID)
+                    if ( no_interior_rings )
+                        update<interior, interior, '1', TransposeResult>(m_result);
+                }
+                else if ( it->operations[0].operation == overlay::operation_continue )
+                {
+                    update<interior, boundary, '1', TransposeResult>(m_result);
+                    is_boundary_found = true;
+                }
+                else if ( ( it->operations[0].operation == overlay::operation_union
+                         || it->operations[0].operation == overlay::operation_blocked )
+                       && it->operations[0].position == overlay::position_middle )
+                {
+// TODO: here we could also check the boundaries and set BB at this point
+                    update<interior, boundary, '0', TransposeResult>(m_result);
+                }
+            }
+
+            return m_result.interrupt;
+        }
+
+    private:
+        Result & m_result;
+        Areal const& m_areal;
+
+    public:
+        bool is_boundary_found;
+    };
+
+    // This analyser should be used like Input or SinglePass Iterator
+    // IMPORTANT! It should be called also for the end iterator - last
+    template <typename TurnInfo>
+    class turns_analyser
+    {
+        typedef typename TurnInfo::point_type turn_point_type;
+
+        static const std::size_t op_id = 0;
+        static const std::size_t other_op_id = 1;
+
+    public:
+        turns_analyser()
+            : m_previous_turn_ptr(NULL)
+            , m_previous_operation(overlay::operation_none)
+            , m_boundary_counter(0)
+            , m_interior_detected(false)
+            , m_first_interior_other_id_ptr(NULL)
+        {}
+
+        template <typename Result,
+                  typename TurnIt,
+                  typename Geometry,
+                  typename OtherGeometry,
+                  typename BoundaryChecker>
+        void apply(Result & res, TurnIt it,
+                   Geometry const& geometry,
+                   OtherGeometry const& other_geometry,
+                   BoundaryChecker const& boundary_checker)
+        {
+            overlay::operation_type op = it->operations[op_id].operation;
+
+            if ( op != overlay::operation_union
+              && op != overlay::operation_intersection
+              && op != overlay::operation_blocked
+              && op != overlay::operation_continue ) // operation_boundary / operation_boundary_intersection
+            {
+                return;
+            }
+
+            segment_identifier const& seg_id = it->operations[op_id].seg_id;
+            segment_identifier const& other_id = it->operations[other_op_id].seg_id;
+
+            const bool first_in_range = m_seg_watcher.update(seg_id);
+
+            // handle possible exit
+            bool fake_enter_detected = false;
+            if ( m_exit_watcher.get_exit_operation() == overlay::operation_union )
+            {
+                // real exit point - may be multiple
+                // we know that we entered and now we exit
+                if ( ! turn_on_the_same_ip<op_id>(m_exit_watcher.get_exit_turn(), *it) )
+                {
+                    m_exit_watcher.reset_detected_exit();
+                    
+                    // not the last IP
+                    update<interior, exterior, '1', TransposeResult>(res);
+                }
+                // fake exit point, reset state
+                else if ( op == overlay::operation_intersection
+                        || op == overlay::operation_continue ) // operation_boundary
+                {
+                    m_exit_watcher.reset_detected_exit();
+                    fake_enter_detected = true;
+                }
+            }
+            else if ( m_exit_watcher.get_exit_operation() == overlay::operation_blocked )
+            {
+                // ignore multiple BLOCKs
+                if ( op == overlay::operation_blocked )
+                    return;
+
+                if ( ( op == overlay::operation_intersection
+                    || op == overlay::operation_continue )
+                  && turn_on_the_same_ip<op_id>(m_exit_watcher.get_exit_turn(), *it) )
+                {
+                    fake_enter_detected = true;
+                }
+
+                m_exit_watcher.reset_detected_exit();
+            }
+
+// NOTE: THE WHOLE m_interior_detected HANDLING IS HERE BECAUSE WE CAN'T EFFICIENTLY SORT TURNS (CORRECTLY)
+// BECAUSE THE SAME IP MAY BE REPRESENTED BY TWO SEGMENTS WITH DIFFERENT DISTANCES
+// IT WOULD REQUIRE THE CALCULATION OF MAX DISTANCE
+// TODO: WE COULD GET RID OF THE TEST IF THE DISTANCES WERE NORMALIZED
+
+// TODO: THIS IS POTENTIALLY ERROREOUS!
+// THIS ALGORITHM DEPENDS ON SOME SPECIFIC SEQUENCE OF OPERATIONS
+// IT WOULD GIVE WRONG RESULTS E.G.
+// IN THE CASE OF SELF-TOUCHING POINT WHEN 'i' WOULD BE BEFORE 'u' 
+
+            // handle the interior overlap
+            if ( m_interior_detected )
+            {
+                // real interior overlap
+                if ( ! turn_on_the_same_ip<op_id>(*m_previous_turn_ptr, *it) )
+                {
+                    update<interior, interior, '1', TransposeResult>(res);
+                    m_interior_detected = false;
+                }
+                // fake interior overlap
+                else if ( op == overlay::operation_continue )
+                {
+                    m_interior_detected = false;
+                }
+                else if ( op == overlay::operation_union )
+                {
+// TODO: this probably is not a good way of handling the interiors/enters
+//       the solution similar to exit_watcher would be more robust
+//       all enters should be kept and handled.
+//       maybe integrate it with the exit_watcher -> enter_exit_watcher
+                    if ( m_first_interior_other_id_ptr
+                      && m_first_interior_other_id_ptr->multi_index == other_id.multi_index )
+                    {
+                        m_interior_detected = false;
+                    }
+                }
+            }
+
+            // i/u, c/u
+            if ( op == overlay::operation_intersection
+              || op == overlay::operation_continue ) // operation_boundary/operation_boundary_intersection
+            {
+                bool no_enters_detected = m_exit_watcher.is_outside();
+                m_exit_watcher.enter(*it);
+
+                if ( op == overlay::operation_intersection )
+                {
+                    if ( m_boundary_counter > 0 && it->operations[op_id].is_collinear )
+                        --m_boundary_counter;
+
+                    if ( m_boundary_counter == 0 )
+                    {
+                        // interiors overlaps
+                        //update<interior, interior, '1', TransposeResult>(res);
+
+// TODO: think about the implementation of the more robust version
+//       this way only the first enter will be handled
+                        if ( !m_interior_detected )
+                        {
+                            // don't update now
+                            // we might enter a boundary of some other ring on the same IP
+                            m_interior_detected = true;
+                            m_first_interior_other_id_ptr = boost::addressof(other_id);
+                        }
+                    }
+                }
+                else // operation_boundary
+                {
+                    // don't add to the count for all met boundaries
+                    // only if this is the "new" boundary
+                    if ( first_in_range || !it->operations[op_id].is_collinear )
+                        ++m_boundary_counter;
+
+                    update<interior, boundary, '1', TransposeResult>(res);
+                }
+
+                bool this_b = is_ip_on_boundary<boundary_front>(it->point,
+                                                                it->operations[op_id],
+                                                                boundary_checker,
+                                                                seg_id);
+                // going inside on boundary point
+                if ( this_b )
+                {
+                    update<boundary, boundary, '0', TransposeResult>(res);
+                }
+                // going inside on non-boundary point
+                else
+                {
+                    update<interior, boundary, '0', TransposeResult>(res);
+
+                    // if we didn't enter in the past, we were outside
+                    if ( no_enters_detected
+                      && ! fake_enter_detected
+                      && it->operations[op_id].position != overlay::position_front )
+                    {
+// TODO: calculate_from_inside() is only needed if the current Linestring is not closed
+                        bool from_inside = first_in_range
+                                            && calculate_from_inside(geometry,
+                                                                    other_geometry,
+                                                                    *it);
+
+                        if ( from_inside )
+                            update<interior, interior, '1', TransposeResult>(res);
+                        else
+                            update<interior, exterior, '1', TransposeResult>(res);
+
+                        // if it's the first IP then the first point is outside
+                        if ( first_in_range )
+                        {
+                            bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(sub_range(geometry, seg_id)),
+                                                boundary_checker);
+
+                            // if there is a boundary on the first point
+                            if ( front_b )
+                            {
+                                if ( from_inside )
+                                    update<boundary, interior, '0', TransposeResult>(res);
+                                else
+                                    update<boundary, exterior, '0', TransposeResult>(res);
+                            }
+                        }
+                    }
+                }
+            }
+            // u/u, x/u
+            else if ( op == overlay::operation_union || op == overlay::operation_blocked )
+            {
+                bool op_blocked = op == overlay::operation_blocked;
+                bool no_enters_detected = m_exit_watcher.is_outside()
+// TODO: is this condition ok?
+// TODO: move it into the exit_watcher?
+                    && m_exit_watcher.get_exit_operation() == overlay::operation_none;
+                    
+                if ( op == overlay::operation_union )
+                {
+                    if ( m_boundary_counter > 0 && it->operations[op_id].is_collinear )
+                        --m_boundary_counter;
+                }
+                else // overlay::operation_blocked
+                {
+                    m_boundary_counter = 0;
+                }
+
+                // we're inside, possibly going out right now
+                if ( ! no_enters_detected )
+                {
+                    if ( op_blocked
+                      && it->operations[op_id].position == overlay::position_back ) // ignore spikes!
+                    {
+                        // check if this is indeed the boundary point
+                        // NOTE: is_ip_on_boundary<>() should be called here but the result will be the same
+                        if ( is_endpoint_on_boundary<boundary_back>(it->point, boundary_checker) )
+                        {
+                            update<boundary, boundary, '0', TransposeResult>(res);
+                        }
+                    }
+                    // union, inside, but no exit -> collinear on self-intersection point
+                    // not needed since we're already inside the boundary
+                    /*else if ( !exit_detected )
+                    {
+                        update<interior, boundary, '0', TransposeResult>(res);
+                    }*/
+                }
+                // we're outside or inside and this is the first turn
+                else
+                {
+                    bool this_b = is_ip_on_boundary<boundary_any>(it->point,
+                                                                    it->operations[op_id],
+                                                                    boundary_checker,
+                                                                    seg_id);                        
+                    // if current IP is on boundary of the geometry
+                    if ( this_b )
+                    {
+                        update<boundary, boundary, '0', TransposeResult>(res);
+                    }
+                    // if current IP is not on boundary of the geometry
+                    else
+                    {
+                        update<interior, boundary, '0', TransposeResult>(res);
+                    }
+
+                    // TODO: very similar code is used in the handling of intersection
+                    if ( it->operations[op_id].position != overlay::position_front )
+                    {
+// TODO: calculate_from_inside() is only needed if the current Linestring is not closed
+                        bool first_from_inside = first_in_range
+                                                && calculate_from_inside(geometry,
+                                                                        other_geometry,
+                                                                        *it);
+                        if ( first_from_inside )
+                        {
+                            update<interior, interior, '1', TransposeResult>(res);
+
+                            // notify the exit_watcher that we started inside
+                            m_exit_watcher.enter(*it);
+                        }
+                        else
+                        {
+                            update<interior, exterior, '1', TransposeResult>(res);
+                        }
+
+                        // first IP on the last segment point - this means that the first point is outside or inside
+                        if ( first_in_range && ( !this_b || op_blocked ) )
+                        {
+                            bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(sub_range(geometry, seg_id)),
+                                                boundary_checker);
+
+                            // if there is a boundary on the first point
+                            if ( front_b )
+                            {
+                                if ( first_from_inside )
+                                    update<boundary, interior, '0', TransposeResult>(res);
+                                else
+                                    update<boundary, exterior, '0', TransposeResult>(res);
+                            }
+                        }
+                    }
+                }
+
+                // if we're going along a boundary, we exit only if the linestring was collinear
+                if ( m_boundary_counter == 0
+                  || it->operations[op_id].is_collinear )
+                {
+                    // notify the exit watcher about the possible exit
+                    m_exit_watcher.exit(*it);
+                }
+            }
+
+            // store ref to previously analysed (valid) turn
+            m_previous_turn_ptr = boost::addressof(*it);
+            // and previously analysed (valid) operation
+            m_previous_operation = op;
+        }
+
+        // it == last
+        template <typename Result,
+                  typename TurnIt,
+                  typename Geometry,
+                  typename OtherGeometry,
+                  typename BoundaryChecker>
+        void apply(Result & res,
+                   TurnIt first, TurnIt last,
+                   Geometry const& geometry,
+                   OtherGeometry const& /*other_geometry*/,
+                   BoundaryChecker const& boundary_checker)
+        {
+            //BOOST_ASSERT( first != last );
+
+            // here, the possible exit is the real one
+            // we know that we entered and now we exit
+            if ( /*m_exit_watcher.get_exit_operation() == overlay::operation_union // THIS CHECK IS REDUNDANT
+                ||*/ m_previous_operation == overlay::operation_union
+                && !m_interior_detected )
+            {
+                // for sure
+                update<interior, exterior, '1', TransposeResult>(res);
+
+                BOOST_ASSERT(first != last);
+                BOOST_ASSERT(m_previous_turn_ptr);
+
+                segment_identifier const& prev_seg_id = m_previous_turn_ptr->operations[op_id].seg_id;
+
+                bool prev_back_b = is_endpoint_on_boundary<boundary_back>(
+                                        range::back(sub_range(geometry, prev_seg_id)),
+                                        boundary_checker);
+
+                // if there is a boundary on the last point
+                if ( prev_back_b )
+                {
+                    update<boundary, exterior, '0', TransposeResult>(res);
+                }
+            }
+            // we might enter some Areal and didn't go out,
+            else if ( m_previous_operation == overlay::operation_intersection
+                   || m_interior_detected )
+            {
+                // just in case
+                update<interior, interior, '1', TransposeResult>(res);
+                m_interior_detected = false;
+
+                BOOST_ASSERT(first != last);
+                BOOST_ASSERT(m_previous_turn_ptr);
+
+                segment_identifier const& prev_seg_id = m_previous_turn_ptr->operations[op_id].seg_id;
+
+                bool prev_back_b = is_endpoint_on_boundary<boundary_back>(
+                                        range::back(sub_range(geometry, prev_seg_id)),
+                                        boundary_checker);
+
+                // if there is a boundary on the last point
+                if ( prev_back_b )
+                {
+                    update<boundary, interior, '0', TransposeResult>(res);
+                }
+            }
+
+            BOOST_ASSERT_MSG(m_previous_operation != overlay::operation_continue,
+                                "Unexpected operation! Probably the error in get_turns(L,A) or relate(L,A)");
+
+            // Reset exit watcher before the analysis of the next Linestring
+            m_exit_watcher.reset();
+            m_boundary_counter = 0;
+        }
+
+        // check if the passed turn's segment of Linear geometry arrived
+        // from the inside or the outside of the Areal geometry
+        template <typename Turn>
+        static inline bool calculate_from_inside(Geometry1 const& geometry1,
+                                                 Geometry2 const& geometry2,
+                                                 Turn const& turn)
+        {
+            if ( turn.operations[op_id].position == overlay::position_front )
+                return false;
+
+            typename sub_range_return_type<Geometry1 const>::type
+                range1 = sub_range(geometry1, turn.operations[op_id].seg_id);
+            
+            typedef detail::normalized_view<Geometry2 const> const range2_type;
+            typedef typename boost::range_iterator<range2_type>::type range2_iterator;
+            range2_type range2(sub_range(geometry2, turn.operations[other_op_id].seg_id));
+            
+            std::size_t s1 = boost::size(range1);
+            std::size_t s2 = boost::size(range2);
+            BOOST_ASSERT(s1 > 1 && s2 > 2);
+            std::size_t seg_count2 = s2 - 1;
+
+            std::size_t p_seg_ij = turn.operations[op_id].seg_id.segment_index;
+            std::size_t q_seg_ij = turn.operations[other_op_id].seg_id.segment_index;
+
+            BOOST_ASSERT(p_seg_ij + 1 < s1 && q_seg_ij + 1 < s2);
+
+            point1_type const& pi = range::at(range1, p_seg_ij);
+            point2_type const& qi = range::at(range2, q_seg_ij);
+            point2_type const& qj = range::at(range2, q_seg_ij + 1);
+            point1_type qi_conv;
+            geometry::convert(qi, qi_conv);
+            bool is_ip_qj = equals::equals_point_point(turn.point, qj);
+// TODO: test this!
+//            BOOST_ASSERT(!equals::equals_point_point(turn.point, pi));
+//            BOOST_ASSERT(!equals::equals_point_point(turn.point, qi));
+            point1_type new_pj;
+            geometry::convert(turn.point, new_pj);
+
+            if ( is_ip_qj )
+            {
+                std::size_t q_seg_jk = (q_seg_ij + 1) % seg_count2;
+// TODO: the following function should return immediately, however the worst case complexity is O(N)
+// It would be good to replace it with some O(1) mechanism
+                range2_iterator qk_it = find_next_non_duplicated(boost::begin(range2),
+                                                                 boost::begin(range2) + q_seg_jk,
+                                                                 boost::end(range2));
+
+                // Will this sequence of points be always correct?
+                overlay::side_calculator<point1_type, point2_type> side_calc(qi_conv, new_pj, pi, qi, qj, *qk_it);
+
+                return calculate_from_inside_sides(side_calc);
+            }
+            else
+            {
+                point1_type new_qj;
+                geometry::convert(turn.point, new_qj);
+
+                overlay::side_calculator<point1_type, point2_type> side_calc(qi_conv, new_pj, pi, qi, new_qj, qj);
+
+                return calculate_from_inside_sides(side_calc);
+            }
+        }
+
+        template <typename It>
+        static inline It find_next_non_duplicated(It first, It current, It last)
+        {
+            BOOST_ASSERT( current != last );
+
+            It it = current;
+
+            for ( ++it ; it != last ; ++it )
+            {
+                if ( !equals::equals_point_point(*current, *it) )
+                    return it;
+            }
+
+            // if not found start from the beginning
+            for ( it = first ; it != current ; ++it )
+            {
+                if ( !equals::equals_point_point(*current, *it) )
+                    return it;
+            }
+
+            return current;
+        }
+
+        // calculate inside or outside based on side_calc
+        // this is simplified version of a check from equal<>
+        template <typename SideCalc>
+        static inline bool calculate_from_inside_sides(SideCalc const& side_calc)
+        {
+            int const side_pk_p = side_calc.pk_wrt_p1();
+            int const side_qk_p = side_calc.qk_wrt_p1();
+            // If they turn to same side (not opposite sides)
+            if (! overlay::base_turn_handler::opposite(side_pk_p, side_qk_p))
+            {
+                int const side_pk_q2 = side_calc.pk_wrt_q2();
+                return side_pk_q2 == -1;
+            }
+            else
+            {
+                return side_pk_p == -1;
+            }
+        }
+
+    private:
+        exit_watcher<TurnInfo, op_id> m_exit_watcher;
+        segment_watcher<same_single> m_seg_watcher;
+        TurnInfo * m_previous_turn_ptr;
+        overlay::operation_type m_previous_operation;
+        unsigned m_boundary_counter;
+        bool m_interior_detected;
+        const segment_identifier * m_first_interior_other_id_ptr;
+    };
+
+    // call analyser.apply() for each turn in range
+    // IMPORTANT! The analyser is also called for the end iterator - last
+    template <typename Result,
+              typename TurnIt,
+              typename Analyser,
+              typename Geometry,
+              typename OtherGeometry,
+              typename BoundaryChecker>
+    static inline void analyse_each_turn(Result & res,
+                                         Analyser & analyser,
+                                         TurnIt first, TurnIt last,
+                                         Geometry const& geometry,
+                                         OtherGeometry const& other_geometry,
+                                         BoundaryChecker const& boundary_checker)
+    {
+        if ( first == last )
+            return;
+
+        for ( TurnIt it = first ; it != last ; ++it )
+        {
+            analyser.apply(res, it,
+                           geometry, other_geometry,
+                           boundary_checker);
+
+            if ( res.interrupt )
+                return;
+        }
+
+        analyser.apply(res, first, last,
+                       geometry, other_geometry,
+                       boundary_checker);
+    }
+
+    // less comparator comparing multi_index then ring_index
+    // may be used to sort turns by ring
+    struct less_ring
+    {
+        template <typename Turn>
+        inline bool operator()(Turn const& left, Turn const& right) const
+        {
+            return left.operations[1].seg_id.multi_index < right.operations[1].seg_id.multi_index
+                || ( left.operations[1].seg_id.multi_index == right.operations[1].seg_id.multi_index
+                  && left.operations[1].seg_id.ring_index < right.operations[1].seg_id.ring_index );
+        }
+    };
+
+    // policy/functor checking if a turn's operation is operation_continue
+    struct has_boundary_intersection
+    {
+        has_boundary_intersection()
+            : result(false) {}
+
+        template <typename Turn>
+        inline void operator()(Turn const& turn)
+        {
+            if ( turn.operations[1].operation == overlay::operation_continue )
+                result = true;
+        }
+
+        bool result;
+    };
+
+    // iterate through the range and search for the different multi_index or ring_index
+    // also call fun for each turn in the current range
+    template <typename It, typename Fun>
+    static inline It find_next_ring(It first, It last, Fun & fun)
+    {
+        if ( first == last )
+            return last;
+
+        int const multi_index = first->operations[1].seg_id.multi_index;
+        int const ring_index = first->operations[1].seg_id.ring_index;
+
+        fun(*first);
+        ++first;
+
+        for ( ; first != last ; ++first )
+        {
+            if ( multi_index != first->operations[1].seg_id.multi_index
+              || ring_index != first->operations[1].seg_id.ring_index )
+            {
+                return first;
+            }
+
+            fun(*first);
+        }
+
+        return last;
+    }
+
+    // analyser which called for turns sorted by seg/distance/operation
+    // checks if the boundary of Areal geometry really got out
+    // into the exterior of Linear geometry
+    template <typename TurnInfo>
+    class areal_boundary_analyser
+    {
+    public:
+        areal_boundary_analyser()
+            : is_union_detected(false)
+            , m_previous_turn_ptr(NULL)
+        {}
+
+        template <typename TurnIt>
+        bool apply(TurnIt /*first*/, TurnIt it, TurnIt last)
+        {
+            overlay::operation_type op = it->operations[1].operation;
+
+            if ( it != last )
+            {
+                if ( op != overlay::operation_union
+                  && op != overlay::operation_continue )
+                {
+                    return true;
+                }
+
+                if ( is_union_detected )
+                {
+                    BOOST_ASSERT(m_previous_turn_ptr != NULL);
+                    if ( !detail::equals::equals_point_point(it->point, m_previous_turn_ptr->point) )
+                    {
+                        // break
+                        return false;
+                    }
+                    else if ( op == overlay::operation_continue ) // operation_boundary
+                    {
+                        is_union_detected = false;
+                    }
+                }
+
+                if ( op == overlay::operation_union )
+                {
+                    is_union_detected = true;
+                    m_previous_turn_ptr = boost::addressof(*it);
+                }
+
+                return true;
+            }
+            else
+            {
+                return false;
+            }            
+        }
+
+        bool is_union_detected;
+
+    private:
+        const TurnInfo * m_previous_turn_ptr;
+    };
+};
+
+template <typename Geometry1, typename Geometry2>
+struct areal_linear
+{
+    template <typename Result>
+    static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Result & result)
+    {
+        linear_areal<Geometry2, Geometry1, true>::apply(geometry2, geometry1, result);
+    }
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_AREAL_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
new file mode 100644
index 000000000..3db680db2
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/linear_linear.hpp
@@ -0,0 +1,765 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_LINEAR_HPP
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+#include <boost/geometry/algorithms/detail/single_geometry.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+#include <boost/geometry/algorithms/detail/relate/boundary_checker.hpp>
+#include <boost/geometry/algorithms/detail/relate/follow_helpers.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+template <typename Result, typename BoundaryChecker, bool TransposeResult>
+class disjoint_linestring_pred
+{
+public:
+    disjoint_linestring_pred(Result & res,
+                             BoundaryChecker const& boundary_checker)
+        : m_result(res)
+        , m_boundary_checker(boundary_checker)
+        , m_flags(0)
+    {
+        if ( ! may_update<interior, exterior, '1', TransposeResult>(m_result) )
+        {
+            m_flags |= 1;
+        }
+        if ( ! may_update<boundary, exterior, '0', TransposeResult>(m_result) )
+        {
+            m_flags |= 2;
+        }
+    }
+
+    template <typename Linestring>
+    bool operator()(Linestring const& linestring)
+    {
+        if ( m_flags == 3 )
+        {
+            return false;
+        }
+
+        std::size_t count = boost::size(linestring);
+        
+        // invalid input
+        if ( count < 2 )
+        {
+            // ignore
+            // TODO: throw an exception?
+            return true;
+        }
+
+        // point-like linestring
+        if ( count == 2
+          && equals::equals_point_point(range::front(linestring),
+                                        range::back(linestring)) )
+        {
+            update<interior, exterior, '0', TransposeResult>(m_result);
+        }
+        else
+        {
+            update<interior, exterior, '1', TransposeResult>(m_result);
+            m_flags |= 1;
+
+            // check if there is a boundary
+            if ( m_flags < 2
+              && ( m_boundary_checker.template
+                    is_endpoint_boundary<boundary_front>(range::front(linestring))
+                || m_boundary_checker.template
+                    is_endpoint_boundary<boundary_back>(range::back(linestring)) ) )
+            {
+                update<boundary, exterior, '0', TransposeResult>(m_result);
+                m_flags |= 2;
+            }
+        }
+
+        return m_flags != 3
+            && ! m_result.interrupt;
+    }
+
+private:
+    Result & m_result;
+    BoundaryChecker const& m_boundary_checker;
+    unsigned m_flags;
+};
+
+template <typename Geometry1, typename Geometry2>
+struct linear_linear
+{
+    static const bool interruption_enabled = true;
+
+    typedef typename geometry::point_type<Geometry1>::type point1_type;
+    typedef typename geometry::point_type<Geometry2>::type point2_type;
+
+    template <typename Result>
+    static inline void apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Result & result)
+    {
+        // The result should be FFFFFFFFF
+        relate::set<exterior, exterior, result_dimension<Geometry1>::value>(result);// FFFFFFFFd, d in [1,9] or T
+        if ( result.interrupt )
+            return;
+
+        // get and analyse turns
+        typedef typename turns::get_turns<Geometry1, Geometry2>::turn_info turn_type;
+        std::vector<turn_type> turns;
+
+        interrupt_policy_linear_linear<Result> interrupt_policy(result);
+
+        turns::get_turns
+            <
+                Geometry1,
+                Geometry2,
+                detail::get_turns::get_turn_info_type<Geometry1, Geometry2, turns::assign_policy<true> >
+            >::apply(turns, geometry1, geometry2, interrupt_policy);
+
+        if ( result.interrupt )
+            return;
+
+        boundary_checker<Geometry1> boundary_checker1(geometry1);
+        disjoint_linestring_pred<Result, boundary_checker<Geometry1>, false> pred1(result, boundary_checker1);
+        for_each_disjoint_geometry_if<0, Geometry1>::apply(turns.begin(), turns.end(), geometry1, pred1);
+        if ( result.interrupt )
+            return;
+
+        boundary_checker<Geometry2> boundary_checker2(geometry2);
+        disjoint_linestring_pred<Result, boundary_checker<Geometry2>, true> pred2(result, boundary_checker2);
+        for_each_disjoint_geometry_if<1, Geometry2>::apply(turns.begin(), turns.end(), geometry2, pred2);
+        if ( result.interrupt )
+            return;
+        
+        if ( turns.empty() )
+            return;
+
+        // TODO: turns must be sorted and followed only if it's possible to go out and in on the same point
+        // for linear geometries union operation must be detected which I guess would be quite often
+
+        if ( may_update<interior, interior, '1'>(result)
+          || may_update<interior, boundary, '0'>(result)
+          || may_update<interior, exterior, '1'>(result)
+          || may_update<boundary, interior, '0'>(result)
+          || may_update<boundary, boundary, '0'>(result)
+          || may_update<boundary, exterior, '0'>(result) )
+        {
+            typedef turns::less<0, turns::less_op_linear_linear> less;
+            std::sort(turns.begin(), turns.end(), less());
+
+            turns_analyser<turn_type, 0> analyser;
+            analyse_each_turn(result, analyser,
+                              turns.begin(), turns.end(),
+                              geometry1, geometry2,
+                              boundary_checker1, boundary_checker2);
+        }
+
+        if ( result.interrupt )
+            return;
+        
+        if ( may_update<interior, interior, '1', true>(result)
+          || may_update<interior, boundary, '0', true>(result)
+          || may_update<interior, exterior, '1', true>(result)
+          || may_update<boundary, interior, '0', true>(result)
+          || may_update<boundary, boundary, '0', true>(result)
+          || may_update<boundary, exterior, '0', true>(result) )
+        {
+            typedef turns::less<1, turns::less_op_linear_linear> less;
+            std::sort(turns.begin(), turns.end(), less());
+
+            turns_analyser<turn_type, 1> analyser;
+            analyse_each_turn(result, analyser,
+                              turns.begin(), turns.end(),
+                              geometry2, geometry1,
+                              boundary_checker2, boundary_checker1);
+        }
+    }
+
+    template <typename Result>
+    class interrupt_policy_linear_linear
+    {
+    public:
+        static bool const enabled = true;
+
+        explicit interrupt_policy_linear_linear(Result & result)
+            : m_result(result)
+        {}
+
+// TODO: since we update result for some operations here, we may not do it in the analyser!
+
+        template <typename Range>
+        inline bool apply(Range const& turns)
+        {
+            typedef typename boost::range_iterator<Range const>::type iterator;
+            
+            for (iterator it = boost::begin(turns) ; it != boost::end(turns) ; ++it)
+            {
+                if ( it->operations[0].operation == overlay::operation_intersection
+                  || it->operations[1].operation == overlay::operation_intersection )
+                {
+                    update<interior, interior, '1'>(m_result);
+                }
+                else if ( ( it->operations[0].operation == overlay::operation_union
+                         || it->operations[0].operation == overlay::operation_blocked
+                         || it->operations[1].operation == overlay::operation_union
+                         || it->operations[1].operation == overlay::operation_blocked )
+                       && it->operations[0].position == overlay::position_middle
+                       && it->operations[1].position == overlay::position_middle )
+                {
+// TODO: here we could also check the boundaries and set IB,BI,BB at this point
+                    update<interior, interior, '0'>(m_result);
+                }
+            }
+
+            return m_result.interrupt;
+        }
+
+    private:
+        Result & m_result;
+    };
+
+    // This analyser should be used like Input or SinglePass Iterator
+    template <typename TurnInfo, std::size_t OpId>
+    class turns_analyser
+    {
+        typedef typename TurnInfo::point_type turn_point_type;
+
+        static const std::size_t op_id = OpId;
+        static const std::size_t other_op_id = (OpId + 1) % 2;
+        static const bool transpose_result = OpId != 0;
+
+    public:
+        turns_analyser()
+            : m_previous_turn_ptr(NULL)
+            , m_previous_operation(overlay::operation_none)
+            , m_degenerated_turn_ptr(NULL)
+        {}
+
+        template <typename Result,
+                  typename TurnIt,
+                  typename Geometry,
+                  typename OtherGeometry,
+                  typename BoundaryChecker,
+                  typename OtherBoundaryChecker>
+        void apply(Result & res, TurnIt it,
+                   Geometry const& geometry,
+                   OtherGeometry const& other_geometry,
+                   BoundaryChecker const& boundary_checker,
+                   OtherBoundaryChecker const& other_boundary_checker)
+        {
+            overlay::operation_type op = it->operations[op_id].operation;
+
+            segment_identifier const& seg_id = it->operations[op_id].seg_id;
+            segment_identifier const& other_id = it->operations[other_op_id].seg_id;
+
+            const bool first_in_range = m_seg_watcher.update(seg_id);
+
+            if ( op != overlay::operation_union
+              && op != overlay::operation_intersection
+              && op != overlay::operation_blocked )
+            {
+                // degenerated turn
+                if ( op == overlay::operation_continue
+                  && it->method == overlay::method_none
+                  && m_exit_watcher.is_outside(*it) 
+                  /*&& ( m_exit_watcher.get_exit_operation() == overlay::operation_none 
+                    || ! turn_on_the_same_ip<op_id>(m_exit_watcher.get_exit_turn(), *it) )*/ )
+                {
+                    // TODO: rewrite the above condition
+
+                    // WARNING! For spikes the above condition may be TRUE
+                    // When degenerated turns are be marked in a different way than c,c/c
+                    // different condition will be checked
+
+                    handle_degenerated(res, *it,
+                                       geometry, other_geometry,
+                                       boundary_checker, other_boundary_checker,
+                                       first_in_range);
+
+                    // TODO: not elegant solution! should be rewritten.
+                    if ( it->operations[op_id].position == overlay::position_back )
+                    {
+                        m_previous_operation = overlay::operation_blocked;
+                        m_exit_watcher.reset_detected_exit();
+                    }
+                }
+
+                return;
+            }
+
+            // reset
+            m_degenerated_turn_ptr = NULL;
+
+            // handle possible exit
+            bool fake_enter_detected = false;
+            if ( m_exit_watcher.get_exit_operation() == overlay::operation_union )
+            {
+                // real exit point - may be multiple
+                // we know that we entered and now we exit
+                if ( ! turn_on_the_same_ip<op_id>(m_exit_watcher.get_exit_turn(), *it) )
+                {
+                    m_exit_watcher.reset_detected_exit();
+                    
+                    // not the last IP
+                    update<interior, exterior, '1', transpose_result>(res);
+                }
+                // fake exit point, reset state
+                else if ( op == overlay::operation_intersection )
+                {
+                    m_exit_watcher.reset_detected_exit();
+                    fake_enter_detected = true;
+                }
+            }
+            else if ( m_exit_watcher.get_exit_operation() == overlay::operation_blocked )
+            {
+                // ignore multiple BLOCKs
+                if ( op == overlay::operation_blocked )
+                    return;
+
+                if ( op == overlay::operation_intersection
+                  && turn_on_the_same_ip<op_id>(m_exit_watcher.get_exit_turn(), *it) )
+                {
+                    fake_enter_detected = true;
+                }
+
+                m_exit_watcher.reset_detected_exit();
+            }
+
+            // i/i, i/x, i/u
+            if ( op == overlay::operation_intersection )
+            {
+                bool was_outside = m_exit_watcher.is_outside();
+                m_exit_watcher.enter(*it);
+
+                // interiors overlaps
+                update<interior, interior, '1', transpose_result>(res);
+
+                bool this_b = it->operations[op_id].position == overlay::position_front // ignore spikes!
+                           && is_ip_on_boundary<boundary_front>(it->point,
+                                                                it->operations[op_id],
+                                                                boundary_checker,
+                                                                seg_id);
+
+                // going inside on boundary point
+                // may be front only
+                if ( this_b )
+                {
+                    // may be front and back
+                    bool other_b = is_ip_on_boundary<boundary_any>(it->point,
+                                                                    it->operations[other_op_id],
+                                                                    other_boundary_checker,
+                                                                    other_id);
+
+                    // it's also the boundary of the other geometry
+                    if ( other_b )
+                    {
+                        update<boundary, boundary, '0', transpose_result>(res);
+                    }
+                    else
+                    {
+                        update<boundary, interior, '0', transpose_result>(res);
+                    }
+                }
+                // going inside on non-boundary point
+                else
+                {
+                    // if we didn't enter in the past, we were outside
+                    if ( was_outside
+                      && ! fake_enter_detected
+                      && it->operations[op_id].position != overlay::position_front )
+                    {
+                        update<interior, exterior, '1', transpose_result>(res);
+
+                        // if it's the first IP then the first point is outside
+                        if ( first_in_range )
+                        {
+                            bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(sub_range(geometry, seg_id)),
+                                                boundary_checker);
+
+                            // if there is a boundary on the first point
+                            if ( front_b )
+                            {
+                                update<boundary, exterior, '0', transpose_result>(res);
+                            }
+                        }
+                    }
+                }
+            }
+            // u/i, u/u, u/x, x/i, x/u, x/x
+            else if ( op == overlay::operation_union || op == overlay::operation_blocked )
+            {
+                // TODO: is exit watcher still needed?
+                // couldn't is_collinear and some going inside counter be used instead?
+
+                bool is_collinear = it->operations[op_id].is_collinear;
+                bool was_outside = m_exit_watcher.is_outside()
+                                && m_exit_watcher.get_exit_operation() == overlay::operation_none;
+// TODO: move the above condition into the exit_watcher?
+
+                // to exit we must be currently inside and the current segment must be collinear
+                if ( !was_outside && is_collinear )
+                {
+                    m_exit_watcher.exit(*it, false);
+                }
+
+                bool op_blocked = op == overlay::operation_blocked;
+
+                // we're inside and going out from inside
+                // possibly going out right now
+                if ( ! was_outside && is_collinear )
+                {
+                    if ( op_blocked
+                      && it->operations[op_id].position == overlay::position_back ) // ignore spikes!
+                    {
+                        // check if this is indeed the boundary point
+                        // NOTE: is_ip_on_boundary<>() should be called here but the result will be the same
+                        if ( is_endpoint_on_boundary<boundary_back>(it->point, boundary_checker) )
+                        {
+                            // may be front and back
+                            bool other_b = is_ip_on_boundary<boundary_any>(it->point,
+                                                                            it->operations[other_op_id],
+                                                                            other_boundary_checker,
+                                                                            other_id);
+                            // it's also the boundary of the other geometry
+                            if ( other_b )
+                            {
+                                update<boundary, boundary, '0', transpose_result>(res);
+                            }
+                            else
+                            {
+                                update<boundary, interior, '0', transpose_result>(res);
+                            }
+                        }
+                    }
+                }
+                // we're outside or intersects some segment from the outside
+                else
+                {
+                    // if we are truly outside
+                    if ( was_outside
+                      && it->operations[op_id].position != overlay::position_front
+                      /*&& !is_collinear*/ )
+                    {
+                        update<interior, exterior, '1', transpose_result>(res);
+                    }
+
+                    // boundaries don't overlap - just an optimization
+                    if ( it->method == overlay::method_crosses )
+                    {
+                        // the L1 is going from one side of the L2 to the other through the point
+                        update<interior, interior, '0', transpose_result>(res);
+
+                        // it's the first point in range
+                        if ( first_in_range )
+                        {
+                            bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(sub_range(geometry, seg_id)),
+                                                boundary_checker);
+
+                            // if there is a boundary on the first point
+                            if ( front_b )
+                            {
+                                update<boundary, exterior, '0', transpose_result>(res);
+                            }
+                        }
+                    }
+                    // method other than crosses, check more conditions
+                    else
+                    {
+                        bool this_b = is_ip_on_boundary<boundary_any>(it->point,
+                                                                        it->operations[op_id],
+                                                                        boundary_checker,
+                                                                        seg_id);
+
+                        bool other_b = is_ip_on_boundary<boundary_any>(it->point,
+                                                                        it->operations[other_op_id],
+                                                                        other_boundary_checker,
+                                                                        other_id);
+                        
+                        // if current IP is on boundary of the geometry
+                        if ( this_b )
+                        {
+                            // it's also the boundary of the other geometry
+                            if ( other_b )
+                            {
+                                update<boundary, boundary, '0', transpose_result>(res);
+                            }
+                            else
+                            {
+                                update<boundary, interior, '0', transpose_result>(res);
+                            }
+                        }
+                        // if current IP is not on boundary of the geometry
+                        else
+                        {
+                            // it's also the boundary of the other geometry
+                            if ( other_b )
+                            {
+                                update<interior, boundary, '0', transpose_result>(res);
+                            }
+                            else
+                            {
+                                update<interior, interior, '0', transpose_result>(res);
+                            }
+                        }
+
+                        // first IP on the last segment point - this means that the first point is outside
+                        if ( first_in_range
+                          && ( !this_b || op_blocked )
+                          && was_outside
+                          && it->operations[op_id].position != overlay::position_front
+                          /*&& !is_collinear*/ )
+                        {
+                            bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(sub_range(geometry, seg_id)),
+                                                boundary_checker);
+
+                            // if there is a boundary on the first point
+                            if ( front_b )
+                            {
+                                update<boundary, exterior, '0', transpose_result>(res);
+                            }
+                        }
+                            
+                    }
+                }
+            }
+
+            // store ref to previously analysed (valid) turn
+            m_previous_turn_ptr = boost::addressof(*it);
+            // and previously analysed (valid) operation
+            m_previous_operation = op;
+        }
+
+        // Called for last
+        template <typename Result,
+                  typename TurnIt,
+                  typename Geometry,
+                  typename OtherGeometry,
+                  typename BoundaryChecker,
+                  typename OtherBoundaryChecker>
+        void apply(Result & res,
+                   TurnIt first, TurnIt last,
+                   Geometry const& geometry,
+                   OtherGeometry const& /*other_geometry*/,
+                   BoundaryChecker const& boundary_checker,
+                   OtherBoundaryChecker const& /*other_boundary_checker*/)
+        {
+            //BOOST_ASSERT( first != last );
+
+            // here, the possible exit is the real one
+            // we know that we entered and now we exit
+            if ( /*m_exit_watcher.get_exit_operation() == overlay::operation_union // THIS CHECK IS REDUNDANT
+                ||*/ m_previous_operation == overlay::operation_union
+                || m_degenerated_turn_ptr )
+            {
+                update<interior, exterior, '1', transpose_result>(res);
+
+                BOOST_ASSERT(first != last);
+
+                const TurnInfo * turn_ptr = NULL;
+                if ( m_degenerated_turn_ptr )
+                    turn_ptr = m_degenerated_turn_ptr;
+                else if ( m_previous_turn_ptr )
+                    turn_ptr = m_previous_turn_ptr;
+                
+                if ( turn_ptr )
+                {
+                    segment_identifier const& prev_seg_id = turn_ptr->operations[op_id].seg_id;
+
+                    //BOOST_ASSERT(!boost::empty(sub_range(geometry, prev_seg_id)));
+                    bool prev_back_b = is_endpoint_on_boundary<boundary_back>(
+                                            range::back(sub_range(geometry, prev_seg_id)),
+                                            boundary_checker);
+
+                    // if there is a boundary on the last point
+                    if ( prev_back_b )
+                    {
+                        update<boundary, exterior, '0', transpose_result>(res);
+                    }
+                }
+            }
+
+            // Just in case,
+            // reset exit watcher before the analysis of the next Linestring
+            // note that if there are some enters stored there may be some error above
+            m_exit_watcher.reset();
+
+            m_previous_turn_ptr = NULL;
+            m_previous_operation = overlay::operation_none;
+            m_degenerated_turn_ptr = NULL;
+        }
+
+        template <typename Result,
+                  typename Turn,
+                  typename Geometry,
+                  typename OtherGeometry,
+                  typename BoundaryChecker,
+                  typename OtherBoundaryChecker>
+        void handle_degenerated(Result & res,
+                                Turn const& turn,
+                                Geometry const& geometry,
+                                OtherGeometry const& other_geometry,
+                                BoundaryChecker const& boundary_checker,
+                                OtherBoundaryChecker const& /*other_boundary_checker*/,
+                                bool first_in_range)
+        {
+            typename detail::single_geometry_return_type<Geometry const>::type
+                ls1_ref = detail::single_geometry(geometry, turn.operations[op_id].seg_id);
+            typename detail::single_geometry_return_type<OtherGeometry const>::type
+                ls2_ref = detail::single_geometry(other_geometry, turn.operations[op_id].other_id);
+
+            // only one of those should be true:
+
+            if ( turn.operations[op_id].position == overlay::position_front )
+            {
+                // valid, point-sized
+                if ( boost::size(ls2_ref) == 2 )
+                {
+                    bool front_b = is_endpoint_on_boundary<boundary_front>(turn.point, boundary_checker);
+
+                    if ( front_b )
+                    {
+                        update<boundary, interior, '0', transpose_result>(res);
+                    }
+                    else
+                    {
+                        update<interior, interior, '0', transpose_result>(res);
+                    }
+
+                    // operation 'c' should be last for the same IP so we know that the next point won't be the same
+                    update<interior, exterior, '1', transpose_result>(res);
+
+                    m_degenerated_turn_ptr = boost::addressof(turn);
+                }
+            }
+            else if ( turn.operations[op_id].position == overlay::position_back )
+            {
+                // valid, point-sized
+                if ( boost::size(ls2_ref) == 2 )
+                {
+                    update<interior, exterior, '1', transpose_result>(res);
+
+                    bool back_b = is_endpoint_on_boundary<boundary_back>(turn.point, boundary_checker);
+
+                    if ( back_b )
+                    {
+                        update<boundary, interior, '0', transpose_result>(res);
+                    }
+                    else
+                    {
+                        update<interior, interior, '0', transpose_result>(res);
+                    }
+
+                    if ( first_in_range )
+                    {
+                        //BOOST_ASSERT(!boost::empty(ls1_ref));
+                        bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(ls1_ref), boundary_checker);
+                        if ( front_b )
+                        {
+                            update<boundary, exterior, '0', transpose_result>(res);
+                        }
+                    }
+                }
+            }
+            else if ( turn.operations[op_id].position == overlay::position_middle
+                   && turn.operations[other_op_id].position == overlay::position_middle )
+            {
+                update<interior, interior, '0', transpose_result>(res);
+
+                // here we don't know which one is degenerated
+
+                bool is_point1 = boost::size(ls1_ref) == 2
+                              && equals::equals_point_point(range::front(ls1_ref), range::back(ls1_ref));
+                bool is_point2 = boost::size(ls2_ref) == 2
+                              && equals::equals_point_point(range::front(ls2_ref), range::back(ls2_ref));
+
+                // if the second one is degenerated
+                if ( !is_point1 && is_point2 )
+                {
+                    update<interior, exterior, '1', transpose_result>(res);
+
+                    if ( first_in_range )
+                    {
+                        //BOOST_ASSERT(!boost::empty(ls1_ref));
+                        bool front_b = is_endpoint_on_boundary<boundary_front>(
+                                                range::front(ls1_ref), boundary_checker);
+                        if ( front_b )
+                        {
+                            update<boundary, exterior, '0', transpose_result>(res);
+                        }
+                    }
+
+                    m_degenerated_turn_ptr = boost::addressof(turn);
+                }
+            }
+
+            // NOTE: other.position == front and other.position == back
+            //       will be handled later, for the other geometry
+        }
+
+    private:
+        exit_watcher<TurnInfo, OpId> m_exit_watcher;
+        segment_watcher<same_single> m_seg_watcher;
+        const TurnInfo * m_previous_turn_ptr;
+        overlay::operation_type m_previous_operation;
+        const TurnInfo * m_degenerated_turn_ptr;
+    };
+
+    template <typename Result,
+              typename TurnIt,
+              typename Analyser,
+              typename Geometry,
+              typename OtherGeometry,
+              typename BoundaryChecker,
+              typename OtherBoundaryChecker>
+    static inline void analyse_each_turn(Result & res,
+                                         Analyser & analyser,
+                                         TurnIt first, TurnIt last,
+                                         Geometry const& geometry,
+                                         OtherGeometry const& other_geometry,
+                                         BoundaryChecker const& boundary_checker,
+                                         OtherBoundaryChecker const& other_boundary_checker)
+    {
+        if ( first == last )
+            return;
+
+        for ( TurnIt it = first ; it != last ; ++it )
+        {
+            analyser.apply(res, it,
+                           geometry, other_geometry,
+                           boundary_checker, other_boundary_checker);
+
+            if ( res.interrupt )
+                return;
+        }
+
+        analyser.apply(res, first, last,
+                       geometry, other_geometry,
+                       boundary_checker, other_boundary_checker);
+    }
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_LINEAR_LINEAR_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp b/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp
new file mode 100644
index 000000000..86c236d35
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/point_geometry.hpp
@@ -0,0 +1,205 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_GEOMETRY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_GEOMETRY_HPP
+
+#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>
+//#include <boost/geometry/algorithms/within.hpp>
+//#include <boost/geometry/algorithms/covered_by.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/topology_check.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+// non-point geometry
+template <typename Point, typename Geometry, bool Transpose = false>
+struct point_geometry
+{
+    // TODO: interrupt only if the topology check is complex
+
+    static const bool interruption_enabled = true;
+
+    template <typename Result>
+    static inline void apply(Point const& point, Geometry const& geometry, Result & result)
+    {
+        int pig = detail::within::point_in_geometry(point, geometry);
+
+        if ( pig > 0 ) // within
+        {
+            set<interior, interior, '0', Transpose>(result);
+        }
+        else if ( pig == 0 )
+        {
+            set<interior, boundary, '0', Transpose>(result);
+        }
+        else // pig < 0 - not within
+        {
+            set<interior, exterior, '0', Transpose>(result);
+        }
+
+        set<exterior, exterior, result_dimension<Point>::value, Transpose>(result);
+
+        if ( result.interrupt )
+            return;
+
+        // the point is on the boundary
+        if ( pig == 0 )
+        {
+            // NOTE: even for MLs, if there is at least one boundary point,
+            // somewhere there must be another one
+
+            // check if there are other boundaries outside
+            typedef detail::relate::topology_check<Geometry> tc_t;
+            //tc_t tc(geometry, point);
+            //if ( tc.has_interior )
+                set<exterior, interior, tc_t::interior, Transpose>(result);
+            //if ( tc.has_boundary )
+                set<exterior, boundary, tc_t::boundary, Transpose>(result);
+        }
+        else
+        {
+            // check if there is a boundary in Geometry
+            typedef detail::relate::topology_check<Geometry> tc_t;
+            tc_t tc(geometry);
+            if ( tc.has_interior )
+                set<exterior, interior, tc_t::interior, Transpose>(result);
+            if ( tc.has_boundary )
+                set<exterior, boundary, tc_t::boundary, Transpose>(result);
+        }
+    }
+};
+
+// transposed result of point_geometry
+template <typename Geometry, typename Point>
+struct geometry_point
+{
+    // TODO: interrupt only if the topology check is complex
+
+    static const bool interruption_enabled = true;
+
+    template <typename Result>
+    static inline void apply(Geometry const& geometry, Point const& point, Result & result)
+    {
+        point_geometry<Point, Geometry, true>::apply(point, geometry, result);
+    }
+};
+
+// TODO: rewrite the folowing:
+
+//// NOTE: Those tests should be consistent with within(Point, Box) and covered_by(Point, Box)
+//// There is no EPS used in those functions, values are compared using < or <=
+//// so comparing MIN and MAX in the same way should be fine
+//
+//template <typename Box, std::size_t I = 0, std::size_t D = geometry::dimension<Box>::value>
+//struct box_has_interior
+//{
+//    static inline bool apply(Box const& box)
+//    {
+//        return geometry::get<min_corner, I>(box) < geometry::get<max_corner, I>(box)
+//            && box_has_interior<Box, I + 1, D>::apply(box);
+//    }
+//};
+//
+//template <typename Box, std::size_t D>
+//struct box_has_interior<Box, D, D>
+//{
+//    static inline bool apply(Box const&) { return true; }
+//};
+//
+//// NOTE: especially important here (see the NOTE above).
+//
+//template <typename Box, std::size_t I = 0, std::size_t D = geometry::dimension<Box>::value>
+//struct box_has_equal_min_max
+//{
+//    static inline bool apply(Box const& box)
+//    {
+//        return geometry::get<min_corner, I>(box) == geometry::get<max_corner, I>(box)
+//            && box_has_equal_min_max<Box, I + 1, D>::apply(box);
+//    }
+//};
+//
+//template <typename Box, std::size_t D>
+//struct box_has_equal_min_max<Box, D, D>
+//{
+//    static inline bool apply(Box const&) { return true; }
+//};
+//
+//template <typename Point, typename Box>
+//struct point_box
+//{
+//    static inline result apply(Point const& point, Box const& box)
+//    {
+//        result res;
+//
+//        if ( geometry::within(point, box) ) // this also means that the box has interior
+//        {
+//            return result("0FFFFFTTT");
+//        }
+//        else if ( geometry::covered_by(point, box) ) // point is on the boundary
+//        {
+//            //if ( box_has_interior<Box>::apply(box) )
+//            //{
+//            //    return result("F0FFFFTTT");
+//            //}
+//            //else if ( box_has_equal_min_max<Box>::apply(box) ) // no boundary outside point
+//            //{
+//            //    return result("F0FFFFFFT");
+//            //}
+//            //else // no interior outside point
+//            //{
+//            //    return result("F0FFFFFTT");
+//            //}
+//            return result("F0FFFF**T");
+//        }
+//        else 
+//        {
+//            /*if ( box_has_interior<Box>::apply(box) )
+//            {
+//                return result("FF0FFFTTT");
+//            }
+//            else
+//            {
+//                return result("FF0FFFFTT");
+//            }*/
+//            return result("FF0FFF*TT");
+//        }
+//
+//        return res;
+//    }
+//};
+//
+//template <typename Box, typename Point>
+//struct box_point
+//{
+//    static inline result apply(Box const& box, Point const& point)
+//    {
+//        if ( geometry::within(point, box) )
+//            return result("0FTFFTFFT");
+//        else if ( geometry::covered_by(point, box) )
+//            return result("FF*0F*FFT");
+//        else 
+//            return result("FF*FFT0FT");
+//    }
+//};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_GEOMETRY_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/point_point.hpp b/include/boost/geometry/algorithms/detail/relate/point_point.hpp
new file mode 100644
index 000000000..f1af67cd6
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/point_point.hpp
@@ -0,0 +1,238 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_POINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_POINT_HPP
+
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/less.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+template <typename Point1, typename Point2>
+struct point_point
+{
+    static const bool interruption_enabled = false;
+
+    template <typename Result>
+    static inline void apply(Point1 const& point1, Point2 const& point2, Result & result)
+    {
+        bool equal = detail::equals::equals_point_point(point1, point2);
+        if ( equal )
+        {
+            set<interior, interior, '0'>(result);
+        }
+        else
+        {
+            set<interior, exterior, '0'>(result);
+            set<exterior, interior, '0'>(result);
+        }
+
+        set<exterior, exterior, result_dimension<Point1>::value>(result);
+    }
+};
+
+template <typename Point, typename MultiPoint>
+std::pair<bool, bool> point_multipoint_check(Point const& point, MultiPoint const& multi_point)
+{
+    bool found_inside = false;
+    bool found_outside = false;
+
+    // point_in_geometry could be used here but why iterate over MultiPoint twice?
+    // we must search for a point in the exterior because all points in MultiPoint can be equal
+
+    typedef typename boost::range_iterator<MultiPoint const>::type iterator;
+    iterator it = boost::begin(multi_point);
+    iterator last = boost::end(multi_point);
+    for ( ; it != last ; ++it )
+    {
+        bool ii = detail::equals::equals_point_point(point, *it);
+
+        if ( ii )
+            found_inside = true;
+        else
+            found_outside = true;
+
+        if ( found_inside && found_outside )
+            break;
+    }
+
+    return std::make_pair(found_inside, found_outside);
+}
+
+template <typename Point, typename MultiPoint, bool Transpose = false>
+struct point_multipoint
+{
+    static const bool interruption_enabled = false;
+
+    template <typename Result>
+    static inline void apply(Point const& point, MultiPoint const& multi_point, Result & result)
+    {
+        if ( boost::empty(multi_point) )
+        {
+            // TODO: throw on empty input?
+            set<interior, exterior, '0', Transpose>(result);
+            return;
+        }
+
+        std::pair<bool, bool> rel = point_multipoint_check(point, multi_point);
+
+        if ( rel.first ) // some point of MP is equal to P
+        {
+            set<interior, interior, '0', Transpose>(result);
+
+            if ( rel.second ) // a point of MP was found outside P
+            {
+                set<exterior, interior, '0', Transpose>(result);
+            }
+        }
+        else
+        {
+            set<interior, exterior, '0', Transpose>(result);
+            set<exterior, interior, '0', Transpose>(result);
+        }
+
+        set<exterior, exterior, result_dimension<Point>::value, Transpose>(result);
+    }
+};
+
+template <typename MultiPoint, typename Point>
+struct multipoint_point
+{
+    static const bool interruption_enabled = false;
+
+    template <typename Result>
+    static inline void apply(MultiPoint const& multi_point, Point const& point, Result & result)
+    {
+        point_multipoint<Point, MultiPoint, true>::apply(point, multi_point, result);
+    }
+};
+
+template <typename MultiPoint1, typename MultiPoint2>
+struct multipoint_multipoint
+{
+    static const bool interruption_enabled = true;
+
+    template <typename Result>
+    static inline void apply(MultiPoint1 const& multi_point1, MultiPoint2 const& multi_point2, Result & result)
+    {
+        {
+            // TODO: throw on empty input?
+            bool empty1 = boost::empty(multi_point1);
+            bool empty2 = boost::empty(multi_point2);
+            if ( empty1 && empty2 )
+            {
+                return;
+            }
+            else if ( empty1 )
+            {
+                set<exterior, interior, '0'>(result);
+                return;
+            }
+            else if ( empty2 )
+            {
+                set<interior, exterior, '0'>(result);
+                return;
+            }
+        }
+
+// TODO: ADD A CHECK TO THE RESULT INDICATING IF THE FIRST AND/OR SECOND GEOMETRY MUST BE ANALYSED
+
+// TODO: if I/I is set for one MPt, this won't be changed when the other one in analysed
+//       so if e.g. only I/I must be analysed we musn't check the other MPt
+
+// TODO: Also, the geometry with the smaller number of points may be analysed first
+        //if ( boost::size(multi_point1) < boost::size(multi_point2) )
+
+        // NlogN + MlogN
+        bool all_handled = search<false>(multi_point1, multi_point2, result);
+        
+        if ( all_handled || result.interrupt )
+            return;
+
+        // MlogM + NlogM
+        search<true>(multi_point2, multi_point1, result);
+    }
+
+    template <bool Transpose,
+              typename SortedMultiPoint,
+              typename IteratedMultiPoint,
+              typename Result>
+    static inline bool search(SortedMultiPoint const& sorted_mpt,
+                              IteratedMultiPoint const& iterated_mpt,
+                              Result & result)
+    {
+        // sort points from the 1 MPt
+        typedef typename geometry::point_type<SortedMultiPoint>::type point_type;
+        std::vector<point_type> points(boost::begin(sorted_mpt), boost::end(sorted_mpt));
+        std::sort(points.begin(), points.end(), less());
+
+        bool found_inside = false;
+        bool found_outside = false;
+
+        // for each point in the second MPt
+        typedef typename boost::range_iterator<IteratedMultiPoint const>::type iterator;
+        for ( iterator it = boost::begin(iterated_mpt) ;
+              it != boost::end(iterated_mpt) ; ++it )
+        {
+            bool ii = binary_search(points.begin(), points.end(), *it, less());
+            if ( ii )
+                found_inside = true;
+            else
+                found_outside = true;
+
+            if ( found_inside && found_outside )
+                break;
+        }
+
+        // an optimization
+        bool all_handled = false;
+
+        if ( found_inside ) // some point of MP2 is equal to some of MP1
+        {
+// TODO: if I/I is set for one MPt, this won't be changed when the other one in analysed
+//       so if e.g. only I/I must be analysed we musn't check the other MPt
+
+            set<interior, interior, '0', Transpose>(result);
+
+            if ( found_outside ) // some point of MP2 was found outside of MP1
+            {
+                set<exterior, interior, '0', Transpose>(result);
+            }
+        }
+        else
+        {
+            set<interior, exterior, '0', Transpose>(result);
+            set<exterior, interior, '0', Transpose>(result);
+
+            // if no point is intersecting the other MPt then we musn't analyse the reversed case
+            all_handled = true;
+        }
+
+        set<exterior, exterior, result_dimension<point_type>::value, Transpose>(result);
+
+        return all_handled;
+    }
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_POINT_POINT_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/relate.hpp b/include/boost/geometry/algorithms/detail/relate/relate.hpp
new file mode 100644
index 000000000..946653452
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/relate.hpp
@@ -0,0 +1,339 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
+
+#include <cstddef>
+
+#include <boost/concept_check.hpp>
+#include <boost/range.hpp>
+
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/type_traits/is_base_of.hpp>
+
+#include <boost/geometry/algorithms/make.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/strategies/concepts/within_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
+#include <boost/geometry/strategies/within.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/order_as_direction.hpp>
+#include <boost/geometry/views/closeable_view.hpp>
+#include <boost/geometry/views/reversible_view.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/result.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/point_point.hpp>
+#include <boost/geometry/algorithms/detail/relate/point_geometry.hpp>
+#include <boost/geometry/algorithms/detail/relate/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/relate/linear_areal.hpp>
+#include <boost/geometry/algorithms/detail/relate/areal_areal.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+// Those are used only to allow dispatch::relate to produce compile-time error
+
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type>
+struct is_supported_by_generic
+{
+    static const bool value
+        = boost::is_same<Tag, linestring_tag>::value
+       || boost::is_same<Tag, multi_linestring_tag>::value
+       || boost::is_same<Tag, ring_tag>::value
+       || boost::is_same<Tag, polygon_tag>::value
+       || boost::is_same<Tag, multi_polygon_tag>::value;
+};
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Tag1 = typename geometry::tag<Geometry1>::type,
+          typename Tag2 = typename geometry::tag<Geometry2>::type>
+struct is_generic
+{
+    static const bool value = is_supported_by_generic<Geometry1>::value
+                           && is_supported_by_generic<Geometry2>::value;
+};
+
+
+template <typename Point, typename Geometry, typename Tag>
+struct is_generic<Point, Geometry, point_tag, Tag>
+{
+    static const bool value = is_supported_by_generic<Geometry>::value;
+};
+
+template <typename Geometry, typename Point, typename Tag>
+struct is_generic<Geometry, Point, Tag, point_tag>
+{
+    static const bool value = is_supported_by_generic<Geometry>::value;
+};
+
+template <typename Point1, typename Point2>
+struct is_generic<Point1, Point2, point_tag, point_tag>
+{
+    static const bool value = false;
+};
+
+
+}} // namespace detail::relate
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace detail_dispatch { namespace relate {
+
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Tag1 = typename geometry::tag<Geometry1>::type,
+          typename Tag2 = typename geometry::tag<Geometry2>::type,
+          int TopDim1 = geometry::topological_dimension<Geometry1>::value,
+          int TopDim2 = geometry::topological_dimension<Geometry2>::value,
+          bool IsGeneric = detail::relate::is_generic<Geometry1, Geometry2>::value
+>
+struct relate : not_implemented<Tag1, Tag2>
+{};
+
+
+template <typename Point1, typename Point2>
+struct relate<Point1, Point2, point_tag, point_tag, 0, 0, false>
+    : detail::relate::point_point<Point1, Point2>
+{};
+
+template <typename Point, typename MultiPoint>
+struct relate<Point, MultiPoint, point_tag, multi_point_tag, 0, 0, false>
+    : detail::relate::point_multipoint<Point, MultiPoint>
+{};
+
+template <typename MultiPoint, typename Point>
+struct relate<MultiPoint, Point, multi_point_tag, point_tag, 0, 0, false>
+    : detail::relate::multipoint_point<MultiPoint, Point>
+{};
+
+template <typename MultiPoint1, typename MultiPoint2>
+struct relate<MultiPoint1, MultiPoint2, multi_point_tag, multi_point_tag, 0, 0, false>
+    : detail::relate::multipoint_multipoint<MultiPoint1, MultiPoint2>
+{};
+
+//template <typename Point, typename Box, int TopDim2>
+//struct relate<Point, Box, point_tag, box_tag, 0, TopDim2, false>
+//    : detail::relate::point_box<Point, Box>
+//{};
+//
+//template <typename Box, typename Point, int TopDim1>
+//struct relate<Box, Point, box_tag, point_tag, TopDim1, 0, false>
+//    : detail::relate::box_point<Box, Point>
+//{};
+
+
+template <typename Point, typename Geometry, typename Tag2, int TopDim2>
+struct relate<Point, Geometry, point_tag, Tag2, 0, TopDim2, true>
+    : detail::relate::point_geometry<Point, Geometry>
+{};
+
+template <typename Geometry, typename Point, typename Tag1, int TopDim1>
+struct relate<Geometry, Point, Tag1, point_tag, TopDim1, 0, true>
+    : detail::relate::geometry_point<Geometry, Point>
+{};
+
+
+template <typename Linear1, typename Linear2, typename Tag1, typename Tag2>
+struct relate<Linear1, Linear2, Tag1, Tag2, 1, 1, true>
+    : detail::relate::linear_linear<Linear1, Linear2>
+{};
+
+
+template <typename Linear, typename Areal, typename Tag1, typename Tag2>
+struct relate<Linear, Areal, Tag1, Tag2, 1, 2, true>
+    : detail::relate::linear_areal<Linear, Areal>
+{};
+
+template <typename Areal, typename Linear, typename Tag1, typename Tag2>
+struct relate<Areal, Linear, Tag1, Tag2, 2, 1, true>
+    : detail::relate::areal_linear<Areal, Linear>
+{};
+
+
+template <typename Areal1, typename Areal2, typename Tag1, typename Tag2>
+struct relate<Areal1, Areal2, Tag1, Tag2, 2, 2, true>
+    : detail::relate::areal_areal<Areal1, Areal2>
+{};
+
+
+}} // namespace detail_dispatch::relate
+#endif // DOXYGEN_NO_DISPATCH
+
+namespace detail { namespace relate {
+
+template <typename Geometry1, typename Geometry2>
+struct interruption_enabled
+{
+    static const bool value =
+        detail_dispatch::relate::relate<Geometry1, Geometry2>::interruption_enabled;
+};
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Result,
+          bool IsSequence = boost::mpl::is_sequence<Result>::value>
+struct result_handler_type
+    : not_implemented<Result>
+{};
+
+template <typename Geometry1, typename Geometry2>
+struct result_handler_type<Geometry1, Geometry2, matrix9, false>
+{
+    typedef matrix_handler<matrix9> type;
+};
+
+template <typename Geometry1, typename Geometry2>
+struct result_handler_type<Geometry1, Geometry2, mask9, false>
+{
+    typedef mask_handler
+        <
+            mask9,
+            interruption_enabled
+                <
+                    Geometry1,
+                    Geometry2
+                >::value
+        > type;
+};
+
+template <typename Geometry1, typename Geometry2, typename Head, typename Tail>
+struct result_handler_type<Geometry1, Geometry2, boost::tuples::cons<Head, Tail>, false>
+{
+    typedef mask_handler
+        <
+            boost::tuples::cons<Head, Tail>,
+            interruption_enabled
+                <
+                    Geometry1,
+                    Geometry2
+                >::value
+        > type;
+};
+
+template <typename Geometry1, typename Geometry2,
+          char II, char IB, char IE,
+          char BI, char BB, char BE,
+          char EI, char EB, char EE>
+struct result_handler_type<Geometry1, Geometry2, static_mask<II, IB, IE, BI, BB, BE, EI, EB, EE>, false>
+{
+    typedef static_mask_handler
+        <
+            static_mask<II, IB, IE, BI, BB, BE, EI, EB, EE>,
+            interruption_enabled
+                <
+                    Geometry1,
+                    Geometry2
+                >::value
+        > type;
+};
+
+template <typename Geometry1, typename Geometry2, typename StaticSequence>
+struct result_handler_type<Geometry1, Geometry2, StaticSequence, true>
+{
+    typedef static_mask_handler
+        <
+            StaticSequence,
+            interruption_enabled
+                <
+                    Geometry1,
+                    Geometry2
+                >::value
+        > type;
+};
+
+template <typename MatrixOrMask, typename Geometry1, typename Geometry2>
+inline
+typename result_handler_type
+    <
+        Geometry1,
+        Geometry2,
+        MatrixOrMask
+    >::type::result_type
+relate(Geometry1 const& geometry1,
+       Geometry2 const& geometry2,
+       MatrixOrMask const& matrix_or_mask = MatrixOrMask())
+{
+    typedef typename result_handler_type
+        <
+            Geometry1,
+            Geometry2,
+            MatrixOrMask
+        >::type handler_type;
+
+    handler_type handler(matrix_or_mask);
+    detail_dispatch::relate::relate<Geometry1, Geometry2>::apply(geometry1, geometry2, handler);
+    return handler.result();
+}
+
+struct implemented_tag {};
+
+template <template <typename, typename> class StaticMaskTrait,
+          typename Geometry1,
+          typename Geometry2>
+struct relate_base
+    : boost::mpl::if_
+        <
+            boost::mpl::or_
+                <
+                    boost::is_base_of
+                        <
+                            nyi::not_implemented_tag,
+                            StaticMaskTrait<Geometry1, Geometry2>
+                        >,
+                    boost::is_base_of
+                        <
+                            nyi::not_implemented_tag,
+                            detail_dispatch::relate::relate<Geometry1, Geometry2>
+                        >
+                >,
+            not_implemented
+                <
+                    typename geometry::tag<Geometry1>::type,
+                    typename geometry::tag<Geometry2>::type
+                >,
+            implemented_tag
+        >::type
+{
+    static inline bool apply(Geometry1 const& g1, Geometry2 const& g2)
+    {
+        typedef typename StaticMaskTrait<Geometry1, Geometry2>::type static_mask;
+        return detail::relate::relate<static_mask>(g1, g2);
+    }
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/result.hpp b/include/boost/geometry/algorithms/detail/relate/result.hpp
new file mode 100644
index 000000000..1bcb5275d
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/result.hpp
@@ -0,0 +1,1390 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RESULT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RESULT_HPP
+
+#include <boost/tuple/tuple.hpp>
+
+#include <boost/mpl/is_sequence.hpp>
+#include <boost/mpl/begin.hpp>
+#include <boost/mpl/end.hpp>
+#include <boost/mpl/next.hpp>
+#include <boost/mpl/at.hpp>
+#include <boost/mpl/vector_c.hpp>
+
+#include <boost/geometry/core/topological_dimension.hpp>
+
+// TEMP - move this header to geometry/detail
+#include <boost/geometry/index/detail/tuples.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+enum field { interior = 0, boundary = 1, exterior = 2 };
+
+// TODO: IF THE RESULT IS UPDATED WITH THE MAX POSSIBLE VALUE FOR SOME PAIR OF GEOEMTRIES
+// THE VALUE ALREADY STORED MUSN'T BE CHECKED
+// update() calls chould be replaced with set() in those cases
+// but for safety reasons (STATIC_ASSERT) we should check if parameter D is valid and set() doesn't do that
+// so some additional function could be added, e.g. set_dim()
+
+// matrix
+
+// TODO add height?
+
+template <std::size_t Width>
+class matrix
+{
+    BOOST_STATIC_ASSERT(Width == 2 || Width == 3);
+
+public:
+
+    static const std::size_t size = Width * Width;
+    
+    inline matrix()
+    {
+        ::memset(m_array, 'F', size);
+    }
+
+    template <field F1, field F2>
+    inline char get() const
+    {
+        static const bool in_bounds = F1 * Width + F2 < size;
+        return get_dispatch<F1, F2>(integral_constant<bool, in_bounds>());
+    }
+
+    template <field F1, field F2, char V>
+    inline void set()
+    {
+        static const bool in_bounds = F1 * Width + F2 < size;
+        set_dispatch<F1, F2, V>(integral_constant<bool, in_bounds>());
+    }
+
+    template <field F1, field F2, char D>
+    inline void update()
+    {
+        static const bool in_bounds = F1 * Width + F2 < size;
+        update_dispatch<F1, F2, D>(integral_constant<bool, in_bounds>());
+    }
+    
+    inline const char * data() const
+    {
+        return m_array;
+    }
+
+private:
+    template <field F1, field F2>
+    inline char get_dispatch(integral_constant<bool, true>) const
+    {
+        return m_array[F1 * Width + F2];
+    }
+    template <field F1, field F2>
+    inline char get_dispatch(integral_constant<bool, false>) const
+    {
+        return 'F';
+    }
+
+    template <field F1, field F2, char V>
+    inline void set_dispatch(integral_constant<bool, true>)
+    {
+        BOOST_STATIC_ASSERT(('0' <= V && V <= '9') || V == 'T' || V == 'F');
+        m_array[F1 * Width + F2] = V;
+    }
+    template <field F1, field F2, char V>
+    inline void set_dispatch(integral_constant<bool, false>)
+    {}
+
+    template <field F1, field F2, char D>
+    inline void update_dispatch(integral_constant<bool, true>)
+    {
+        BOOST_STATIC_ASSERT('0' <= D && D <= '9');
+        char c = m_array[F1 * Width + F2];
+        if ( D > c || c > '9')
+            m_array[F1 * Width + F2] = D;
+    }
+    template <field F1, field F2, char D>
+    inline void update_dispatch(integral_constant<bool, false>)
+    {}
+
+    char m_array[size];
+};
+
+// TODO add EnableDimensions parameter?
+
+struct matrix9 {};
+//struct matrix4 {};
+
+// matrix_width
+
+template <typename MatrixOrMask>
+struct matrix_width
+    : not_implemented<MatrixOrMask>
+{};
+
+template <>
+struct matrix_width<matrix9>
+{
+    static const std::size_t value = 3;
+};
+
+// matrix_handler
+
+template <typename Matrix>
+class matrix_handler
+    : private matrix<matrix_width<Matrix>::value>
+{
+    typedef matrix<matrix_width<Matrix>::value> base_t;
+
+public:
+    typedef std::string result_type;
+
+    static const bool interrupt = false;
+
+    matrix_handler(Matrix const&)
+    {}
+
+    result_type result() const
+    {
+        return std::string(this->data(),
+                           this->data() + base_t::size);
+    }
+
+    template <field F1, field F2, char D>
+    inline bool may_update() const
+    {
+        BOOST_STATIC_ASSERT('0' <= D && D <= '9');
+
+        char const c = static_cast<base_t const&>(*this).template get<F1, F2>();
+        return D > c || c > '9';
+    }
+
+    //template <field F1, field F2>
+    //inline char get() const
+    //{
+    //    return static_cast<base_t const&>(*this).template get<F1, F2>();
+    //}
+
+    template <field F1, field F2, char V>
+    inline void set()
+    {
+        static_cast<base_t&>(*this).template set<F1, F2, V>();
+    }
+
+    template <field F1, field F2, char D>
+    inline void update()
+    {
+        static_cast<base_t&>(*this).template update<F1, F2, D>();
+    }
+};
+
+// RUN-TIME MASKS
+
+// mask9
+
+class mask9
+{
+public:
+    static const std::size_t width = 3; // TEMP
+
+    inline mask9(std::string const& de9im_mask)
+    {
+        // TODO: throw an exception here?
+        BOOST_ASSERT(de9im_mask.size() == 9);
+        ::memcpy(m_mask, de9im_mask.c_str(), 9);
+    }
+
+    template <field F1, field F2>
+    inline char get() const
+    {
+        return m_mask[F1 * 3 + F2];
+    }
+
+private:
+    char m_mask[9];
+};
+
+// interrupt()
+
+template <typename Mask, bool InterruptEnabled>
+struct interrupt_dispatch
+{
+    template <field F1, field F2, char V>
+    static inline bool apply(Mask const&)
+    {
+        return false;
+    }
+};
+
+template <typename Mask>
+struct interrupt_dispatch<Mask, true>
+{
+    template <field F1, field F2, char V>
+    static inline bool apply(Mask const& mask)
+    {
+        char m = mask.template get<F1, F2>();
+        return check<V>(m);            
+    }
+
+    template <char V>
+    static inline bool check(char m)
+    {
+        if ( V >= '0' && V <= '9' )
+        {
+            return m == 'F' || ( m < V && m >= '0' && m <= '9' );
+        }
+        else if ( V == 'T' )
+        {
+            return m == 'F';
+        }
+        return false;
+    }
+};
+
+template <typename Masks, int I = 0, int N = boost::tuples::length<Masks>::value>
+struct interrupt_dispatch_tuple
+{
+    template <field F1, field F2, char V>
+    static inline bool apply(Masks const& masks)
+    {
+        typedef typename boost::tuples::element<I, Masks>::type mask_type;
+        mask_type const& mask = boost::get<I>(masks);
+        return interrupt_dispatch<mask_type, true>::template apply<F1, F2, V>(mask)
+            && interrupt_dispatch_tuple<Masks, I+1>::template apply<F1, F2, V>(masks);
+    }
+};
+
+template <typename Masks, int N>
+struct interrupt_dispatch_tuple<Masks, N, N>
+{
+    template <field F1, field F2, char V>
+    static inline bool apply(Masks const& )
+    {
+        return true;
+    }
+};
+
+template <typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6, typename T7, typename T8, typename T9>
+struct interrupt_dispatch<boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, true>
+{
+    typedef boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> mask_type;
+
+    template <field F1, field F2, char V>
+    static inline bool apply(mask_type const& mask)
+    {
+        return interrupt_dispatch_tuple<mask_type>::template apply<F1, F2, V>(mask);
+    }
+};
+
+template <typename Head, typename Tail>
+struct interrupt_dispatch<boost::tuples::cons<Head, Tail>, true>
+{
+    typedef boost::tuples::cons<Head, Tail> mask_type;
+
+    template <field F1, field F2, char V>
+    static inline bool apply(mask_type const& mask)
+    {
+        return interrupt_dispatch_tuple<mask_type>::template apply<F1, F2, V>(mask);
+    }
+};
+
+template <field F1, field F2, char V, bool InterruptEnabled, typename Mask>
+inline bool interrupt(Mask const& mask)
+{
+    return interrupt_dispatch<Mask, InterruptEnabled>
+                ::template apply<F1, F2, V>(mask);
+}
+
+// may_update()
+
+template <typename Mask>
+struct may_update_dispatch
+{
+    template <field F1, field F2, char D, typename Matrix>
+    static inline bool apply(Mask const& mask, Matrix const& matrix)
+    {
+        BOOST_STATIC_ASSERT('0' <= D && D <= '9');
+
+        char const m = mask.template get<F1, F2>();
+        
+        if ( m == 'F' )
+        {
+            return true;
+        }
+        else if ( m == 'T' )
+        {
+            char const c = matrix.template get<F1, F2>();
+            return c == 'F'; // if it's T or between 0 and 9, the result will be the same
+        }
+        else if ( m >= '0' && m <= '9' )
+        {
+            char const c = matrix.template get<F1, F2>();
+            return D > c || c > '9';
+        }
+
+        return false;
+    }
+};
+
+template <typename Masks, int I = 0, int N = boost::tuples::length<Masks>::value>
+struct may_update_dispatch_tuple
+{
+    template <field F1, field F2, char D, typename Matrix>
+    static inline bool apply(Masks const& masks, Matrix const& matrix)
+    {
+        typedef typename boost::tuples::element<I, Masks>::type mask_type;
+        mask_type const& mask = boost::get<I>(masks);
+        return may_update_dispatch<mask_type>::template apply<F1, F2, D>(mask, matrix)
+            || may_update_dispatch_tuple<Masks, I+1>::template apply<F1, F2, D>(masks, matrix);
+    }
+};
+
+template <typename Masks, int N>
+struct may_update_dispatch_tuple<Masks, N, N>
+{
+    template <field F1, field F2, char D, typename Matrix>
+    static inline bool apply(Masks const& , Matrix const& )
+    {
+        return false;
+    }
+};
+
+template <typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6, typename T7, typename T8, typename T9>
+struct may_update_dispatch< boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+{
+    typedef boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> mask_type;
+
+    template <field F1, field F2, char D, typename Matrix>
+    static inline bool apply(mask_type const& mask, Matrix const& matrix)
+    {
+        return may_update_dispatch_tuple<mask_type>::template apply<F1, F2, D>(mask, matrix);
+    }
+};
+
+template <typename Head, typename Tail>
+struct may_update_dispatch< boost::tuples::cons<Head, Tail> >
+{
+    typedef boost::tuples::cons<Head, Tail> mask_type;
+
+    template <field F1, field F2, char D, typename Matrix>
+    static inline bool apply(mask_type const& mask, Matrix const& matrix)
+    {
+        return may_update_dispatch_tuple<mask_type>::template apply<F1, F2, D>(mask, matrix);
+    }
+};
+
+template <field F1, field F2, char D, typename Mask, typename Matrix>
+inline bool may_update(Mask const& mask, Matrix const& matrix)
+{
+    return may_update_dispatch<Mask>
+                ::template apply<F1, F2, D>(mask, matrix);
+}
+
+// check()
+
+template <typename Mask>
+struct check_dispatch
+{
+    template <typename Matrix>
+    static inline bool apply(Mask const& mask, Matrix const& matrix)
+    {
+        return per_one<interior, interior>(mask, matrix)
+            && per_one<interior, boundary>(mask, matrix)
+            && per_one<interior, exterior>(mask, matrix)
+            && per_one<boundary, interior>(mask, matrix)
+            && per_one<boundary, boundary>(mask, matrix)
+            && per_one<boundary, exterior>(mask, matrix)
+            && per_one<exterior, interior>(mask, matrix)
+            && per_one<exterior, boundary>(mask, matrix)
+            && per_one<exterior, exterior>(mask, matrix);
+    }
+
+    template <field F1, field F2, typename Matrix>
+    static inline bool per_one(Mask const& mask, Matrix const& matrix)
+    {
+        const char mask_el = mask.template get<F1, F2>();
+        const char el = matrix.template get<F1, F2>();
+
+        if ( mask_el == 'F' )
+        {
+            return el == 'F';
+        }
+        else if ( mask_el == 'T' )
+        {
+            return el == 'T' || ( el >= '0' && el <= '9' );
+        }
+        else if ( mask_el >= '0' && mask_el <= '9' )
+        {
+            return el == mask_el;
+        }
+
+        return true;
+    }
+};
+
+template <typename Masks, int I = 0, int N = boost::tuples::length<Masks>::value>
+struct check_dispatch_tuple
+{
+    template <typename Matrix>
+    static inline bool apply(Masks const& masks, Matrix const& matrix)
+    {
+        typedef typename boost::tuples::element<I, Masks>::type mask_type;
+        mask_type const& mask = boost::get<I>(masks);
+        return check_dispatch<mask_type>::apply(mask, matrix)
+            || check_dispatch_tuple<Masks, I+1>::apply(masks, matrix);
+    }
+};
+
+template <typename Masks, int N>
+struct check_dispatch_tuple<Masks, N, N>
+{
+    template <typename Matrix>
+    static inline bool apply(Masks const&, Matrix const&)
+    {
+        return false;
+    }
+};
+
+template <typename T0, typename T1, typename T2, typename T3, typename T4,
+          typename T5, typename T6, typename T7, typename T8, typename T9>
+struct check_dispatch< boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+{
+    typedef boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> mask_type;
+
+    template <typename Matrix>
+    static inline bool apply(mask_type const& mask, Matrix const& matrix)
+    {
+        return check_dispatch_tuple<mask_type>::apply(mask, matrix);
+    }
+};
+
+template <typename Head, typename Tail>
+struct check_dispatch< boost::tuples::cons<Head, Tail> >
+{
+    typedef boost::tuples::cons<Head, Tail> mask_type;
+
+    template <typename Matrix>
+    static inline bool apply(mask_type const& mask, Matrix const& matrix)
+    {
+        return check_dispatch_tuple<mask_type>::apply(mask, matrix);
+    }
+};
+
+template <typename Mask, typename Matrix>
+inline bool check(Mask const& mask, Matrix const& matrix)
+{
+    return check_dispatch<Mask>::apply(mask, matrix);
+}
+
+// matrix_width
+
+template <>
+struct matrix_width<mask9>
+{
+    static const std::size_t value = 3;
+};
+
+template <typename Tuple,
+          int I = 0,
+          int N = boost::tuples::length<Tuple>::value>
+struct matrix_width_tuple
+{
+    static const std::size_t
+        current = matrix_width<typename boost::tuples::element<I, Tuple>::type>::value;
+    static const std::size_t
+        next = matrix_width_tuple<Tuple, I+1>::value;
+
+    static const std::size_t
+        value = current > next ? current : next;
+};
+
+template <typename Tuple, int N>
+struct matrix_width_tuple<Tuple, N, N>
+{
+    static const std::size_t value = 0;
+};
+
+template <typename Head, typename Tail>
+struct matrix_width< boost::tuples::cons<Head, Tail> >
+{
+    static const std::size_t
+        value = matrix_width_tuple< boost::tuples::cons<Head, Tail> >::value;
+};
+
+// matrix_handler
+
+template <typename Mask, bool Interrupt>
+class mask_handler
+    : private matrix<matrix_width<Mask>::value>
+{
+    typedef matrix<matrix_width<Mask>::value> base_t;
+
+public:
+    typedef bool result_type;
+
+    bool interrupt;
+
+    inline mask_handler(Mask const& m)
+        : interrupt(false)
+        , m_mask(m)
+    {}
+
+    result_type result() const
+    {
+        return !interrupt
+            && check(m_mask, static_cast<base_t const&>(*this));
+    }
+
+    template <field F1, field F2, char D>
+    inline bool may_update() const
+    {
+        return detail::relate::may_update<F1, F2, D>(
+                    m_mask, static_cast<base_t const&>(*this)
+               );
+    }
+
+    //template <field F1, field F2>
+    //inline char get() const
+    //{
+    //    return static_cast<base_t const&>(*this).template get<F1, F2>();
+    //}
+
+    template <field F1, field F2, char V>
+    inline void set()
+    {
+        if ( relate::interrupt<F1, F2, V, Interrupt>(m_mask) )
+        {
+            interrupt = true;
+        }
+        else
+        {
+            base_t::template set<F1, F2, V>();
+        }
+    }
+
+    template <field F1, field F2, char V>
+    inline void update()
+    {
+        if ( relate::interrupt<F1, F2, V, Interrupt>(m_mask) )
+        {
+            interrupt = true;
+        }
+        else
+        {
+            base_t::template update<F1, F2, V>();
+        }
+    }
+
+private:
+    Mask const& m_mask;
+};
+
+// STATIC MASKS
+
+// static_mask
+
+template <char II, char IB, char IE,
+          char BI, char BB, char BE,
+          char EI, char EB, char EE>
+class static_mask
+{
+    typedef boost::mpl::vector_c
+                <
+                    char, II, IB, IE, BI, BB, BE, EI, EB, EE
+                > vector_type;
+
+public:
+    template <field F1, field F2>
+    struct get
+    {
+        BOOST_STATIC_ASSERT(F1 * 3 + F2 < boost::mpl::size<vector_type>::value);
+
+        static const char value
+            = boost::mpl::at_c<vector_type, F1 * 3 + F2>::type::value;
+    };
+};
+
+// static_should_handle_element
+
+template <typename StaticMask, field F1, field F2, bool IsSequence>
+struct static_should_handle_element_dispatch
+{
+    static const char mask_el = StaticMask::template get<F1, F2>::value;
+    static const bool value = mask_el == 'F'
+                           || mask_el == 'T'
+                           || ( mask_el >= '0' && mask_el <= '9' );
+};
+
+template <typename First, typename Last, field F1, field F2>
+struct static_should_handle_element_sequence
+{
+    typedef typename boost::mpl::deref<First>::type StaticMask;
+
+    static const bool value
+        = static_should_handle_element_dispatch
+            <
+                StaticMask,
+                F1, F2,
+                boost::mpl::is_sequence<StaticMask>::value
+            >::value
+       || static_should_handle_element_sequence
+            <
+                typename boost::mpl::next<First>::type,
+                Last,
+                F1, F2
+            >::value;
+};
+
+template <typename Last, field F1, field F2>
+struct static_should_handle_element_sequence<Last, Last, F1, F2>
+{
+    static const bool value = false;
+};
+
+template <typename StaticMask, field F1, field F2>
+struct static_should_handle_element_dispatch<StaticMask, F1, F2, true>
+{
+    static const bool value
+        = static_should_handle_element_sequence
+            <
+                typename boost::mpl::begin<StaticMask>::type,
+                typename boost::mpl::end<StaticMask>::type,
+                F1, F2
+            >::value;
+};
+
+template <typename StaticMask, field F1, field F2>
+struct static_should_handle_element
+{
+    static const bool value
+        = static_should_handle_element_dispatch
+            <
+                StaticMask,
+                F1, F2,
+                boost::mpl::is_sequence<StaticMask>::value
+            >::value;
+};
+
+// static_interrupt
+
+template <typename StaticMask, char V, field F1, field F2, bool InterruptEnabled, bool IsSequence>
+struct static_interrupt_dispatch
+{
+    static const bool value = false;
+};
+
+template <typename StaticMask, char V, field F1, field F2, bool IsSequence>
+struct static_interrupt_dispatch<StaticMask, V, F1, F2, true, IsSequence>
+{
+    static const char mask_el = StaticMask::template get<F1, F2>::value;
+
+    static const bool value
+        = ( V >= '0' && V <= '9' ) ? 
+          ( mask_el == 'F' || ( mask_el < V && mask_el >= '0' && mask_el <= '9' ) ) :
+          ( ( V == 'T' ) ? mask_el == 'F' : false );
+};
+
+template <typename First, typename Last, char V, field F1, field F2>
+struct static_interrupt_sequence
+{
+    typedef typename boost::mpl::deref<First>::type StaticMask;
+
+    static const bool value
+        = static_interrupt_dispatch
+            <
+                StaticMask,
+                V, F1, F2,
+                true,
+                boost::mpl::is_sequence<StaticMask>::value
+            >::value
+       && static_interrupt_sequence
+            <
+                typename boost::mpl::next<First>::type,
+                Last,
+                V, F1, F2
+            >::value;
+};
+
+template <typename Last, char V, field F1, field F2>
+struct static_interrupt_sequence<Last, Last, V, F1, F2>
+{
+    static const bool value = true;
+};
+
+template <typename StaticMask, char V, field F1, field F2>
+struct static_interrupt_dispatch<StaticMask, V, F1, F2, true, true>
+{
+    static const bool value
+        = static_interrupt_sequence
+            <
+                typename boost::mpl::begin<StaticMask>::type,
+                typename boost::mpl::end<StaticMask>::type,
+                V, F1, F2
+            >::value;
+};
+
+template <typename StaticMask, char V, field F1, field F2, bool EnableInterrupt>
+struct static_interrupt
+{
+    static const bool value
+        = static_interrupt_dispatch
+            <
+                StaticMask,
+                V, F1, F2,
+                EnableInterrupt,
+                boost::mpl::is_sequence<StaticMask>::value
+            >::value;
+};
+
+// static_may_update
+
+template <typename StaticMask, char D, field F1, field F2, bool IsSequence>
+struct static_may_update_dispatch
+{
+    static const char mask_el = StaticMask::template get<F1, F2>::value;
+    static const int version
+                        = mask_el == 'F' ? 0
+                        : mask_el == 'T' ? 1
+                        : mask_el >= '0' && mask_el <= '9' ? 2
+                        : 3;
+
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return apply_dispatch(matrix, integral_constant<int, version>());
+    }
+
+    // mask_el == 'F'
+    template <typename Matrix>
+    static inline bool apply_dispatch(Matrix const& , integral_constant<int, 0>)
+    {
+        return true;
+    }
+    // mask_el == 'T'
+    template <typename Matrix>
+    static inline bool apply_dispatch(Matrix const& matrix, integral_constant<int, 1>)
+    {
+        char const c = matrix.template get<F1, F2>();
+        return c == 'F'; // if it's T or between 0 and 9, the result will be the same
+    }
+    // mask_el >= '0' && mask_el <= '9'
+    template <typename Matrix>
+    static inline bool apply_dispatch(Matrix const& matrix, integral_constant<int, 2>)
+    {
+        char const c = matrix.template get<F1, F2>();
+        return D > c || c > '9';
+    }
+    // else
+    template <typename Matrix>
+    static inline bool apply_dispatch(Matrix const&, integral_constant<int, 3>)
+    {
+        return false;
+    }
+};
+
+template <typename First, typename Last, char D, field F1, field F2>
+struct static_may_update_sequence
+{
+    typedef typename boost::mpl::deref<First>::type StaticMask;
+
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_may_update_dispatch
+                <
+                    StaticMask,
+                    D, F1, F2,
+                    boost::mpl::is_sequence<StaticMask>::value
+                >::apply(matrix)
+            || static_may_update_sequence
+                <
+                    typename boost::mpl::next<First>::type,
+                    Last,
+                    D, F1, F2
+                >::apply(matrix);
+    }
+};
+
+template <typename Last, char D, field F1, field F2>
+struct static_may_update_sequence<Last, Last, D, F1, F2>
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& /*matrix*/)
+    {
+        return false;
+    }
+};
+
+template <typename StaticMask, char D, field F1, field F2>
+struct static_may_update_dispatch<StaticMask, D, F1, F2, true>
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_may_update_sequence
+                <
+                    typename boost::mpl::begin<StaticMask>::type,
+                    typename boost::mpl::end<StaticMask>::type,
+                    D, F1, F2
+                >::apply(matrix);
+    }
+};
+
+template <typename StaticMask, char D, field F1, field F2>
+struct static_may_update
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_may_update_dispatch
+                <
+                    StaticMask,
+                    D, F1, F2,
+                    boost::mpl::is_sequence<StaticMask>::value
+                >::apply(matrix);
+    }
+};
+
+// static_check
+
+template <typename StaticMask, bool IsSequence>
+struct static_check_dispatch
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return per_one<interior, interior>::apply(matrix)
+            && per_one<interior, boundary>::apply(matrix)
+            && per_one<interior, exterior>::apply(matrix)
+            && per_one<boundary, interior>::apply(matrix)
+            && per_one<boundary, boundary>::apply(matrix)
+            && per_one<boundary, exterior>::apply(matrix)
+            && per_one<exterior, interior>::apply(matrix)
+            && per_one<exterior, boundary>::apply(matrix)
+            && per_one<exterior, exterior>::apply(matrix);
+    }
+    
+    template <field F1, field F2>
+    struct per_one
+    {
+        static const char mask_el = StaticMask::template get<F1, F2>::value;
+        static const int version
+                            = mask_el == 'F' ? 0
+                            : mask_el == 'T' ? 1
+                            : mask_el >= '0' && mask_el <= '9' ? 2
+                            : 3;
+
+        template <typename Matrix>
+        static inline bool apply(Matrix const& matrix)
+        {
+            const char el = matrix.template get<F1, F2>();
+            return apply_dispatch(el, integral_constant<int, version>());
+        }
+
+        // mask_el == 'F'
+        static inline bool apply_dispatch(char el, integral_constant<int, 0>)
+        {
+            return el == 'F';
+        }
+        // mask_el == 'T'
+        static inline bool apply_dispatch(char el, integral_constant<int, 1>)
+        {
+            return el == 'T' || ( el >= '0' && el <= '9' );
+        }
+        // mask_el >= '0' && mask_el <= '9'
+        static inline bool apply_dispatch(char el, integral_constant<int, 2>)
+        {
+            return el == mask_el;
+        }
+        // else
+        static inline bool apply_dispatch(char /*el*/, integral_constant<int, 3>)
+        {
+            return true;
+        }
+    };
+};
+
+template <typename First, typename Last>
+struct static_check_sequence
+{
+    typedef typename boost::mpl::deref<First>::type StaticMask;
+
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_check_dispatch
+                <
+                    StaticMask,
+                    boost::mpl::is_sequence<StaticMask>::value
+                >::apply(matrix)
+            || static_check_sequence
+                <
+                    typename boost::mpl::next<First>::type,
+                    Last
+                >::apply(matrix);
+    }
+};
+
+template <typename Last>
+struct static_check_sequence<Last, Last>
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& /*matrix*/)
+    {
+        return false;
+    }
+};
+
+template <typename StaticMask>
+struct static_check_dispatch<StaticMask, true>
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_check_sequence
+                <
+                    typename boost::mpl::begin<StaticMask>::type,
+                    typename boost::mpl::end<StaticMask>::type
+                >::apply(matrix);
+    }
+};
+
+template <typename StaticMask>
+struct static_check
+{
+    template <typename Matrix>
+    static inline bool apply(Matrix const& matrix)
+    {
+        return static_check_dispatch
+                <
+                    StaticMask,
+                    boost::mpl::is_sequence<StaticMask>::value
+                >::apply(matrix);
+    }
+};
+
+// static_mask_handler
+
+template <typename StaticMask, bool Interrupt>
+class static_mask_handler
+    : private matrix<3>
+{
+    typedef matrix<3> base_t;
+
+public:
+    typedef bool result_type;
+
+    bool interrupt;
+
+    inline static_mask_handler(StaticMask const& /*dummy*/)
+        : interrupt(false)
+    {}
+
+    result_type result() const
+    {
+        return (!Interrupt || !interrupt)
+            && static_check<StaticMask>::
+                    apply(static_cast<base_t const&>(*this));
+    }
+
+    template <field F1, field F2, char D>
+    inline bool may_update() const
+    {
+        return static_may_update<StaticMask, D, F1, F2>::
+                    apply(static_cast<base_t const&>(*this));
+    }
+
+    template <field F1, field F2>
+    static inline bool expects()
+    {
+        return static_should_handle_element<StaticMask, F1, F2>::value;
+    }
+
+    //template <field F1, field F2>
+    //inline char get() const
+    //{
+    //    return base_t::template get<F1, F2>();
+    //}
+
+    template <field F1, field F2, char V>
+    inline void set()
+    {
+        static const bool interrupt_c = static_interrupt<StaticMask, V, F1, F2, Interrupt>::value;
+        static const bool should_handle = static_should_handle_element<StaticMask, F1, F2>::value;
+        static const int version = interrupt_c ? 0
+                                 : should_handle ? 1
+                                 : 2;
+
+        set_dispatch<F1, F2, V>(integral_constant<int, version>());
+    }
+
+    template <field F1, field F2, char V>
+    inline void update()
+    {
+        static const bool interrupt_c = static_interrupt<StaticMask, V, F1, F2, Interrupt>::value;
+        static const bool should_handle = static_should_handle_element<StaticMask, F1, F2>::value;
+        static const int version = interrupt_c ? 0
+                                 : should_handle ? 1
+                                 : 2;
+
+        update_dispatch<F1, F2, V>(integral_constant<int, version>());
+    }
+
+private:
+    // Interrupt && interrupt
+    template <field F1, field F2, char V>
+    inline void set_dispatch(integral_constant<int, 0>)
+    {
+        interrupt = true;
+    }
+    // else should_handle
+    template <field F1, field F2, char V>
+    inline void set_dispatch(integral_constant<int, 1>)
+    {
+        base_t::template set<F1, F2, V>();
+    }
+    // else
+    template <field F1, field F2, char V>
+    inline void set_dispatch(integral_constant<int, 2>)
+    {}
+
+    // Interrupt && interrupt
+    template <field F1, field F2, char V>
+    inline void update_dispatch(integral_constant<int, 0>)
+    {
+        interrupt = true;
+    }
+    // else should_handle
+    template <field F1, field F2, char V>
+    inline void update_dispatch(integral_constant<int, 1>)
+    {
+        base_t::template update<F1, F2, V>();
+    }
+    // else
+    template <field F1, field F2, char V>
+    inline void update_dispatch(integral_constant<int, 2>)
+    {}
+};
+
+// OPERATORS
+
+template <typename Mask1, typename Mask2> inline
+boost::tuples::cons<
+    Mask1,
+    boost::tuples::cons<Mask2, boost::tuples::null_type>
+>
+operator||(Mask1 const& m1, Mask2 const& m2)
+{
+    namespace bt = boost::tuples;
+
+    return
+    bt::cons< Mask1, bt::cons<Mask2, bt::null_type> >
+        ( m1, bt::cons<Mask2, bt::null_type>(m2, bt::null_type()) );
+}
+
+template <typename Head, typename Tail, typename Mask> inline
+typename index::detail::tuples::push_back<
+    boost::tuples::cons<Head, Tail>, Mask
+>::type
+operator||(boost::tuples::cons<Head, Tail> const& t, Mask const& m)
+{
+    namespace bt = boost::tuples;
+
+    return
+    index::detail::tuples::push_back<
+        bt::cons<Head, Tail>, Mask
+    >::apply(t, m);
+}
+
+// PREDEFINED MASKS
+
+// TODO:
+// 1. specialize for simplified masks if available
+// e.g. for TOUCHES use 1 mask for A/A
+// 2. Think about dimensions > 2 e.g. should TOUCHES be true
+// if the interior of the Areal overlaps the boundary of the Volumetric
+// like it's true for Linear/Areal
+
+// EQUALS
+template <typename Geometry1, typename Geometry2>
+struct static_mask_equals_type
+{
+    typedef static_mask<'T', '*', 'F', '*', '*', 'F', 'F', 'F', '*'> type; // wikipedia
+    //typedef static_mask<'T', 'F', 'F', 'F', 'T', 'F', 'F', 'F', 'T'> type; // OGC
+};
+
+// DISJOINT
+typedef static_mask<'F', 'F', '*', 'F', 'F', '*', '*', '*', '*'> static_mask_disjoint;
+
+// TOUCHES - NOT P/P
+template <typename Geometry1,
+          typename Geometry2,
+          std::size_t Dim1 = topological_dimension<Geometry1>::value,
+          std::size_t Dim2 = topological_dimension<Geometry2>::value>
+struct static_mask_touches_impl
+{
+    typedef boost::mpl::vector<
+                static_mask<'F', 'T', '*', '*', '*', '*', '*', '*', '*'>,
+                static_mask<'F', '*', '*', 'T', '*', '*', '*', '*', '*'>,
+                static_mask<'F', '*', '*', '*', 'T', '*', '*', '*', '*'>
+        > type;
+};
+// According to OGC, doesn't apply to P/P
+// Using the above mask the result would be always false
+template <typename Geometry1, typename Geometry2>
+struct static_mask_touches_impl<Geometry1, Geometry2, 0, 0>
+    : not_implemented<typename geometry::tag<Geometry1>::type,
+                      typename geometry::tag<Geometry2>::type>
+{};
+
+template <typename Geometry1, typename Geometry2>
+struct static_mask_touches_type
+    : static_mask_touches_impl<Geometry1, Geometry2>
+{};
+
+// WITHIN
+typedef static_mask<'T', '*', 'F', '*', '*', 'F', '*', '*', '*'> static_mask_within;
+
+// COVERED_BY (non OGC)
+typedef boost::mpl::vector<
+            static_mask<'T', '*', 'F', '*', '*', 'F', '*', '*', '*'>,
+            static_mask<'*', 'T', 'F', '*', '*', 'F', '*', '*', '*'>,
+            static_mask<'*', '*', 'F', 'T', '*', 'F', '*', '*', '*'>,
+            static_mask<'*', '*', 'F', '*', 'T', 'F', '*', '*', '*'>
+        > static_mask_covered_by;
+
+// CROSSES
+// dim(G1) < dim(G2) - P/L P/A L/A
+template <typename Geometry1,
+          typename Geometry2,
+          std::size_t Dim1 = topological_dimension<Geometry1>::value,
+          std::size_t Dim2 = topological_dimension<Geometry2>::value,
+          bool D1LessD2 = (Dim1 < Dim2)
+>
+struct static_mask_crosses_impl
+{
+    typedef static_mask<'T', '*', 'T', '*', '*', '*', '*', '*', '*'> type;
+};
+// TODO: I'm not sure if this one below should be available!
+// dim(G1) > dim(G2) - L/P A/P A/L
+template <typename Geometry1, typename Geometry2,
+          std::size_t Dim1, std::size_t Dim2
+>
+struct static_mask_crosses_impl<Geometry1, Geometry2, Dim1, Dim2, false>
+{
+    typedef static_mask<'T', '*', '*', '*', '*', '*', 'T', '*', '*'> type;
+};
+// dim(G1) == dim(G2) - P/P A/A
+template <typename Geometry1, typename Geometry2,
+          std::size_t Dim
+>
+struct static_mask_crosses_impl<Geometry1, Geometry2, Dim, Dim, false>
+    : not_implemented<typename geometry::tag<Geometry1>::type,
+                      typename geometry::tag<Geometry2>::type>
+{};
+// dim(G1) == 1 && dim(G2) == 1 - L/L
+template <typename Geometry1, typename Geometry2>
+struct static_mask_crosses_impl<Geometry1, Geometry2, 1, 1, false>
+{
+    typedef static_mask<'0', '*', '*', '*', '*', '*', '*', '*', '*'> type;
+};
+
+template <typename Geometry1, typename Geometry2>
+struct static_mask_crosses_type
+    : static_mask_crosses_impl<Geometry1, Geometry2>
+{};
+
+// OVERLAPS
+
+// dim(G1) != dim(G2) - NOT P/P, L/L, A/A
+template <typename Geometry1,
+          typename Geometry2,
+          std::size_t Dim1 = topological_dimension<Geometry1>::value,
+          std::size_t Dim2 = topological_dimension<Geometry2>::value
+>
+struct static_mask_overlaps_impl
+    : not_implemented<typename geometry::tag<Geometry1>::type,
+                      typename geometry::tag<Geometry2>::type>
+{};
+// dim(G1) == D && dim(G2) == D - P/P A/A
+template <typename Geometry1, typename Geometry2, std::size_t Dim>
+struct static_mask_overlaps_impl<Geometry1, Geometry2, Dim, Dim>
+{
+    typedef static_mask<'T', '*', 'T', '*', '*', '*', 'T', '*', '*'> type;
+};
+// dim(G1) == 1 && dim(G2) == 1 - L/L
+template <typename Geometry1, typename Geometry2>
+struct static_mask_overlaps_impl<Geometry1, Geometry2, 1, 1>
+{
+    typedef static_mask<'1', '*', 'T', '*', '*', '*', 'T', '*', '*'> type;
+};
+
+template <typename Geometry1, typename Geometry2>
+struct static_mask_overlaps_type
+    : static_mask_overlaps_impl<Geometry1, Geometry2>
+{};
+
+// RESULTS/HANDLERS UTILS
+
+template <field F1, field F2, char V, typename Result>
+inline void set(Result & res)
+{
+    res.template set<F1, F2, V>();
+}
+
+template <field F1, field F2, char V, bool Transpose>
+struct set_dispatch
+{
+    template <typename Result>
+    static inline void apply(Result & res)
+    {
+        res.template set<F1, F2, V>();
+    }
+};
+
+template <field F1, field F2, char V>
+struct set_dispatch<F1, F2, V, true>
+{
+    template <typename Result>
+    static inline void apply(Result & res)
+    {
+        res.template set<F2, F1, V>();
+    }
+};
+
+template <field F1, field F2, char V, bool Transpose, typename Result>
+inline void set(Result & res)
+{
+    set_dispatch<F1, F2, V, Transpose>::apply(res);
+}
+
+template <char V, typename Result>
+inline void set(Result & res)
+{
+    res.template set<interior, interior, V>();
+    res.template set<interior, boundary, V>();
+    res.template set<interior, exterior, V>();
+    res.template set<boundary, interior, V>();
+    res.template set<boundary, boundary, V>();
+    res.template set<boundary, exterior, V>();
+    res.template set<exterior, interior, V>();
+    res.template set<exterior, boundary, V>();
+    res.template set<exterior, exterior, V>();
+}
+
+template <char II, char IB, char IE, char BI, char BB, char BE, char EI, char EB, char EE, typename Result>
+inline void set(Result & res)
+{
+    res.template set<interior, interior, II>();
+    res.template set<interior, boundary, IB>();
+    res.template set<interior, exterior, IE>();
+    res.template set<boundary, interior, BI>();
+    res.template set<boundary, boundary, BB>();
+    res.template set<boundary, exterior, BE>();
+    res.template set<exterior, interior, EI>();
+    res.template set<exterior, boundary, EB>();
+    res.template set<exterior, exterior, EE>();
+}
+
+template <field F1, field F2, char D, typename Result>
+inline void update(Result & res)
+{
+    res.template update<F1, F2, D>();
+}
+
+template <field F1, field F2, char D, bool Transpose>
+struct update_result_dispatch
+{
+    template <typename Result>
+    static inline void apply(Result & res)
+    {
+        update<F1, F2, D>(res);
+    }
+};
+
+template <field F1, field F2, char D>
+struct update_result_dispatch<F1, F2, D, true>
+{
+    template <typename Result>
+    static inline void apply(Result & res)
+    {
+        update<F2, F1, D>(res);
+    }
+};
+
+template <field F1, field F2, char D, bool Transpose, typename Result>
+inline void update(Result & res)
+{
+    update_result_dispatch<F1, F2, D, Transpose>::apply(res);
+}
+
+template <field F1, field F2, char D, typename Result>
+inline bool may_update(Result const& res)
+{
+    return res.template may_update<F1, F2, D>();
+}
+
+template <field F1, field F2, char D, bool Transpose>
+struct may_update_result_dispatch
+{
+    template <typename Result>
+    static inline bool apply(Result const& res)
+    {
+        return may_update<F1, F2, D>(res);
+    }
+};
+
+template <field F1, field F2, char D>
+struct may_update_result_dispatch<F1, F2, D, true>
+{
+    template <typename Result>
+    static inline bool apply(Result const& res)
+    {
+        return may_update<F2, F1, D>(res);
+    }
+};
+
+template <field F1, field F2, char D, bool Transpose, typename Result>
+inline bool may_update(Result const& res)
+{
+    return may_update_result_dispatch<F1, F2, D, Transpose>::apply(res);
+}
+
+template <typename Result, char II, char IB, char IE, char BI, char BB, char BE, char EI, char EB, char EE>
+inline Result return_result()
+{
+    Result res;
+    set<II, IB, IE, BI, BB, BE, EI, EB, EE>(res);
+    return res;
+}
+
+template <typename Geometry>
+struct result_dimension
+{
+    BOOST_STATIC_ASSERT(geometry::dimension<Geometry>::value >= 0);
+    static const char value
+        = ( geometry::dimension<Geometry>::value <= 9 ) ?
+            ( '0' + geometry::dimension<Geometry>::value ) :
+              'T';
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RESULT_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/topology_check.hpp b/include/boost/geometry/algorithms/detail/relate/topology_check.hpp
new file mode 100644
index 000000000..98b857a48
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/topology_check.hpp
@@ -0,0 +1,241 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TOPOLOGY_CHECK_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TOPOLOGY_CHECK_HPP
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+#include <boost/geometry/policies/compare.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate {
+
+// TODO: change the name for e.g. something with the word "exterior"
+
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type>
+struct topology_check
+    : not_implemented<Tag>
+{};
+
+//template <typename Point>
+//struct topology_check<Point, point_tag>
+//{
+//    static const char interior = '0';
+//    static const char boundary = 'F';
+//
+//    static const bool has_interior = true;
+//    static const bool has_boundary = false;
+//
+//    topology_check(Point const&) {}
+//    template <typename IgnoreBoundaryPoint>
+//    topology_check(Point const&, IgnoreBoundaryPoint const&) {}
+//};
+
+template <typename Linestring>
+struct topology_check<Linestring, linestring_tag>
+{
+    static const char interior = '1';
+    static const char boundary = '0';
+
+    bool has_interior;
+    bool has_boundary;
+
+    topology_check(Linestring const& ls)
+    {
+        init(ls, 0); /*dummy param*/
+    }
+
+    template <typename IgnoreBoundaryPoint>
+    topology_check(Linestring const& ls, IgnoreBoundaryPoint const& ibp)
+    {
+        init(ls, ibp); /*dummy param, won't be used*/
+    }
+
+    // Even if some point is on the boundary, if the Linestring has the boundary,
+    // there will be second boundary point different than IgnoreBoundaryPoint
+    template <typename IgnoreBoundaryPoint>
+    void init(Linestring const& ls, IgnoreBoundaryPoint const&)
+    {
+        std::size_t count = boost::size(ls);
+        has_interior = count > 0;
+        // NOTE: Linestring with all points equal is treated as 1d linear ring
+        has_boundary = count > 1
+                    && ! detail::equals::equals_point_point(range::front(ls), range::back(ls));
+    }
+};
+
+template <typename MultiLinestring>
+struct topology_check<MultiLinestring, multi_linestring_tag>
+{
+    static const char interior = '1';
+    static const char boundary = '0';
+
+    bool has_interior;
+    bool has_boundary;
+
+    topology_check(MultiLinestring const& mls)
+    {
+        init(mls, not_ignoring_counter());
+    }
+
+    template <typename IgnoreBoundaryPoint>
+    topology_check(MultiLinestring const& mls, IgnoreBoundaryPoint const& ibp)
+    {
+        init(mls, ignoring_counter<IgnoreBoundaryPoint>(ibp));
+    }
+
+    template <typename OddCounter>
+    void init(MultiLinestring const& mls, OddCounter const& odd_counter)
+    {
+        typedef typename geometry::point_type<MultiLinestring>::type point_type;
+        std::vector<point_type> endpoints;
+        endpoints.reserve(boost::size(mls) * 2);
+
+        typedef typename boost::range_iterator<MultiLinestring const>::type ls_iterator;
+        for ( ls_iterator it = boost::begin(mls) ; it != boost::end(mls) ; ++it )
+        {
+            std::size_t count = boost::size(*it);
+
+            if ( count > 0 )
+            {
+                has_interior = true;
+            }
+
+            if ( count > 1 )
+            {
+                // don't store boundaries of linear rings, this doesn't change anything
+                if ( ! equals::equals_point_point(range::front(*it), range::back(*it)) )
+                {
+                    endpoints.push_back(range::front(*it));
+                    endpoints.push_back(range::back(*it));
+                }
+            }
+        }
+
+        has_boundary = false;
+
+        if ( !endpoints.empty() )
+        {
+            std::sort(endpoints.begin(), endpoints.end(), geometry::less<point_type>());
+            has_boundary = odd_counter(endpoints.begin(), endpoints.end());
+        }
+    }
+
+    struct not_ignoring_counter
+    {
+        template <typename It>
+        bool operator()(It first, It last) const
+        {
+            return find_odd_count(first, last);
+        }
+    };
+
+    template <typename Point>
+    struct ignoring_counter
+    {
+        ignoring_counter(Point const& pt) : m_pt(pt) {}
+
+        template <typename It>
+        bool operator()(It first, It last) const
+        {
+            typedef typename std::iterator_traits<It>::value_type point_type;
+
+            std::pair<It, It> ignore_range
+                              = std::equal_range(first, last, m_pt,
+                                                 geometry::less<point_type>());
+
+            if ( find_odd_count(first, ignore_range.first) )
+                return true;
+
+            return find_odd_count(ignore_range.second, last);
+        }
+
+        Point const& m_pt;
+    };
+
+    template <typename It>
+    static inline bool find_odd_count(It first, It last)
+    {
+        if ( first == last )
+            return false;
+
+        std::size_t count = 1;
+        It prev = first;
+        ++first;
+        for ( ; first != last ; ++first, ++prev )
+        {
+            // the end of the equal points subrange
+            if ( ! equals::equals_point_point(*first, *prev) )
+            {
+                if ( count % 2 != 0 )
+                    return true;
+
+                count = 1;
+            }
+            else
+            {
+                ++count;
+            }
+        }
+
+        return count % 2 != 0;
+    }
+};
+
+template <typename Ring>
+struct topology_check<Ring, ring_tag>
+{
+    static const char interior = '2';
+    static const char boundary = '1';
+    static const bool has_interior = true;
+    static const bool has_boundary = true;
+
+    topology_check(Ring const&) {}
+    template <typename P>
+    topology_check(Ring const&, P const&) {}
+};
+
+template <typename Polygon>
+struct topology_check<Polygon, polygon_tag>
+{
+    static const char interior = '2';
+    static const char boundary = '1';
+    static const bool has_interior = true;
+    static const bool has_boundary = true;
+
+    topology_check(Polygon const&) {}
+    template <typename P>
+    topology_check(Polygon const&, P const&) {}
+};
+
+template <typename MultiPolygon>
+struct topology_check<MultiPolygon, multi_polygon_tag>
+{
+    static const char interior = '2';
+    static const char boundary = '1';
+    static const bool has_interior = true;
+    static const bool has_boundary = true;
+
+    topology_check(MultiPolygon const&) {}
+    template <typename P>
+    topology_check(MultiPolygon const&, P const&) {}
+};
+
+}} // namespace detail::relate
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TOPOLOGY_CHECK_HPP
diff --git a/include/boost/geometry/algorithms/detail/relate/turns.hpp b/include/boost/geometry/algorithms/detail/relate/turns.hpp
new file mode 100644
index 000000000..b8c292bee
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/relate/turns.hpp
@@ -0,0 +1,228 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TURNS_HPP
+
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turn_info.hpp>
+
+#include <boost/type_traits/is_base_of.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace relate { namespace turns {
+
+template <bool IncludeDegenerate = false>
+struct assign_policy
+    : overlay::assign_null_policy
+{
+    static bool const include_degenerate = IncludeDegenerate;
+};
+
+// GET_TURNS
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename GetTurnPolicy
+            = detail::get_turns::get_turn_info_type<Geometry1, Geometry2, assign_policy<> > >
+struct get_turns
+{
+    typedef typename geometry::point_type<Geometry1>::type point1_type;
+
+    typedef overlay::turn_info
+            <
+                point1_type,
+                typename segment_ratio_type<point1_type, detail::no_rescale_policy>::type,
+                typename detail::get_turns::turn_operation_type
+                    <
+                        Geometry1, Geometry2,
+                        typename segment_ratio_type<point1_type, detail::no_rescale_policy>::type
+                    >::type
+            > turn_info;
+
+    template <typename Turns>
+    static inline void apply(Turns & turns,
+                             Geometry1 const& geometry1,
+                             Geometry2 const& geometry2)
+    {
+        detail::get_turns::no_interrupt_policy interrupt_policy;
+
+        apply(turns, geometry1, geometry2, interrupt_policy);
+    }
+
+    template <typename Turns, typename InterruptPolicy>
+    static inline void apply(Turns & turns,
+                             Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             InterruptPolicy & interrupt_policy)
+    {
+        static const bool reverse1 = detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value;
+        static const bool reverse2 = detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value;
+
+        dispatch::get_turns
+            <
+                typename geometry::tag<Geometry1>::type,
+                typename geometry::tag<Geometry2>::type,
+                Geometry1,
+                Geometry2,
+                reverse1,
+                reverse2,
+                GetTurnPolicy
+            >::apply(0, geometry1, 1, geometry2,
+                     detail::no_rescale_policy(), turns, interrupt_policy);
+    }
+};
+
+// TURNS SORTING AND SEARCHING
+
+template <int N = 0, int U = 1, int I = 2, int B = 3, int C = 4, int O = 0>
+struct op_to_int
+{
+    template <typename Op>
+    inline int operator()(Op const& op) const
+    {
+        switch(op.operation)
+        {
+        case detail::overlay::operation_none : return N;
+        case detail::overlay::operation_union : return U;
+        case detail::overlay::operation_intersection : return I;
+        case detail::overlay::operation_blocked : return B;
+        case detail::overlay::operation_continue : return C;
+        case detail::overlay::operation_opposite : return O;
+        }
+        return -1;
+    }
+};
+
+template <typename OpToInt>
+struct less_op_xxx_linear
+{
+    template <typename Op>
+    inline bool operator()(Op const& left, Op const& right)
+    {
+        static OpToInt op_to_int;
+        return op_to_int(left) < op_to_int(right);
+    }
+};
+
+struct less_op_linear_linear
+    : less_op_xxx_linear< op_to_int<0,2,3,1,4,0> >
+{};
+
+struct less_op_linear_areal
+{
+    template <typename Op>
+    inline bool operator()(Op const& left, Op const& right)
+    {
+        static turns::op_to_int<0,2,3,1,4,0> op_to_int_xuic;
+        static turns::op_to_int<0,3,2,1,4,0> op_to_int_xiuc;
+
+        if ( left.other_id.multi_index == right.other_id.multi_index )
+        {
+            if ( left.other_id.ring_index == right.other_id.ring_index )
+                return op_to_int_xuic(left) < op_to_int_xuic(right);
+            else
+                return op_to_int_xiuc(left) < op_to_int_xiuc(right);
+        }
+        else
+        {
+            //return op_to_int_xuic(left) < op_to_int_xuic(right);
+            return left.other_id.multi_index < right.other_id.multi_index;
+        }
+    }
+};
+
+struct less_op_areal_linear
+    : less_op_xxx_linear< op_to_int<0,1,0,0,2,0> >
+{};
+
+struct less_op_areal_areal
+{
+    template <typename Op>
+    inline bool operator()(Op const& left, Op const& right)
+    {
+        static op_to_int<0, 1, 2, 3, 4, 0> op_to_int_uixc;
+        static op_to_int<0, 2, 1, 3, 4, 0> op_to_int_iuxc;
+
+        if ( left.other_id.multi_index == right.other_id.multi_index )
+        {
+            if ( left.other_id.ring_index == right.other_id.ring_index )
+            {
+                return op_to_int_uixc(left) < op_to_int_uixc(right);
+            }
+            else
+            {
+                if ( left.other_id.ring_index == -1 )
+                {
+                    if ( left.operation == overlay::operation_union )
+                        return false;
+                    else if ( left.operation == overlay::operation_intersection )
+                        return true;
+                }
+                else if ( right.other_id.ring_index == -1 )
+                {
+                    if ( right.operation == overlay::operation_union )
+                        return true;
+                    else if ( right.operation == overlay::operation_intersection )
+                        return false;
+                }
+                
+                return op_to_int_iuxc(left) < op_to_int_iuxc(right);
+            }
+        }
+        else
+        {
+            return op_to_int_uixc(left) < op_to_int_uixc(right);
+        }
+    }
+};
+
+// sort turns by G1 - source_index == 0 by:
+// seg_id -> distance -> operation
+template <std::size_t OpId = 0,
+          typename LessOp = less_op_xxx_linear< op_to_int<> > >
+struct less
+{
+    BOOST_STATIC_ASSERT(OpId < 2);
+
+    template <typename Op> static inline
+    bool use_fraction(Op const& left, Op const& right)
+    {
+        static LessOp less_op;
+
+        if ( left.fraction == right.fraction )
+            return less_op(left, right);
+        else
+            return left.fraction < right.fraction;
+    }
+
+    template <typename Turn>
+    inline bool operator()(Turn const& left, Turn const& right) const
+    {
+        segment_identifier const& sl = left.operations[OpId].seg_id;
+        segment_identifier const& sr = right.operations[OpId].seg_id;
+
+        return sl < sr || ( sl == sr && use_fraction(left.operations[OpId], right.operations[OpId]) );
+    }
+};
+
+}}} // namespace detail::relate::turns
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp b/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
index ad62f232b..4ef11175f 100644
--- a/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
+++ b/include/boost/geometry/algorithms/detail/sections/range_by_section.hpp
@@ -7,14 +7,19 @@
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 
-
+#include <boost/assert.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
 
@@ -22,7 +27,9 @@
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
-
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
@@ -55,6 +62,28 @@ struct full_section_polygon
 };
 
 
+template
+<
+    typename MultiGeometry,
+    typename Section,
+    typename Policy
+>
+struct full_section_multi
+{
+    static inline typename ring_return_type<MultiGeometry const>::type apply(
+                MultiGeometry const& multi, Section const& section)
+    {
+        BOOST_ASSERT
+            (
+                section.ring_id.multi_index >= 0
+                && section.ring_id.multi_index < int(boost::size(multi))
+            );
+
+        return Policy::apply(multi[section.ring_id.multi_index], section);
+    }
+};
+
+
 }} // namespace detail::section
 #endif
 
@@ -98,6 +127,35 @@ struct range_by_section<polygon_tag, Polygon, Section>
 {};
 
 
+template <typename MultiPolygon, typename Section>
+struct range_by_section<multi_polygon_tag, MultiPolygon, Section>
+    : detail::section::full_section_multi
+        <
+            MultiPolygon,
+            Section,
+            detail::section::full_section_polygon
+                <
+                    typename boost::range_value<MultiPolygon>::type,
+                    Section
+                >
+       >
+{};
+
+template <typename MultiLinestring, typename Section>
+struct range_by_section<multi_linestring_tag, MultiLinestring, Section>
+    : detail::section::full_section_multi
+        <
+            MultiLinestring,
+            Section,
+            detail::section::full_section_range
+                <
+                    typename boost::range_value<MultiLinestring>::type,
+                    Section
+                >
+       >
+{};
+
+
 } // namespace dispatch
 #endif
 
diff --git a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
index f5588522f..250577c0c 100644
--- a/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost/geometry/algorithms/detail/sections/sectionalize.hpp
@@ -3,6 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -11,33 +15,39 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 
 #include <cstddef>
 #include <vector>
 
+#include <boost/concept/requires.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/expand.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
 #include <boost/geometry/algorithms/detail/ring_identifier.hpp>
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/util/math.hpp>
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/views/reversible_view.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 
-
 namespace boost { namespace geometry
 {
 
@@ -71,6 +81,9 @@ struct section
     bool duplicate;
     int non_duplicate_index;
 
+    bool is_non_duplicate_first;
+    bool is_non_duplicate_last;
+
     inline section()
         : id(-1)
         , begin_index(-1)
@@ -79,6 +92,8 @@ struct section
         , range_count(0)
         , duplicate(false)
         , non_duplicate_index(-1)
+        , is_non_duplicate_first(false)
+        , is_non_duplicate_last(false)
     {
         assign_inverse(bounding_box);
         for (std::size_t i = 0; i < DimensionCount; i++)
@@ -107,14 +122,14 @@ struct sections : std::vector<section<Box, DimensionCount> >
 namespace detail { namespace sectionalize
 {
 
-template <typename Segment, std::size_t Dimension, std::size_t DimensionCount>
+template <std::size_t Dimension, std::size_t DimensionCount>
 struct get_direction_loop
 {
-    typedef typename coordinate_type<Segment>::type coordinate_type;
-
+    template <typename Segment>
     static inline void apply(Segment const& seg,
                 int directions[DimensionCount])
     {
+        typedef typename coordinate_type<Segment>::type coordinate_type;
         coordinate_type const diff =
             geometry::get<1, Dimension>(seg) - geometry::get<0, Dimension>(seg);
 
@@ -123,14 +138,15 @@ struct get_direction_loop
 
         get_direction_loop
             <
-                Segment, Dimension + 1, DimensionCount
+                Dimension + 1, DimensionCount
             >::apply(seg, directions);
     }
 };
 
-template <typename Segment, std::size_t DimensionCount>
-struct get_direction_loop<Segment, DimensionCount, DimensionCount>
+template <std::size_t DimensionCount>
+struct get_direction_loop<DimensionCount, DimensionCount>
 {
+    template <typename Segment>
     static inline void apply(Segment const&, int [DimensionCount])
     {}
 };
@@ -182,16 +198,15 @@ struct compare_loop<T, DimensionCount, DimensionCount>
 };
 
 
-template <typename Segment, std::size_t Dimension, std::size_t DimensionCount>
+template <std::size_t Dimension, std::size_t DimensionCount>
 struct check_duplicate_loop
 {
-    typedef typename coordinate_type<Segment>::type coordinate_type;
-
+    template <typename Segment>
     static inline bool apply(Segment const& seg)
     {
         if (! geometry::math::equals
                 (
-                    geometry::get<0, Dimension>(seg), 
+                    geometry::get<0, Dimension>(seg),
                     geometry::get<1, Dimension>(seg)
                 )
             )
@@ -201,14 +216,15 @@ struct check_duplicate_loop
 
         return check_duplicate_loop
             <
-                Segment, Dimension + 1, DimensionCount
+                Dimension + 1, DimensionCount
             >::apply(seg);
     }
 };
 
-template <typename Segment, std::size_t DimensionCount>
-struct check_duplicate_loop<Segment, DimensionCount, DimensionCount>
+template <std::size_t DimensionCount>
+struct check_duplicate_loop<DimensionCount, DimensionCount>
 {
+    template <typename Segment>
     static inline bool apply(Segment const&)
     {
         return true;
@@ -236,48 +252,62 @@ struct assign_loop<T, DimensionCount, DimensionCount>
 /// @brief Helper class to create sections of a part of a range, on the fly
 template
 <
-    typename Range,  // Can be closeable_view
     typename Point,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize_part
 {
-    typedef model::referring_segment<Point const> segment_type;
-    typedef typename boost::range_value<Sections>::type section_type;
-
-    typedef typename boost::range_iterator<Range const>::type iterator_type;
-
-    static inline void apply(Sections& sections, section_type& section,
-                int& index, int& ndi,
-                Range const& range,
-                ring_identifier ring_id)
+    template
+    <
+        typename Range,  // Can be closeable_view
+        typename RobustPolicy,
+        typename Sections
+    >
+    static inline void apply(Sections& sections,
+                             Range const& range,
+                             RobustPolicy const& robust_policy,
+                             bool make_rescaled_boxes,
+                             ring_identifier ring_id,
+                             std::size_t max_count)
     {
-        if (int(boost::size(range)) <= index)
+        boost::ignore_unused_variable_warning(robust_policy);
+        boost::ignore_unused_variable_warning(make_rescaled_boxes);
+
+        typedef model::referring_segment<Point const> segment_type;
+        typedef typename boost::range_value<Sections>::type section_type;
+        typedef model::segment
+            <
+                typename robust_point_type<Point, RobustPolicy>::type
+            > robust_segment_type;
+        typedef typename boost::range_iterator<Range const>::type iterator_type;
+
+        if ( boost::empty(range) )
         {
             return;
         }
 
-        if (index == 0)
-        {
-            ndi = 0;
-        }
+        int index = 0;
+        int ndi = 0; // non duplicate index
+        section_type section;
+
+        bool mark_first_non_duplicated = true;
+        std::size_t last_non_duplicate_index = sections.size();
 
         iterator_type it = boost::begin(range);
-        it += index;
-
+        
         for(iterator_type previous = it++;
             it != boost::end(range);
             ++previous, ++it, index++)
         {
             segment_type segment(*previous, *it);
+            robust_segment_type robust_segment;
+            geometry::recalculate(robust_segment, segment, robust_policy);
 
             int direction_classes[DimensionCount] = {0};
             get_direction_loop
                 <
-                    segment_type, 0, DimensionCount
-                >::apply(segment, direction_classes);
+                    0, DimensionCount
+                >::apply(robust_segment, direction_classes);
 
             // if "dir" == 0 for all point-dimensions, it is duplicate.
             // Those sections might be omitted, if wished, lateron
@@ -290,8 +320,8 @@ struct sectionalize_part
                 // (DimensionCount might be < dimension<P>::value)
                 if (check_duplicate_loop
                     <
-                        segment_type, 0, geometry::dimension<Point>::type::value
-                    >::apply(segment)
+                        0, geometry::dimension<Point>::type::value
+                    >::apply(robust_segment)
                     )
                 {
                     duplicate = true;
@@ -312,10 +342,15 @@ struct sectionalize_part
                         <
                             int, 0, DimensionCount
                         >::apply(direction_classes, section.directions)
-                    || section.count > MaxCount
+                    || section.count > max_count
                     )
                 )
             {
+                if ( !section.duplicate )
+                {
+                    last_non_duplicate_index = sections.size();
+                }
+
                 sections.push_back(section);
                 section = section_type();
             }
@@ -328,14 +363,21 @@ struct sectionalize_part
                 section.non_duplicate_index = ndi;
                 section.range_count = boost::size(range);
 
+                if ( mark_first_non_duplicated && !duplicate )
+                {
+                    section.is_non_duplicate_first = true;
+                    mark_first_non_duplicated = false;
+                }
+
                 copy_loop
                     <
                         int, 0, DimensionCount
                     >::apply(direction_classes, section.directions);
-                geometry::expand(section.bounding_box, *previous);
+
+                expand_box(*previous, robust_policy, section);
             }
 
-            geometry::expand(section.bounding_box, *it);
+            expand_box(*it, robust_policy, section);
             section.end_index = index + 1;
             section.count++;
             if (! duplicate)
@@ -343,20 +385,58 @@ struct sectionalize_part
                 ndi++;
             }
         }
+
+        // Add last section if applicable
+        if (section.count > 0)
+        {
+            if ( !section.duplicate )
+            {
+                last_non_duplicate_index = sections.size();
+            }
+
+            sections.push_back(section);
+        }
+
+        if ( last_non_duplicate_index < sections.size()
+          && !sections[last_non_duplicate_index].duplicate )
+        {
+            sections[last_non_duplicate_index].is_non_duplicate_last = true;
+        }
+    }
+
+    template <typename InputPoint, typename RobustPolicy, typename Section>
+    static inline void expand_box(InputPoint const& point,
+                        RobustPolicy const& robust_policy,
+                        Section& section)
+    {
+                typename geometry::point_type<typename Section::box_type>::type robust_point;
+                geometry::recalculate(robust_point, point, robust_policy);
+                geometry::expand(section.bounding_box, robust_point);
     }
 };
 
 
 template
 <
-    typename Range, closure_selector Closure, bool Reverse,
+    closure_selector Closure, bool Reverse,
     typename Point,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize_range
 {
+    template
+    <
+        typename Range,
+        typename RobustPolicy,
+        typename Sections
+    >
+    static inline void apply(Range const& range,
+                             RobustPolicy const& robust_policy,
+                             bool make_rescaled_boxes,
+                             Sections& sections,
+                             ring_identifier ring_id,
+                             std::size_t max_count)
+    {
     typedef typename closeable_view<Range const, Closure>::type cview_type;
     typedef typename reversible_view
         <
@@ -364,9 +444,6 @@ struct sectionalize_range
             Reverse ? iterate_reverse : iterate_forward
         >::type view_type;
 
-    static inline void apply(Range const& range, Sections& sections,
-                ring_identifier ring_id)
-    {
         cview_type cview(range);
         view_type view(cview);
 
@@ -383,72 +460,69 @@ struct sectionalize_range
             return;
         }
 
-        int index = 0;
-        int ndi = 0; // non duplicate index
-
-        typedef typename boost::range_value<Sections>::type section_type;
-        section_type section;
-
-        sectionalize_part
-            <
-                view_type, Point, Sections,
-                DimensionCount, MaxCount
-            >::apply(sections, section, index, ndi,
-                        view, ring_id);
-
-        // Add last section if applicable
-        if (section.count > 0)
-        {
-            sections.push_back(section);
-        }
+        sectionalize_part<Point, DimensionCount>
+                ::apply(sections, view, robust_policy, make_rescaled_boxes, ring_id, max_count);
     }
 };
 
 template
 <
-    typename Polygon,
     bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize_polygon
 {
-    static inline void apply(Polygon const& poly, Sections& sections,
-                ring_identifier ring_id)
+    template
+    <
+        typename Polygon,
+        typename RobustPolicy,
+        typename Sections
+    >
+    static inline void apply(Polygon const& poly,
+                RobustPolicy const& robust_policy,
+                bool make_rescaled_boxes,
+                Sections& sections,
+                ring_identifier ring_id, std::size_t max_count)
     {
         typedef typename point_type<Polygon>::type point_type;
-        typedef typename ring_type<Polygon>::type ring_type;
+        //typedef typename ring_type<Polygon>::type ring_type;
         typedef sectionalize_range
             <
-                ring_type, closure<Polygon>::value, Reverse,
-                point_type, Sections, DimensionCount, MaxCount
-            > sectionalizer_type;
+                closure<Polygon>::value, Reverse,
+                point_type, DimensionCount
+            > per_range;
 
         ring_id.ring_index = -1;
-        sectionalizer_type::apply(exterior_ring(poly), sections, ring_id);//-1, multi_index);
+        per_range::apply(exterior_ring(poly), robust_policy, make_rescaled_boxes, sections, ring_id, max_count);
 
         ring_id.ring_index++;
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings);
-             ++it, ++ring_id.ring_index)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(poly);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it, ++ring_id.ring_index)
         {
-            sectionalizer_type::apply(*it, sections, ring_id);
+            per_range::apply(*it, robust_policy, make_rescaled_boxes, sections, ring_id, max_count);
         }
     }
 };
 
 template
 <
-    typename Box,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize_box
 {
-    static inline void apply(Box const& box, Sections& sections, ring_identifier const& ring_id)
+    template
+    <
+        typename Box,
+        typename RobustPolicy,
+        typename Sections
+    >
+    static inline void apply(Box const& box,
+                RobustPolicy const& robust_policy,
+                bool make_rescaled_boxes,
+                Sections& sections,
+                ring_identifier const& ring_id, std::size_t max_count)
     {
         typedef typename point_type<Box>::type point_type;
 
@@ -460,7 +534,7 @@ struct sectionalize_box
         // (or polygon would be a helper-type).
         // Therefore we mimic a linestring/std::vector of 5 points
 
-        // TODO: might be replaced by assign_box_corners_oriented 
+        // TODO: might be replaced by assign_box_corners_oriented
         // or just "convert"
         point_type ll, lr, ul, ur;
         geometry::detail::assign_box_corners(box, ll, lr, ul, ur);
@@ -474,12 +548,36 @@ struct sectionalize_box
 
         sectionalize_range
             <
-                std::vector<point_type>, closed, false,
+                closed, false,
                 point_type,
-                Sections,
-                DimensionCount,
-                MaxCount
-            >::apply(points, sections, ring_id);
+                DimensionCount
+            >::apply(points, robust_policy, make_rescaled_boxes, sections,
+                     ring_id, max_count);
+    }
+};
+
+template <std::size_t DimensionCount, typename Policy>
+struct sectionalize_multi
+{
+    template
+    <
+        typename MultiGeometry,
+        typename RobustPolicy,
+        typename Sections
+    >
+    static inline void apply(MultiGeometry const& multi,
+                RobustPolicy const& robust_policy,
+                bool make_rescaled_boxes,
+                Sections& sections, ring_identifier ring_id, std::size_t max_count)
+    {
+        ring_id.multi_index = 0;
+        for (typename boost::range_iterator<MultiGeometry const>::type
+                    it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it, ++ring_id.multi_index)
+        {
+            Policy::apply(*it, robust_policy, make_rescaled_boxes, sections, ring_id, max_count);
+        }
     }
 };
 
@@ -497,7 +595,7 @@ inline void set_section_unique_ids(Sections& sections)
 }
 
 template <typename Sections>
-inline void enlargeSections(Sections& sections)
+inline void enlarge_sections(Sections& sections)
 {
     // Robustness issue. Increase sections a tiny bit such that all points are really within (and not on border)
     // Reason: turns might, rarely, be missed otherwise (case: "buffer_mp1")
@@ -533,9 +631,7 @@ template
     typename Tag,
     typename Geometry,
     bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize
 {
@@ -550,43 +646,29 @@ template
 <
     typename Box,
     bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
-struct sectionalize<box_tag, Box, Reverse, Sections, DimensionCount, MaxCount>
-    : detail::sectionalize::sectionalize_box
-        <
-            Box,
-            Sections,
-            DimensionCount,
-            MaxCount
-        >
+struct sectionalize<box_tag, Box, Reverse, DimensionCount>
+    : detail::sectionalize::sectionalize_box<DimensionCount>
 {};
 
 template
 <
     typename LineString,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
 struct sectionalize
     <
         linestring_tag,
         LineString,
         false,
-        Sections,
-        DimensionCount,
-        MaxCount
+        DimensionCount
     >
     : detail::sectionalize::sectionalize_range
         <
-            LineString, closed, false,
+            closed, false,
             typename point_type<LineString>::type,
-            Sections,
-            DimensionCount,
-            MaxCount
+            DimensionCount
         >
 {};
 
@@ -594,18 +676,14 @@ template
 <
     typename Ring,
     bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
-struct sectionalize<ring_tag, Ring, Reverse, Sections, DimensionCount, MaxCount>
+struct sectionalize<ring_tag, Ring, Reverse, DimensionCount>
     : detail::sectionalize::sectionalize_range
         <
-            Ring, geometry::closure<Ring>::value, Reverse,
+            geometry::closure<Ring>::value, Reverse,
             typename point_type<Ring>::type,
-            Sections,
-            DimensionCount,
-            MaxCount
+            DimensionCount
         >
 {};
 
@@ -613,17 +691,54 @@ template
 <
     typename Polygon,
     bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
+    std::size_t DimensionCount
 >
-struct sectionalize<polygon_tag, Polygon, Reverse, Sections, DimensionCount, MaxCount>
+struct sectionalize<polygon_tag, Polygon, Reverse, DimensionCount>
     : detail::sectionalize::sectionalize_polygon
         <
-            Polygon, Reverse, Sections, DimensionCount, MaxCount
+            Reverse, DimensionCount
         >
 {};
 
+template
+<
+    typename MultiPolygon,
+    bool Reverse,
+    std::size_t DimensionCount
+>
+struct sectionalize<multi_polygon_tag, MultiPolygon, Reverse, DimensionCount>
+    : detail::sectionalize::sectionalize_multi
+        <
+            DimensionCount,
+            detail::sectionalize::sectionalize_polygon
+                <
+                    Reverse,
+                    DimensionCount
+                >
+        >
+
+{};
+
+template
+<
+    typename MultiLinestring,
+    bool Reverse,
+    std::size_t DimensionCount
+>
+struct sectionalize<multi_linestring_tag, MultiLinestring, Reverse, DimensionCount>
+    : detail::sectionalize::sectionalize_multi
+        <
+            DimensionCount,
+            detail::sectionalize::sectionalize_range
+                <
+                    closed, false,
+                    typename point_type<MultiLinestring>::type,
+                    DimensionCount
+                >
+        >
+
+{};
+
 } // namespace dispatch
 #endif
 
@@ -634,36 +749,57 @@ struct sectionalize<polygon_tag, Polygon, Reverse, Sections, DimensionCount, Max
     \tparam Geometry type of geometry to check
     \tparam Sections type of sections to create
     \param geometry geometry to create sections from
+    \param robust_policy policy to handle robustness issues
+    \param enlarge_secion_boxes if true, boxes are enlarged a tiny bit to be sure
+        they really contain all geometries (w.r.t. robustness)
     \param sections structure with sections
     \param source_index index to assign to the ring_identifiers
  */
-template<bool Reverse, typename Geometry, typename Sections>
-inline void sectionalize(Geometry const& geometry, Sections& sections, int source_index = 0)
+template<bool Reverse, typename Geometry, typename Sections, typename RobustPolicy>
+inline void sectionalize(Geometry const& geometry,
+                RobustPolicy const& robust_policy,
+                bool enlarge_secion_boxes,
+                Sections& sections,
+                int source_index = 0)
 {
     concept::check<Geometry const>();
 
-    // TODO: review use of this constant (see below) as causing problems with GCC 4.6 --mloskot
+    sections.clear();
+
+    ring_identifier ring_id;
+    ring_id.source_index = source_index;
+
     // A maximum of 10 segments per section seems to give the fastest results
-    //static std::size_t const max_segments_per_section = 10;
-    typedef dispatch::sectionalize
+    dispatch::sectionalize
         <
             typename tag<Geometry>::type,
             Geometry,
             Reverse,
-            Sections,
-            Sections::value,
-            10 // TODO: max_segments_per_section
-        > sectionalizer_type;
+            Sections::value
+        >::apply(geometry, robust_policy, enlarge_secion_boxes, sections, ring_id, 10);
 
-    sections.clear();
-    ring_identifier ring_id;
-    ring_id.source_index = source_index;
-    sectionalizer_type::apply(geometry, sections, ring_id);
     detail::sectionalize::set_section_unique_ids(sections);
-    detail::sectionalize::enlargeSections(sections);
+    if (! enlarge_secion_boxes)
+    {
+        detail::sectionalize::enlarge_sections(sections);
+    }
 }
 
 
+#if defined(BOOST_GEOMETRY_UNIT_TEST_SECTIONALIZE)
+// Backwards compatibility
+template<bool Reverse, typename Geometry, typename Sections>
+inline void sectionalize(Geometry const& geometry,
+                         Sections& sections,
+                         int source_index = 0)
+{
+    return geometry::sectionalize<Reverse>(geometry, detail::no_rescale_policy(),
+                                           false, sections,
+                                           source_index);
+}
+#endif
+
+
 }} // namespace boost::geometry
 
 
diff --git a/include/boost/geometry/algorithms/detail/single_geometry.hpp b/include/boost/geometry/algorithms/detail/single_geometry.hpp
new file mode 100644
index 000000000..c65ff8bf8
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/single_geometry.hpp
@@ -0,0 +1,95 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SINGLE_GEOMETRY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SINGLE_GEOMETRY_HPP
+
+#include <boost/type_traits/is_base_of.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/util/range.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace detail_dispatch {
+
+// Returns single geometry by Id
+// for single geometries returns the geometry itself
+template <typename Geometry,
+          bool IsMulti = boost::is_base_of
+                            <
+                                multi_tag,
+                                typename geometry::tag<Geometry>::type
+                            >::value
+>
+struct single_geometry
+{
+    typedef Geometry & return_type;
+
+    template <typename Id>
+    static inline return_type apply(Geometry & g, Id const& ) { return g; }
+};
+
+// for multi geometries returns one of the stored single geometries
+template <typename Geometry>
+struct single_geometry<Geometry, true>
+{
+    typedef typename boost::mpl::if_c
+        <
+            boost::is_const<Geometry>::value,
+            typename boost::range_value<Geometry>::type const&,
+            typename boost::range_value<Geometry>::type
+        >::type return_type;
+
+    template <typename Id>
+    static inline return_type apply(Geometry & g, Id const& id)
+    {
+        BOOST_ASSERT(id.multi_index >= 0);
+        return range::at(g, id.multi_index);
+    }
+};
+
+} // namespace detail_dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail {
+
+template <typename Geometry>
+struct single_geometry_return_type
+{
+    typedef typename detail_dispatch::single_geometry<Geometry>::return_type type;
+};
+
+template <typename Geometry, typename Id>
+inline
+typename single_geometry_return_type<Geometry>::type
+single_geometry(Geometry & geometry, Id const& id)
+{
+    return detail_dispatch::single_geometry<Geometry>::apply(geometry, id);
+}
+
+template <typename Geometry, typename Id>
+inline
+typename single_geometry_return_type<Geometry const>::type
+single_geometry(Geometry const& geometry, Id const& id)
+{
+    return detail_dispatch::single_geometry<Geometry const>::apply(geometry, id);
+}
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_SINGLE_GEOMETRY_HPP
diff --git a/include/boost/geometry/algorithms/detail/sub_range.hpp b/include/boost/geometry/algorithms/detail/sub_range.hpp
new file mode 100644
index 000000000..5c5b2f9c0
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/sub_range.hpp
@@ -0,0 +1,113 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_SUB_RANGE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_SUB_RANGE_HPP
+
+#include <boost/geometry/util/range.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace detail_dispatch {
+
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type,
+          bool IsMulti = boost::is_base_of<multi_tag, Tag>::value>
+struct sub_range : not_implemented<Tag>
+{};
+
+template <typename Geometry, typename Tag>
+struct sub_range<Geometry, Tag, false>
+{
+    typedef Geometry & return_type;
+
+    template <typename Id> static inline
+    return_type apply(Geometry & geometry, Id const&)
+    {
+        return geometry;
+    }
+};
+
+template <typename Geometry>
+struct sub_range<Geometry, polygon_tag, false>
+{
+    typedef typename geometry::ring_type<Geometry>::type & return_type;
+
+    template <typename Id> static inline
+    return_type apply(Geometry & geometry, Id const& id)
+    {
+        if ( id.ring_index < 0 )
+        {
+            return geometry::exterior_ring(geometry);
+        }
+        else
+        {
+            std::size_t ri = static_cast<std::size_t>(id.ring_index);
+            return range::at(geometry::interior_rings(geometry), ri);
+        }
+    }
+};
+
+template <typename Geometry, typename Tag>
+struct sub_range<Geometry, Tag, true>
+{
+    typedef typename boost::range_value<Geometry>::type value_type;
+    typedef typename boost::mpl::if_c
+        <
+            boost::is_const<Geometry>::value,
+            typename boost::add_const<value_type>::type,
+            value_type
+        >::type sub_type;
+
+    typedef detail_dispatch::sub_range<sub_type> sub_sub_range;
+
+    // TODO: shouldn't it be return_type?
+    typedef typename sub_sub_range::return_type return_type;
+
+    template <typename Id> static inline
+    return_type apply(Geometry & geometry, Id const& id)
+    {
+        BOOST_ASSERT(0 <= id.multi_index);
+        return sub_sub_range::apply(range::at(geometry, id.multi_index), id);
+    }
+};
+
+} // namespace detail_dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+namespace detail {
+
+template <typename Geometry>
+struct sub_range_return_type
+{
+    typedef typename detail_dispatch::sub_range<Geometry>::return_type type;
+};
+
+// This function also works for geometry::segment_identifier
+
+template <typename Geometry, typename Id> inline
+typename sub_range_return_type<Geometry>::type
+sub_range(Geometry & geometry, Id const& id)
+{
+    return detail_dispatch::sub_range<Geometry>::apply(geometry, id);
+};
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_SUB_RANGE_HPP
diff --git a/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp b/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
index 62328a0d8..3d83e6930 100644
--- a/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
+++ b/include/boost/geometry/algorithms/detail/throw_on_empty_input.hpp
@@ -16,7 +16,7 @@
 
 // BSG 2012-02-06: we use this currently only for distance.
 // For other scalar results area,length,perimeter it is commented on purpose.
-// Reason is that for distance there is no other choice. distance of two 
+// Reason is that for distance there is no other choice. distance of two
 // empty geometries (or one empty) should NOT return any value.
 // But for area it is no problem to be 0.
 // Suppose: area(intersection(a,b)). We (probably) don't want a throw there...
diff --git a/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp b/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
new file mode 100644
index 000000000..7e21c654e
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/turns/compare_turns.hpp
@@ -0,0 +1,109 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_COMPARE_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_COMPARE_TURNS_HPP
+
+#include <cstddef>
+#include <functional>
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace turns
+{
+
+// TURNS SORTING AND SEARCHING
+
+// sort turns by G1 - source_index == 0 by:
+// seg_id -> fraction -> other_id -> operation
+template
+<
+    typename IdLess = std::less<int>,
+    int N = 0, int U = 1, int I = 2, int B = 3, int C = 4, int O = 0,
+    std::size_t OpId = 0
+>
+struct less_seg_fraction_other_op
+{
+    BOOST_STATIC_ASSERT(OpId < 2);
+
+    template <typename Op>
+    static inline int order_op(Op const& op)
+    {
+        switch (op.operation)
+        {
+        case detail::overlay::operation_none : return N;
+        case detail::overlay::operation_union : return U;
+        case detail::overlay::operation_intersection : return I;
+        case detail::overlay::operation_blocked : return B;
+        case detail::overlay::operation_continue : return C;
+        case detail::overlay::operation_opposite : return O;
+        }
+        return -1;
+    }
+
+    template <typename Op>
+    static inline bool use_operation(Op const& left, Op const& right)
+    {
+        return order_op(left) < order_op(right);
+    }
+
+    template <typename Op>
+    static inline bool use_other_id(Op const& left, Op const& right)
+    {
+        if ( left.other_id.multi_index != right.other_id.multi_index )
+        {
+            return left.other_id.multi_index < right.other_id.multi_index;
+        }
+        if ( left.other_id.ring_index != right.other_id.ring_index )
+        {
+            return left.other_id.ring_index != right.other_id.ring_index;
+        }
+        if ( left.other_id.segment_index != right.other_id.segment_index )
+        {
+            return IdLess()(left.other_id.segment_index,
+                            right.other_id.segment_index);
+        }
+        return use_operation(left, right);
+    }
+
+    template <typename Op>
+    static inline bool use_fraction(Op const& left, Op const& right)
+    {
+        return left.fraction < right.fraction
+           || ( geometry::math::equals(left.fraction, right.fraction) 
+                && use_other_id(left, right)
+              );
+    }
+
+    template <typename Turn>
+    inline bool operator()(Turn const& left, Turn const& right) const
+    {
+        segment_identifier const& sl = left.operations[OpId].seg_id;
+        segment_identifier const& sr = right.operations[OpId].seg_id;
+
+        return sl < sr || ( sl == sr && use_fraction(left.operations[OpId], right.operations[OpId]) );
+    }
+};
+
+
+
+
+
+}} // namespace detail::turns
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_COMPARE_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp b/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
new file mode 100644
index 000000000..d34aa04db
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/turns/debug_turn.hpp
@@ -0,0 +1,59 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_DEBUG_TURN_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_DEBUG_TURN_HPP
+
+#include <iostream>
+#include <string>
+
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace turns
+{
+
+
+template <typename Turn, typename Operation>
+#ifdef BOOST_GEOMETRY_DEBUG_TURNS
+inline void debug_turn(Turn const& turn, Operation op,
+                       std::string const& header)
+{
+    std::cout << header
+        << " at " << op.seg_id
+        << " meth: " << method_char(turn.method)
+        << " op: " << operation_char(op.operation)
+        << " of: " << operation_char(turn.operations[0].operation)
+        << operation_char(turn.operations[1].operation)
+        << " " << geometry::wkt(turn.point)
+        << std::endl;
+
+    if (boost::contains(header, "Finished"))
+    {
+        std::cout << std::endl;
+    }
+}
+#else
+inline void debug_turn(Turn const& , Operation, const char*)
+{
+}
+#endif // BOOST_GEOMETRY_DEBUG_TURNS
+
+
+}} // namespace detail::turns
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost:geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_DEBUG_TURN_HPP
diff --git a/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp b/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp
new file mode 100644
index 000000000..17fbd65dd
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp
@@ -0,0 +1,78 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_FILTER_CONTINUE_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_FILTER_CONTINUE_TURNS_HPP
+
+#include <algorithm>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace turns
+{
+
+
+template <typename Turns, bool Enable>
+struct filter_continue_turns
+{
+    static inline void apply(Turns&) {}
+};
+
+
+template <typename Turns>
+class filter_continue_turns<Turns, true>
+{
+private:
+    class IsContinueTurn
+    {
+    private:
+        template <typename Operation>
+        inline bool is_continue_or_opposite(Operation const& operation) const
+        {
+            return operation == detail::overlay::operation_continue
+                || operation == detail::overlay::operation_opposite;
+        }
+
+    public:
+        template <typename Turn>
+        bool operator()(Turn const& turn) const
+        {
+            if ( turn.method != detail::overlay::method_collinear
+                 && turn.method != detail::overlay::method_equal )
+            {
+                return false;
+            }
+
+            return is_continue_or_opposite(turn.operations[0].operation)
+                && is_continue_or_opposite(turn.operations[1].operation);
+        }
+    };
+
+
+public:
+    static inline void apply(Turns& turns)
+    {
+        turns.erase( std::remove_if(turns.begin(), turns.end(),
+                                    IsContinueTurn()),
+                     turns.end()
+                     );
+    }
+};
+
+
+}} // namespace detail::turns
+
+}} // namespect boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_FILTER_CONTINUE_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/turns/print_turns.hpp b/include/boost/geometry/algorithms/detail/turns/print_turns.hpp
new file mode 100644
index 000000000..5093c1a80
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/turns/print_turns.hpp
@@ -0,0 +1,104 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_PRINT_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_PRINT_TURNS_HPP
+
+#include <iostream>
+
+#include <boost/foreach.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace turns
+{
+
+
+
+template <typename Geometry1, typename Geometry2, typename Turns>
+static inline void print_turns(Geometry1 const& g1,
+                               Geometry2 const& g2,
+                               Turns const& turns)
+{
+    typedef typename boost::range_value<Turns>::type turn_info;
+
+    std::cout << geometry::wkt(g1) << std::endl;
+    std::cout << geometry::wkt(g2) << std::endl;
+    int index = 0;
+    BOOST_FOREACH(turn_info const& turn, turns)
+    {
+        std::ostream& out = std::cout;
+        out << index
+            << ": " << geometry::method_char(turn.method);
+
+        if ( turn.is_discarded() )
+            out << " (discarded)\n";
+        else if ( turn.blocked() )
+            out << " (blocked)\n";
+        else
+            out << '\n';
+
+        double fraction[2];
+
+        fraction[0] = turn.operations[0].fraction.numerator()
+            / turn.operations[0].fraction.denominator();
+
+        out << geometry::operation_char(turn.operations[0].operation)
+            <<": seg: " << turn.operations[0].seg_id.source_index
+            << ", m: " << turn.operations[0].seg_id.multi_index
+            << ", r: " << turn.operations[0].seg_id.ring_index
+            << ", s: " << turn.operations[0].seg_id.segment_index << ", ";
+        out << "other: " << turn.operations[0].other_id.source_index
+            << ", m: " << turn.operations[0].other_id.multi_index
+            << ", r: " << turn.operations[0].other_id.ring_index
+            << ", s: " << turn.operations[0].other_id.segment_index;
+        out << ", fr: " << fraction[0];
+        out << ", col?: " << turn.operations[0].is_collinear;
+        out << ' ' << geometry::dsv(turn.point) << ' ';
+
+        out << '\n';
+
+        fraction[1] = turn.operations[1].fraction.numerator()
+            / turn.operations[1].fraction.denominator();
+
+        out << geometry::operation_char(turn.operations[1].operation)
+            << ": seg: " << turn.operations[1].seg_id.source_index
+            << ", m: " << turn.operations[1].seg_id.multi_index
+            << ", r: " << turn.operations[1].seg_id.ring_index
+            << ", s: " << turn.operations[1].seg_id.segment_index << ", ";
+        out << "other: " << turn.operations[1].other_id.source_index
+            << ", m: " << turn.operations[1].other_id.multi_index
+            << ", r: " << turn.operations[1].other_id.ring_index
+            << ", s: " << turn.operations[1].other_id.segment_index;
+        out << ", fr: " << fraction[1];
+        out << ", col?: " << turn.operations[1].is_collinear;
+        out << ' ' << geometry::dsv(turn.point) << ' ';
+
+        ++index;
+        std::cout << std::endl;
+    }
+}
+
+
+
+
+}} // namespace detail::turns
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_PRINT_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp b/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp
new file mode 100644
index 000000000..d48736c8f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp
@@ -0,0 +1,62 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_REMOVE_DUPLICATE_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_REMOVE_DUPLICATE_TURNS_HPP
+
+#include <algorithm>
+#include <boost/geometry/algorithms/equals.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace detail { namespace turns
+{
+
+template <typename Turns, bool Enable>
+struct remove_duplicate_turns
+{
+    static inline void apply(Turns&) {}
+};
+
+
+
+template <typename Turns>
+class remove_duplicate_turns<Turns, true>
+{
+private:
+    struct TurnEqualsTo
+    {
+        template <typename Turn>
+        bool operator()(Turn const& t1, Turn const& t2) const
+        {
+            return geometry::equals(t1.point, t2.point)
+                && t1.operations[0].seg_id == t2.operations[0].seg_id
+                && t1.operations[0].other_id == t2.operations[0].other_id;
+        }
+    };
+
+public:
+    static inline void apply(Turns& turns)
+    {
+        turns.erase( std::unique(turns.begin(), turns.end(),
+                                 TurnEqualsTo()),
+                     turns.end()
+                     );
+    }
+};
+
+
+
+}} // namespace detail::turns
+
+}} // namespect boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_TURNS_REMOVE_DUPLICATE_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp b/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp
new file mode 100644
index 000000000..b8caf464f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/within/point_in_geometry.hpp
@@ -0,0 +1,465 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014, Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_POINT_IN_GEOMETRY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_POINT_IN_GEOMETRY_HPP
+
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/range.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/strategies/concepts/within_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
+#include <boost/geometry/strategies/within.hpp>
+#include <boost/geometry/strategies/covered_by.hpp>
+
+#include <boost/geometry/views/detail/normalized_view.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace within {
+
+// TODO: is this needed?
+inline int check_result_type(int result)
+{
+    return result;
+}
+
+template <typename T>
+inline T check_result_type(T result)
+{
+    BOOST_ASSERT(false);
+    return result;
+}
+
+template <typename Point, typename Range, typename Strategy> inline
+int point_in_range(Point const& point, Range const& range, Strategy const& strategy)
+{
+    boost::ignore_unused_variable_warning(strategy);
+
+    typedef typename boost::range_iterator<Range const>::type iterator_type;
+    typename Strategy::state_type state;
+    iterator_type it = boost::begin(range);
+    iterator_type end = boost::end(range);
+
+    for ( iterator_type previous = it++ ; it != end ; ++previous, ++it )
+    {
+        if ( ! strategy.apply(point, *previous, *it, state) )
+        {
+            break;
+        }
+    }
+
+    return check_result_type(strategy.result(state));
+}
+
+template <typename Geometry, typename Point, typename Range>
+inline int point_in_range(Point const& point, Range const& range)
+{
+    typedef typename point_type<Point>::type point_type1;
+    typedef typename point_type<Geometry>::type point_type2;
+
+    typedef typename strategy::within::services::default_strategy
+        <
+            typename tag<Point>::type,
+            typename tag<Geometry>::type,
+            typename tag<Point>::type,
+            typename tag_cast<typename tag<Geometry>::type, areal_tag>::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type1>::type, spherical_tag
+                >::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type2>::type, spherical_tag
+                >::type,
+            Point,
+            Geometry
+        >::type strategy_type;
+
+    typedef typename strategy::covered_by::services::default_strategy
+        <
+            typename tag<Point>::type,
+            typename tag<Geometry>::type,
+            typename tag<Point>::type,
+            typename tag_cast<typename tag<Geometry>::type, areal_tag>::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type1>::type, spherical_tag
+                >::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type2>::type, spherical_tag
+                >::type,
+            Point,
+            Geometry
+        >::type strategy_type2;
+
+    static const bool same_strategies = boost::is_same<strategy_type, strategy_type2>::value;
+    BOOST_MPL_ASSERT_MSG((same_strategies),
+                         DEFAULT_WITHIN_AND_COVERED_BY_STRATEGIES_NOT_COMPATIBLE,
+                         (strategy_type, strategy_type2));
+
+    return point_in_range(point, range, strategy_type());
+}
+
+}} // namespace detail::within
+
+namespace detail_dispatch { namespace within {
+
+// checks the relation between a point P and geometry G
+// returns 1 if P is in the interior of G
+// returns 0 if P is on the boundry of G
+// returns -1 if P is in the exterior of G
+
+// TODO: replace magic numbers with enum
+
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type>
+struct point_in_geometry
+    : not_implemented<Tag>
+{};
+
+template <typename Point2>
+struct point_in_geometry<Point2, point_tag>
+{
+    template <typename Point1, typename Strategy> static inline
+    int apply(Point1 const& point1, Point2 const& point2, Strategy const& strategy)
+    {
+        boost::ignore_unused_variable_warning(strategy);
+        return strategy.apply(point1, point2) ? 1 : -1;
+    }
+};
+
+template <typename Segment>
+struct point_in_geometry<Segment, segment_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Segment const& segment, Strategy const& strategy)
+    {
+        typedef typename geometry::point_type<Segment>::type point_type;
+        point_type p0, p1;
+// TODO: don't copy points
+        detail::assign_point_from_index<0>(segment, p0);
+        detail::assign_point_from_index<1>(segment, p1);
+
+        typename Strategy::state_type state;
+        strategy.apply(point, p0, p1, state);
+        int r = detail::within::check_result_type(strategy.result(state));
+
+        if ( r != 0 )
+            return -1; // exterior
+
+        // if the point is equal to the one of the terminal points
+        if ( detail::equals::equals_point_point(point, p0)
+          || detail::equals::equals_point_point(point, p1) )
+            return 0; // boundary
+        else
+            return 1; // interior
+    }
+};
+
+
+template <typename Linestring>
+struct point_in_geometry<Linestring, linestring_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Linestring const& linestring, Strategy const& strategy)
+    {
+        std::size_t count = boost::size(linestring);
+        if ( count > 1 )
+        {
+            if ( detail::within::point_in_range(point, linestring, strategy) != 0 )
+                return -1; // exterior
+
+            // if the linestring doesn't have a boundary
+            if ( detail::equals::equals_point_point(*boost::begin(linestring), *(--boost::end(linestring))) )
+                return 1; // interior
+            // else if the point is equal to the one of the terminal points
+            else if ( detail::equals::equals_point_point(point, *boost::begin(linestring))
+                   || detail::equals::equals_point_point(point, *(--boost::end(linestring))) )
+                return 0; // boundary
+            else
+                return 1; // interior
+        }
+// TODO: for now degenerated linestrings are ignored
+//       throw an exception here?
+        /*else if ( count == 1 )
+        {
+            if ( detail::equals::equals_point_point(point, *boost::begin(linestring)) )
+                return 1;
+        }*/
+
+        return -1; // exterior
+    }
+};
+
+template <typename Ring>
+struct point_in_geometry<Ring, ring_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Ring const& ring, Strategy const& strategy)
+    {
+        if ( boost::size(ring) < core_detail::closure::minimum_ring_size
+                                    <
+                                        geometry::closure<Ring>::value
+                                    >::value )
+        {
+            return -1;
+        }
+
+        detail::normalized_view<Ring const> view(ring);
+        return detail::within::point_in_range(point, view, strategy);
+    }
+};
+
+// Polygon: in exterior ring, and if so, not within interior ring(s)
+template <typename Polygon>
+struct point_in_geometry<Polygon, polygon_tag>
+{
+    template <typename Point, typename Strategy>
+    static inline int apply(Point const& point, Polygon const& polygon,
+                            Strategy const& strategy)
+    {
+        int const code = point_in_geometry
+            <
+                typename ring_type<Polygon>::type
+            >::apply(point, exterior_ring(polygon), strategy);
+
+        if (code == 1)
+        {
+            typename interior_return_type<Polygon const>::type
+                rings = interior_rings(polygon);
+            
+            for (typename detail::interior_iterator<Polygon const>::type
+                 it = boost::begin(rings);
+                 it != boost::end(rings);
+                 ++it)
+            {
+                int const interior_code = point_in_geometry
+                    <
+                        typename ring_type<Polygon>::type
+                    >::apply(point, *it, strategy);
+
+                if (interior_code != -1)
+                {
+                    // If 0, return 0 (touch)
+                    // If 1 (inside hole) return -1 (outside polygon)
+                    // If -1 (outside hole) check other holes if any
+                    return -interior_code;
+                }
+            }
+        }
+        return code;
+    }
+};
+
+template <typename Geometry>
+struct point_in_geometry<Geometry, multi_point_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Geometry const& geometry, Strategy const& strategy)
+    {
+        typedef typename boost::range_value<Geometry>::type point_type;
+        typedef typename boost::range_const_iterator<Geometry>::type iterator;
+        for ( iterator it = boost::begin(geometry) ; it != boost::end(geometry) ; ++it )
+        {
+            int pip = point_in_geometry<point_type>::apply(point, *it, strategy);
+
+            //BOOST_ASSERT(pip != 0);
+            if ( pip > 0 ) // inside
+                return 1;
+        }
+
+        return -1; // outside
+    }
+};
+
+template <typename Geometry>
+struct point_in_geometry<Geometry, multi_linestring_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Geometry const& geometry, Strategy const& strategy)
+    {
+        int pip = -1; // outside
+
+        typedef typename boost::range_value<Geometry>::type linestring_type;
+        typedef typename boost::range_value<linestring_type>::type point_type;
+        typedef typename boost::range_iterator<Geometry const>::type iterator;
+        iterator it = boost::begin(geometry);
+        for ( ; it != boost::end(geometry) ; ++it )
+        {
+            pip = point_in_geometry<linestring_type>::apply(point, *it, strategy);
+
+            // inside or on the boundary
+            if ( pip >= 0 )
+            {
+                ++it;
+                break;
+            }
+        }
+
+        // outside
+        if ( pip < 0 )
+            return -1;
+
+        // TODO: the following isn't needed for covered_by()
+
+        unsigned boundaries = pip == 0 ? 1 : 0;
+
+        for ( ; it != boost::end(geometry) ; ++it )
+        {
+            if ( boost::size(*it) < 2 )
+                continue;
+
+            point_type const& front = *boost::begin(*it);
+            point_type const& back = *(--boost::end(*it));
+
+            // is closed_ring - no boundary
+            if ( detail::equals::equals_point_point(front, back) )
+                continue;
+
+            // is point on boundary
+            if ( detail::equals::equals_point_point(point, front)
+              || detail::equals::equals_point_point(point, back) )
+            {
+                ++boundaries;
+            }
+        }
+
+        // if the number of boundaries is odd, the point is on the boundary
+        return boundaries % 2 ? 0 : 1;
+    }
+};
+
+template <typename Geometry>
+struct point_in_geometry<Geometry, multi_polygon_tag>
+{
+    template <typename Point, typename Strategy> static inline
+    int apply(Point const& point, Geometry const& geometry, Strategy const& strategy)
+    {
+        // For invalid multipolygons
+        //int res = -1; // outside
+
+        typedef typename boost::range_value<Geometry>::type polygon_type;
+        typedef typename boost::range_const_iterator<Geometry>::type iterator;
+        for ( iterator it = boost::begin(geometry) ; it != boost::end(geometry) ; ++it )
+        {
+            int pip = point_in_geometry<polygon_type>::apply(point, *it, strategy);
+
+            // inside or on the boundary
+            if ( pip >= 0 )
+                return pip;
+
+            // For invalid multi-polygons
+            //if ( 1 == pip ) // inside polygon
+            //    return 1;
+            //else if ( res < pip ) // point must be inside at least one polygon
+            //    res = pip;
+        }
+
+        return -1; // for valid multipolygons
+        //return res; // for invalid multipolygons
+    }
+};
+
+}} // namespace detail_dispatch::within
+
+namespace detail { namespace within {
+
+// 1 - in the interior
+// 0 - in the boundry
+// -1 - in the exterior
+template <typename Point, typename Geometry, typename Strategy>
+inline int point_in_geometry(Point const& point, Geometry const& geometry, Strategy const& strategy)
+{
+    concept::within::check
+        <
+            typename tag<Point>::type,
+            typename tag<Geometry>::type,
+            typename tag_cast<typename tag<Geometry>::type, areal_tag>::type,
+            Strategy
+        >();
+
+    return detail_dispatch::within::point_in_geometry<Geometry>::apply(point, geometry, strategy);
+}
+
+template <typename Point, typename Geometry>
+inline int point_in_geometry(Point const& point, Geometry const& geometry)
+{
+    typedef typename point_type<Point>::type point_type1;
+    typedef typename point_type<Geometry>::type point_type2;
+
+    typedef typename strategy::within::services::default_strategy
+        <
+            typename tag<Point>::type,
+            typename tag<Geometry>::type,
+            typename tag<Point>::type,
+            typename tag_cast<typename tag<Geometry>::type, areal_tag>::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type1>::type, spherical_tag
+                >::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type2>::type, spherical_tag
+                >::type,
+            Point,
+            Geometry
+        >::type strategy_type;
+
+    typedef typename strategy::covered_by::services::default_strategy
+        <
+            typename tag<Point>::type,
+            typename tag<Geometry>::type,
+            typename tag<Point>::type,
+            typename tag_cast<typename tag<Geometry>::type, areal_tag>::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type1>::type, spherical_tag
+                >::type,
+            typename tag_cast
+                <
+                    typename cs_tag<point_type2>::type, spherical_tag
+                >::type,
+            Point,
+            Geometry
+        >::type strategy_type2;
+
+    static const bool same_strategies = boost::is_same<strategy_type, strategy_type2>::value;
+    BOOST_MPL_ASSERT_MSG((same_strategies),
+                         DEFAULT_WITHIN_AND_COVERED_BY_STRATEGIES_NOT_COMPATIBLE,
+                         (strategy_type, strategy_type2));
+
+    return point_in_geometry(point, geometry, strategy_type());
+}
+
+}} // namespace detail::within
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_POINT_IN_GEOMETRY_HPP
diff --git a/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
new file mode 100644
index 000000000..8da05e58f
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/within/within_no_turns.hpp
@@ -0,0 +1,221 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
+
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
+#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>
+
+namespace boost { namespace geometry {
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail_dispatch { namespace within {
+
+// returns true if G1 is within G2
+// this function should be called only if there are no intersection points
+// otherwise it may return invalid result
+// e.g. when non-first point of G1 is outside G2 or when some rings of G1 are the same as rings of G2
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Tag1 = typename geometry::tag<Geometry1>::type,
+          typename Tag2 = typename geometry::tag<Geometry2>::type>
+struct within_no_turns
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        typedef typename geometry::point_type<Geometry1>::type point1_type;
+        point1_type p;
+        if ( !geometry::point_on_border(p, geometry1) )
+            return false;
+
+        return detail::within::point_in_geometry(p, geometry2, strategy) >= 0;
+    }
+};
+
+template <typename Geometry1, typename Geometry2>
+struct within_no_turns<Geometry1, Geometry2, ring_tag, polygon_tag>
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        typedef typename geometry::point_type<Geometry1>::type point1_type;
+        typedef typename geometry::point_type<Geometry2>::type point2_type;
+        point1_type p;
+        if ( !geometry::point_on_border(p, geometry1) )
+            return false;
+        // check if one of ring points is outside the polygon
+        if ( detail::within::point_in_geometry(p, geometry2, strategy) < 0 )
+            return false;
+        // Now check if holes of G2 aren't inside G1
+        typedef typename boost::range_const_iterator
+            <
+                typename geometry::interior_type<Geometry2>::type
+            >::type iterator;
+        for ( iterator it = boost::begin(geometry::interior_rings(geometry2)) ;
+              it != boost::end(geometry::interior_rings(geometry2)) ;
+              ++it )
+        {
+            point2_type p;
+            if ( !geometry::point_on_border(p, *it) )
+                return false;
+            if ( detail::within::point_in_geometry(p, geometry1, strategy) > 0 )
+                return false;
+        }
+        return true;
+    }
+};
+
+template <typename Geometry1, typename Geometry2>
+struct within_no_turns<Geometry1, Geometry2, polygon_tag, polygon_tag>
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        typedef typename geometry::point_type<Geometry1>::type point1_type;
+        typedef typename geometry::point_type<Geometry2>::type point2_type;
+        point1_type p;
+        if ( !geometry::point_on_border(p, geometry1) )
+            return false;
+        // check if one of ring points is outside the polygon
+        if ( detail::within::point_in_geometry(p, geometry2, strategy) < 0 )
+            return false;
+        // Now check if holes of G2 aren't inside G1
+        typedef typename boost::range_const_iterator
+            <
+                typename geometry::interior_type<Geometry2>::type
+            >::type iterator2;
+        for ( iterator2 it = boost::begin(geometry::interior_rings(geometry2)) ;
+              it != boost::end(geometry::interior_rings(geometry2)) ;
+              ++it )
+        {
+            point2_type p2;
+            if ( !geometry::point_on_border(p2, *it) )
+                return false;
+            // if the hole of G2 is inside G1
+            if ( detail::within::point_in_geometry(p2, geometry1, strategy) > 0 )
+            {
+                // if it's also inside one of the G1 holes, it's ok
+                bool ok = false;
+                typedef typename boost::range_const_iterator
+                    <
+                        typename geometry::interior_type<Geometry1>::type
+                    >::type iterator1;
+                for ( iterator1 it1 = boost::begin(geometry::interior_rings(geometry1)) ;
+                      it1 != boost::end(geometry::interior_rings(geometry1)) ;
+                      ++it1 )
+                {
+                    if ( detail::within::point_in_geometry(p2, *it1, strategy) < 0 )
+                    {
+                        ok = true;
+                        break;
+                    }
+                }
+                if ( !ok )
+                    return false;
+            }
+        }
+        return true;
+    }
+};
+
+template <typename Geometry1,
+          typename Geometry2,
+          typename Tag1 = typename geometry::tag<Geometry1>::type,
+          typename Tag2 = typename geometry::tag<Geometry2>::type,
+          bool IsMulti1 = boost::is_base_of<geometry::multi_tag, Tag1>::value,
+          bool IsMulti2 = boost::is_base_of<geometry::multi_tag, Tag2>::value>
+struct within_no_turns_multi
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        return within_no_turns<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
+    }
+};
+
+template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
+struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, true, false>
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        // All values of G1 must be inside G2
+        typedef typename boost::range_value<Geometry1>::type subgeometry1;
+        typedef typename boost::range_const_iterator<Geometry1>::type iterator;
+        for ( iterator it = boost::begin(geometry1) ; it != boost::end(geometry1) ; ++it )
+        {
+            if ( !within_no_turns<subgeometry1, Geometry2>::apply(*it, geometry2, strategy) )
+                return false;
+        }
+        return true;
+    }
+};
+
+template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
+struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, false, true>
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        // G1 must be within at least one value of G2
+        typedef typename boost::range_value<Geometry2>::type subgeometry2;
+        typedef typename boost::range_const_iterator<Geometry2>::type iterator;
+        for ( iterator it = boost::begin(geometry2) ; it != boost::end(geometry2) ; ++it )
+        {
+            if ( within_no_turns<Geometry1, subgeometry2>::apply(geometry1, *it, strategy) )
+                return true;
+        }
+        return false;
+    }
+};
+
+template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
+struct within_no_turns_multi<Geometry1, Geometry2, Tag1, Tag2, true, true>
+{
+    template <typename Strategy> static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+    {
+        // each value of G1 must be inside at least one value of G2
+        typedef typename boost::range_value<Geometry1>::type subgeometry1;
+        typedef typename boost::range_const_iterator<Geometry1>::type iterator;
+        for ( iterator it = boost::begin(geometry1) ; it != boost::end(geometry1) ; ++it )
+        {
+            if ( !within_no_turns_multi<subgeometry1, Geometry2>::apply(*it, geometry2, strategy) )
+                return false;
+        }
+        return true;
+    }
+};
+
+}} // namespace detail_dispatch::within
+
+namespace detail { namespace within {
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+inline bool within_no_turns(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
+{
+    return detail_dispatch::within::within_no_turns_multi<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
+}
+
+}} // namespace detail::within
+#endif // DOXYGEN_NO_DETAIL
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_WITHIN_WITHIN_NO_TURNS_HPP
diff --git a/include/boost/geometry/algorithms/detail/zoom_to_robust.hpp b/include/boost/geometry/algorithms/detail/zoom_to_robust.hpp
new file mode 100644
index 000000000..ac78a200b
--- /dev/null
+++ b/include/boost/geometry/algorithms/detail/zoom_to_robust.hpp
@@ -0,0 +1,180 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_ZOOM_TO_ROBUST_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DETAIL_ZOOM_TO_ROBUST_HPP
+
+
+#include <cstddef>
+
+#include <boost/type_traits.hpp>
+
+#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
+#include <boost/geometry/algorithms/detail/get_max_size.hpp>
+
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/point.hpp>
+
+#include <boost/geometry/policies/robustness/rescale_policy.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+
+template <typename IsFloatingPoint>
+struct zoom_to_robust
+{
+    template
+    <
+        typename Geometry1, typename Geometry2, typename Geometry3,
+        typename Geometry4, typename Geometry5, typename Geometry6,
+        typename GeometryOut
+    >
+    static inline void apply(Geometry1 const& g1, Geometry2 const& g2, Geometry3 const& g3,
+          Geometry4 const& g4, Geometry5 const& g5, Geometry6 const& g6,
+          GeometryOut& og1, GeometryOut& og2, GeometryOut& og3,
+          GeometryOut& og4, GeometryOut& og5, GeometryOut& og6)
+    {
+        // By default, just convert these geometries (until now: points or maybe segments)
+        geometry::convert(g1, og1);
+        geometry::convert(g2, og2);
+        geometry::convert(g3, og3);
+        geometry::convert(g4, og4);
+        geometry::convert(g5, og5);
+        geometry::convert(g6, og6);
+    }
+};
+
+template <>
+struct zoom_to_robust<boost::true_type>
+{
+    template
+    <
+        typename Geometry1, typename Geometry2, typename Geometry3,
+        typename Geometry4, typename Geometry5, typename Geometry6,
+        typename GeometryOut
+    >
+    static inline void apply(Geometry1 const& g1, Geometry2 const& g2, Geometry3 const& g3,
+          Geometry4 const& g4, Geometry5 const& g5, Geometry6 const& g6,
+          GeometryOut& og1, GeometryOut& og2, GeometryOut& og3,
+          GeometryOut& og4, GeometryOut& og5, GeometryOut& og6)
+    {
+        typedef typename point_type<Geometry1>::type point1_type;
+
+        // Get the envelop of inputs
+        model::box<point1_type> env;
+        geometry::assign_inverse(env);
+        geometry::expand(env, g1);
+        geometry::expand(env, g2);
+        geometry::expand(env, g3);
+        geometry::expand(env, g4);
+        geometry::expand(env, g5);
+        geometry::expand(env, g6);
+
+        // Scale this to integer-range
+        typename geometry::coordinate_type<point1_type>::type diff = detail::get_max_size(env);
+        double range = 1000000000.0; // Define a large range to get precise integer coordinates
+        double factor = double(boost::long_long_type(range / double(diff)));
+
+        // Assign input/output minimal points
+        point1_type min_point1;
+        detail::assign_point_from_index<0>(env, min_point1);
+
+        typedef typename point_type<GeometryOut>::type point2_type;
+        point2_type min_point2;
+        assign_values(min_point2, boost::long_long_type(-range/2.0), boost::long_long_type(-range/2.0));
+
+        detail::robust_policy<point1_type, point2_type, double> strategy(min_point1, min_point2, factor);
+
+        geometry::recalculate(og1, g1, strategy);
+        geometry::recalculate(og2, g2, strategy);
+        geometry::recalculate(og3, g3, strategy);
+        geometry::recalculate(og4, g4, strategy);
+        geometry::recalculate(og5, g5, strategy);
+        geometry::recalculate(og6, g6, strategy);
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+
+template <typename Geometry1, typename Geometry2>
+inline void zoom_to_robust(Geometry1 const& g1a, Geometry1 const& g1b, Geometry2& g2a, Geometry2& g2b)
+{
+    typedef typename point_type<Geometry1>::type point1_type;
+    typedef typename point_type<Geometry2>::type point2_type;
+
+    point1_type min_point1;
+    point2_type min_point2;
+
+    // Get the envelop of inputs
+    model::box<point1_type> env;
+    geometry::envelope(g1a, env);
+    geometry::expand(env, g1b);
+
+    // Scale this to integer-range
+    typename coordinate_type<point1_type>::type diff = detail::get_max_size(env);
+    double range = 1000000000.0; // Define a large range to get precise integer coordinates
+    double factor = range / diff;
+
+    // Assign input/output minimal points
+    detail::assign_point_from_index<0>(env, min_point1);
+    assign_values(min_point2, boost::long_long_type(-range/2.0), boost::long_long_type(-range/2.0));
+
+    detail::robust_policy<point1_type, point2_type, double> strategy(min_point1, min_point2, factor);
+    geometry::recalculate(g2a, g1a, strategy);
+    geometry::recalculate(g2b, g1b, strategy);
+}
+
+template
+<
+    typename Geometry1, typename Geometry2, typename Geometry3,
+    typename Geometry4, typename Geometry5, typename Geometry6,
+    typename GeometryOut
+>
+void zoom_to_robust(Geometry1 const& g1, Geometry2 const& g2, Geometry3 const& g3,
+          Geometry4 const& g4, Geometry5 const& g5, Geometry6 const& g6,
+          GeometryOut& og1, GeometryOut& og2, GeometryOut& og3,
+          GeometryOut& og4, GeometryOut& og5, GeometryOut& og6)
+{
+    // Make FP robust (so dispatch to true), so float and double
+    // Other types as int, boost::rational, or ttmath are considered to be already robust
+    dispatch::zoom_to_robust
+        <
+            typename boost::is_floating_point
+                <
+                    typename geometry::coordinate_type<Geometry1>::type
+                >::type
+        >::apply(g1, g2, g3, g4, g5, g6, og1, og2, og3, og4, og5, og6);
+}
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DETAIL_ZOOM_TO_ROBUST_HPP
diff --git a/include/boost/geometry/algorithms/difference.hpp b/include/boost/geometry/algorithms/difference.hpp
index 2f32b344c..780436f01 100644
--- a/include/boost/geometry/algorithms/difference.hpp
+++ b/include/boost/geometry/algorithms/difference.hpp
@@ -12,6 +12,7 @@
 #include <algorithm>
 
 #include <boost/geometry/algorithms/detail/overlay/intersection_insert.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 namespace boost { namespace geometry
 {
@@ -43,17 +44,20 @@ template
     typename GeometryOut,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator,
     typename Strategy
 >
 inline OutputIterator difference_insert(Geometry1 const& geometry1,
-            Geometry2 const& geometry2, OutputIterator out,
+            Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& strategy)
 {
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
     concept::check<GeometryOut>();
-    
+
     return geometry::dispatch::intersection_insert
         <
             Geometry1, Geometry2,
@@ -61,7 +65,7 @@ inline OutputIterator difference_insert(Geometry1 const& geometry1,
             overlay_difference,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, true>::value
-        >::apply(geometry1, geometry2, out, strategy);
+        >::apply(geometry1, geometry2, robust_policy, out, strategy);
 }
 
 /*!
@@ -85,10 +89,13 @@ template
     typename GeometryOut,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator
 >
 inline OutputIterator difference_insert(Geometry1 const& geometry1,
-            Geometry2 const& geometry2, OutputIterator out)
+            Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out)
 {
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
@@ -99,11 +106,12 @@ inline OutputIterator difference_insert(Geometry1 const& geometry1,
             typename cs_tag<GeometryOut>::type,
             Geometry1,
             Geometry2,
-            typename geometry::point_type<GeometryOut>::type
+            typename geometry::point_type<GeometryOut>::type,
+            RobustPolicy
         > strategy;
 
     return difference_insert<GeometryOut>(geometry1, geometry2,
-            out, strategy());
+            robust_policy, out, strategy());
 }
 
 
@@ -140,8 +148,17 @@ inline void difference(Geometry1 const& geometry1,
     typedef typename boost::range_value<Collection>::type geometry_out;
     concept::check<geometry_out>();
 
+    typedef typename geometry::rescale_overlay_policy_type
+        <
+            Geometry1,
+            Geometry2
+        >::type rescale_policy_type;
+
+    rescale_policy_type robust_policy
+            = geometry::get_rescale_policy<rescale_policy_type>(geometry1, geometry2);
+
     detail::difference::difference_insert<geometry_out>(
-            geometry1, geometry2,
+            geometry1, geometry2, robust_policy,
             std::back_inserter(output_collection));
 }
 
diff --git a/include/boost/geometry/algorithms/disjoint.hpp b/include/boost/geometry/algorithms/disjoint.hpp
index cd384d380..f997487c7 100644
--- a/include/boost/geometry/algorithms/disjoint.hpp
+++ b/include/boost/geometry/algorithms/disjoint.hpp
@@ -1,9 +1,15 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
-// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -15,337 +21,7 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DISJOINT_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DISJOINT_HPP
 
-#include <cstddef>
-#include <deque>
-
-#include <boost/mpl/if.hpp>
-#include <boost/range.hpp>
-
-#include <boost/static_assert.hpp>
-
-#include <boost/geometry/core/access.hpp>
-#include <boost/geometry/core/coordinate_dimension.hpp>
-#include <boost/geometry/core/reverse_dispatch.hpp>
-
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
-#include <boost/geometry/algorithms/detail/for_each_range.hpp>
-#include <boost/geometry/algorithms/detail/point_on_border.hpp>
-#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/algorithms/within.hpp>
-
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-#include <boost/geometry/util/math.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace disjoint
-{
-
-template<typename Geometry>
-struct check_each_ring_for_within
-{
-    bool has_within;
-    Geometry const& m_geometry;
-
-    inline check_each_ring_for_within(Geometry const& g)
-        : has_within(false)
-        , m_geometry(g)
-    {}
-
-    template <typename Range>
-    inline void apply(Range const& range)
-    {
-        typename geometry::point_type<Range>::type p;
-        geometry::point_on_border(p, range);
-        if (geometry::within(p, m_geometry))
-        {
-            has_within = true;
-        }
-    }
-};
-
-template <typename FirstGeometry, typename SecondGeometry>
-inline bool rings_containing(FirstGeometry const& geometry1,
-                SecondGeometry const& geometry2)
-{
-    check_each_ring_for_within<FirstGeometry> checker(geometry1);
-    geometry::detail::for_each_range(geometry2, checker);
-    return checker.has_within;
-}
-
-
-struct assign_disjoint_policy
-{
-    // We want to include all points:
-    static bool const include_no_turn = true;
-    static bool const include_degenerate = true;
-    static bool const include_opposite = true;
-
-    // We don't assign extra info:
-    template 
-    <
-        typename Info,
-        typename Point1,
-        typename Point2,
-        typename IntersectionInfo,
-        typename DirInfo
-    >
-    static inline void apply(Info& , Point1 const& , Point2 const&,
-                IntersectionInfo const&, DirInfo const&)
-    {}
-};
-   
-
-template <typename Geometry1, typename Geometry2>
-struct disjoint_linear
-{
-    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
-    {
-        typedef typename geometry::point_type<Geometry1>::type point_type;
-
-        typedef overlay::turn_info<point_type> turn_info;
-        std::deque<turn_info> turns;
-
-        // Specify two policies:
-        // 1) Stop at any intersection
-        // 2) In assignment, include also degenerate points (which are normally skipped)
-        disjoint_interrupt_policy policy;
-        geometry::get_turns
-            <
-                false, false, 
-                assign_disjoint_policy
-            >(geometry1, geometry2, turns, policy);
-        if (policy.has_intersections)
-        {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-template <typename Segment1, typename Segment2>
-struct disjoint_segment
-{
-    static inline bool apply(Segment1 const& segment1, Segment2 const& segment2)
-    {
-        typedef typename point_type<Segment1>::type point_type;
-
-        segment_intersection_points<point_type> is
-            = strategy::intersection::relate_cartesian_segments
-            <
-                policies::relate::segments_intersection_points
-                    <
-                        Segment1,
-                        Segment2,
-                        segment_intersection_points<point_type>
-                    >
-            >::apply(segment1, segment2);
-
-        return is.count == 0;
-    }
-};
-
-template <typename Geometry1, typename Geometry2>
-struct general_areal
-{
-    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
-    {
-        if (! disjoint_linear<Geometry1, Geometry2>::apply(geometry1, geometry2))
-        {
-            return false;
-        }
-
-        // If there is no intersection of segments, they might located
-        // inside each other
-        if (rings_containing(geometry1, geometry2)
-            || rings_containing(geometry2, geometry1))
-        {
-            return false;
-        }
-
-        return true;
-    }
-};
-
-template <typename Segment, typename Box>
-struct disjoint_segment_box
-{
-    static inline bool apply(Segment const& segment, Box const& box)
-    {
-        typedef typename point_type<Segment>::type point_type;
-        point_type p0, p1;
-        geometry::detail::assign_point_from_index<0>(segment, p0);
-        geometry::detail::assign_point_from_index<1>(segment, p1);
-
-        return ! detail::disjoint::segment_box_intersection<point_type, Box>::apply(p0, p1, box);
-    }
-};
-
-template <typename Linestring, typename Box>
-struct disjoint_linestring_box
-{
-    static inline bool apply(Linestring const& linestring, Box const& box)
-    {
-        typedef typename ::boost::range_value<Linestring>::type point_type;
-        typedef typename ::boost::range_const_iterator<Linestring>::type const_iterator;        
-        typedef typename ::boost::range_size<Linestring>::type size_type;
-
-        const size_type count = ::boost::size(linestring);
-
-        if ( count == 0 )
-            return false;
-        else if ( count == 1 )
-            return detail::disjoint::point_box<point_type, Box, 0, dimension<point_type>::value>
-                   ::apply(*::boost::begin(linestring), box);
-        else
-        {
-            const_iterator it0 = ::boost::begin(linestring);
-            const_iterator it1 = ::boost::begin(linestring) + 1;
-            const_iterator last = ::boost::end(linestring);
-
-            for ( ; it1 != last ; ++it0, ++it1 )
-            {
-                if ( detail::disjoint::segment_box_intersection<point_type, Box>::apply(*it0, *it1, box) )
-                    return false;
-            }
-            return true;
-        }
-    }
-};
-
-}} // namespace detail::disjoint
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename Geometry1, typename Geometry2,
-    std::size_t DimensionCount = dimension<Geometry1>::type::value,
-    typename Tag1 = typename tag<Geometry1>::type,
-    typename Tag2 = typename tag<Geometry2>::type,
-    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
->
-struct disjoint
-    : detail::disjoint::general_areal<Geometry1, Geometry2>
-{};
-
-
-// If reversal is needed, perform it
-template
-<
-    typename Geometry1, typename Geometry2,
-    std::size_t DimensionCount,
-    typename Tag1, typename Tag2
->
-struct disjoint<Geometry1, Geometry2, DimensionCount, Tag1, Tag2, true>
-    : disjoint<Geometry2, Geometry1, DimensionCount, Tag2, Tag1, false>
-{
-    static inline bool apply(Geometry1 const& g1, Geometry2 const& g2)
-    {
-        return disjoint
-            <
-                Geometry2, Geometry1,
-                DimensionCount,
-                Tag2, Tag1
-            >::apply(g2, g1);
-    }
-};
-
-
-template <typename Point1, typename Point2, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Point1, Point2, DimensionCount, point_tag, point_tag, Reverse>
-    : detail::disjoint::point_point<Point1, Point2, 0, DimensionCount>
-{};
-
-
-template <typename Box1, typename Box2, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Box1, Box2, DimensionCount, box_tag, box_tag, Reverse>
-    : detail::disjoint::box_box<Box1, Box2, 0, DimensionCount>
-{};
-
-
-template <typename Point, typename Box, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Point, Box, DimensionCount, point_tag, box_tag, Reverse>
-    : detail::disjoint::point_box<Point, Box, 0, DimensionCount>
-{};
-
-template <typename Point, typename Ring, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Point, Ring, DimensionCount, point_tag, ring_tag, Reverse>
-    : detail::disjoint::reverse_covered_by<Point, Ring>
-{};
-
-template <typename Point, typename Polygon, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Point, Polygon, DimensionCount, point_tag, polygon_tag, Reverse>
-    : detail::disjoint::reverse_covered_by<Point, Polygon>
-{};
-
-template <typename Linestring1, typename Linestring2, bool Reverse>
-struct disjoint<Linestring1, Linestring2, 2, linestring_tag, linestring_tag, Reverse>
-    : detail::disjoint::disjoint_linear<Linestring1, Linestring2>
-{};
-
-template <typename Segment1, typename Segment2, bool Reverse>
-struct disjoint<Segment1, Segment2, 2, segment_tag, segment_tag, Reverse>
-    : detail::disjoint::disjoint_segment<Segment1, Segment2>
-{};
-
-template <typename Linestring, typename Segment, bool Reverse>
-struct disjoint<Linestring, Segment, 2, linestring_tag, segment_tag, Reverse>
-    : detail::disjoint::disjoint_linear<Linestring, Segment>
-{};
-
-template <typename Segment, typename Box, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Segment, Box, DimensionCount, segment_tag, box_tag, Reverse>
-    : detail::disjoint::disjoint_segment_box<Segment, Box>
-{};
-
-template <typename Linestring, typename Box, std::size_t DimensionCount, bool Reverse>
-struct disjoint<Linestring, Box, DimensionCount, linestring_tag, box_tag, Reverse>
-    : detail::disjoint::disjoint_linestring_box<Linestring, Box>
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-
-/*!
-\brief \brief_check2{are disjoint}
-\ingroup disjoint
-\tparam Geometry1 \tparam_geometry
-\tparam Geometry2 \tparam_geometry
-\param geometry1 \param_geometry
-\param geometry2 \param_geometry
-\return \return_check2{are disjoint}
-
-\qbk{[include reference/algorithms/disjoint.qbk]}
-*/
-template <typename Geometry1, typename Geometry2>
-inline bool disjoint(Geometry1 const& geometry1,
-            Geometry2 const& geometry2)
-{
-    concept::check_concepts_and_equal_dimensions
-        <
-            Geometry1 const,
-            Geometry2 const
-        >();
-
-    return dispatch::disjoint<Geometry1, Geometry2>::apply(geometry1, geometry2);
-}
-
-
-}} // namespace boost::geometry
-
+#include <boost/geometry/algorithms/detail/disjoint/interface.hpp>
+#include <boost/geometry/algorithms/detail/disjoint/implementation.hpp>
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_DISJOINT_HPP
diff --git a/include/boost/geometry/algorithms/dispatch/disjoint.hpp b/include/boost/geometry/algorithms/dispatch/disjoint.hpp
new file mode 100644
index 000000000..627bcff83
--- /dev/null
+++ b/include/boost/geometry/algorithms/dispatch/disjoint.hpp
@@ -0,0 +1,70 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISJOINT_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISJOINT_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/reverse_dispatch.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    std::size_t DimensionCount = dimension<Geometry1>::type::value,
+    typename Tag1 = typename tag_cast
+        <
+            typename tag<Geometry1>::type,
+            segment_tag, box_tag, linear_tag, areal_tag
+        >::type,
+    typename Tag2 = typename tag_cast
+        <
+            typename tag<Geometry2>::type,
+            segment_tag, box_tag, linear_tag, areal_tag
+        >::type,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct disjoint
+    : not_implemented<Geometry1, Geometry2>
+{};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISJOINT_HPP
diff --git a/include/boost/geometry/algorithms/dispatch/distance.hpp b/include/boost/geometry/algorithms/dispatch/distance.hpp
new file mode 100644
index 000000000..58fd59340
--- /dev/null
+++ b/include/boost/geometry/algorithms/dispatch/distance.hpp
@@ -0,0 +1,65 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISTANCE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISTANCE_HPP
+
+
+#include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+using strategy::distance::services::return_type;
+
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename Strategy = typename detail::distance::default_strategy<Geometry1, Geometry2>::type,
+    typename Tag1 = typename tag_cast<typename tag<Geometry1>::type, multi_tag>::type,
+    typename Tag2 = typename tag_cast<typename tag<Geometry2>::type, multi_tag>::type,
+    typename StrategyTag = typename strategy::distance::services::tag<Strategy>::type,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct distance: not_implemented<Tag1, Tag2>
+{};
+
+
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISTANCE_HPP
diff --git a/include/boost/geometry/algorithms/dispatch/is_simple.hpp b/include/boost/geometry/algorithms/dispatch/is_simple.hpp
new file mode 100644
index 000000000..2ac92256b
--- /dev/null
+++ b/include/boost/geometry/algorithms/dispatch/is_simple.hpp
@@ -0,0 +1,38 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_SIMPLE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_SIMPLE_HPP
+
+#include <boost/geometry/core/tag.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+struct is_simple
+    : not_implemented<Geometry>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_SIMPLE_HPP
diff --git a/include/boost/geometry/algorithms/dispatch/is_valid.hpp b/include/boost/geometry/algorithms/dispatch/is_valid.hpp
new file mode 100644
index 000000000..266bab918
--- /dev/null
+++ b/include/boost/geometry/algorithms/dispatch/is_valid.hpp
@@ -0,0 +1,46 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_VALID_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_VALID_HPP
+
+#include <boost/geometry/core/tag.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry,
+    typename Tag = typename tag<Geometry>::type,
+    // for linear geometries: determines if spikes are allowed
+    bool AllowSpikes = true,
+    // for areal geometries: determines if duplicate points are allowed
+    bool AllowDuplicates = true
+>
+struct is_valid
+    : not_implemented<Geometry>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISPATCH_IS_VALID_HPP
diff --git a/include/boost/geometry/algorithms/distance.hpp b/include/boost/geometry/algorithms/distance.hpp
index a810fd7b8..dcfe597cd 100644
--- a/include/boost/geometry/algorithms/distance.hpp
+++ b/include/boost/geometry/algorithms/distance.hpp
@@ -1,8 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,562 +20,7 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP
 
-
-#include <boost/concept_check.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
-
-#include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/core/reverse_dispatch.hpp>
-#include <boost/geometry/core/tag_cast.hpp>
-
-#include <boost/geometry/algorithms/not_implemented.hpp>
-#include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
-
-#include <boost/geometry/geometries/segment.hpp>
-#include <boost/geometry/geometries/concepts/check.hpp>
-
-#include <boost/geometry/strategies/distance.hpp>
-#include <boost/geometry/strategies/default_distance_result.hpp>
-#include <boost/geometry/algorithms/assign.hpp>
-#include <boost/geometry/algorithms/within.hpp>
-
-#include <boost/geometry/views/closeable_view.hpp>
-#include <boost/geometry/util/math.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace distance
-{
-
-// To avoid spurious namespaces here:
-using strategy::distance::services::return_type;
-
-template <typename P1, typename P2, typename Strategy>
-struct point_to_point
-{
-    static inline typename return_type<Strategy, P1, P2>::type
-    apply(P1 const& p1, P2 const& p2, Strategy const& strategy)
-    {
-        boost::ignore_unused_variable_warning(strategy);
-        return strategy.apply(p1, p2);
-    }
-};
-
-
-template<typename Point, typename Segment, typename Strategy>
-struct point_to_segment
-{
-    static inline typename return_type<Strategy, Point, typename point_type<Segment>::type>::type
-    apply(Point const& point, Segment const& segment, Strategy const& )
-    {
-        typename strategy::distance::services::default_strategy
-            <
-                segment_tag,
-                Point,
-                typename point_type<Segment>::type,
-                typename cs_tag<Point>::type,
-                typename cs_tag<typename point_type<Segment>::type>::type,
-                Strategy
-            >::type segment_strategy;
-
-        typename point_type<Segment>::type p[2];
-        geometry::detail::assign_point_from_index<0>(segment, p[0]);
-        geometry::detail::assign_point_from_index<1>(segment, p[1]);
-        return segment_strategy.apply(point, p[0], p[1]);
-    }
-};
-
-
-template
-<
-    typename Point,
-    typename Range,
-    closure_selector Closure,
-    typename PPStrategy,
-    typename PSStrategy
->
-struct point_to_range
-{
-    typedef typename return_type<PSStrategy, Point, typename point_type<Range>::type>::type return_type;
-
-    static inline return_type apply(Point const& point, Range const& range,
-            PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
-    {
-        return_type const zero = return_type(0);
-
-        if (boost::size(range) == 0)
-        {
-            return zero;
-        }
-
-        typedef typename closeable_view<Range const, Closure>::type view_type;
-
-        view_type view(range);
-
-        // line of one point: return point distance
-        typedef typename boost::range_iterator<view_type const>::type iterator_type;
-        iterator_type it = boost::begin(view);
-        iterator_type prev = it++;
-        if (it == boost::end(view))
-        {
-            return pp_strategy.apply(point, *boost::begin(view));
-        }
-
-        // Create comparable (more efficient) strategy
-        typedef typename strategy::distance::services::comparable_type<PSStrategy>::type eps_strategy_type;
-        eps_strategy_type eps_strategy = strategy::distance::services::get_comparable<PSStrategy>::apply(ps_strategy);
-
-        // start with first segment distance
-        return_type d = eps_strategy.apply(point, *prev, *it);
-        return_type rd = ps_strategy.apply(point, *prev, *it);
-
-        // check if other segments are closer
-        for (++prev, ++it; it != boost::end(view); ++prev, ++it)
-        {
-            return_type const ds = eps_strategy.apply(point, *prev, *it);
-            if (geometry::math::equals(ds, zero))
-            {
-                return ds;
-            }
-            else if (ds < d)
-            {
-                d = ds;
-                rd = ps_strategy.apply(point, *prev, *it);
-            }
-        }
-
-        return rd;
-    }
-};
-
-
-template
-<
-    typename Point,
-    typename Ring,
-    closure_selector Closure,
-    typename PPStrategy,
-    typename PSStrategy
->
-struct point_to_ring
-{
-    typedef std::pair
-        <
-            typename return_type<PPStrategy, Point, typename point_type<Ring>::type>::type, bool
-        > distance_containment;
-
-    static inline distance_containment apply(Point const& point,
-                Ring const& ring,
-                PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
-    {
-        return distance_containment
-            (
-                point_to_range
-                    <
-                        Point,
-                        Ring,
-                        Closure,
-                        PPStrategy,
-                        PSStrategy
-                    >::apply(point, ring, pp_strategy, ps_strategy),
-                geometry::within(point, ring)
-            );
-    }
-};
-
-
-
-template
-<
-    typename Point,
-    typename Polygon,
-    closure_selector Closure,
-    typename PPStrategy,
-    typename PSStrategy
->
-struct point_to_polygon
-{
-    typedef typename return_type<PPStrategy, Point, typename point_type<Polygon>::type>::type return_type;
-    typedef std::pair<return_type, bool> distance_containment;
-
-    static inline distance_containment apply(Point const& point,
-                Polygon const& polygon,
-                PPStrategy const& pp_strategy, PSStrategy const& ps_strategy)
-    {
-        // Check distance to all rings
-        typedef point_to_ring
-            <
-                Point,
-                typename ring_type<Polygon>::type,
-                Closure,
-                PPStrategy,
-                PSStrategy
-            > per_ring;
-
-        distance_containment dc = per_ring::apply(point,
-                        exterior_ring(polygon), pp_strategy, ps_strategy);
-
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
-        {
-            distance_containment dcr = per_ring::apply(point,
-                            *it, pp_strategy, ps_strategy);
-            if (dcr.first < dc.first)
-            {
-                dc.first = dcr.first;
-            }
-            // If it was inside, and also inside inner ring,
-            // turn off the inside-flag, it is outside the polygon
-            if (dc.second && dcr.second)
-            {
-                dc.second = false;
-            }
-        }
-        return dc;
-    }
-};
-
-
-// Helper metafunction for default strategy retrieval
-template <typename Geometry1, typename Geometry2>
-struct default_strategy
-    : strategy::distance::services::default_strategy
-          <
-              point_tag,
-              typename point_type<Geometry1>::type,
-              typename point_type<Geometry2>::type
-          >
-{};
-
-
-}} // namespace detail::distance
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-using strategy::distance::services::return_type;
-
-
-template
-<
-    typename Geometry1, typename Geometry2,
-    typename Strategy = typename detail::distance::default_strategy<Geometry1, Geometry2>::type,
-    typename Tag1 = typename tag_cast<typename tag<Geometry1>::type, multi_tag>::type,
-    typename Tag2 = typename tag_cast<typename tag<Geometry2>::type, multi_tag>::type,
-    typename StrategyTag = typename strategy::distance::services::tag<Strategy>::type,
-    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
->
-struct distance: not_implemented<Tag1, Tag2>
-{};
-
-
-// If reversal is needed, perform it
-template
-<
-    typename Geometry1, typename Geometry2, typename Strategy,
-    typename Tag1, typename Tag2, typename StrategyTag
->
-struct distance
-<
-    Geometry1, Geometry2, Strategy,
-    Tag1, Tag2, StrategyTag,
-    true
->
-    : distance<Geometry2, Geometry1, Strategy, Tag2, Tag1, StrategyTag, false>
-{
-    typedef typename strategy::distance::services::return_type
-                     <
-                         Strategy,
-                         typename point_type<Geometry2>::type,
-                         typename point_type<Geometry1>::type
-                     >::type return_type;
-
-    static inline return_type apply(
-        Geometry1 const& g1,
-        Geometry2 const& g2,
-        Strategy const& strategy)
-    {
-        return distance
-            <
-                Geometry2, Geometry1, Strategy,
-                Tag2, Tag1, StrategyTag,
-                false
-            >::apply(g2, g1, strategy);
-    }
-};
-
-
-// Point-point
-template <typename P1, typename P2, typename Strategy>
-struct distance
-    <
-        P1, P2, Strategy,
-        point_tag, point_tag, strategy_tag_distance_point_point,
-        false
-    >
-    : detail::distance::point_to_point<P1, P2, Strategy>
-{};
-
-
-// Point-line version 1, where point-point strategy is specified
-template <typename Point, typename Linestring, typename Strategy>
-struct distance
-<
-    Point, Linestring, Strategy,
-    point_tag, linestring_tag, strategy_tag_distance_point_point,
-    false
->
-{
-
-    static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
-    apply(Point const& point,
-          Linestring const& linestring,
-          Strategy const& strategy)
-    {
-        typedef typename strategy::distance::services::default_strategy
-                    <
-                        segment_tag,
-                        Point,
-                        typename point_type<Linestring>::type,
-                        typename cs_tag<Point>::type,
-                        typename cs_tag<typename point_type<Linestring>::type>::type,
-                        Strategy
-                    >::type ps_strategy_type;
-
-        return detail::distance::point_to_range
-            <
-                Point, Linestring, closed, Strategy, ps_strategy_type
-            >::apply(point, linestring, strategy, ps_strategy_type());
-    }
-};
-
-
-// Point-line version 2, where point-segment strategy is specified
-template <typename Point, typename Linestring, typename Strategy>
-struct distance
-<
-    Point, Linestring, Strategy,
-    point_tag, linestring_tag, strategy_tag_distance_point_segment,
-    false
->
-{
-    static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
-    apply(Point const& point,
-          Linestring const& linestring,
-          Strategy const& strategy)
-    {
-        typedef typename Strategy::point_strategy_type pp_strategy_type;
-        return detail::distance::point_to_range
-            <
-                Point, Linestring, closed, pp_strategy_type, Strategy
-            >::apply(point, linestring, pp_strategy_type(), strategy);
-    }
-};
-
-// Point-ring , where point-segment strategy is specified
-template <typename Point, typename Ring, typename Strategy>
-struct distance
-<
-    Point, Ring, Strategy,
-    point_tag, ring_tag, strategy_tag_distance_point_point,
-    false
->
-{
-    typedef typename return_type<Strategy, Point, typename point_type<Ring>::type>::type return_type;
-
-    static inline return_type apply(Point const& point,
-            Ring const& ring,
-            Strategy const& strategy)
-    {
-        typedef typename strategy::distance::services::default_strategy
-            <
-                segment_tag,
-                Point,
-                typename point_type<Ring>::type
-            >::type ps_strategy_type;
-
-        std::pair<return_type, bool>
-            dc = detail::distance::point_to_ring
-            <
-                Point, Ring,
-                geometry::closure<Ring>::value,
-                Strategy, ps_strategy_type
-            >::apply(point, ring, strategy, ps_strategy_type());
-
-        return dc.second ? return_type(0) : dc.first;
-    }
-};
-
-
-// Point-polygon , where point-segment strategy is specified
-template <typename Point, typename Polygon, typename Strategy>
-struct distance
-<
-    Point, Polygon, Strategy,
-    point_tag, polygon_tag, strategy_tag_distance_point_point,
-    false
->
-{
-    typedef typename return_type<Strategy, Point, typename point_type<Polygon>::type>::type return_type;
-
-    static inline return_type apply(Point const& point,
-            Polygon const& polygon,
-            Strategy const& strategy)
-    {
-        typedef typename strategy::distance::services::default_strategy
-            <
-                segment_tag,
-                Point,
-                typename point_type<Polygon>::type
-            >::type ps_strategy_type;
-
-        std::pair<return_type, bool>
-            dc = detail::distance::point_to_polygon
-            <
-                Point, Polygon,
-                geometry::closure<Polygon>::value,
-                Strategy, ps_strategy_type
-            >::apply(point, polygon, strategy, ps_strategy_type());
-
-        return dc.second ? return_type(0) : dc.first;
-    }
-};
-
-
-
-// Point-segment version 1, with point-point strategy
-template <typename Point, typename Segment, typename Strategy>
-struct distance
-<
-    Point, Segment, Strategy,
-    point_tag, segment_tag, strategy_tag_distance_point_point,
-    false
-> : detail::distance::point_to_segment<Point, Segment, Strategy>
-{};
-
-// Point-segment version 2, with point-segment strategy
-template <typename Point, typename Segment, typename Strategy>
-struct distance
-<
-    Point, Segment, Strategy,
-    point_tag, segment_tag, strategy_tag_distance_point_segment,
-    false
->
-{
-    static inline typename return_type<Strategy, Point, typename point_type<Segment>::type>::type
-    apply(Point const& point,
-          Segment const& segment,
-          Strategy const& strategy)
-    {
-        
-        typename point_type<Segment>::type p[2];
-        geometry::detail::assign_point_from_index<0>(segment, p[0]);
-        geometry::detail::assign_point_from_index<1>(segment, p[1]);
-        return strategy.apply(point, p[0], p[1]);
-    }
-};
-
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-/*!
-\brief \brief_calc2{distance} \brief_strategy
-\ingroup distance
-\details
-\details \details_calc{area}. \brief_strategy. \details_strategy_reasons
-
-\tparam Geometry1 \tparam_geometry
-\tparam Geometry2 \tparam_geometry
-\tparam Strategy \tparam_strategy{Distance}
-\param geometry1 \param_geometry
-\param geometry2 \param_geometry
-\param strategy \param_strategy{distance}
-\return \return_calc{distance}
-\note The strategy can be a point-point strategy. In case of distance point-line/point-polygon
-    it may also be a point-segment strategy.
-
-\qbk{distinguish,with strategy}
-
-\qbk{
-[heading Available Strategies]
-\* [link geometry.reference.strategies.strategy_distance_pythagoras Pythagoras (cartesian)]
-\* [link geometry.reference.strategies.strategy_distance_haversine Haversine (spherical)]
-\* [link geometry.reference.strategies.strategy_distance_cross_track Cross track (spherical\, point-to-segment)]
-\* [link geometry.reference.strategies.strategy_distance_projected_point Projected point (cartesian\, point-to-segment)]
-\* more (currently extensions): Vincenty\, Andoyer (geographic)
-}
- */
-
-/*
-Note, in case of a Compilation Error:
-if you get:
- - "Failed to specialize function template ..."
- - "error: no matching function for call to ..."
-for distance, it is probably so that there is no specialization
-for return_type<...> for your strategy.
-*/
-template <typename Geometry1, typename Geometry2, typename Strategy>
-inline typename strategy::distance::services::return_type
-                <
-                    Strategy,
-                    typename point_type<Geometry1>::type,
-                    typename point_type<Geometry2>::type
-                >::type
-distance(Geometry1 const& geometry1,
-         Geometry2 const& geometry2,
-         Strategy const& strategy)
-{
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-    
-    detail::throw_on_empty_input(geometry1);
-    detail::throw_on_empty_input(geometry2);
-
-    return dispatch::distance
-               <
-                   Geometry1,
-                   Geometry2,
-                   Strategy
-               >::apply(geometry1, geometry2, strategy);
-}
-
-
-/*!
-\brief \brief_calc2{distance}
-\ingroup distance
-\details The default strategy is used, corresponding to the coordinate system of the geometries
-\tparam Geometry1 \tparam_geometry
-\tparam Geometry2 \tparam_geometry
-\param geometry1 \param_geometry
-\param geometry2 \param_geometry
-\return \return_calc{distance}
-
-\qbk{[include reference/algorithms/distance.qbk]}
- */
-template <typename Geometry1, typename Geometry2>
-inline typename default_distance_result<Geometry1, Geometry2>::type distance(
-                Geometry1 const& geometry1, Geometry2 const& geometry2)
-{
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-
-    return distance(geometry1, geometry2,
-                    typename detail::distance::default_strategy<Geometry1, Geometry2>::type());
-}
-
-}} // namespace boost::geometry
+#include <boost/geometry/algorithms/detail/distance/interface.hpp>
+#include <boost/geometry/algorithms/detail/distance/implementation.hpp>
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_DISTANCE_HPP
diff --git a/include/boost/geometry/algorithms/envelope.hpp b/include/boost/geometry/algorithms/envelope.hpp
index ee88fe888..e06ed71e8 100644
--- a/include/boost/geometry/algorithms/envelope.hpp
+++ b/include/boost/geometry/algorithms/envelope.hpp
@@ -14,15 +14,22 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_ENVELOPE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_ENVELOPE_HPP
 
-#include <boost/range.hpp>
+#include <vector>
 
 #include <boost/numeric/conversion/cast.hpp>
+#include <boost/range.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/expand.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 
@@ -74,6 +81,42 @@ struct envelope_range
     }
 };
 
+
+struct envelope_multi_linestring
+{
+    template<typename MultiLinestring, typename Box>
+    static inline void apply(MultiLinestring const& mp, Box& mbr)
+    {
+        assign_inverse(mbr);
+        for (typename boost::range_iterator<MultiLinestring const>::type
+                it = mp.begin();
+            it != mp.end();
+            ++it)
+        {
+            envelope_range_additional(*it, mbr);
+        }
+    }
+};
+
+
+// version for multi_polygon: outer ring's of all polygons
+struct envelope_multi_polygon
+{
+    template<typename MultiPolygon, typename Box>
+    static inline void apply(MultiPolygon const& mp, Box& mbr)
+    {
+        assign_inverse(mbr);
+        for (typename boost::range_const_iterator<MultiPolygon>::type
+                it = mp.begin();
+            it != mp.end();
+            ++it)
+        {
+            envelope_range_additional(exterior_ring(*it), mbr);
+        }
+    }
+};
+
+
 }} // namespace detail::envelope
 #endif // DOXYGEN_NO_DETAIL
 
@@ -135,10 +178,72 @@ struct envelope<Polygon, polygon_tag>
 };
 
 
+template <typename Multi>
+struct envelope<Multi, multi_point_tag>
+    : detail::envelope::envelope_range
+{};
+
+
+template <typename Multi>
+struct envelope<Multi, multi_linestring_tag>
+    : detail::envelope::envelope_multi_linestring
+{};
+
+
+template <typename Multi>
+struct envelope<Multi, multi_polygon_tag>
+    : detail::envelope::envelope_multi_polygon
+{};
+
+
 } // namespace dispatch
 #endif
 
 
+namespace resolve_variant {
+
+template <typename Geometry>
+struct envelope
+{
+    template <typename Box>
+    static inline void apply(Geometry const& geometry, Box& box)
+    {
+        concept::check<Geometry const>();
+        concept::check<Box>();
+
+        dispatch::envelope<Geometry>::apply(geometry, box);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct envelope<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Box>
+    struct visitor: boost::static_visitor<void>
+    {
+        Box& m_box;
+
+        visitor(Box& box): m_box(box) {}
+
+        template <typename Geometry>
+        void operator()(Geometry const& geometry) const
+        {
+            envelope<Geometry>::apply(geometry, m_box);
+        }
+    };
+
+    template <typename Box>
+    static inline void
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          Box& box)
+    {
+        boost::apply_visitor(visitor<Box>(box), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief \brief_calc{envelope}
 \ingroup envelope
@@ -157,10 +262,7 @@ struct envelope<Polygon, polygon_tag>
 template<typename Geometry, typename Box>
 inline void envelope(Geometry const& geometry, Box& mbr)
 {
-    concept::check<Geometry const>();
-    concept::check<Box>();
-
-    dispatch::envelope<Geometry>::apply(geometry, mbr);
+    resolve_variant::envelope<Geometry>::apply(geometry, mbr);
 }
 
 
@@ -182,11 +284,8 @@ inline void envelope(Geometry const& geometry, Box& mbr)
 template<typename Box, typename Geometry>
 inline Box return_envelope(Geometry const& geometry)
 {
-    concept::check<Geometry const>();
-    concept::check<Box>();
-
     Box mbr;
-    dispatch::envelope<Geometry>::apply(geometry, mbr);
+    resolve_variant::envelope<Geometry>::apply(geometry, mbr);
     return mbr;
 }
 
diff --git a/include/boost/geometry/algorithms/equals.hpp b/include/boost/geometry/algorithms/equals.hpp
index 60175d456..c6b718da1 100644
--- a/include/boost/geometry/algorithms/equals.hpp
+++ b/include/boost/geometry/algorithms/equals.hpp
@@ -3,6 +3,12 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -22,11 +28,13 @@
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
 #include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/algorithms/detail/disjoint.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
 #include <boost/geometry/algorithms/detail/not.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
@@ -38,11 +46,13 @@
 #include <boost/geometry/util/select_most_precise.hpp>
 
 #include <boost/geometry/algorithms/detail/equals/collect_vectors.hpp>
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+
+#include <boost/geometry/views/detail/indexed_point_view.hpp>
 
 #include <boost/variant/static_visitor.hpp>
 #include <boost/variant/apply_visitor.hpp>
 
-
 namespace boost { namespace geometry
 {
 
@@ -81,6 +91,28 @@ struct box_box<DimensionCount, DimensionCount>
 };
 
 
+struct segment_segment
+{
+    template <typename Segment1, typename Segment2>
+    static inline bool apply(Segment1 const& segment1, Segment2 const& segment2)
+    {
+        return equals::equals_point_point(
+                    indexed_point_view<Segment1 const, 0>(segment1),
+                    indexed_point_view<Segment2 const, 0>(segment2) )
+                ? equals::equals_point_point(
+                    indexed_point_view<Segment1 const, 1>(segment1),
+                    indexed_point_view<Segment2 const, 1>(segment2) )
+                : ( equals::equals_point_point(
+                        indexed_point_view<Segment1 const, 0>(segment1),
+                        indexed_point_view<Segment2 const, 1>(segment2) )
+                 && equals::equals_point_point(
+                        indexed_point_view<Segment1 const, 1>(segment1),
+                        indexed_point_view<Segment2 const, 0>(segment2) )
+                  );
+    }
+};
+
+
 struct area_check
 {
     template <typename Geometry1, typename Geometry2>
@@ -144,6 +176,15 @@ struct equals_by_collection
     }
 };
 
+template<typename Geometry1, typename Geometry2>
+struct equals_by_relate
+    : detail::relate::relate_base
+        <
+            detail::relate::static_mask_equals_type,
+            Geometry1,
+            Geometry2
+        >
+{};
 
 }} // namespace detail::equals
 #endif // DOXYGEN_NO_DETAIL
@@ -218,12 +259,6 @@ struct equals<Polygon1, Polygon2, polygon_tag, polygon_tag, 2, Reverse>
 {};
 
 
-template <typename LineString1, typename LineString2, bool Reverse>
-struct equals<LineString1, LineString2, linestring_tag, linestring_tag, 2, Reverse>
-    : detail::equals::equals_by_collection<detail::equals::length_check>
-{};
-
-
 template <typename Polygon, typename Ring, bool Reverse>
 struct equals<Polygon, Ring, polygon_tag, ring_tag, 2, Reverse>
     : detail::equals::equals_by_collection<detail::equals::area_check>
@@ -241,9 +276,60 @@ struct equals<Polygon, Box, polygon_tag, box_tag, 2, Reverse>
     : detail::equals::equals_by_collection<detail::equals::area_check>
 {};
 
+template <typename Segment1, typename Segment2, std::size_t DimensionCount, bool Reverse>
+struct equals<Segment1, Segment2, segment_tag, segment_tag, DimensionCount, Reverse>
+    : detail::equals::segment_segment
+{};
+
+template <typename LineString1, typename LineString2, bool Reverse>
+struct equals<LineString1, LineString2, linestring_tag, linestring_tag, 2, Reverse>
+    //: detail::equals::equals_by_collection<detail::equals::length_check>
+    : detail::equals::equals_by_relate<LineString1, LineString2>
+{};
+
+template <typename LineString, typename MultiLineString, bool Reverse>
+struct equals<LineString, MultiLineString, linestring_tag, multi_linestring_tag, 2, Reverse>
+    : detail::equals::equals_by_relate<LineString, MultiLineString>
+{};
+
+template <typename MultiLineString1, typename MultiLineString2, bool Reverse>
+struct equals<MultiLineString1, MultiLineString2, multi_linestring_tag, multi_linestring_tag, 2, Reverse>
+    : detail::equals::equals_by_relate<MultiLineString1, MultiLineString2>
+{};
+
+
+template <typename MultiPolygon1, typename MultiPolygon2, bool Reverse>
+struct equals
+    <
+        MultiPolygon1, MultiPolygon2,
+        multi_polygon_tag, multi_polygon_tag,
+        2,
+        Reverse
+    >
+    : detail::equals::equals_by_collection<detail::equals::area_check>
+{};
+
+
+template <typename Polygon, typename MultiPolygon, bool Reverse>
+struct equals
+    <
+        Polygon, MultiPolygon,
+        polygon_tag, multi_polygon_tag,
+        2,
+        Reverse
+    >
+    : detail::equals::equals_by_collection<detail::equals::area_check>
+{};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
 
 template <typename Geometry1, typename Geometry2>
-struct devarianted_equals
+struct equals
 {
     static inline bool apply(Geometry1 const& geometry1,
                              Geometry2 const& geometry2)
@@ -253,12 +339,14 @@ struct devarianted_equals
             Geometry1 const,
             Geometry2 const
         >();
-        return equals<Geometry1, Geometry2>::apply(geometry1, geometry2);
+
+        return dispatch::equals<Geometry1, Geometry2>
+                       ::apply(geometry1, geometry2);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
-struct devarianted_equals<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+struct equals<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
 {
     struct visitor: static_visitor<bool>
     {
@@ -271,8 +359,8 @@ struct devarianted_equals<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry
         template <typename Geometry1>
         inline bool operator()(Geometry1 const& geometry1) const
         {
-            return devarianted_equals<Geometry1, Geometry2>
-                       ::apply(geometry1, m_geometry2);
+            return equals<Geometry1, Geometry2>
+                   ::apply(geometry1, m_geometry2);
         }
 
     };
@@ -287,7 +375,7 @@ struct devarianted_equals<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry
 };
 
 template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_equals<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct equals<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     struct visitor: static_visitor<bool>
     {
@@ -300,8 +388,8 @@ struct devarianted_equals<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)
         template <typename Geometry2>
         inline bool operator()(Geometry2 const& geometry2) const
         {
-            return devarianted_equals<Geometry1, Geometry2>
-                       ::apply(m_geometry1, geometry2);
+            return equals<Geometry1, Geometry2>
+                   ::apply(m_geometry1, geometry2);
         }
 
     };
@@ -319,7 +407,7 @@ template <
     BOOST_VARIANT_ENUM_PARAMS(typename T1),
     BOOST_VARIANT_ENUM_PARAMS(typename T2)
 >
-struct devarianted_equals<
+struct equals<
     boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
     boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
 >
@@ -330,8 +418,8 @@ struct devarianted_equals<
         inline bool operator()(Geometry1 const& geometry1,
                                Geometry2 const& geometry2) const
         {
-            return devarianted_equals<Geometry1, Geometry2>
-                ::apply(geometry1, geometry2);
+            return equals<Geometry1, Geometry2>
+                   ::apply(geometry1, geometry2);
         }
 
     };
@@ -345,16 +433,14 @@ struct devarianted_equals<
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
+} // namespace resolve_variant
 
 
 /*!
 \brief \brief_check{are spatially equal}
-\details \details_check12{equals, is spatially equal}. Spatially equal means 
+\details \details_check12{equals, is spatially equal}. Spatially equal means
     that the same point set is included. A box can therefore be spatially equal
-    to a ring or a polygon, or a linestring can be spatially equal to a 
+    to a ring or a polygon, or a linestring can be spatially equal to a
     multi-linestring or a segment. This only works theoretically, not all
     combinations are implemented yet.
 \ingroup equals
@@ -370,8 +456,8 @@ struct devarianted_equals<
 template <typename Geometry1, typename Geometry2>
 inline bool equals(Geometry1 const& geometry1, Geometry2 const& geometry2)
 {
-    return dispatch::devarianted_equals<Geometry1, Geometry2>
-               ::apply(geometry1, geometry2);
+    return resolve_variant::equals<Geometry1, Geometry2>
+                          ::apply(geometry1, geometry2);
 }
 
 
diff --git a/include/boost/geometry/algorithms/expand.hpp b/include/boost/geometry/algorithms/expand.hpp
index 2e1531bf0..19e40aa2d 100644
--- a/include/boost/geometry/algorithms/expand.hpp
+++ b/include/boost/geometry/algorithms/expand.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -28,6 +29,9 @@
 #include <boost/geometry/strategies/compare.hpp>
 #include <boost/geometry/policies/compare.hpp>
 
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -249,6 +253,51 @@ struct expand<Box, Segment, StrategyLess, StrategyGreater, box_tag, segment_tag>
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_variant {
+    
+template <typename Geometry>
+struct expand
+{
+    template <typename Box>
+    static inline void apply(Box& box, Geometry const& geometry)
+    {
+        concept::check<Box>();
+        concept::check<Geometry const>();
+        concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
+        
+        dispatch::expand<Box, Geometry>::apply(box, geometry);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct expand<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Box>
+    struct visitor: boost::static_visitor<void>
+    {
+        Box& m_box;
+        
+        visitor(Box& box) : m_box(box) {}
+        
+        template <typename Geometry>
+        void operator()(Geometry const& geometry) const
+        {
+            return expand<Geometry>::apply(m_box, geometry);
+        }
+    };
+    
+    template <class Box>
+    static inline void
+    apply(Box& box,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry)
+    {
+        return boost::apply_visitor(visitor<Box>(box), geometry);
+    }
+};
+    
+} // namespace resolve_variant
+    
+    
 /***
 *!
 \brief Expands a box using the extend (envelope) of another geometry (box, point)
@@ -290,9 +339,7 @@ inline void expand(Box& box, Geometry const& geometry,
 template <typename Box, typename Geometry>
 inline void expand(Box& box, Geometry const& geometry)
 {
-    concept::check_concepts_and_equal_dimensions<Box, Geometry const>();
-
-    dispatch::expand<Box, Geometry>::apply(box, geometry);
+    resolve_variant::expand<Geometry>::apply(box, geometry);
 }
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/algorithms/for_each.hpp b/include/boost/geometry/algorithms/for_each.hpp
index 24d38d3d8..036109d3c 100644
--- a/include/boost/geometry/algorithms/for_each.hpp
+++ b/include/boost/geometry/algorithms/for_each.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -19,12 +20,15 @@
 
 #include <boost/range.hpp>
 #include <boost/type_traits/is_const.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
@@ -32,7 +36,6 @@
 
 #include <boost/geometry/util/add_const_if_c.hpp>
 
-
 namespace boost { namespace geometry
 {
 
@@ -54,7 +57,7 @@ struct fe_point_per_point
 struct fe_point_per_segment
 {
     template <typename Point, typename Functor>
-    static inline void apply(Point& , Functor& f)
+    static inline void apply(Point& , Functor& /*f*/)
     {
         // TODO: if non-const, we should extract the points from the segment
         // and call the functor on those two points
@@ -74,7 +77,8 @@ struct fe_range_per_point
 
         // So we now loop manually.
 
-        for (typename boost::range_iterator<Range>::type it = boost::begin(range); it != boost::end(range); ++it)
+        for (typename boost::range_iterator<Range>::type
+                it = boost::begin(range); it != boost::end(range); ++it)
         {
             f(*it);
         }
@@ -92,9 +96,11 @@ struct fe_range_per_segment
                 is_const<Range>::value,
                 typename point_type<Range>::type
             >::type point_type;
+        typedef typename boost::range_iterator<Range>::type
+            iterator_type;
 
-        BOOST_AUTO_TPL(it, boost::begin(range));
-        BOOST_AUTO_TPL(previous, it++);
+        iterator_type it = boost::begin(range);
+        iterator_type previous = it++;
         while(it != boost::end(range))
         {
             model::referring_segment<point_type> s(*previous, *it);
@@ -112,9 +118,11 @@ struct fe_polygon_per_point
     {
         fe_range_per_point::apply(exterior_ring(poly), f);
 
-        typename interior_return_type<Polygon>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(poly);
+
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             fe_range_per_point::apply(*it, f);
         }
@@ -122,7 +130,6 @@ struct fe_polygon_per_point
 
 };
 
-
 struct fe_polygon_per_segment
 {
     template <typename Polygon, typename Functor>
@@ -130,9 +137,11 @@ struct fe_polygon_per_segment
     {
         fe_range_per_segment::apply(exterior_ring(poly), f);
 
-        typename interior_return_type<Polygon>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(poly);
+
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             fe_range_per_segment::apply(*it, f);
         }
@@ -140,6 +149,21 @@ struct fe_polygon_per_segment
 
 };
 
+// Implementation of multi, for both point and segment,
+// just calling the single version.
+template <typename Policy>
+struct for_each_multi
+{
+    template <typename MultiGeometry, typename Functor>
+    static inline void apply(MultiGeometry& multi, Functor& f)
+    {
+        for (typename boost::range_iterator<MultiGeometry>::type
+                it = boost::begin(multi); it != boost::end(multi); ++it)
+        {
+            Policy::apply(*it, f);
+        }
+    }
+};
 
 }} // namespace detail::for_each
 #endif // DOXYGEN_NO_DETAIL
@@ -214,6 +238,40 @@ struct for_each_segment<Polygon, polygon_tag>
 {};
 
 
+template <typename MultiGeometry>
+struct for_each_point<MultiGeometry, multi_tag>
+    : detail::for_each::for_each_multi
+        <
+            // Specify the dispatch of the single-version as policy
+            for_each_point
+                <
+                    typename add_const_if_c
+                        <
+                            is_const<MultiGeometry>::value,
+                            typename boost::range_value<MultiGeometry>::type
+                        >::type
+                >
+        >
+{};
+
+
+template <typename MultiGeometry>
+struct for_each_segment<MultiGeometry, multi_tag>
+    : detail::for_each::for_each_multi
+        <
+            // Specify the dispatch of the single-version as policy
+            for_each_segment
+                <
+                    typename add_const_if_c
+                        <
+                            is_const<MultiGeometry>::value,
+                            typename boost::range_value<MultiGeometry>::type
+                        >::type
+                >
+        >
+{};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
diff --git a/include/boost/geometry/algorithms/intersection.hpp b/include/boost/geometry/algorithms/intersection.hpp
index 3125752db..b066e8150 100644
--- a/include/boost/geometry/algorithms/intersection.hpp
+++ b/include/boost/geometry/algorithms/intersection.hpp
@@ -12,67 +12,14 @@
 
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/algorithms/detail/overlay/intersection_insert.hpp>
+#include <boost/geometry/algorithms/detail/overlay/intersection_box_box.hpp>
 #include <boost/geometry/algorithms/intersects.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 
 namespace boost { namespace geometry
 {
 
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace intersection
-{
-
-template <std::size_t Dimension, std::size_t DimensionCount>
-struct intersection_box_box
-{
-    template
-    <
-        typename Box1, typename Box2, typename BoxOut,
-        typename Strategy
-    >
-    static inline bool apply(Box1 const& box1,
-            Box2 const& box2, BoxOut& box_out,
-            Strategy const& strategy)
-    {
-        typedef typename coordinate_type<BoxOut>::type ct;
-
-        ct min1 = get<min_corner, Dimension>(box1);
-        ct min2 = get<min_corner, Dimension>(box2);
-        ct max1 = get<max_corner, Dimension>(box1);
-        ct max2 = get<max_corner, Dimension>(box2);
-
-        if (max1 < min2 || max2 < min1)
-        {
-            return false;
-        }
-        // Set dimensions of output coordinate
-        set<min_corner, Dimension>(box_out, min1 < min2 ? min2 : min1);
-        set<max_corner, Dimension>(box_out, max1 > max2 ? max2 : max1);
-
-        return intersection_box_box<Dimension + 1, DimensionCount>
-               ::apply(box1, box2, box_out, strategy);
-    }
-};
-
-template <std::size_t DimensionCount>
-struct intersection_box_box<DimensionCount, DimensionCount>
-{
-    template
-    <
-        typename Box1, typename Box2, typename BoxOut,
-        typename Strategy
-    >
-    static inline bool apply(Box1 const&, Box2 const&, BoxOut&, Strategy const&)
-    {
-        return true;
-    }
-};
-
-
-}} // namespace detail::intersection
-#endif // DOXYGEN_NO_DETAIL
-
-
 
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
@@ -88,9 +35,10 @@ template
 >
 struct intersection
 {
-    template <typename GeometryOut, typename Strategy>
+    template <typename RobustPolicy, typename GeometryOut, typename Strategy>
     static inline bool apply(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
             GeometryOut& geometry_out,
             Strategy const& strategy)
     {
@@ -100,7 +48,7 @@ struct intersection
         <
             Geometry1, Geometry2, OneOut,
             overlay_intersection
-        >::apply(geometry1, geometry2, std::back_inserter(geometry_out), strategy);
+        >::apply(geometry1, geometry2, robust_policy, std::back_inserter(geometry_out), strategy);
 
         return true;
     }
@@ -122,10 +70,11 @@ struct intersection
 >
     : intersection<Geometry2, Geometry1, Tag2, Tag1, false>
 {
-    template <typename GeometryOut, typename Strategy>
+    template <typename RobustPolicy, typename GeometryOut, typename Strategy>
     static inline bool apply(
         Geometry1 const& g1,
         Geometry2 const& g2,
+        RobustPolicy const& robust_policy,
         GeometryOut& out,
         Strategy const& strategy)
     {
@@ -133,7 +82,7 @@ struct intersection
                    Geometry2, Geometry1,
                    Tag2, Tag1,
                    false
-               >::apply(g2, g1, out, strategy);
+               >::apply(g2, g1, robust_policy, out, strategy);
     }
 };
 
@@ -157,6 +106,175 @@ struct intersection
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
+    
+namespace resolve_variant
+{
+    
+template <typename Geometry1, typename Geometry2>
+struct intersection
+{
+    template <typename GeometryOut>
+    static inline bool
+    apply(
+          const Geometry1& geometry1,
+          const Geometry2& geometry2,
+          GeometryOut& geometry_out)
+    {
+        concept::check<Geometry1 const>();
+        concept::check<Geometry2 const>();
+        
+        typedef typename geometry::rescale_overlay_policy_type
+        <
+            Geometry1,
+            Geometry2
+        >::type rescale_policy_type;
+        
+        rescale_policy_type robust_policy
+        = geometry::get_rescale_policy<rescale_policy_type>(geometry1, geometry2);
+        
+        typedef strategy_intersection
+        <
+            typename cs_tag<Geometry1>::type,
+            Geometry1,
+            Geometry2,
+            typename geometry::point_type<Geometry1>::type,
+            rescale_policy_type
+        > strategy;
+        
+        return dispatch::intersection
+        <
+            Geometry1,
+            Geometry2
+        >::apply(geometry1, geometry2, robust_policy, geometry_out, strategy());
+    }
+};
+
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct intersection<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    template <typename GeometryOut>
+    struct visitor: static_visitor<bool>
+    {
+        Geometry2 const& m_geometry2;
+        GeometryOut& m_geometry_out;
+        
+        visitor(Geometry2 const& geometry2,
+                GeometryOut& geometry_out)
+        : m_geometry2(geometry2),
+        m_geometry_out(geometry_out)
+        {}
+        
+        template <typename Geometry1>
+        result_type operator()(Geometry1 const& geometry1) const
+        {
+            return intersection
+            <
+                Geometry1,
+                Geometry2
+            >::template apply
+            <
+                GeometryOut
+            >
+            (geometry1, m_geometry2, m_geometry_out);
+        }
+    };
+    
+    template <typename GeometryOut>
+    static inline bool
+    apply(variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2,
+          GeometryOut& geometry_out)
+    {
+        return apply_visitor(visitor<GeometryOut>(geometry2, geometry_out), geometry1);
+    }
+};
+
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct intersection<Geometry1, variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename GeometryOut>
+    struct visitor: static_visitor<bool>
+    {
+        Geometry1 const& m_geometry1;
+        GeometryOut& m_geometry_out;
+        
+        visitor(Geometry1 const& geometry1,
+                GeometryOut& geometry_out)
+        : m_geometry1(geometry1),
+          m_geometry_out(geometry_out)
+        {}
+        
+        template <typename Geometry2>
+        result_type operator()(Geometry2 const& geometry2) const
+        {
+            return intersection
+            <
+                Geometry1,
+                Geometry2
+            >::template apply
+            <
+                GeometryOut
+            >
+            (m_geometry1, geometry2, m_geometry_out);
+        }
+    };
+    
+    template <typename GeometryOut>
+    static inline bool
+    apply(
+          Geometry1 const& geometry1,
+          const variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry2,
+          GeometryOut& geometry_out)
+    {
+        return apply_visitor(visitor<GeometryOut>(geometry1, geometry_out), geometry2);
+    }
+};
+
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename A), BOOST_VARIANT_ENUM_PARAMS(typename B)>
+struct intersection<variant<BOOST_VARIANT_ENUM_PARAMS(A)>, variant<BOOST_VARIANT_ENUM_PARAMS(B)> >
+{
+    template <typename GeometryOut>
+    struct visitor: static_visitor<bool>
+    {
+        GeometryOut& m_geometry_out;
+        
+        visitor(GeometryOut& geometry_out)
+        : m_geometry_out(geometry_out)
+        {}
+        
+        template <typename Geometry1, typename Geometry2>
+        result_type operator()(
+                               Geometry1 const& geometry1,
+                               Geometry2 const& geometry2) const
+        {
+            return intersection
+            <
+                Geometry1,
+                Geometry2
+            >::template apply
+            <
+                GeometryOut
+            >
+            (geometry1, geometry2, m_geometry_out);
+        }
+    };
+    
+    template <typename GeometryOut>
+    static inline bool
+    apply(
+          const variant<BOOST_VARIANT_ENUM_PARAMS(A)>& geometry1,
+          const variant<BOOST_VARIANT_ENUM_PARAMS(B)>& geometry2,
+          GeometryOut& geometry_out)
+    {
+        return apply_visitor(visitor<GeometryOut>(geometry_out), geometry1, geometry2);
+    }
+};
+    
+} // namespace resolve_variant
+    
 
 /*!
 \brief \brief_calc2{intersection}
@@ -183,22 +301,15 @@ inline bool intersection(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
             GeometryOut& geometry_out)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-
-    typedef strategy_intersection
+    return resolve_variant::intersection
         <
-            typename cs_tag<Geometry1>::type,
-            Geometry1,
-            Geometry2,
-            typename geometry::point_type<Geometry1>::type
-        > strategy;
-
-
-    return dispatch::intersection<
-               Geometry1,
-               Geometry2
-           >::apply(geometry1, geometry2, geometry_out, strategy());
+           Geometry1,
+           Geometry2
+        >::template apply
+        <
+            GeometryOut
+        >
+        (geometry1, geometry2, geometry_out);
 }
 
 
diff --git a/include/boost/geometry/algorithms/intersects.hpp b/include/boost/geometry/algorithms/intersects.hpp
index f367f2e25..12cf78173 100644
--- a/include/boost/geometry/algorithms/intersects.hpp
+++ b/include/boost/geometry/algorithms/intersects.hpp
@@ -21,6 +21,9 @@
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
+
 
 namespace boost { namespace geometry
 {
@@ -43,37 +46,31 @@ inline bool intersects(Geometry const& geometry)
 {
     concept::check<Geometry const>();
 
+    typedef typename geometry::point_type<Geometry>::type point_type;
+    typedef typename rescale_policy_type<point_type>::type
+        rescale_policy_type;
 
     typedef detail::overlay::turn_info
         <
-            typename geometry::point_type<Geometry>::type
+            point_type,
+            typename segment_ratio_type<point_type, rescale_policy_type>::type
         > turn_info;
-    std::deque<turn_info> turns;
 
-    typedef typename strategy_intersection
-        <
-            typename cs_tag<Geometry>::type,
-            Geometry,
-            Geometry,
-            typename geometry::point_type<Geometry>::type
-        >::segment_intersection_strategy_type segment_intersection_strategy_type;
+    std::deque<turn_info> turns;
 
     typedef detail::overlay::get_turn_info
         <
-            typename point_type<Geometry>::type,
-            typename point_type<Geometry>::type,
-            turn_info,
             detail::overlay::assign_null_policy
-        > TurnPolicy;
+        > turn_policy;
+
+    rescale_policy_type robust_policy
+        = geometry::get_rescale_policy<rescale_policy_type>(geometry);
 
     detail::disjoint::disjoint_interrupt_policy policy;
     detail::self_get_turn_points::get_turns
-            <
-                Geometry,
-                std::deque<turn_info>,
-                TurnPolicy,
-                detail::disjoint::disjoint_interrupt_policy
-            >::apply(geometry, turns, policy);
+        <
+            turn_policy
+        >::apply(geometry, robust_policy, turns, policy);
     return policy.has_intersections;
 }
 
diff --git a/include/boost/geometry/algorithms/is_simple.hpp b/include/boost/geometry/algorithms/is_simple.hpp
new file mode 100644
index 000000000..d4572b333
--- /dev/null
+++ b/include/boost/geometry/algorithms/is_simple.hpp
@@ -0,0 +1,36 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_IS_SIMPLE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_IS_SIMPLE_HPP
+
+#include <boost/geometry/algorithms/detail/is_simple/always_simple.hpp>
+#include <boost/geometry/algorithms/detail/is_simple/areal.hpp>
+#include <boost/geometry/algorithms/detail/is_simple/linear.hpp>
+#include <boost/geometry/algorithms/detail/is_simple/multipoint.hpp>
+
+#include <boost/geometry/algorithms/dispatch/is_simple.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+template <typename Geometry>
+inline bool is_simple(Geometry const& g)
+{
+    return dispatch::is_simple<Geometry>::apply(g);
+}
+
+
+}} // namespace boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_IS_SIMPLE_HPP
diff --git a/include/boost/geometry/algorithms/is_valid.hpp b/include/boost/geometry/algorithms/is_valid.hpp
new file mode 100644
index 000000000..ffaa07ce7
--- /dev/null
+++ b/include/boost/geometry/algorithms/is_valid.hpp
@@ -0,0 +1,36 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_IS_VALID_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_IS_VALID_HPP
+
+#include <boost/geometry/algorithms/dispatch/is_valid.hpp>
+
+#include <boost/geometry/algorithms/detail/is_valid/pointlike.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/linear.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/polygon.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/ring.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/segment.hpp>
+#include <boost/geometry/algorithms/detail/is_valid/box.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+template <typename Geometry>
+inline bool is_valid(Geometry const& g)
+{
+    return dispatch::is_valid<Geometry>::apply(g);
+}
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_IS_VALID_HPP
diff --git a/include/boost/geometry/algorithms/length.hpp b/include/boost/geometry/algorithms/length.hpp
index 2051e41a9..0517a7c25 100644
--- a/include/boost/geometry/algorithms/length.hpp
+++ b/include/boost/geometry/algorithms/length.hpp
@@ -29,22 +29,24 @@
 #include <boost/mpl/transform.hpp>
 #include <boost/type_traits.hpp>
 
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/detail/calculate_null.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 // #include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/strategies/distance.hpp>
 #include <boost/geometry/strategies/default_length_result.hpp>
 
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
-
 
 namespace boost { namespace geometry
 {
@@ -149,8 +151,35 @@ struct length<Geometry, segment_tag>
 {};
 
 
+template <typename MultiLinestring>
+struct length<MultiLinestring, multi_linestring_tag> : detail::multi_sum
+{
+    template <typename Strategy>
+    static inline typename default_length_result<MultiLinestring>::type
+    apply(MultiLinestring const& multi, Strategy const& strategy)
+    {
+        return multi_sum::apply
+               <
+                   typename default_length_result<MultiLinestring>::type,
+                   detail::length::range_length
+                   <
+                       typename boost::range_value<MultiLinestring>::type,
+                       closed // no need to close it explicitly
+                   >
+               >(multi, strategy);
+
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
 template <typename Geometry>
-struct devarianted_length
+struct length
 {
     typedef typename default_length_result<Geometry>::type result_type;
 
@@ -158,12 +187,12 @@ struct devarianted_length
     static inline result_type apply(Geometry const& geometry,
                                     Strategy const& strategy)
     {
-        return length<Geometry>::apply(geometry, strategy);
+        return dispatch::length<Geometry>::apply(geometry, strategy);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_length<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct length<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     typedef typename mpl::fold<
                 typename mpl::transform<
@@ -194,10 +223,10 @@ struct devarianted_length<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
         {}
 
         template <typename Geometry>
-        inline typename devarianted_length<Geometry>::result_type
+        inline typename length<Geometry>::result_type
         operator()(Geometry const& geometry) const
         {
-            return devarianted_length<Geometry>::apply(geometry, m_strategy);
+            return length<Geometry>::apply(geometry, m_strategy);
         }
     };
 
@@ -211,9 +240,7 @@ struct devarianted_length<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
     }
 };
 
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
+} // namespace resolve_variant
 
 
 /*!
@@ -228,19 +255,20 @@ struct devarianted_length<variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 \qbk{[length] [length_output]}
  */
 template<typename Geometry>
-inline typename dispatch::devarianted_length<Geometry>::result_type
+inline typename resolve_variant::length<Geometry>::result_type
 length(Geometry const& geometry)
 {
     concept::check<Geometry const>();
 
     // detail::throw_on_empty_input(geometry);
 
+    // TODO put this into a resolve_strategy stage
     typedef typename strategy::distance::services::default_strategy
         <
-            point_tag, typename point_type<Geometry>::type
+            point_tag, point_tag, typename point_type<Geometry>::type
         >::type strategy_type;
 
-    return dispatch::devarianted_length<Geometry>::apply(geometry, strategy_type());
+    return resolve_variant::length<Geometry>::apply(geometry, strategy_type());
 }
 
 
@@ -259,14 +287,14 @@ length(Geometry const& geometry)
 \qbk{[length_with_strategy] [length_with_strategy_output]}
  */
 template<typename Geometry, typename Strategy>
-inline typename dispatch::devarianted_length<Geometry>::result_type
+inline typename resolve_variant::length<Geometry>::result_type
 length(Geometry const& geometry, Strategy const& strategy)
 {
     concept::check<Geometry const>();
 
     // detail::throw_on_empty_input(geometry);
-    
-    return dispatch::devarianted_length<Geometry>::apply(geometry, strategy);
+
+    return resolve_variant::length<Geometry>::apply(geometry, strategy);
 }
 
 
diff --git a/include/boost/geometry/algorithms/not_implemented.hpp b/include/boost/geometry/algorithms/not_implemented.hpp
index 008f111cc..cd40a2772 100644
--- a/include/boost/geometry/algorithms/not_implemented.hpp
+++ b/include/boost/geometry/algorithms/not_implemented.hpp
@@ -18,7 +18,6 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/algorithms/num_geometries.hpp b/include/boost/geometry/algorithms/num_geometries.hpp
index 58afe4b97..c32494607 100644
--- a/include/boost/geometry/algorithms/num_geometries.hpp
+++ b/include/boost/geometry/algorithms/num_geometries.hpp
@@ -17,6 +17,8 @@
 
 #include <cstddef>
 
+#include <boost/range.hpp>
+
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
 #include <boost/geometry/core/tag.hpp>
@@ -59,6 +61,15 @@ struct num_geometries<Geometry, single_tag>
 };
 
 
+template <typename MultiGeometry>
+struct num_geometries<MultiGeometry, multi_tag>
+{
+    static inline std::size_t apply(MultiGeometry const& multi_geometry)
+    {
+        return boost::size(multi_geometry);
+    }
+};
+
 
 } // namespace dispatch
 #endif
diff --git a/include/boost/geometry/algorithms/num_points.hpp b/include/boost/geometry/algorithms/num_points.hpp
index af7ee1d0c..d8dc91ace 100644
--- a/include/boost/geometry/algorithms/num_points.hpp
+++ b/include/boost/geometry/algorithms/num_points.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,12 +18,12 @@
 #include <cstddef>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
 #include <boost/geometry/core/closure.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
@@ -36,7 +37,7 @@ namespace boost { namespace geometry
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4127)
 #endif
 
@@ -81,12 +82,12 @@ struct polygon_count: private range_count
     template <typename Polygon>
     static inline std::size_t apply(Polygon const& poly, bool add_for_open)
     {
-        std::size_t n = range_count::apply(
-                    exterior_ring(poly), add_for_open);
+        std::size_t n = range_count::apply(exterior_ring(poly), add_for_open);
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(poly);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             n += range_count::apply(*it, add_for_open);
         }
@@ -141,18 +142,24 @@ struct num_points<Geometry, polygon_tag>
         : detail::num_points::polygon_count
 {};
 
+} // namespace dispatch
+#endif
+
+
+namespace resolve_variant {
+
 template <typename Geometry>
-struct devarianted_num_points
+struct num_points
 {
     static inline std::size_t apply(Geometry const& geometry,
                                     bool add_for_open)
     {
-        return num_points<Geometry>::apply(geometry, add_for_open);
+        return dispatch::num_points<Geometry>::apply(geometry, add_for_open);
     }
 };
 
 template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
-struct devarianted_num_points<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+struct num_points<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
 {
     struct visitor: boost::static_visitor<std::size_t>
     {
@@ -163,7 +170,7 @@ struct devarianted_num_points<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
         template <typename Geometry>
         typename std::size_t operator()(Geometry const& geometry) const
         {
-            return dispatch::num_points<Geometry>::apply(geometry, m_add_for_open);
+            return num_points<Geometry>::apply(geometry, m_add_for_open);
         }
     };
 
@@ -175,9 +182,7 @@ struct devarianted_num_points<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
     }
 };
 
-
-} // namespace dispatch
-#endif
+} // namespace resolve_variant
 
 
 /*!
@@ -196,7 +201,7 @@ inline std::size_t num_points(Geometry const& geometry, bool add_for_open = fals
 {
     concept::check<Geometry const>();
 
-    return dispatch::devarianted_num_points<Geometry>::apply(geometry, add_for_open);
+    return resolve_variant::num_points<Geometry>::apply(geometry, add_for_open);
 }
 
 #if defined(_MSC_VER)
diff --git a/include/boost/geometry/algorithms/overlaps.hpp b/include/boost/geometry/algorithms/overlaps.hpp
index d417a4b1f..f724a544f 100644
--- a/include/boost/geometry/algorithms/overlaps.hpp
+++ b/include/boost/geometry/algorithms/overlaps.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -11,6 +14,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_OVERLAPS_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_OVERLAPS_HPP
 
@@ -23,6 +28,8 @@
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+
 namespace boost { namespace geometry
 {
 
@@ -124,8 +131,6 @@ struct box_box
     }
 };
 
-
-
 }} // namespace detail::overlaps
 #endif // DOXYGEN_NO_DETAIL
 
@@ -143,7 +148,13 @@ template
     typename Tag1 = typename tag<Geometry1>::type,
     typename Tag2 = typename tag<Geometry2>::type
 >
-struct overlaps: not_implemented<Tag1, Tag2>
+struct overlaps
+    : detail::relate::relate_base
+        <
+            detail::relate::static_mask_overlaps_type,
+            Geometry1,
+            Geometry2
+        >
 {};
 
 
@@ -152,9 +163,6 @@ struct overlaps<Box1, Box2, box_tag, box_tag>
     : detail::overlaps::box_box
 {};
 
-
-
-
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
@@ -162,6 +170,10 @@ struct overlaps<Box1, Box2, box_tag, box_tag>
 /*!
 \brief \brief_check2{overlap}
 \ingroup overlaps
+\tparam Geometry1 \tparam_geometry
+\tparam Geometry2 \tparam_geometry
+\param geometry1 \param_geometry
+\param geometry2 \param_geometry
 \return \return_check2{overlap}
 
 \qbk{[include reference/algorithms/overlaps.qbk]}
diff --git a/include/boost/geometry/algorithms/perimeter.hpp b/include/boost/geometry/algorithms/perimeter.hpp
index b70517e3e..27d80e97b 100644
--- a/include/boost/geometry/algorithms/perimeter.hpp
+++ b/include/boost/geometry/algorithms/perimeter.hpp
@@ -14,16 +14,24 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_PERIMETER_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_PERIMETER_HPP
 
+#include <boost/range/metafunctions.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
-#include <boost/geometry/core/cs.hpp>
-#include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/strategies/default_length_result.hpp>
 #include <boost/geometry/algorithms/length.hpp>
 #include <boost/geometry/algorithms/detail/calculate_null.hpp>
 #include <boost/geometry/algorithms/detail/calculate_sum.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 // #include <boost/geometry/algorithms/detail/throw_on_empty_input.hpp>
-
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/strategies/default_length_result.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
+#include <boost/geometry/util/compress_variant.hpp>
+#include <boost/geometry/util/transform_variant.hpp>
 
 namespace boost { namespace geometry
 {
@@ -71,6 +79,22 @@ struct perimeter<Polygon, polygon_tag> : detail::calculate_polygon_sum
     }
 };
 
+template <typename MultiPolygon>
+struct perimeter<MultiPolygon, multi_polygon_tag> : detail::multi_sum
+{
+    typedef typename default_length_result<MultiPolygon>::type return_type;
+
+    template <typename Strategy>
+    static inline return_type apply(MultiPolygon const& multi, Strategy const& strategy)
+    {
+        return multi_sum::apply
+               <
+                   return_type,
+                   perimeter<typename boost::range_value<MultiPolygon>::type>
+               >(multi, strategy);
+    }
+};
+
 
 // box,n-sphere: to be implemented
 
@@ -78,6 +102,85 @@ struct perimeter<Polygon, polygon_tag> : detail::calculate_polygon_sum
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy {
+
+struct perimeter
+{
+    template <typename Geometry, typename Strategy>
+    static inline typename default_length_result<Geometry>::type
+    apply(Geometry const& geometry, Strategy const& strategy)
+    {
+        return dispatch::perimeter<Geometry>::apply(geometry, strategy);
+    }
+
+    template <typename Geometry>
+    static inline typename default_length_result<Geometry>::type
+    apply(Geometry const& geometry, default_strategy)
+    {
+        typedef typename strategy::distance::services::default_strategy
+            <
+                point_tag, point_tag, typename point_type<Geometry>::type
+            >::type strategy_type;
+
+        return dispatch::perimeter<Geometry>::apply(geometry, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct perimeter
+{
+    typedef typename default_length_result<Geometry>::type result_type;
+
+    template <typename Strategy>
+    static inline result_type
+    apply(Geometry const& geometry, Strategy const& strategy)
+    {
+        concept::check<Geometry const>();
+        return resolve_strategy::perimeter::apply(geometry, strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct perimeter<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    typedef typename compress_variant<
+        typename transform_variant<
+            boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>,
+            default_length_result<boost::mpl::placeholders::_>
+        >::type
+    >:: type result_type;
+
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<result_type>
+    {
+        Strategy const& m_strategy;
+
+        visitor(Strategy const& strategy): m_strategy(strategy) {}
+
+        template <typename Geometry>
+        result_type operator()(Geometry const& geometry) const
+        {
+            return perimeter<Geometry>::apply(geometry, m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline result_type
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(visitor<Strategy>(strategy), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief \brief_calc{perimeter}
 \ingroup perimeter
@@ -90,20 +193,11 @@ struct perimeter<Polygon, polygon_tag> : detail::calculate_polygon_sum
 \qbk{[include reference/algorithms/perimeter.qbk]}
  */
 template<typename Geometry>
-inline typename default_length_result<Geometry>::type perimeter(
+inline typename resolve_variant::perimeter<Geometry>::result_type perimeter(
         Geometry const& geometry)
 {
-    concept::check<Geometry const>();
-
-    typedef typename point_type<Geometry>::type point_type;
-    typedef typename strategy::distance::services::default_strategy
-        <
-            point_tag, point_type
-        >::type strategy_type;
-
     // detail::throw_on_empty_input(geometry);
-        
-    return dispatch::perimeter<Geometry>::apply(geometry, strategy_type());
+    return resolve_variant::perimeter<Geometry>::apply(geometry, default_strategy());
 }
 
 /*!
@@ -121,14 +215,11 @@ inline typename default_length_result<Geometry>::type perimeter(
 \qbk{[include reference/algorithms/perimeter.qbk]}
  */
 template<typename Geometry, typename Strategy>
-inline typename default_length_result<Geometry>::type perimeter(
+inline typename resolve_variant::perimeter<Geometry>::result_type perimeter(
         Geometry const& geometry, Strategy const& strategy)
 {
-    concept::check<Geometry const>();
-
     // detail::throw_on_empty_input(geometry);
-    
-    return dispatch::perimeter<Geometry>::apply(geometry, strategy);
+    return resolve_variant::perimeter<Geometry>::apply(geometry, strategy);
 }
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/algorithms/point_on_surface.hpp b/include/boost/geometry/algorithms/point_on_surface.hpp
new file mode 100644
index 000000000..a6f7ed71d
--- /dev/null
+++ b/include/boost/geometry/algorithms/point_on_surface.hpp
@@ -0,0 +1,355 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_POINT_ON_SURFACE_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_POINT_ON_SURFACE_HPP
+
+
+#include <cstddef>
+
+#include <numeric>
+
+#include <boost/concept_check.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+
+#include <boost/geometry/geometries/concepts/check.hpp>
+
+#include <boost/geometry/algorithms/detail/extreme_points.hpp>
+
+#include <boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace point_on_surface
+{
+
+template <typename CoordinateType, int Dimension>
+struct specific_coordinate_first
+{
+    CoordinateType const m_value_to_be_first;
+
+    inline specific_coordinate_first(CoordinateType value_to_be_skipped)
+        : m_value_to_be_first(value_to_be_skipped)
+    {}
+
+    template <typename Point>
+    inline bool operator()(Point const& lhs, Point const& rhs)
+    {
+        CoordinateType const lh = geometry::get<Dimension>(lhs);
+        CoordinateType const rh = geometry::get<Dimension>(rhs);
+
+        // If both lhs and rhs equal m_value_to_be_first,
+        // we should handle conform if lh < rh = FALSE
+        // The first condition meets that, keep it first
+        if (geometry::math::equals(rh, m_value_to_be_first))
+        {
+            // Handle conform lh < -INF, which is always false
+            return false;
+        }
+
+        if (geometry::math::equals(lh, m_value_to_be_first))
+        {
+            // Handle conform -INF < rh, which is always true
+            return true;
+        }
+
+        return lh < rh;
+    }
+};
+
+template <int Dimension, typename Collection, typename Value, typename Predicate>
+inline bool max_value(Collection const& collection, Value& the_max, Predicate const& predicate)
+{
+    bool first = true;
+    for (typename Collection::const_iterator it = collection.begin(); it != collection.end(); ++it)
+    {
+        if (! it->empty())
+        {
+            Value the_value = geometry::get<Dimension>(*std::max_element(it->begin(), it->end(), predicate));
+            if (first || the_value > the_max)
+            {
+                the_max = the_value;
+                first = false;
+            }
+        }
+    }
+    return ! first;
+}
+
+
+template <int Dimension, typename Value>
+struct select_below
+{
+    Value m_value;
+    inline select_below(Value const& v)
+        : m_value(v)
+    {}
+
+    template <typename Intruder>
+    inline bool operator()(Intruder const& intruder) const
+    {
+        if (intruder.empty())
+        {
+            return true;
+        }
+        Value max = geometry::get<Dimension>(*std::max_element(intruder.begin(), intruder.end(), detail::extreme_points::compare<Dimension>()));
+        return geometry::math::equals(max, m_value) || max < m_value;
+    }
+};
+
+template <int Dimension, typename Value>
+struct adapt_base
+{
+    Value m_value;
+    inline adapt_base(Value const& v)
+        : m_value(v)
+    {}
+
+    template <typename Intruder>
+    inline void operator()(Intruder& intruder) const
+    {
+        if (intruder.size() >= 3)
+        {
+            detail::extreme_points::move_along_vector<Dimension>(intruder, m_value);
+        }
+    }
+};
+
+template <int Dimension, typename Value>
+struct min_of_intruder
+{
+    template <typename Intruder>
+    inline bool operator()(Intruder const& lhs, Intruder const& rhs) const
+    {
+        Value lhs_min = geometry::get<Dimension>(*std::min_element(lhs.begin(), lhs.end(), detail::extreme_points::compare<Dimension>()));
+        Value rhs_min = geometry::get<Dimension>(*std::min_element(rhs.begin(), rhs.end(), detail::extreme_points::compare<Dimension>()));
+        return lhs_min < rhs_min;
+    }
+};
+
+template <typename Point, typename Segments>
+inline void calculate_centroid(Point& point, Segments const& segments)
+{
+    if (segments.size() == 3)
+    {
+        // In almost all cases, the segments do have 3 values. In that case we use another
+        // centroid calculation, which should be slightly faster
+        // and is more precise (case #geos_1_test_overlay => normal centroid is outside! TODO)
+
+        typedef typename geometry::coordinate_type<Point>::type coordinate_type;
+        coordinate_type const three = 3.0;
+        coordinate_type const sx = geometry::get<0>(segments[0]) + geometry::get<0>(segments[1]) + geometry::get<0>(segments[2]);
+        coordinate_type const sy = geometry::get<1>(segments[0]) + geometry::get<1>(segments[1]) + geometry::get<1>(segments[2]);
+        geometry::set<0>(point, sx / three);
+        geometry::set<1>(point, sy / three);
+        return;
+    }
+
+    // For 4 or more segments, we use normal centroid calculation
+
+    // Specify centroid, it should have "areal_tag" to have correct calculation
+    typedef typename strategy::centroid::services::default_strategy
+        <
+            typename cs_tag<Point>::type,
+            areal_tag,
+            dimension<Point>::type::value,
+            Point,
+            Point
+        >::type strategy_type;
+
+    strategy_type strategy;
+
+
+    // Ignore warning (because using static method sometimes) on strategy
+    boost::ignore_unused_variable_warning(strategy);
+
+
+    typename strategy_type::state_type state;
+
+    typedef typename boost::range_iterator<Segments const>::type iterator_type;
+
+    iterator_type begin = boost::begin(segments);
+    iterator_type end = boost::end(segments);
+    iterator_type it = begin;
+    iterator_type previous = it++;
+    for (; it != end; ++previous, ++it)
+    {
+        strategy.apply(*previous, *it, state);
+    }
+    // Close it explicitly:
+    strategy.apply(*previous, *begin, state);
+
+    strategy.result(state, point);
+}
+
+
+
+template <int Dimension, typename Extremes, typename Intruders, typename CoordinateType>
+inline void replace_extremes_for_self_tangencies(Extremes& extremes, Intruders& intruders, CoordinateType const& max_intruder)
+{
+    // This function handles self-tangencies.
+    // Self-tangencies use, as usual, the major part of code...
+
+    //        ___ e
+    //       /|\ \                                                            .
+    //      / | \ \                                                           .
+    //     /  |  \ \                                                          .
+    //    /   |   \ \                                                         .
+    //   / /\ |    \ \                                                        .
+    //     i2    i1
+
+    // The picture above shows the extreme (outside, "e") and two intruders ("i1","i2")
+    // Assume that "i1" is self-tangent with the extreme, in one point at the top
+    // Now the "penultimate" value is searched, this is is the top of i2
+    // Then everything including and below (this is "i2" here) is removed
+    // Then the base of "i1" and of "e" is adapted to this penultimate value
+    // It then looks like:
+
+    //      b ___ e
+    //       /|\ \                                                            .
+    //      / | \ \                                                           .
+    //     /  |  \ \                                                          .
+    //    /   |   \ \                                                         .
+    //   a    c i1
+
+    // Then intruders (here "i1" but there may be more) are sorted from left to right
+    // Finally points "a","b" and "c" (in this order) are selected as a new triangle.
+    // This triangle will have a centroid which is inside (assumed that intruders left segment
+    // is not equal to extremes left segment, but that polygon would be invalid)
+
+    // Find highest non-self tangent intrusion, if any
+    CoordinateType penultimate_value;
+    specific_coordinate_first<CoordinateType, Dimension> pu_compare(max_intruder);
+    if (max_value<Dimension>(intruders, penultimate_value, pu_compare))
+    {
+        // Throw away all intrusions <= this value, and of the kept one set this as base.
+        select_below<Dimension, CoordinateType> predicate(penultimate_value);
+        intruders.erase
+            (
+                std::remove_if(boost::begin(intruders), boost::end(intruders), predicate),
+                boost::end(intruders)
+            );
+        adapt_base<Dimension, CoordinateType> fe_predicate(penultimate_value);
+        // Sort from left to right (or bottom to top if Dimension=0)
+        std::for_each(boost::begin(intruders), boost::end(intruders), fe_predicate);
+
+        // Also adapt base of extremes
+        detail::extreme_points::move_along_vector<Dimension>(extremes, penultimate_value);
+    }
+    // Then sort in 1-Dim. Take first to calc centroid.
+    std::sort(boost::begin(intruders), boost::end(intruders), min_of_intruder<1 - Dimension, CoordinateType>());
+
+    Extremes triangle;
+    triangle.reserve(3);
+
+    // Make a triangle of first two points of extremes (the ramp, from left to right), and last point of first intruder (which goes from right to left)
+    std::copy(extremes.begin(), extremes.begin() + 2, std::back_inserter(triangle));
+    triangle.push_back(intruders.front().back());
+
+    // (alternatively we could use the last two points of extremes, and first point of last intruder...):
+    //// ALTERNATIVE: std::copy(extremes.rbegin(), extremes.rbegin() + 2, std::back_inserter(triangle));
+    //// ALTERNATIVE: triangle.push_back(intruders.back().front());
+
+    // Now replace extremes with this smaller subset, a triangle, such that centroid calculation will result in a point inside
+    extremes = triangle;
+}
+
+template <int Dimension, typename Geometry, typename Point>
+inline bool calculate_point_on_surface(Geometry const& geometry, Point& point)
+{
+    typedef typename geometry::point_type<Geometry>::type point_type;
+    typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
+    std::vector<point_type> extremes;
+
+    typedef std::vector<std::vector<point_type> > intruders_type;
+    intruders_type intruders;
+    geometry::extreme_points<Dimension>(geometry, extremes, intruders);
+
+    if (extremes.size() < 3)
+    {
+        return false;
+    }
+
+    // If there are intruders, find the max.
+    if (! intruders.empty())
+    {
+        coordinate_type max_intruder;
+        detail::extreme_points::compare<Dimension> compare;
+        if (max_value<Dimension>(intruders, max_intruder, compare))
+        {
+            coordinate_type max_extreme = geometry::get<Dimension>(*std::max_element(extremes.begin(), extremes.end(), detail::extreme_points::compare<Dimension>()));
+            if (max_extreme > max_intruder)
+            {
+                detail::extreme_points::move_along_vector<Dimension>(extremes, max_intruder);
+            }
+            else
+            {
+                replace_extremes_for_self_tangencies<Dimension>(extremes, intruders, max_intruder);
+            }
+        }
+    }
+
+    // Now calculate the centroid of the (possibly adapted) extremes
+    calculate_centroid(point, extremes);
+
+    return true;
+}
+
+}} // namespace detail::point_on_surface
+#endif // DOXYGEN_NO_DETAIL
+
+
+/*!
+\brief Assigns a Point guaranteed to lie on the surface of the Geometry
+\tparam Geometry geometry type. This also defines the type of the output point
+\param geometry Geometry to take point from
+\param point Point to assign
+ */
+template <typename Geometry, typename Point>
+inline void point_on_surface(Geometry const& geometry, Point & point)
+{
+    concept::check<Point>();
+    concept::check<Geometry const>();
+
+    // First try in Y-direction (which should always succeed for valid polygons)
+    if (! detail::point_on_surface::calculate_point_on_surface<1>(geometry, point))
+    {
+        // For invalid polygons, we might try X-direction
+        detail::point_on_surface::calculate_point_on_surface<0>(geometry, point);
+    }
+}
+
+/*!
+\brief Returns point guaranteed to lie on the surface of the Geometry
+\tparam Geometry geometry type. This also defines the type of the output point
+\param geometry Geometry to take point from
+\return The Point guaranteed to lie on the surface of the Geometry
+ */
+template<typename Geometry>
+inline typename geometry::point_type<Geometry>::type
+return_point_on_surface(Geometry const& geometry)
+{
+    typename geometry::point_type<Geometry>::type result;
+    geometry::point_on_surface(geometry, result);
+    return result;
+}
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_POINT_ON_SURFACE_HPP
diff --git a/include/boost/geometry/algorithms/remove_spikes.hpp b/include/boost/geometry/algorithms/remove_spikes.hpp
new file mode 100644
index 000000000..e62ea9fe3
--- /dev/null
+++ b/include/boost/geometry/algorithms/remove_spikes.hpp
@@ -0,0 +1,280 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_REMOVE_SPIKES_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_REMOVE_SPIKES_HPP
+
+#include <deque>
+
+#include <boost/range.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/algorithms/detail/point_is_spike_or_equal.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+#include <boost/geometry/algorithms/clear.hpp>
+
+
+/*
+Remove spikes from a ring/polygon.
+Ring (having 8 vertices, including closing vertex)
++------+
+|      |
+|      +--+
+|      |  ^this "spike" is removed, can be located outside/inside the ring
++------+
+(the actualy determination if it is removed is done by a strategy)
+
+*/
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace remove_spikes
+{
+
+
+template <typename Range>
+struct range_remove_spikes
+{
+    typedef typename strategy::side::services::default_strategy
+    <
+        typename cs_tag<Range>::type
+    >::type side_strategy;
+
+    typedef typename coordinate_type<Range>::type coordinate_type;
+    typedef typename point_type<Range>::type point_type;
+
+
+    static inline void apply(Range& range)
+    {
+        std::size_t n = boost::size(range);
+        std::size_t const min_num_points = core_detail::closure::minimum_ring_size
+            <
+                geometry::closure<Range>::value
+            >::value - 1; // subtract one: a polygon with only one spike should result into one point
+        if (n < min_num_points)
+        {
+            return;
+        }
+
+        std::deque<point_type> cleaned;
+        for (typename boost::range_iterator<Range const>::type it = boost::begin(range);
+            it != boost::end(range); ++it)
+        {
+            // Add point
+            cleaned.push_back(*it);
+
+            while(cleaned.size() >= 3
+                    && detail::point_is_spike_or_equal(cleaned.back(), *(cleaned.end() - 3), *(cleaned.end() - 2)))
+            {
+                // Remove pen-ultimate point causing the spike (or which was equal)
+                cleaned.erase(cleaned.end() - 2);
+            }
+        }
+
+        // For a closed-polygon, remove closing point, this makes checking first point(s) easier and consistent
+        if (geometry::closure<Range>::value == geometry::closed)
+        {
+            cleaned.pop_back();
+        }
+
+        bool found = false;
+        do
+        {
+            found = false;
+            // Check for spike in first point
+            int const penultimate = 2;
+            while(cleaned.size() >= 3 && detail::point_is_spike_or_equal(cleaned.front(), *(cleaned.end() - penultimate), cleaned.back()))
+            {
+                cleaned.pop_back();
+                found = true;
+            }
+            // Check for spike in second point
+            while(cleaned.size() >= 3 && detail::point_is_spike_or_equal(*(cleaned.begin() + 1), cleaned.back(), cleaned.front()))
+            {
+                cleaned.pop_front();
+                found = true;
+            }
+        }
+        while (found);
+
+        if (cleaned.size() == 2)
+        {
+            // Ticket #9871: open polygon with only two points.
+            // the second point forms, by definition, a spike
+            cleaned.pop_back();
+        }
+
+        // Close if necessary
+        if (geometry::closure<Range>::value == geometry::closed)
+        {
+            cleaned.push_back(cleaned.front());
+        }
+
+        // Copy output
+        geometry::clear(range);
+        std::copy(cleaned.begin(), cleaned.end(), std::back_inserter(range));
+    }
+};
+
+
+template <typename Polygon>
+struct polygon_remove_spikes
+{
+    static inline void apply(Polygon& polygon)
+    {
+        typedef typename geometry::ring_type<Polygon>::type ring_type;
+
+        typedef range_remove_spikes<ring_type> per_range;
+        per_range::apply(exterior_ring(polygon));
+
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(polygon);
+
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
+        {
+            per_range::apply(*it);
+        }
+    }
+};
+
+
+template <typename MultiGeometry, typename SingleVersion>
+struct multi_remove_spikes
+{
+    static inline void apply(MultiGeometry& multi)
+    {
+        for (typename boost::range_iterator<MultiGeometry>::type
+                it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            SingleVersion::apply(*it);
+        }
+    }
+};
+
+
+}} // namespace detail::remove_spikes
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry,
+    typename Tag = typename tag<Geometry>::type
+>
+struct remove_spikes
+{
+    static inline void apply(Geometry&)
+    {}
+};
+
+
+template <typename Ring>
+struct remove_spikes<Ring, ring_tag>
+    : detail::remove_spikes::range_remove_spikes<Ring>
+{};
+
+
+
+template <typename Polygon>
+struct remove_spikes<Polygon, polygon_tag>
+    : detail::remove_spikes::polygon_remove_spikes<Polygon>
+{};
+
+
+template <typename MultiPolygon>
+struct remove_spikes<MultiPolygon, multi_polygon_tag>
+    : detail::remove_spikes::multi_remove_spikes
+        <
+            MultiPolygon,
+            detail::remove_spikes::polygon_remove_spikes
+            <
+                typename boost::range_value<MultiPolygon>::type
+            >
+        >
+{};
+
+
+} // namespace dispatch
+#endif
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct remove_spikes
+{
+    static void apply(Geometry& geometry)
+    {
+        concept::check<Geometry>();
+        dispatch::remove_spikes<Geometry>::apply(geometry);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct remove_spikes<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<void>
+    {
+        template <typename Geometry>
+        void operator()(Geometry& geometry) const
+        {
+            remove_spikes<Geometry>::apply(geometry);
+        }
+    };
+
+    static inline void apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry)
+    {
+        boost::apply_visitor(visitor(), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
+/*!
+    \ingroup remove_spikes
+    \tparam Geometry geometry type
+    \param geometry the geometry to make remove_spikes
+*/
+template <typename Geometry>
+inline void remove_spikes(Geometry& geometry)
+{
+    resolve_variant::remove_spikes<Geometry>::apply(geometry);
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_REMOVE_SPIKES_HPP
diff --git a/include/boost/geometry/algorithms/reverse.hpp b/include/boost/geometry/algorithms/reverse.hpp
index 1e1168a5a..17b23ffdf 100644
--- a/include/boost/geometry/algorithms/reverse.hpp
+++ b/include/boost/geometry/algorithms/reverse.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,9 +18,15 @@
 #include <algorithm>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
+#include <boost/geometry/algorithms/detail/multi_modify.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 
@@ -47,13 +54,13 @@ struct polygon_reverse: private range_reverse
     template <typename Polygon>
     static inline void apply(Polygon& polygon)
     {
-        typedef typename geometry::ring_type<Polygon>::type ring_type;
-
         range_reverse::apply(exterior_ring(polygon));
 
-        typename interior_return_type<Polygon>::type rings
-                    = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(polygon);
+
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             range_reverse::apply(*it);
         }
@@ -96,10 +103,65 @@ struct reverse<Polygon, polygon_tag>
 {};
 
 
+template <typename Geometry>
+struct reverse<Geometry, multi_linestring_tag>
+    : detail::multi_modify
+        <
+            Geometry,
+            detail::reverse::range_reverse
+        >
+{};
+
+
+template <typename Geometry>
+struct reverse<Geometry, multi_polygon_tag>
+    : detail::multi_modify
+        <
+            Geometry,
+            detail::reverse::polygon_reverse
+        >
+{};
+
+
+
 } // namespace dispatch
 #endif
 
 
+namespace resolve_variant
+{
+
+template <typename Geometry>
+struct reverse
+{
+    static void apply(Geometry& geometry)
+    {
+        concept::check<Geometry>();
+        dispatch::reverse<Geometry>::apply(geometry);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct reverse<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<void>
+    {
+        template <typename Geometry>
+        void operator()(Geometry& geometry) const
+        {
+            reverse<Geometry>::apply(geometry);
+        }
+    };
+
+    static inline void apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>& geometry)
+    {
+        boost::apply_visitor(visitor(), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief Reverses the points within a geometry
 \details Generic function to reverse a geometry. It resembles the std::reverse
@@ -114,9 +176,7 @@ struct reverse<Polygon, polygon_tag>
 template <typename Geometry>
 inline void reverse(Geometry& geometry)
 {
-    concept::check<Geometry>();
-
-    dispatch::reverse<Geometry>::apply(geometry);
+    resolve_variant::reverse<Geometry>::apply(geometry);
 }
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/algorithms/simplify.hpp b/include/boost/geometry/algorithms/simplify.hpp
index 2bd097f13..ba89fe234 100644
--- a/include/boost/geometry/algorithms/simplify.hpp
+++ b/include/boost/geometry/algorithms/simplify.hpp
@@ -14,28 +14,30 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_SIMPLIFY_HPP
 
-
 #include <cstddef>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp>
 #include <boost/geometry/strategies/concepts/simplify_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
 
 #include <boost/geometry/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/convert.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
-#include <boost/geometry/algorithms/num_interior_rings.hpp>
 
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
 
 namespace boost { namespace geometry
 {
@@ -114,13 +116,54 @@ struct simplify_range
 
 struct simplify_polygon
 {
+private:
+
+    template
+    <
+        std::size_t Minimum,
+        typename IteratorIn,
+        typename IteratorOut,
+        typename Distance,
+        typename Strategy
+    >
+    static inline void iterate(IteratorIn begin, IteratorIn end,
+                    IteratorOut it_out,
+                    Distance const& max_distance, Strategy const& strategy)
+    {
+        for (IteratorIn it_in = begin; it_in != end;  ++it_in, ++it_out)
+        {
+            simplify_range<Minimum>::apply(*it_in, *it_out, max_distance, strategy);
+        }
+    }
+
+    template
+    <
+        std::size_t Minimum,
+        typename InteriorRingsIn,
+        typename InteriorRingsOut,
+        typename Distance,
+        typename Strategy
+    >
+    static inline void apply_interior_rings(
+                    InteriorRingsIn const& interior_rings_in,
+                    InteriorRingsOut& interior_rings_out,
+                    Distance const& max_distance, Strategy const& strategy)
+    {
+        traits::resize<InteriorRingsOut>::apply(interior_rings_out,
+            boost::size(interior_rings_in));
+
+        iterate<Minimum>(
+            boost::begin(interior_rings_in), boost::end(interior_rings_in),
+            boost::begin(interior_rings_out),
+            max_distance, strategy);
+    }
+
+public:
     template <typename Polygon, typename Strategy, typename Distance>
     static inline void apply(Polygon const& poly_in, Polygon& poly_out,
                     Distance const& max_distance, Strategy const& strategy)
     {
-        typedef typename ring_type<Polygon>::type ring_type;
-
-        int const Minimum = core_detail::closure::minimum_ring_size
+        std::size_t const minimum = core_detail::closure::minimum_ring_size
             <
                 geometry::closure<Polygon>::value
             >::value;
@@ -128,28 +171,34 @@ struct simplify_polygon
         // Note that if there are inner rings, and distance is too large,
         // they might intersect with the outer ring in the output,
         // while it didn't in the input.
-        simplify_range<Minimum>::apply(exterior_ring(poly_in),
+        simplify_range<minimum>::apply(exterior_ring(poly_in),
                                        exterior_ring(poly_out),
                                        max_distance, strategy);
 
-        traits::resize
-            <
-                typename boost::remove_reference
-                <
-                    typename traits::interior_mutable_type<Polygon>::type
-                >::type
-            >::apply(interior_rings(poly_out), num_interior_rings(poly_in));
+        apply_interior_rings<minimum>(interior_rings(poly_in),
+                                      interior_rings(poly_out),
+                                      max_distance, strategy);
+    }
+};
 
-        typename interior_return_type<Polygon const>::type rings_in
-                    = interior_rings(poly_in);
-        typename interior_return_type<Polygon>::type rings_out
-                    = interior_rings(poly_out);
-        BOOST_AUTO_TPL(it_out, boost::begin(rings_out));
-        for (BOOST_AUTO_TPL(it_in,  boost::begin(rings_in));
-            it_in != boost::end(rings_in);
-            ++it_in, ++it_out)
+
+template<typename Policy>
+struct simplify_multi
+{
+    template <typename MultiGeometry, typename Strategy>
+    static inline void apply(MultiGeometry const& multi, MultiGeometry& out,
+                             double max_distance, Strategy const& strategy)
+    {
+        traits::resize<MultiGeometry>::apply(out, boost::size(multi));
+
+        typename boost::range_iterator<MultiGeometry>::type it_out
+                = boost::begin(out);
+        for (typename boost::range_iterator<MultiGeometry const>::type
+                it_in = boost::begin(multi);
+             it_in != boost::end(multi);
+             ++it_in, ++it_out)
         {
-            simplify_range<Minimum>::apply(*it_in, *it_out, max_distance, strategy);
+            Policy::apply(*it_in, *it_out, max_distance, strategy);
         }
     }
 };
@@ -224,11 +273,168 @@ struct simplify_insert<Ring, ring_tag>
     : detail::simplify::simplify_range_insert
 {};
 
+template <typename MultiPoint>
+struct simplify<MultiPoint, multi_point_tag>
+    : detail::simplify::simplify_copy
+{};
+
+
+template <typename MultiLinestring>
+struct simplify<MultiLinestring, multi_linestring_tag>
+    : detail::simplify::simplify_multi<detail::simplify::simplify_range<2> >
+{};
+
+
+template <typename MultiPolygon>
+struct simplify<MultiPolygon, multi_polygon_tag>
+    : detail::simplify::simplify_multi<detail::simplify::simplify_polygon>
+{};
+
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy
+{
+
+struct simplify
+{
+    template <typename Geometry, typename Distance, typename Strategy>
+    static inline void apply(Geometry const& geometry,
+                             Geometry& out,
+                             Distance const& max_distance,
+                             Strategy const& strategy)
+    {
+        dispatch::simplify<Geometry>::apply(geometry, out, max_distance, strategy);
+    }
+
+    template <typename Geometry, typename Distance>
+    static inline void apply(Geometry const& geometry,
+                             Geometry& out,
+                             Distance const& max_distance,
+                             default_strategy)
+    {
+        typedef typename point_type<Geometry>::type point_type;
+
+        typedef typename strategy::distance::services::default_strategy
+        <
+            point_tag, segment_tag, point_type
+        >::type ds_strategy_type;
+
+        typedef strategy::simplify::douglas_peucker
+        <
+            point_type, ds_strategy_type
+        > strategy_type;
+
+        BOOST_CONCEPT_ASSERT(
+            (concept::SimplifyStrategy<strategy_type, point_type>)
+        );
+
+        apply(geometry, out, max_distance, strategy_type());
+    }
+};
+
+struct simplify_insert
+{
+    template
+    <
+        typename Geometry,
+        typename OutputIterator,
+        typename Distance,
+        typename Strategy
+    >
+    static inline void apply(Geometry const& geometry,
+                             OutputIterator& out,
+                             Distance const& max_distance,
+                             Strategy const& strategy)
+    {
+        dispatch::simplify_insert<Geometry>::apply(geometry, out, max_distance, strategy);
+    }
+
+    template <typename Geometry, typename OutputIterator, typename Distance>
+    static inline void apply(Geometry const& geometry,
+                             OutputIterator& out,
+                             Distance const& max_distance,
+                             default_strategy)
+    {
+        typedef typename point_type<Geometry>::type point_type;
+
+        typedef typename strategy::distance::services::default_strategy
+        <
+            point_tag, segment_tag, point_type
+        >::type ds_strategy_type;
+
+        typedef strategy::simplify::douglas_peucker
+        <
+            point_type, ds_strategy_type
+        > strategy_type;
+
+        BOOST_CONCEPT_ASSERT(
+            (concept::SimplifyStrategy<strategy_type, point_type>)
+        );
+
+        apply(geometry, out, max_distance, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry>
+struct simplify
+{
+    template <typename Distance, typename Strategy>
+    static inline void apply(Geometry const& geometry,
+                             Geometry& out,
+                             Distance const& max_distance,
+                             Strategy const& strategy)
+    {
+        resolve_strategy::simplify::apply(geometry, out, max_distance, strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct simplify<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Distance, typename Strategy>
+    struct visitor: boost::static_visitor<void>
+    {
+        Distance const& m_max_distance;
+        Strategy const& m_strategy;
+
+        visitor(Distance const& max_distance, Strategy const& strategy)
+            : m_max_distance(max_distance)
+            , m_strategy(strategy)
+        {}
+
+        template <typename Geometry>
+        void operator()(Geometry const& geometry, Geometry& out) const
+        {
+            simplify<Geometry>::apply(geometry, out, m_max_distance, m_strategy);
+        }
+    };
+
+    template <typename Distance, typename Strategy>
+    static inline void
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>& out,
+          Distance const& max_distance,
+          Strategy const& strategy)
+    {
+        boost::apply_visitor(
+            visitor<Distance, Strategy>(max_distance, strategy),
+            geometry,
+            out
+        );
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief Simplify a geometry using a specified strategy
 \ingroup simplify
@@ -252,13 +458,9 @@ inline void simplify(Geometry const& geometry, Geometry& out,
 {
     concept::check<Geometry>();
 
-    BOOST_CONCEPT_ASSERT(
-        (concept::SimplifyStrategy<Strategy, typename point_type<Geometry>::type>)
-    );
-
     geometry::clear(out);
 
-    dispatch::simplify<Geometry>::apply(geometry, out, max_distance, strategy);
+    resolve_variant::simplify<Geometry>::apply(geometry, out, max_distance, strategy);
 }
 
 
@@ -284,18 +486,7 @@ inline void simplify(Geometry const& geometry, Geometry& out,
 {
     concept::check<Geometry>();
 
-    typedef typename point_type<Geometry>::type point_type;
-    typedef typename strategy::distance::services::default_strategy
-            <
-                segment_tag, point_type
-            >::type ds_strategy_type;
-
-    typedef strategy::simplify::douglas_peucker
-        <
-            point_type, ds_strategy_type
-        > strategy_type;
-
-    simplify(geometry, out, max_distance, strategy_type());
+    simplify(geometry, out, max_distance, default_strategy());
 }
 
 
@@ -321,14 +512,11 @@ namespace detail { namespace simplify
 */
 template<typename Geometry, typename OutputIterator, typename Distance, typename Strategy>
 inline void simplify_insert(Geometry const& geometry, OutputIterator out,
-                              Distance const& max_distance, Strategy const& strategy)
+                            Distance const& max_distance, Strategy const& strategy)
 {
     concept::check<Geometry const>();
-    BOOST_CONCEPT_ASSERT(
-        (concept::SimplifyStrategy<Strategy, typename point_type<Geometry>::type>)
-    );
 
-    dispatch::simplify_insert<Geometry>::apply(geometry, out, max_distance, strategy);
+    resolve_strategy::simplify_insert::apply(geometry, out, max_distance, strategy);
 }
 
 /*!
@@ -344,25 +532,13 @@ inline void simplify_insert(Geometry const& geometry, OutputIterator out,
  */
 template<typename Geometry, typename OutputIterator, typename Distance>
 inline void simplify_insert(Geometry const& geometry, OutputIterator out,
-                              Distance const& max_distance)
+                            Distance const& max_distance)
 {
-    typedef typename point_type<Geometry>::type point_type;
-
     // Concept: output point type = point type of input geometry
     concept::check<Geometry const>();
-    concept::check<point_type>();
+    concept::check<typename point_type<Geometry>::type>();
 
-    typedef typename strategy::distance::services::default_strategy
-        <
-            segment_tag, point_type
-        >::type ds_strategy_type;
-
-    typedef strategy::simplify::douglas_peucker
-        <
-            point_type, ds_strategy_type
-        > strategy_type;
-
-    dispatch::simplify_insert<Geometry>::apply(geometry, out, max_distance, strategy_type());
+    simplify_insert(geometry, out, max_distance, default_strategy());
 }
 
 }} // namespace detail::simplify
diff --git a/include/boost/geometry/algorithms/sym_difference.hpp b/include/boost/geometry/algorithms/sym_difference.hpp
index 28affc43c..de34c9c7b 100644
--- a/include/boost/geometry/algorithms/sym_difference.hpp
+++ b/include/boost/geometry/algorithms/sym_difference.hpp
@@ -46,11 +46,14 @@ template
     typename GeometryOut,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator,
     typename Strategy
 >
 inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
-            Geometry2 const& geometry2, OutputIterator out,
+            Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& strategy)
 {
     concept::check<Geometry1 const>();
@@ -64,7 +67,7 @@ inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
             overlay_difference,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value, true>::value
-        >::apply(geometry1, geometry2, out, strategy);
+        >::apply(geometry1, geometry2, robust_policy, out, strategy);
     out = geometry::dispatch::intersection_insert
         <
             Geometry2, Geometry1,
@@ -73,7 +76,7 @@ inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
             geometry::detail::overlay::do_reverse<geometry::point_order<Geometry1>::value, true>::value,
             geometry::detail::overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value
-        >::apply(geometry2, geometry1, out, strategy);
+        >::apply(geometry2, geometry1, robust_policy, out, strategy);
     return out;
 }
 
@@ -97,10 +100,12 @@ template
     typename GeometryOut,
     typename Geometry1,
     typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator
 >
 inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
-            Geometry2 const& geometry2, OutputIterator out)
+            Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy, OutputIterator out)
 {
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
@@ -111,10 +116,11 @@ inline OutputIterator sym_difference_insert(Geometry1 const& geometry1,
             typename cs_tag<GeometryOut>::type,
             Geometry1,
             Geometry2,
-            typename geometry::point_type<GeometryOut>::type
+            typename geometry::point_type<GeometryOut>::type,
+            RobustPolicy
         > strategy_type;
 
-    return sym_difference_insert<GeometryOut>(geometry1, geometry2, out, strategy_type());
+    return sym_difference_insert<GeometryOut>(geometry1, geometry2, robust_policy, out, strategy_type());
 }
 
 }} // namespace detail::sym_difference
@@ -150,8 +156,17 @@ inline void sym_difference(Geometry1 const& geometry1,
     typedef typename boost::range_value<Collection>::type geometry_out;
     concept::check<geometry_out>();
 
+    typedef typename geometry::rescale_overlay_policy_type
+        <
+            Geometry1,
+            Geometry2
+        >::type rescale_policy_type;
+
+    rescale_policy_type robust_policy
+            = geometry::get_rescale_policy<rescale_policy_type>(geometry1, geometry2);
+
     detail::sym_difference::sym_difference_insert<geometry_out>(
-            geometry1, geometry2,
+            geometry1, geometry2, robust_policy,
             std::back_inserter(output_collection));
 }
 
diff --git a/include/boost/geometry/algorithms/touches.hpp b/include/boost/geometry/algorithms/touches.hpp
index 7d424af42..a06071d42 100644
--- a/include/boost/geometry/algorithms/touches.hpp
+++ b/include/boost/geometry/algorithms/touches.hpp
@@ -3,6 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014, Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -11,6 +15,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_TOUCHES_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_TOUCHES_HPP
 
@@ -18,70 +24,511 @@
 #include <deque>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/detail/overlay/overlay.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
-#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/intersects.hpp>
 #include <boost/geometry/algorithms/num_geometries.hpp>
+#include <boost/geometry/algorithms/detail/sub_range.hpp>
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
 
 namespace boost { namespace geometry
 {
 
-namespace detail { namespace touches 
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace touches
 {
 
-template <typename Turn>
-inline bool ok_for_touch(Turn const& turn)
-{
-    return turn.both(detail::overlay::operation_union)
-        || turn.both(detail::overlay::operation_blocked)
-        || turn.combination(detail::overlay::operation_union, detail::overlay::operation_blocked)
-        ;
-}
+// Box/Box
 
-template <typename Turns>
-inline bool has_only_turns(Turns const& turns)
+template
+<
+    std::size_t Dimension,
+    std::size_t DimensionCount
+>
+struct box_box_loop
 {
-    bool has_touch = false;
-    typedef typename boost::range_iterator<Turns const>::type iterator_type;
-    for (iterator_type it = boost::begin(turns); it != boost::end(turns); ++it)
+    template <typename Box1, typename Box2>
+    static inline bool apply(Box1 const& b1, Box2 const& b2, bool & touch)
     {
-        if (it->has(detail::overlay::operation_intersection))
+        typedef typename coordinate_type<Box1>::type coordinate_type1;
+        typedef typename coordinate_type<Box2>::type coordinate_type2;
+
+        coordinate_type1 const& min1 = get<min_corner, Dimension>(b1);
+        coordinate_type1 const& max1 = get<max_corner, Dimension>(b1);
+        coordinate_type2 const& min2 = get<min_corner, Dimension>(b2);
+        coordinate_type2 const& max2 = get<max_corner, Dimension>(b2);
+
+        // TODO assert or exception?
+        //BOOST_ASSERT(min1 <= max1 && min2 <= max2);
+
+        if ( max1 < min2 || max2 < min1 )
         {
             return false;
         }
 
-        switch(it->method)
+        if ( max1 == min2 || max2 == min1 )
         {
-            case detail::overlay::method_crosses: 
-                return false;
-            case detail::overlay::method_equal: 
-                // Segment spatially equal means: at the right side
-                // the polygon internally overlaps. So return false.
-                return false;
-            case detail::overlay::method_touch: 
-            case detail::overlay::method_touch_interior: 
-            case detail::overlay::method_collinear: 
-                if (ok_for_touch(*it))
-                {
-                    has_touch = true;
-                }
-                else
-                {
-                    return false;
-                }
-                break;
-            case detail::overlay::method_none :
-            case detail::overlay::method_disjoint :
-            case detail::overlay::method_error :
-                break;
+            touch = true;
+        }
+        
+        return box_box_loop
+                <
+                    Dimension + 1,
+                    DimensionCount
+                >::apply(b1, b2, touch);
+    }
+};
+
+template
+<
+    std::size_t DimensionCount
+>
+struct box_box_loop<DimensionCount, DimensionCount>
+{
+    template <typename Box1, typename Box2>
+    static inline bool apply(Box1 const& , Box2 const&, bool &)
+    {
+        return true;
+    }
+};
+
+struct box_box
+{
+    template <typename Box1, typename Box2>
+    static inline bool apply(Box1 const& b1, Box2 const& b2)
+    {
+        BOOST_STATIC_ASSERT((boost::is_same
+                                <
+                                    typename geometry::coordinate_system<Box1>::type,
+                                    typename geometry::coordinate_system<Box2>::type
+                                >::value
+                           ));
+        assert_dimension_equal<Box1, Box2>();
+
+        bool touches = false;
+        bool ok = box_box_loop
+                    <
+                        0,
+                        dimension<Box1>::type::value
+                    >::apply(b1, b2, touches);
+
+        return ok && touches;
+    }
+};
+
+// Areal/Areal
+
+struct areal_interrupt_policy
+{
+    static bool const enabled = true;
+    bool found_touch;
+    bool found_not_touch;
+
+    // dummy variable required by self_get_turn_points::get_turns
+    static bool const has_intersections = false;
+
+    inline bool result()
+    {
+        return found_touch && !found_not_touch;
+    }
+
+    inline areal_interrupt_policy()
+        : found_touch(false), found_not_touch(false)
+    {}
+
+    template <typename Range>
+    inline bool apply(Range const& range)
+    {
+        // if already rejected (temp workaround?)
+        if ( found_not_touch )
+            return true;
+
+        typedef typename boost::range_iterator<Range const>::type iterator;
+        for ( iterator it = boost::begin(range) ; it != boost::end(range) ; ++it )
+        {
+            if ( it->has(overlay::operation_intersection) )
+            {
+                found_not_touch = true;
+                return true;
+            }
+
+            switch(it->method)
+            {
+                case overlay::method_crosses:
+                    found_not_touch = true;
+                    return true;
+                case overlay::method_equal:
+                    // Segment spatially equal means: at the right side
+                    // the polygon internally overlaps. So return false.
+                    found_not_touch = true;
+                    return true;
+                case overlay::method_touch:
+                case overlay::method_touch_interior:
+                case overlay::method_collinear:
+                    if ( ok_for_touch(*it) )
+                    {
+                        found_touch = true;
+                    }
+                    else
+                    {
+                        found_not_touch = true;
+                        return true;
+                    }
+                    break;
+                case overlay::method_none :
+                case overlay::method_disjoint :
+                case overlay::method_error :
+                    break;
+            }
+        }
+
+        return false;
+    }
+
+    template <typename Turn>
+    inline bool ok_for_touch(Turn const& turn)
+    {
+        return turn.both(overlay::operation_union)
+            || turn.both(overlay::operation_blocked)
+            || turn.combination(overlay::operation_union, overlay::operation_blocked)
+            ;
+    }
+};
+
+template<typename Geometry>
+struct check_each_ring_for_within
+{
+    bool has_within;
+    Geometry const& m_geometry;
+
+    inline check_each_ring_for_within(Geometry const& g)
+        : has_within(false)
+        , m_geometry(g)
+    {}
+
+    template <typename Range>
+    inline void apply(Range const& range)
+    {
+        typename geometry::point_type<Range>::type p;
+        geometry::point_on_border(p, range);
+        if ( !has_within && geometry::within(p, m_geometry) )
+        {
+            has_within = true;
         }
     }
-    return has_touch;
+};
+
+template <typename FirstGeometry, typename SecondGeometry>
+inline bool rings_containing(FirstGeometry const& geometry1,
+                SecondGeometry const& geometry2)
+{
+    check_each_ring_for_within<FirstGeometry> checker(geometry1);
+    geometry::detail::for_each_range(geometry2, checker);
+    return checker.has_within;
 }
 
+template <typename Geometry1, typename Geometry2>
+struct areal_areal
+{
+    static inline
+    bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        typedef detail::no_rescale_policy rescale_policy_type;
+        typedef typename geometry::point_type<Geometry1>::type point_type;
+        typedef detail::overlay::turn_info
+            <
+                point_type,
+                typename segment_ratio_type<point_type, rescale_policy_type>::type
+            > turn_info;
+
+        std::deque<turn_info> turns;
+        detail::touches::areal_interrupt_policy policy;
+        rescale_policy_type robust_policy;
+        boost::geometry::get_turns
+                <
+                    detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+                    detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
+                    detail::overlay::assign_null_policy
+                >(geometry1, geometry2, robust_policy, turns, policy);
+
+        return policy.result()
+            && ! geometry::detail::touches::rings_containing(geometry1, geometry2)
+            && ! geometry::detail::touches::rings_containing(geometry2, geometry1);
+    }
+};
+
+// P/*
+
+struct use_point_in_geometry
+{
+    template <typename Point, typename Geometry>
+    static inline bool apply(Point const& point, Geometry const& geometry)
+    {
+        return detail::within::point_in_geometry(point, geometry) == 0;
+    }
+};
+
 }}
+#endif // DOXYGEN_NO_DETAIL
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch {
+
+// TODO: Since CastedTags are used is Reverse needed?
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename Tag1 = typename tag<Geometry1>::type,
+    typename Tag2 = typename tag<Geometry2>::type,
+    typename CastedTag1 = typename tag_cast<Tag1, pointlike_tag, linear_tag, areal_tag>::type,
+    typename CastedTag2 = typename tag_cast<Tag2, pointlike_tag, linear_tag, areal_tag>::type,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct touches
+    : not_implemented<Tag1, Tag2>
+{};
+
+// If reversal is needed, perform it
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename Tag1, typename Tag2,
+    typename CastedTag1, typename CastedTag2
+>
+struct touches<Geometry1, Geometry2, Tag1, Tag2, CastedTag1, CastedTag2, true>
+    : touches<Geometry2, Geometry1, Tag2, Tag1, CastedTag2, CastedTag1, false>
+{
+    static inline bool apply(Geometry1 const& g1, Geometry2 const& g2)
+    {
+        return touches<Geometry2, Geometry1>::apply(g2, g1);
+    }
+};
+
+// P/P
+
+template <typename Geometry1, typename Geometry2, typename Tag1, typename Tag2>
+struct touches<Geometry1, Geometry2, Tag1, Tag2, pointlike_tag, pointlike_tag, false>
+{
+    static inline bool apply(Geometry1 const& , Geometry2 const& )
+    {
+        return false;
+    }
+};
+
+// P/*
+
+template <typename Point, typename Geometry, typename Tag2, typename CastedTag2>
+struct touches<Point, Geometry, point_tag, Tag2, pointlike_tag, CastedTag2, false>
+    : detail::touches::use_point_in_geometry
+{};
+
+// TODO: support touches(MPt, Linear/Areal)
+
+// Box/Box
+
+template <typename Box1, typename Box2, typename CastedTag1, typename CastedTag2>
+struct touches<Box1, Box2, box_tag, box_tag, CastedTag1, CastedTag2, false>
+    : detail::touches::box_box
+{};
+
+template <typename Box1, typename Box2>
+struct touches<Box1, Box2, box_tag, box_tag, areal_tag, areal_tag, false>
+    : detail::touches::box_box
+{};
+
+// L/L
+
+template <typename Linear1, typename Linear2, typename Tag1, typename Tag2>
+struct touches<Linear1, Linear2, Tag1, Tag2, linear_tag, linear_tag, false>
+    : detail::relate::relate_base
+    <
+        detail::relate::static_mask_touches_type,
+        Linear1,
+        Linear2
+    >
+{};
+
+// L/A
+
+template <typename Linear, typename Areal, typename Tag1, typename Tag2>
+struct touches<Linear, Areal, Tag1, Tag2, linear_tag, areal_tag, false>
+    : detail::relate::relate_base
+    <
+        detail::relate::static_mask_touches_type,
+        Linear,
+        Areal
+    >
+{};
+
+// A/L
+template <typename Linear, typename Areal, typename Tag1, typename Tag2>
+struct touches<Linear, Areal, Tag1, Tag2, linear_tag, areal_tag, true>
+    : detail::relate::relate_base
+    <
+        detail::relate::static_mask_touches_type,
+        Areal,
+        Linear
+    >
+{};
+
+// A/A
+
+template <typename Areal1, typename Areal2, typename Tag1, typename Tag2>
+struct touches<Areal1, Areal2, Tag1, Tag2, areal_tag, areal_tag, false>
+    : detail::touches::areal_areal<Areal1, Areal2>
+{};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+namespace resolve_variant {
+
+template <typename Geometry1, typename Geometry2>
+struct touches
+{
+    static bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        concept::check<Geometry1 const>();
+        concept::check<Geometry2 const>();
+
+        return dispatch::touches<Geometry1, Geometry2>
+                       ::apply(geometry1, geometry2);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct touches<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry2 const& m_geometry2;
+
+        visitor(Geometry2 const& geometry2): m_geometry2(geometry2) {}
+
+        template <typename Geometry1>
+        bool operator()(Geometry1 const& geometry1) const
+        {
+            return touches<Geometry1, Geometry2>::apply(geometry1, m_geometry2);
+        }
+    };
+
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2)
+    {
+        return boost::apply_visitor(visitor(geometry2), geometry1);
+    }
+};
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct touches<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry1 const& m_geometry1;
+
+        visitor(Geometry1 const& geometry1): m_geometry1(geometry1) {}
+
+        template <typename Geometry2>
+        bool operator()(Geometry2 const& geometry2) const
+        {
+            return touches<Geometry1, Geometry2>::apply(m_geometry1, geometry2);
+        }
+    };
+
+    static inline bool
+    apply(Geometry1 const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2)
+    {
+        return boost::apply_visitor(visitor(geometry1), geometry2);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T1),
+          BOOST_VARIANT_ENUM_PARAMS(typename T2)>
+struct touches<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
+               boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> >
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        template <typename Geometry1, typename Geometry2>
+        bool operator()(Geometry1 const& geometry1,
+                        Geometry2 const& geometry2) const
+        {
+            return touches<Geometry1, Geometry2>::apply(geometry1, geometry2);
+        }
+    };
+
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2)
+    {
+        return boost::apply_visitor(visitor(), geometry1, geometry2);
+    }
+};
+
+template <typename Geometry>
+struct self_touches
+{
+    static bool apply(Geometry const& geometry)
+    {
+        concept::check<Geometry const>();
+
+        typedef detail::no_rescale_policy rescale_policy_type;
+        typedef typename geometry::point_type<Geometry>::type point_type;
+        typedef detail::overlay::turn_info
+            <
+                point_type,
+                typename segment_ratio_type<point_type, rescale_policy_type>::type
+            > turn_info;
+
+        typedef detail::overlay::get_turn_info
+        <
+            detail::overlay::assign_null_policy
+        > policy_type;
+
+        std::deque<turn_info> turns;
+        detail::touches::areal_interrupt_policy policy;
+        rescale_policy_type robust_policy;
+        detail::self_get_turn_points::get_turns
+        <
+            policy_type
+        >::apply(geometry, robust_policy, turns, policy);
+
+        return policy.result();
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct self_touches<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    struct visitor: boost::static_visitor<bool>
+    {
+        template <typename Geometry>
+        bool operator()(Geometry const& geometry) const
+        {
+            return self_touches<Geometry>::apply(geometry);
+        }
+    };
+
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry)
+    {
+        return boost::apply_visitor(visitor(), geometry);
+    }
+};
+
+} // namespace resolve_variant
+
 
 /*!
 \brief \brief_check{has at least one touching point (self-tangency)}
@@ -99,32 +546,7 @@ inline bool has_only_turns(Turns const& turns)
 template <typename Geometry>
 inline bool touches(Geometry const& geometry)
 {
-    concept::check<Geometry const>();
-
-    typedef detail::overlay::turn_info
-        <
-            typename geometry::point_type<Geometry>::type
-        > turn_info;
-
-    typedef detail::overlay::get_turn_info
-        <
-            typename point_type<Geometry>::type,
-            typename point_type<Geometry>::type,
-            turn_info,
-            detail::overlay::assign_null_policy
-        > policy_type;
-
-    std::deque<turn_info> turns;
-    detail::self_get_turn_points::no_interrupt_policy policy;
-    detail::self_get_turn_points::get_turns
-            <
-                Geometry,
-                std::deque<turn_info>,
-                policy_type,
-                detail::self_get_turn_points::no_interrupt_policy
-            >::apply(geometry, turns, policy);
-
-    return detail::touches::has_only_turns(turns);
+    return resolve_variant::self_touches<Geometry>::apply(geometry);
 }
 
 
@@ -143,39 +565,10 @@ inline bool touches(Geometry const& geometry)
 template <typename Geometry1, typename Geometry2>
 inline bool touches(Geometry1 const& geometry1, Geometry2 const& geometry2)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-
-
-    typedef detail::overlay::turn_info
-        <
-            typename geometry::point_type<Geometry1>::type
-        > turn_info;
-
-    typedef detail::overlay::get_turn_info
-        <
-            typename point_type<Geometry1>::type,
-            typename point_type<Geometry2>::type,
-            turn_info,
-            detail::overlay::assign_null_policy
-        > policy_type;
-
-    std::deque<turn_info> turns;
-    detail::get_turns::no_interrupt_policy policy;
-    boost::geometry::get_turns
-            <
-                false, false,
-                detail::overlay::assign_null_policy
-            >(geometry1, geometry2, turns, policy);
-
-    return detail::touches::has_only_turns(turns)
-        && ! geometry::detail::disjoint::rings_containing(geometry1, geometry2)
-        && ! geometry::detail::disjoint::rings_containing(geometry2, geometry1)
-        ;
+    return resolve_variant::touches<Geometry1, Geometry2>::apply(geometry1, geometry2);
 }
 
 
-
 }} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_ALGORITHMS_TOUCHES_HPP
diff --git a/include/boost/geometry/algorithms/transform.hpp b/include/boost/geometry/algorithms/transform.hpp
index 52d195fe8..1d6e8d0a3 100644
--- a/include/boost/geometry/algorithms/transform.hpp
+++ b/include/boost/geometry/algorithms/transform.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -18,10 +19,14 @@
 #include <iterator>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/num_interior_rings.hpp>
 
 #include <boost/geometry/core/cs.hpp>
@@ -30,7 +35,9 @@
 #include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
 #include <boost/geometry/strategies/transform.hpp>
 
 
@@ -149,8 +156,6 @@ struct transform_polygon
     static inline bool apply(Polygon1 const& poly1, Polygon2& poly2,
                 Strategy const& strategy)
     {
-        typedef typename ring_type<Polygon1>::type ring1_type;
-        typedef typename ring_type<Polygon2>::type ring2_type;
         typedef typename point_type<Polygon2>::type point2_type;
 
         geometry::clear(poly2);
@@ -170,16 +175,20 @@ struct transform_polygon
                 >::type
             >::apply(interior_rings(poly2), num_interior_rings(poly1));
 
-        typename interior_return_type<Polygon1 const>::type rings1
-                    = interior_rings(poly1);
-        typename interior_return_type<Polygon2>::type rings2
-                    = interior_rings(poly2);
-        BOOST_AUTO_TPL(it1, boost::begin(rings1));
-        BOOST_AUTO_TPL(it2, boost::begin(rings2));
-        for ( ; it1 != boost::end(interior_rings(poly1)); ++it1, ++it2)
+        typename interior_return_type<Polygon1 const>::type
+            rings1 = interior_rings(poly1);
+        typename interior_return_type<Polygon2>::type
+            rings2 = interior_rings(poly2);
+
+        typename detail::interior_iterator<Polygon1 const>::type
+            it1 = boost::begin(rings1);
+        typename detail::interior_iterator<Polygon2>::type
+            it2 = boost::begin(rings2);
+        for ( ; it1 != boost::end(rings1); ++it1, ++it2)
         {
-            if (!transform_range_out<point2_type>(*it1,
-                std::back_inserter(*it2), strategy))
+            if ( ! transform_range_out<point2_type>(*it1,
+                                                    std::back_inserter(*it2),
+                                                    strategy) )
             {
                 return false;
             }
@@ -221,6 +230,36 @@ struct transform_range
     }
 };
 
+
+/*!
+    \brief Is able to transform any multi-geometry, calling the single-version as policy
+*/
+template <typename Policy>
+struct transform_multi
+{
+    template <typename Multi1, typename Multi2, typename S>
+    static inline bool apply(Multi1 const& multi1, Multi2& multi2, S const& strategy)
+    {
+        traits::resize<Multi2>::apply(multi2, boost::size(multi1));
+
+        typename boost::range_iterator<Multi1 const>::type it1
+                = boost::begin(multi1);
+        typename boost::range_iterator<Multi2>::type it2
+                = boost::begin(multi2);
+
+        for (; it1 != boost::end(multi1); ++it1, ++it2)
+        {
+            if (! Policy::apply(*it1, *it2, strategy))
+            {
+                return false;
+            }
+        }
+
+        return true;
+    }
+};
+
+
 }} // namespace detail::transform
 #endif // DOXYGEN_NO_DETAIL
 
@@ -278,11 +317,119 @@ struct transform<Segment1, Segment2, segment_tag, segment_tag>
 {
 };
 
+template <typename Multi1, typename Multi2>
+struct transform
+    <
+        Multi1, Multi2,
+        multi_tag, multi_tag
+    >
+    : detail::transform::transform_multi
+        <
+            dispatch::transform
+                <
+                    typename boost::range_value<Multi1>::type,
+                    typename boost::range_value<Multi2>::type
+                >
+        >
+{};
+
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy {
+
+struct transform
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2& geometry2,
+                             Strategy const& strategy)
+    {
+        concept::check<Geometry1 const>();
+        concept::check<Geometry2>();
+
+        return dispatch::transform<Geometry1, Geometry2>::apply(
+            geometry1,
+            geometry2,
+            strategy
+        );
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2& geometry2,
+                             default_strategy)
+    {
+        return apply(
+            geometry1,
+            geometry2,
+            typename detail::transform::select_strategy<Geometry1, Geometry2>::type()
+        );
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant {
+
+template <typename Geometry1, typename Geometry2>
+struct transform
+{
+    template <typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2& geometry2,
+                             Strategy const& strategy)
+    {
+        return resolve_strategy::transform::apply(
+            geometry1,
+            geometry2,
+            strategy
+        );
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct transform<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    template <typename Strategy>
+    struct visitor: static_visitor<bool>
+    {
+        Geometry2& m_geometry2;
+        Strategy const& m_strategy;
+
+        visitor(Geometry2& geometry2, Strategy const& strategy)
+            : m_geometry2(geometry2)
+            , m_strategy(strategy)
+        {}
+
+        template <typename Geometry1>
+        inline bool operator()(Geometry1 const& geometry1) const
+        {
+            return transform<Geometry1, Geometry2>::apply(
+                geometry1,
+                m_geometry2,
+                m_strategy
+            );
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool apply(
+        boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+        Geometry2& geometry2,
+        Strategy const& strategy
+    )
+    {
+        return apply_visitor(visitor<Strategy>(geometry2, strategy), geometry1);
+    }
+};
+
+} // namespace resolve_variant
+
+
 /*!
 \brief Transforms from one geometry to another geometry  \brief_strategy
 \ingroup transform
@@ -302,12 +449,8 @@ template <typename Geometry1, typename Geometry2, typename Strategy>
 inline bool transform(Geometry1 const& geometry1, Geometry2& geometry2,
             Strategy const& strategy)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2>();
-
-    typedef dispatch::transform<Geometry1, Geometry2> transform_type;
-
-    return transform_type::apply(geometry1, geometry2, strategy);
+    return resolve_variant::transform<Geometry1, Geometry2>
+                          ::apply(geometry1, geometry2, strategy);
 }
 
 
@@ -325,11 +468,7 @@ inline bool transform(Geometry1 const& geometry1, Geometry2& geometry2,
 template <typename Geometry1, typename Geometry2>
 inline bool transform(Geometry1 const& geometry1, Geometry2& geometry2)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2>();
-
-    typename detail::transform::select_strategy<Geometry1, Geometry2>::type strategy;
-    return transform(geometry1, geometry2, strategy);
+    return transform(geometry1, geometry2, default_strategy());
 }
 
 
diff --git a/include/boost/geometry/algorithms/union.hpp b/include/boost/geometry/algorithms/union.hpp
index 479f556a1..bfd0ab3ba 100644
--- a/include/boost/geometry/algorithms/union.hpp
+++ b/include/boost/geometry/algorithms/union.hpp
@@ -1,6 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -18,6 +23,10 @@
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/algorithms/detail/overlay/overlay.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/linear_linear.hpp>
+#include <boost/geometry/algorithms/detail/overlay/pointlike_pointlike.hpp>
 
 
 namespace boost { namespace geometry
@@ -51,26 +60,29 @@ template
 <
     typename Geometry1, typename Geometry2, typename GeometryOut,
     typename TagIn1, typename TagIn2, typename TagOut,
+    bool Areal1, bool Areal2, bool ArealOut,
     bool Reverse1, bool Reverse2, bool ReverseOut
 >
 struct union_insert
     <
         Geometry1, Geometry2, GeometryOut,
         TagIn1, TagIn2, TagOut,
-        true, true, true,
+        Areal1, Areal2, ArealOut,
         Reverse1, Reverse2, ReverseOut,
         true
     >: union_insert<Geometry2, Geometry1, GeometryOut>
 {
-    template <typename OutputIterator, typename Strategy>
+    template <typename RobustPolicy, typename OutputIterator, typename Strategy>
     static inline OutputIterator apply(Geometry1 const& g1,
-            Geometry2 const& g2, OutputIterator out,
+            Geometry2 const& g2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& strategy)
     {
         return union_insert
             <
                 Geometry2, Geometry1, GeometryOut
-            >::apply(g2, g1, out, strategy);
+            >::apply(g2, g1, robust_policy, out, strategy);
     }
 };
 
@@ -93,6 +105,73 @@ struct union_insert
 {};
 
 
+// dispatch for union of non-areal geometries
+template
+<
+    typename Geometry1, typename Geometry2, typename GeometryOut,
+    typename TagIn1, typename TagIn2, typename TagOut,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct union_insert
+    <
+        Geometry1, Geometry2, GeometryOut,
+        TagIn1, TagIn2, TagOut,
+        false, false, false,
+        Reverse1, Reverse2, ReverseOut,
+        false
+    > : union_insert
+        <
+            Geometry1, Geometry2, GeometryOut,
+            typename tag_cast<TagIn1, pointlike_tag, linear_tag>::type,
+            typename tag_cast<TagIn2, pointlike_tag, linear_tag>::type,
+            TagOut,
+            false, false, false,
+            Reverse1, Reverse2, ReverseOut,
+            false
+        >
+{};
+
+
+// dispatch for union of linear geometries
+template
+<
+    typename Linear1, typename Linear2, typename LineStringOut,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct union_insert
+    <
+        Linear1, Linear2, LineStringOut,
+        linear_tag, linear_tag, linestring_tag,
+        false, false, false,
+        Reverse1, Reverse2, ReverseOut,
+        false
+    > : detail::overlay::linear_linear_linestring
+        <
+            Linear1, Linear2, LineStringOut, overlay_union
+        >
+{};
+
+
+// dispatch for point-like geometries
+template
+<
+    typename PointLike1, typename PointLike2, typename PointOut,
+    bool Reverse1, bool Reverse2, bool ReverseOut
+>
+struct union_insert
+    <
+        PointLike1, PointLike2, PointOut,
+        pointlike_tag, pointlike_tag, point_tag,
+        false, false, false,
+        Reverse1, Reverse2, ReverseOut,
+        false
+    > : detail::overlay::union_pointlike_pointlike_point
+        <
+            PointLike1, PointLike2, PointOut
+        >
+{};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
@@ -104,18 +183,20 @@ template
 <
     typename GeometryOut,
     typename Geometry1, typename Geometry2,
+    typename RobustPolicy,
     typename OutputIterator,
     typename Strategy
 >
 inline OutputIterator insert(Geometry1 const& geometry1,
             Geometry2 const& geometry2,
+            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
 {
     return dispatch::union_insert
            <
                Geometry1, Geometry2, GeometryOut
-           >::apply(geometry1, geometry2, out, strategy);
+           >::apply(geometry1, geometry2, robust_policy, out, strategy);
 }
 
 /*!
@@ -153,7 +234,11 @@ inline OutputIterator union_insert(Geometry1 const& geometry1,
     concept::check<Geometry2 const>();
     concept::check<GeometryOut>();
 
-    return detail::union_::insert<GeometryOut>(geometry1, geometry2, out, strategy);
+    typedef typename Strategy::rescale_policy_type rescale_policy_type;
+    rescale_policy_type robust_policy
+            = geometry::get_rescale_policy<rescale_policy_type>(geometry1, geometry2);
+
+    return detail::union_::insert<GeometryOut>(geometry1, geometry2, robust_policy, out, strategy);
 }
 
 /*!
@@ -185,12 +270,19 @@ inline OutputIterator union_insert(Geometry1 const& geometry1,
     concept::check<Geometry2 const>();
     concept::check<GeometryOut>();
 
+    typedef typename geometry::rescale_overlay_policy_type
+        <
+            Geometry1,
+            Geometry2
+        >::type rescale_policy_type;
+
     typedef strategy_intersection
         <
             typename cs_tag<GeometryOut>::type,
             Geometry1,
             Geometry2,
-            typename geometry::point_type<GeometryOut>::type
+            typename geometry::point_type<GeometryOut>::type,
+            rescale_policy_type
         > strategy;
 
     return union_insert<GeometryOut>(geometry1, geometry2, out, strategy());
diff --git a/include/boost/geometry/algorithms/unique.hpp b/include/boost/geometry/algorithms/unique.hpp
index b64f7565c..fed9f8af4 100644
--- a/include/boost/geometry/algorithms/unique.hpp
+++ b/include/boost/geometry/algorithms/unique.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,10 +18,12 @@
 #include <algorithm>
 
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/type_traits/remove_reference.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/policies/compare.hpp>
 
@@ -59,9 +62,11 @@ struct polygon_unique
     {
         range_unique::apply(exterior_ring(polygon), policy);
 
-        typename interior_return_type<Polygon>::type rings
-                    = interior_rings(polygon);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon>::type
+            rings = interior_rings(polygon);
+
+        for (typename detail::interior_iterator<Polygon>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             range_unique::apply(*it, policy);
         }
@@ -69,6 +74,22 @@ struct polygon_unique
 };
 
 
+template <typename Policy>
+struct multi_unique
+{
+    template <typename MultiGeometry, typename ComparePolicy>
+    static inline void apply(MultiGeometry& multi, ComparePolicy const& compare)
+    {
+        for (typename boost::range_iterator<MultiGeometry>::type
+                it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it)
+        {
+            Policy::apply(*it, compare);
+        }
+    }
+};
+
 
 }} // namespace detail::unique
 #endif // DOXYGEN_NO_DETAIL
@@ -111,6 +132,24 @@ struct unique<Polygon, polygon_tag>
 {};
 
 
+// For points, unique is not applicable and does nothing
+// (Note that it is not "spatially unique" but that it removes duplicate coordinates,
+//  like std::unique does). Spatially unique is "dissolve" which can (or will be)
+//  possible for multi-points as well, removing points at the same location.
+
+
+template <typename MultiLineString>
+struct unique<MultiLineString, multi_linestring_tag>
+    : detail::unique::multi_unique<detail::unique::range_unique>
+{};
+
+
+template <typename MultiPolygon>
+struct unique<MultiPolygon, multi_polygon_tag>
+    : detail::unique::multi_unique<detail::unique::polygon_unique>
+{};
+
+
 } // namespace dispatch
 #endif
 
diff --git a/include/boost/geometry/algorithms/within.hpp b/include/boost/geometry/algorithms/within.hpp
index b024bd9fa..f66b1ed1c 100644
--- a/include/boost/geometry/algorithms/within.hpp
+++ b/include/boost/geometry/algorithms/within.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -11,6 +14,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_ALGORITHMS_WITHIN_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_WITHIN_HPP
 
@@ -19,7 +24,9 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
@@ -35,132 +42,47 @@
 #include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/strategies/within.hpp>
 #include <boost/geometry/strategies/concepts/within_concept.hpp>
+#include <boost/geometry/strategies/default_strategy.hpp>
+#include <boost/geometry/strategies/within.hpp>
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/order_as_direction.hpp>
 #include <boost/geometry/views/closeable_view.hpp>
 #include <boost/geometry/views/reversible_view.hpp>
 
+#include <boost/geometry/algorithms/detail/within/point_in_geometry.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/do_reverse.hpp>
+#include <deque>
 
 namespace boost { namespace geometry
 {
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within
+namespace detail { namespace within {
+
+struct use_point_in_geometry
 {
-
-
-template
-<
-    typename Point,
-    typename Ring,
-    iterate_direction Direction,
-    closure_selector Closure,
-    typename Strategy
->
-struct point_in_ring
-{
-    BOOST_CONCEPT_ASSERT( (geometry::concept::WithinStrategyPolygonal<Strategy>) );
-
-    static inline int apply(Point const& point, Ring const& ring,
-            Strategy const& strategy)
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy)
     {
-        boost::ignore_unused_variable_warning(strategy);
-        if (int(boost::size(ring))
-                < core_detail::closure::minimum_ring_size<Closure>::value)
-        {
-            return -1;
-        }
-
-        typedef typename reversible_view<Ring const, Direction>::type rev_view_type;
-        typedef typename closeable_view
-            <
-                rev_view_type const, Closure
-            >::type cl_view_type;
-        typedef typename boost::range_iterator<cl_view_type const>::type iterator_type;
-
-        rev_view_type rev_view(ring);
-        cl_view_type view(rev_view);
-        typename Strategy::state_type state;
-        iterator_type it = boost::begin(view);
-        iterator_type end = boost::end(view);
-
-        bool stop = false;
-        for (iterator_type previous = it++;
-            it != end && ! stop;
-            ++previous, ++it)
-        {
-            if (! strategy.apply(point, *previous, *it, state))
-            {
-                stop = true;
-            }
-        }
-
-        return strategy.result(state);
+        return detail::within::point_in_geometry(geometry1, geometry2, strategy) == 1;
     }
 };
 
-
-// Polygon: in exterior ring, and if so, not within interior ring(s)
-template
-<
-    typename Point,
-    typename Polygon,
-    iterate_direction Direction,
-    closure_selector Closure,
-    typename Strategy
->
-struct point_in_polygon
+struct use_relate
 {
-    BOOST_CONCEPT_ASSERT( (geometry::concept::WithinStrategyPolygonal<Strategy>) );
-
-    static inline int apply(Point const& point, Polygon const& poly,
-            Strategy const& strategy)
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& /*strategy*/)
     {
-        int const code = point_in_ring
-            <
-                Point,
-                typename ring_type<Polygon>::type,
-                Direction,
-                Closure,
-                Strategy
-            >::apply(point, exterior_ring(poly), strategy);
-
-        if (code == 1)
-        {
-            typename interior_return_type<Polygon const>::type rings
-                        = interior_rings(poly);
-            for (BOOST_AUTO_TPL(it, boost::begin(rings));
-                it != boost::end(rings);
-                ++it)
-            {
-                int const interior_code = point_in_ring
-                    <
-                        Point,
-                        typename ring_type<Polygon>::type,
-                        Direction,
-                        Closure,
-                        Strategy
-                    >::apply(point, *it, strategy);
-
-                if (interior_code != -1)
-                {
-                    // If 0, return 0 (touch)
-                    // If 1 (inside hole) return -1 (outside polygon)
-                    // If -1 (outside hole) check other holes if any
-                    return -interior_code;
-                }
-            }
-        }
-        return code;
+        return Strategy::apply(geometry1, geometry2);
     }
 };
 
 }} // namespace detail::within
 #endif // DOXYGEN_NO_DETAIL
 
-
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
 {
@@ -172,7 +94,8 @@ template
     typename Tag1 = typename tag<Geometry1>::type,
     typename Tag2 = typename tag<Geometry2>::type
 >
-struct within: not_implemented<Tag1, Tag2>
+struct within
+    : not_implemented<Tag1, Tag2>
 {};
 
 
@@ -199,46 +122,346 @@ struct within<Box1, Box2, box_tag, box_tag>
     }
 };
 
+// P/P
 
+template <typename Point1, typename Point2>
+struct within<Point1, Point2, point_tag, point_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiPoint>
+struct within<Point, MultiPoint, point_tag, multi_point_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+// P/L
+
+template <typename Point, typename Segment>
+struct within<Point, Segment, point_tag, segment_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+template <typename Point, typename Linestring>
+struct within<Point, Linestring, point_tag, linestring_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiLinestring>
+struct within<Point, MultiLinestring, point_tag, multi_linestring_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+// P/A
 
 template <typename Point, typename Ring>
 struct within<Point, Ring, point_tag, ring_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, Ring const& ring, Strategy const& strategy)
-    {
-        return detail::within::point_in_ring
-            <
-                Point,
-                Ring,
-                order_as_direction<geometry::point_order<Ring>::value>::value,
-                geometry::closure<Ring>::value,
-                Strategy
-            >::apply(point, ring, strategy) == 1;
-    }
-};
+    : public detail::within::use_point_in_geometry
+{};
 
 template <typename Point, typename Polygon>
 struct within<Point, Polygon, point_tag, polygon_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, Polygon const& polygon, Strategy const& strategy)
-    {
-        return detail::within::point_in_polygon
-            <
-                Point,
-                Polygon,
-                order_as_direction<geometry::point_order<Polygon>::value>::value,
-                geometry::closure<Polygon>::value,
-                Strategy
-            >::apply(point, polygon, strategy) == 1;
-    }
-};
+    : public detail::within::use_point_in_geometry
+{};
+
+template <typename Point, typename MultiPolygon>
+struct within<Point, MultiPolygon, point_tag, multi_polygon_tag>
+    : public detail::within::use_point_in_geometry
+{};
+
+// L/L
+
+template <typename Linestring1, typename Linestring2>
+struct within<Linestring1, Linestring2, linestring_tag, linestring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Linestring, typename MultiLinestring>
+struct within<Linestring, MultiLinestring, linestring_tag, multi_linestring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiLinestring, typename Linestring>
+struct within<MultiLinestring, Linestring, multi_linestring_tag, linestring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiLinestring1, typename MultiLinestring2>
+struct within<MultiLinestring1, MultiLinestring2, multi_linestring_tag, multi_linestring_tag>
+    : public detail::within::use_relate
+{};
+
+// L/A
+
+template <typename Linestring, typename Ring>
+struct within<Linestring, Ring, linestring_tag, ring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiLinestring, typename Ring>
+struct within<MultiLinestring, Ring, multi_linestring_tag, ring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Linestring, typename Polygon>
+struct within<Linestring, Polygon, linestring_tag, polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiLinestring, typename Polygon>
+struct within<MultiLinestring, Polygon, multi_linestring_tag, polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Linestring, typename MultiPolygon>
+struct within<Linestring, MultiPolygon, linestring_tag, multi_polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiLinestring, typename MultiPolygon>
+struct within<MultiLinestring, MultiPolygon, multi_linestring_tag, multi_polygon_tag>
+    : public detail::within::use_relate
+{};
+
+// A/A
+
+template <typename Ring1, typename Ring2>
+struct within<Ring1, Ring2, ring_tag, ring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Ring, typename Polygon>
+struct within<Ring, Polygon, ring_tag, polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Polygon, typename Ring>
+struct within<Polygon, Ring, polygon_tag, ring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Polygon1, typename Polygon2>
+struct within<Polygon1, Polygon2, polygon_tag, polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Ring, typename MultiPolygon>
+struct within<Ring, MultiPolygon, ring_tag, multi_polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiPolygon, typename Ring>
+struct within<MultiPolygon, Ring, multi_polygon_tag, ring_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename Polygon, typename MultiPolygon>
+struct within<Polygon, MultiPolygon, polygon_tag, multi_polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiPolygon, typename Polygon>
+struct within<MultiPolygon, Polygon, multi_polygon_tag, polygon_tag>
+    : public detail::within::use_relate
+{};
+
+template <typename MultiPolygon1, typename MultiPolygon2>
+struct within<MultiPolygon1, MultiPolygon2, multi_polygon_tag, multi_polygon_tag>
+    : public detail::within::use_relate
+{};
 
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
+namespace resolve_strategy
+{
+
+struct within
+{
+    template <typename Geometry1, typename Geometry2, typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             Strategy const& strategy)
+    {
+        concept::within::check
+            <
+                typename tag<Geometry1>::type,
+                typename tag<Geometry2>::type,
+                typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
+                Strategy
+            >();
+
+        return dispatch::within<Geometry1, Geometry2>::apply(geometry1, geometry2, strategy);
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             default_strategy)
+    {
+        typedef typename point_type<Geometry1>::type point_type1;
+        typedef typename point_type<Geometry2>::type point_type2;
+
+        typedef typename strategy::within::services::default_strategy
+            <
+                typename tag<Geometry1>::type,
+                typename tag<Geometry2>::type,
+                typename tag<Geometry1>::type,
+                typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
+                typename tag_cast
+                    <
+                        typename cs_tag<point_type1>::type, spherical_tag
+                    >::type,
+                typename tag_cast
+                    <
+                        typename cs_tag<point_type2>::type, spherical_tag
+                    >::type,
+                Geometry1,
+                Geometry2
+            >::type strategy_type;
+
+        return apply(geometry1, geometry2, strategy_type());
+    }
+};
+
+} // namespace resolve_strategy
+
+
+namespace resolve_variant
+{
+
+template <typename Geometry1, typename Geometry2>
+struct within
+{
+    template <typename Strategy>
+    static inline bool apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             Strategy const& strategy)
+    {
+        concept::check<Geometry1 const>();
+        concept::check<Geometry2 const>();
+        assert_dimension_equal<Geometry1, Geometry2>();
+
+        return resolve_strategy::within::apply(geometry1,
+                                               geometry2,
+                                               strategy);
+    }
+};
+
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Geometry2>
+struct within<boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Geometry2>
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry2 const& m_geometry2;
+        Strategy const& m_strategy;
+
+        visitor(Geometry2 const& geometry2, Strategy const& strategy):
+        m_geometry2(geometry2),
+        m_strategy(strategy)
+        {}
+
+        template <typename Geometry1>
+        bool operator()(Geometry1 const& geometry1) const
+        {
+            return within<Geometry1, Geometry2>::apply(geometry1,
+                                                       m_geometry2,
+                                                       m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry1,
+          Geometry2 const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(
+            visitor<Strategy>(geometry2, strategy),
+            geometry1
+        );
+    }
+};
+
+template <typename Geometry1, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+struct within<Geometry1, boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> >
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Geometry1 const& m_geometry1;
+        Strategy const& m_strategy;
+
+        visitor(Geometry1 const& geometry1, Strategy const& strategy):
+        m_geometry1(geometry1),
+        m_strategy(strategy)
+        {}
+
+        template <typename Geometry2>
+        bool operator()(Geometry2 const& geometry2) const
+        {
+            return within<Geometry1, Geometry2>::apply(m_geometry1,
+                                                       geometry2,
+                                                       m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(Geometry1 const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)> const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(
+            visitor<Strategy>(geometry1, strategy),
+            geometry2
+        );
+    }
+};
+
+template <
+    BOOST_VARIANT_ENUM_PARAMS(typename T1),
+    BOOST_VARIANT_ENUM_PARAMS(typename T2)
+>
+struct within<
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)>,
+    boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)>
+>
+{
+    template <typename Strategy>
+    struct visitor: boost::static_visitor<bool>
+    {
+        Strategy const& m_strategy;
+
+        visitor(Strategy const& strategy): m_strategy(strategy) {}
+
+        template <typename Geometry1, typename Geometry2>
+        bool operator()(Geometry1 const& geometry1,
+                        Geometry2 const& geometry2) const
+        {
+            return within<Geometry1, Geometry2>::apply(geometry1,
+                                                       geometry2,
+                                                       m_strategy);
+        }
+    };
+
+    template <typename Strategy>
+    static inline bool
+    apply(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T1)> const& geometry1,
+          boost::variant<BOOST_VARIANT_ENUM_PARAMS(T2)> const& geometry2,
+          Strategy const& strategy)
+    {
+        return boost::apply_visitor(
+            visitor<Strategy>(strategy),
+            geometry1, geometry2
+        );
+    }
+};
+
+}
+
+
 /*!
 \brief \brief_check12{is completely inside}
 \ingroup within
@@ -263,36 +486,11 @@ struct within<Point, Polygon, point_tag, polygon_tag>
 template<typename Geometry1, typename Geometry2>
 inline bool within(Geometry1 const& geometry1, Geometry2 const& geometry2)
 {
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-    assert_dimension_equal<Geometry1, Geometry2>();
-
-    typedef typename point_type<Geometry1>::type point_type1;
-    typedef typename point_type<Geometry2>::type point_type2;
-
-    typedef typename strategy::within::services::default_strategy
-        <
-            typename tag<Geometry1>::type,
-            typename tag<Geometry2>::type,
-            typename tag<Geometry1>::type,
-            typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
-            typename tag_cast
-                <
-                    typename cs_tag<point_type1>::type, spherical_tag
-                >::type,
-            typename tag_cast
-                <
-                    typename cs_tag<point_type2>::type, spherical_tag
-                >::type,
-            Geometry1,
-            Geometry2
-        >::type strategy_type;
-
-    return dispatch::within
+    return resolve_variant::within
         <
             Geometry1,
             Geometry2
-        >::apply(geometry1, geometry2, strategy_type());
+        >::apply(geometry1, geometry2, default_strategy());
 }
 
 /*!
@@ -325,18 +523,7 @@ template<typename Geometry1, typename Geometry2, typename Strategy>
 inline bool within(Geometry1 const& geometry1, Geometry2 const& geometry2,
         Strategy const& strategy)
 {
-    concept::within::check
-        <
-            typename tag<Geometry1>::type, 
-            typename tag<Geometry2>::type, 
-            typename tag_cast<typename tag<Geometry2>::type, areal_tag>::type,
-            Strategy
-        >();
-    concept::check<Geometry1 const>();
-    concept::check<Geometry2 const>();
-    assert_dimension_equal<Geometry1, Geometry2>();
-
-    return dispatch::within
+    return resolve_variant::within
         <
             Geometry1,
             Geometry2
diff --git a/include/boost/geometry/arithmetic/arithmetic.hpp b/include/boost/geometry/arithmetic/arithmetic.hpp
index 6479ecc4a..9e325b09d 100644
--- a/include/boost/geometry/arithmetic/arithmetic.hpp
+++ b/include/boost/geometry/arithmetic/arithmetic.hpp
@@ -139,7 +139,7 @@ inline void add_value(Point& p, typename detail::param<Point>::type value)
 template <typename Point1, typename Point2>
 inline void add_point(Point1& p1, Point2 const& p2)
 {
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point2>) );
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point1>) );
     BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
 
     for_each_coordinate(p1, detail::point_operation<Point2, std::plus>(p2));
@@ -171,7 +171,7 @@ inline void subtract_value(Point& p, typename detail::param<Point>::type value)
 template <typename Point1, typename Point2>
 inline void subtract_point(Point1& p1, Point2 const& p2)
 {
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point2>) );
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point1>) );
     BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
 
     for_each_coordinate(p1, detail::point_operation<Point2, std::minus>(p2));
@@ -204,7 +204,7 @@ inline void multiply_value(Point& p, typename detail::param<Point>::type value)
 template <typename Point1, typename Point2>
 inline void multiply_point(Point1& p1, Point2 const& p2)
 {
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point2>) );
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point1>) );
     BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
 
     for_each_coordinate(p1, detail::point_operation<Point2, std::multiplies>(p2));
@@ -236,7 +236,7 @@ inline void divide_value(Point& p, typename detail::param<Point>::type value)
 template <typename Point1, typename Point2>
 inline void divide_point(Point1& p1, Point2 const& p2)
 {
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point2>) );
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point1>) );
     BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
 
     for_each_coordinate(p1, detail::point_operation<Point2, std::divides>(p2));
@@ -268,7 +268,7 @@ inline void assign_value(Point& p, typename detail::param<Point>::type value)
 template <typename Point1, typename Point2>
 inline void assign_point(Point1& p1, const Point2& p2)
 {
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point2>) );
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point1>) );
     BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point2>) );
 
     for_each_coordinate(p1, detail::point_assignment<Point2>(p2));
diff --git a/include/boost/geometry/arithmetic/determinant.hpp b/include/boost/geometry/arithmetic/determinant.hpp
index db3b86709..14edea718 100644
--- a/include/boost/geometry/arithmetic/determinant.hpp
+++ b/include/boost/geometry/arithmetic/determinant.hpp
@@ -62,7 +62,7 @@ inline ReturnType determinant(U const& u, V const& v)
 
     return calculate_determinant
         <
-            ReturnType, 
+            ReturnType,
             typename geometry::coordinate_type<U>::type,
             typename geometry::coordinate_type<V>::type
         >::apply(get<0>(u), get<1>(u), get<0>(v), get<1>(v));
diff --git a/include/boost/geometry/core/access.hpp b/include/boost/geometry/core/access.hpp
index 9ee33cd64..57f925763 100644
--- a/include/boost/geometry/core/access.hpp
+++ b/include/boost/geometry/core/access.hpp
@@ -303,7 +303,7 @@ inline void set(Geometry& geometry
         , typename coordinate_type<Geometry>::type const& value
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_dimension* dummy = 0
-#endif        
+#endif
         )
 {
     boost::ignore_unused_variable_warning(dummy);
@@ -338,7 +338,7 @@ template <std::size_t Index, std::size_t Dimension, typename Geometry>
 inline typename coordinate_type<Geometry>::type get(Geometry const& geometry
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         , detail::signature_getset_index_dimension* dummy = 0
-#endif        
+#endif
         )
 {
     boost::ignore_unused_variable_warning(dummy);
@@ -382,7 +382,7 @@ inline void set(Geometry& geometry
 
     typedef core_dispatch::indexed_access
         <
-            typename tag<Geometry>::type, 
+            typename tag<Geometry>::type,
             typename geometry::util::bare_type<Geometry>::type,
             typename coordinate_type<Geometry>::type,
             Index,
diff --git a/include/boost/geometry/core/closure.hpp b/include/boost/geometry/core/closure.hpp
index aab02e787..b61e352e9 100644
--- a/include/boost/geometry/core/closure.hpp
+++ b/include/boost/geometry/core/closure.hpp
@@ -14,10 +14,9 @@
 #ifndef BOOST_GEOMETRY_CORE_CLOSURE_HPP
 #define BOOST_GEOMETRY_CORE_CLOSURE_HPP
 
-
 #include <boost/mpl/assert.hpp>
-#include <boost/mpl/int.hpp>
-#include <boost/range.hpp>
+#include <boost/mpl/size_t.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -32,10 +31,10 @@ namespace boost { namespace geometry
 \brief Enumerates options for defining if polygons are open or closed
 \ingroup enum
 \details The enumeration closure_selector describes options for if a polygon is
-    open or closed. In a closed polygon the very first point (per ring) should 
+    open or closed. In a closed polygon the very first point (per ring) should
     be equal to the very last point.
-    The specific closing property of a polygon type is defined by the closure 
-    metafunction. The closure metafunction defines a value, which is one of the 
+    The specific closing property of a polygon type is defined by the closure
+    metafunction. The closure metafunction defines a value, which is one of the
     values enumerated in the closure_selector
 
 \qbk{
@@ -45,12 +44,12 @@ namespace boost { namespace geometry
 */
 enum closure_selector
 {
-    /// Rings are open: first point and last point are different, algorithms 
+    /// Rings are open: first point and last point are different, algorithms
     /// close them explicitly on the fly
     open = 0,
     /// Rings are closed: first point and last point must be the same
     closed = 1,
-    /// (Not yet implemented): algorithms first figure out if ring must be 
+    /// (Not yet implemented): algorithms first figure out if ring must be
     /// closed on the fly
     closure_undertermined = -1
 };
@@ -93,10 +92,10 @@ template <closure_selector Closure>
 struct minimum_ring_size {};
 
 template <>
-struct minimum_ring_size<geometry::closed> : boost::mpl::int_<4> {};
+struct minimum_ring_size<geometry::closed> : boost::mpl::size_t<4> {};
 
 template <>
-struct minimum_ring_size<geometry::open> : boost::mpl::int_<3> {};
+struct minimum_ring_size<geometry::open> : boost::mpl::size_t<3> {};
 
 
 }} // namespace detail::point_order
@@ -128,18 +127,18 @@ template <typename Box>
 struct closure<segment_tag, Box> : public core_detail::closure::closed {};
 
 template <typename LineString>
-struct closure<linestring_tag, LineString> 
+struct closure<linestring_tag, LineString>
     : public core_detail::closure::closed {};
 
 
 template <typename Ring>
 struct closure<ring_tag, Ring>
 {
-    static const closure_selector value 
+    static const closure_selector value
         = geometry::traits::closure<Ring>::value;
 };
 
-// Specialization for polygon: the closure is the closure of its rings
+// Specialization for Polygon: the closure is the closure of its rings
 template <typename Polygon>
 struct closure<polygon_tag, Polygon>
 {
@@ -150,13 +149,31 @@ struct closure<polygon_tag, Polygon>
         >::value ;
 };
 
+template <typename MultiPoint>
+struct closure<multi_point_tag, MultiPoint>
+    : public core_detail::closure::closed {};
+
+template <typename MultiLinestring>
+struct closure<multi_linestring_tag, MultiLinestring>
+    : public core_detail::closure::closed {};
+
+// Specialization for MultiPolygon: the closure is the closure of Polygon's rings
+template <typename MultiPolygon>
+struct closure<multi_polygon_tag, MultiPolygon>
+{
+    static const closure_selector value = core_dispatch::closure
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::value ;
+};
 
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
 /*!
-\brief \brief_meta{value, closure (clockwise\, counterclockwise), 
+\brief \brief_meta{value, closure (clockwise\, counterclockwise),
     \meta_geometry_type}
 \tparam Geometry \tparam_geometry
 \ingroup core
diff --git a/include/boost/geometry/core/cs.hpp b/include/boost/geometry/core/cs.hpp
index 3588ed1a8..dd120ffd3 100644
--- a/include/boost/geometry/core/cs.hpp
+++ b/include/boost/geometry/core/cs.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace geometry
 /*!
 \brief Unit of plane angle: Degrees
 \details Tag defining the unit of plane angle for spherical coordinate systems.
-    This tag specifies that coordinates are defined in degrees (-180 .. 180). 
+    This tag specifies that coordinates are defined in degrees (-180 .. 180).
     It has to be specified for some coordinate systems.
 \qbk{[include reference/core/degree_radian.qbk]}
 */
@@ -38,7 +38,7 @@ struct degree {};
 /*!
 \brief Unit of plane angle: Radians
 \details Tag defining the unit of plane angle for spherical coordinate systems.
-    This tag specifies that coordinates are defined in radians (-PI .. PI). 
+    This tag specifies that coordinates are defined in radians (-PI .. PI).
     It has to be specified for some coordinate systems.
 \qbk{[include reference/core/degree_radian.qbk]}
 */
@@ -106,7 +106,7 @@ struct spherical
 /*!
 \brief Spherical equatorial coordinate system, in degree or in radian
 \details This one resembles the geographic coordinate system, and has latitude
-    up from zero at the equator, to 90 at the pole 
+    up from zero at the equator, to 90 at the pole
     (opposite to the spherical(polar) coordinate system).
     Used in astronomy and in GIS (but there is also the geographic)
 
diff --git a/include/boost/geometry/core/geometry_id.hpp b/include/boost/geometry/core/geometry_id.hpp
index 369c5cfa1..5fc5a8005 100644
--- a/include/boost/geometry/core/geometry_id.hpp
+++ b/include/boost/geometry/core/geometry_id.hpp
@@ -18,8 +18,6 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/type_traits.hpp>
-
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -45,29 +43,40 @@ struct geometry_id
 
 
 template <>
-struct geometry_id<point_tag>      : boost::mpl::int_<1> {};
+struct geometry_id<point_tag>            : boost::mpl::int_<1> {};
 
 
 template <>
-struct geometry_id<linestring_tag> : boost::mpl::int_<2> {};
+struct geometry_id<linestring_tag>       : boost::mpl::int_<2> {};
 
 
 template <>
-struct geometry_id<polygon_tag>    : boost::mpl::int_<3> {};
+struct geometry_id<polygon_tag>          : boost::mpl::int_<3> {};
 
 
 template <>
-struct geometry_id<segment_tag>    : boost::mpl::int_<92> {};
+struct geometry_id<multi_point_tag>      : boost::mpl::int_<4> {};
 
 
 template <>
-struct geometry_id<ring_tag>       : boost::mpl::int_<93> {};
+struct geometry_id<multi_linestring_tag> : boost::mpl::int_<5> {};
 
 
 template <>
-struct geometry_id<box_tag>        : boost::mpl::int_<94> {};
+struct geometry_id<multi_polygon_tag>    : boost::mpl::int_<6> {};
 
 
+template <>
+struct geometry_id<segment_tag>          : boost::mpl::int_<92> {};
+
+
+template <>
+struct geometry_id<ring_tag>             : boost::mpl::int_<93> {};
+
+
+template <>
+struct geometry_id<box_tag>              : boost::mpl::int_<94> {};
+
 
 } // namespace core_dispatch
 #endif
@@ -76,9 +85,9 @@ struct geometry_id<box_tag>        : boost::mpl::int_<94> {};
 
 /*!
 \brief Meta-function returning the id of a geometry type
-\details The meta-function geometry_id defines a numerical ID (based on 
-    boost::mpl::int_<...> ) for each geometry concept. A numerical ID is 
-    sometimes useful, and within Boost.Geometry it is used for the 
+\details The meta-function geometry_id defines a numerical ID (based on
+    boost::mpl::int_<...> ) for each geometry concept. A numerical ID is
+    sometimes useful, and within Boost.Geometry it is used for the
     reverse_dispatch metafuntion.
 \note Used for e.g. reverse meta-function
 \ingroup core
diff --git a/include/boost/geometry/core/interior_rings.hpp b/include/boost/geometry/core/interior_rings.hpp
index 10af2ae4e..798f41577 100644
--- a/include/boost/geometry/core/interior_rings.hpp
+++ b/include/boost/geometry/core/interior_rings.hpp
@@ -17,7 +17,7 @@
 #include <cstddef>
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/tag.hpp>
@@ -85,6 +85,17 @@ struct interior_rings<polygon_tag, Polygon>
 };
 
 
+template <typename MultiPolygon>
+struct interior_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename core_dispatch::interior_type
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::type type;
+};
+
+
 } // namespace core_dispatch
 #endif
 
diff --git a/include/boost/geometry/core/is_areal.hpp b/include/boost/geometry/core/is_areal.hpp
index 5ddfa753b..23858605f 100644
--- a/include/boost/geometry/core/is_areal.hpp
+++ b/include/boost/geometry/core/is_areal.hpp
@@ -16,8 +16,7 @@
 #define BOOST_GEOMETRY_CORE_IS_AREAL_HPP
 
 
-#include <boost/type_traits.hpp>
-
+#include <boost/type_traits/integral_constant.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -36,7 +35,7 @@ template <typename GeometryTag> struct is_areal : boost::false_type {};
 template <> struct is_areal<ring_tag> : boost::true_type {};
 template <> struct is_areal<box_tag> : boost::true_type {};
 template <> struct is_areal<polygon_tag> : boost::true_type {};
-
+template <> struct is_areal<multi_polygon_tag> : boost::true_type {};
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/core/point_order.hpp b/include/boost/geometry/core/point_order.hpp
index f09086a9d..501dda777 100644
--- a/include/boost/geometry/core/point_order.hpp
+++ b/include/boost/geometry/core/point_order.hpp
@@ -16,7 +16,7 @@
 
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -29,10 +29,10 @@ namespace boost { namespace geometry
 /*!
 \brief Enumerates options for the order of points within polygons
 \ingroup enum
-\details The enumeration order_selector describes options for the order of 
-    points within a polygon. Polygons can be ordered either clockwise or 
-    counterclockwise. The specific order of a polygon type is defined by the 
-    point_order metafunction. The point_order metafunction defines a value, 
+\details The enumeration order_selector describes options for the order of
+    points within a polygon. Polygons can be ordered either clockwise or
+    counterclockwise. The specific order of a polygon type is defined by the
+    point_order metafunction. The point_order metafunction defines a value,
     which is one of the values enumerated in the order_selector
 
 \qbk{
@@ -120,7 +120,7 @@ struct point_order<linestring_tag, LineString>
 template <typename Ring>
 struct point_order<ring_tag, Ring>
 {
-    static const order_selector value 
+    static const order_selector value
         = geometry::traits::point_order<Ring>::value;
 };
 
@@ -135,12 +135,32 @@ struct point_order<polygon_tag, Polygon>
         >::value ;
 };
 
+template <typename MultiPoint>
+struct point_order<multi_point_tag, MultiPoint>
+    : public detail::point_order::clockwise {};
+
+template <typename MultiLinestring>
+struct point_order<multi_linestring_tag, MultiLinestring>
+    : public detail::point_order::clockwise {};
+
+
+// Specialization for multi_polygon: the order is the order of its polygons
+template <typename MultiPolygon>
+struct point_order<multi_polygon_tag, MultiPolygon>
+{
+    static const order_selector value = core_dispatch::point_order
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::value ;
+};
+
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
 /*!
-\brief \brief_meta{value, point order (clockwise\, counterclockwise), 
+\brief \brief_meta{value, point order (clockwise\, counterclockwise),
     \meta_geometry_type}
 \tparam Geometry \tparam_geometry
 \ingroup core
diff --git a/include/boost/geometry/core/point_type.hpp b/include/boost/geometry/core/point_type.hpp
index e148c84a5..f70e1fedd 100644
--- a/include/boost/geometry/core/point_type.hpp
+++ b/include/boost/geometry/core/point_type.hpp
@@ -16,7 +16,7 @@
 
 
 #include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
+#include <boost/range/value_type.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
@@ -102,13 +102,45 @@ struct point_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiPoint>
+struct point_type<multi_point_tag, MultiPoint>
+{
+    typedef typename boost::range_value
+        <
+            MultiPoint
+        >::type type;
+};
+
+
+template <typename MultiLinestring>
+struct point_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename point_type
+        <
+            linestring_tag,
+            typename boost::range_value<MultiLinestring>::type
+        >::type type;
+};
+
+
+template <typename MultiPolygon>
+struct point_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename point_type
+        <
+            polygon_tag,
+            typename boost::range_value<MultiPolygon>::type
+        >::type type;
+};
+
+
 } // namespace core_dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
 
 /*!
 \brief \brief_meta{type, point_type, \meta_geometry_type}
-\tparam Geometry \tparam_geometry 
+\tparam Geometry \tparam_geometry
 \ingroup core
 
 \qbk{[include reference/core/point_type.qbk]}
diff --git a/include/boost/geometry/core/ring_type.hpp b/include/boost/geometry/core/ring_type.hpp
index 9b984faf3..fe551f060 100644
--- a/include/boost/geometry/core/ring_type.hpp
+++ b/include/boost/geometry/core/ring_type.hpp
@@ -18,8 +18,10 @@
 
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/if.hpp>
+#include <boost/range/value_type.hpp>
+#include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/remove_const.hpp>
-
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
@@ -102,6 +104,38 @@ struct ring_return_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiLinestring>
+struct ring_return_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename ring_return_type
+        <
+            linestring_tag,
+            typename mpl::if_
+                <
+                    boost::is_const<MultiLinestring>,
+                    typename boost::range_value<MultiLinestring>::type const,
+                    typename boost::range_value<MultiLinestring>::type
+                >::type
+        >::type type;
+};
+
+
+template <typename MultiPolygon>
+struct ring_return_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename ring_return_type
+        <
+            polygon_tag,
+            typename mpl::if_
+                <
+                    boost::is_const<MultiPolygon>,
+                    typename boost::range_value<MultiPolygon>::type const,
+                    typename boost::range_value<MultiPolygon>::type
+                >::type
+        >::type type;
+};
+
+
 template <typename GeometryTag, typename Geometry>
 struct ring_type
 {};
@@ -124,8 +158,25 @@ struct ring_type<polygon_tag, Polygon>
 };
 
 
+template <typename MultiLinestring>
+struct ring_type<multi_linestring_tag, MultiLinestring>
+{
+    typedef typename boost::remove_reference
+        <
+            typename ring_return_type<multi_linestring_tag, MultiLinestring>::type
+        >::type type;
+};
 
 
+template <typename MultiPolygon>
+struct ring_type<multi_polygon_tag, MultiPolygon>
+{
+    typedef typename boost::remove_reference
+        <
+            typename ring_return_type<multi_polygon_tag, MultiPolygon>::type
+        >::type type;
+};
+
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/core/tag.hpp b/include/boost/geometry/core/tag.hpp
index 1687085a7..6bffcb932 100644
--- a/include/boost/geometry/core/tag.hpp
+++ b/include/boost/geometry/core/tag.hpp
@@ -14,7 +14,6 @@
 #ifndef BOOST_GEOMETRY_CORE_TAG_HPP
 #define BOOST_GEOMETRY_CORE_TAG_HPP
 
-
 #include <boost/mpl/assert.hpp>
 
 #include <boost/geometry/core/tags.hpp>
@@ -52,7 +51,7 @@ struct tag
 \brief \brief_meta{type, tag, \meta_geometry_type}
 \details With Boost.Geometry, tags are the driving force of the tag dispatching
     mechanism. The tag metafunction is therefore used in every free function.
-\tparam Geometry \tparam_geometry 
+\tparam Geometry \tparam_geometry
 \ingroup core
 
 \qbk{[include reference/core/tag.qbk]}
diff --git a/include/boost/geometry/core/tag_cast.hpp b/include/boost/geometry/core/tag_cast.hpp
index 47a2e834f..cafd13cba 100644
--- a/include/boost/geometry/core/tag_cast.hpp
+++ b/include/boost/geometry/core/tag_cast.hpp
@@ -25,10 +25,10 @@ namespace boost { namespace geometry
 \brief Metafunction defining a type being either the specified tag, or one
     of the specified basetags if the type inherits from them.
 \details Tags can inherit each other. A multi_point inherits, for example,
-    both the multi_tag and the pointlike tag. Often behaviour can be shared
+    both the multi_tag and the pointlike_tag. Often behaviour can be shared
     between different geometry types. A tag, found by the metafunction tag,
     can be casted to a more basic tag, and then dispatched by that tag.
-\ingroup core    
+\ingroup core
 \tparam Tag The tag to be casted to one of the base tags
 \tparam BaseTag First base tag
 \tparam BaseTag2 Optional second base tag
diff --git a/include/boost/geometry/core/tags.hpp b/include/boost/geometry/core/tags.hpp
index 9272858ed..160477b8c 100644
--- a/include/boost/geometry/core/tags.hpp
+++ b/include/boost/geometry/core/tags.hpp
@@ -57,7 +57,7 @@ struct linear_tag {};
 struct areal_tag {};
 
 // Subset of areal types (polygon, multi_polygon, ring)
-struct polygonal_tag : areal_tag {}; 
+struct polygonal_tag : areal_tag {};
 
 /// For volume types (also box (?), polyhedron)
 struct volumetric_tag {};
@@ -88,6 +88,49 @@ struct box_tag : single_tag, areal_tag {};
 struct segment_tag : single_tag, linear_tag {};
 
 
+/// OGC Multi point identifying tag
+struct multi_point_tag : multi_tag, pointlike_tag  {};
+
+/// OGC Multi linestring identifying tag
+struct multi_linestring_tag : multi_tag, linear_tag {};
+
+/// OGC Multi polygon identifying tag
+struct multi_polygon_tag : multi_tag, polygonal_tag {};
+
+/// OGC Geometry Collection identifying tag
+struct geometry_collection_tag : multi_tag {};
+
+
+/*!
+\brief Meta-function to get for a tag of a multi-geometry
+    the tag of the corresponding single-geometry
+*/
+template <typename Tag>
+struct single_tag_of
+{};
+
+#ifndef DOXYGEN_NO_DETAIL
+
+template <>
+struct single_tag_of<multi_point_tag>
+{
+    typedef point_tag type;
+};
+
+template <>
+struct single_tag_of<multi_linestring_tag>
+{
+    typedef linestring_tag type;
+};
+
+template <>
+struct single_tag_of<multi_polygon_tag>
+{
+    typedef polygon_tag type;
+};
+
+#endif
+
 
 }} // namespace boost::geometry
 
diff --git a/include/boost/geometry/core/topological_dimension.hpp b/include/boost/geometry/core/topological_dimension.hpp
index 02f1ed341..22ed676fc 100644
--- a/include/boost/geometry/core/topological_dimension.hpp
+++ b/include/boost/geometry/core/topological_dimension.hpp
@@ -49,10 +49,12 @@ struct top_dim<segment_tag>    : boost::mpl::int_<1> {};
 
 
 // ring: topological dimension of two, but some people say: 1 !!
+// NOTE: This is not OGC LinearRing!
 template <>
 struct top_dim<ring_tag>       : boost::mpl::int_<2> {};
 
 
+// TODO: This is wrong! Boxes may have various topological dimensions
 template <>
 struct top_dim<box_tag>        : boost::mpl::int_<2> {};
 
@@ -61,6 +63,17 @@ template <>
 struct top_dim<polygon_tag>    : boost::mpl::int_<2> {};
 
 
+template <>
+struct top_dim<multi_point_tag> : boost::mpl::int_<0> {};
+
+
+template <>
+struct top_dim<multi_linestring_tag> : boost::mpl::int_<1> {};
+
+
+template <>
+struct top_dim<multi_polygon_tag> : boost::mpl::int_<2> {};
+
 
 } // namespace core_dispatch
 #endif
diff --git a/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp b/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
index 93b21fee9..490fa45fe 100644
--- a/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
+++ b/include/boost/geometry/geometries/adapted/boost_polygon/ring.hpp
@@ -69,7 +69,26 @@ struct push_back<boost::polygon::polygon_data<CoordinateType> >
     }
 };
 
+template <typename CoordinateType>
+struct resize<boost::polygon::polygon_data<CoordinateType> >
+{
+    typedef boost::polygon::point_data<CoordinateType> point_type;
 
+    static inline void apply(boost::polygon::polygon_data<CoordinateType>& data,
+                             std::size_t new_size)
+    {
+        // Boost.Polygon's polygons are not resizable. So create a temporary vector,
+        // resize it and set it to the original. Of course: this is not efficient.
+        // But there seems no other way (without using a wrapper)
+        std::vector<point_type> temporary_vector
+            (
+                boost::polygon::begin_points(data),
+                boost::polygon::end_points(data)
+            );
+        temporary_vector.resize(new_size);
+        data.set(temporary_vector.begin(), temporary_vector.end());
+    }
+};
 
 
 } // namespace traits
diff --git a/include/boost/geometry/geometries/concepts/check.hpp b/include/boost/geometry/geometries/concepts/check.hpp
index 68cca9e98..07ef84f4a 100644
--- a/include/boost/geometry/geometries/concepts/check.hpp
+++ b/include/boost/geometry/geometries/concepts/check.hpp
@@ -18,13 +18,17 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/concept/requires.hpp>
-
 #include <boost/type_traits/is_const.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
 #include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/box_concept.hpp>
 #include <boost/geometry/geometries/concepts/linestring_concept.hpp>
+#include <boost/geometry/geometries/concepts/multi_point_concept.hpp>
+#include <boost/geometry/geometries/concepts/multi_linestring_concept.hpp>
+#include <boost/geometry/geometries/concepts/multi_polygon_concept.hpp>
 #include <boost/geometry/geometries/concepts/point_concept.hpp>
 #include <boost/geometry/geometries/concepts/polygon_concept.hpp>
 #include <boost/geometry/geometries/concepts/ring_concept.hpp>
@@ -32,8 +36,6 @@
 
 #include <boost/geometry/algorithms/not_implemented.hpp>
 
-#include <boost/variant/variant_fwd.hpp>
-
 namespace boost { namespace geometry
 {
 
@@ -57,7 +59,7 @@ class check
 namespace dispatch
 {
 
-template 
+template
 <
     typename Geometry,
     typename GeometryTag = typename geometry::tag<Geometry>::type,
@@ -138,6 +140,42 @@ struct check<Geometry, segment_tag, false>
 {};
 
 
+template <typename Geometry>
+struct check<Geometry, multi_point_tag, true>
+    : detail::concept_check::check<concept::ConstMultiPoint<Geometry> >
+{};
+
+
+template <typename Geometry>
+struct check<Geometry, multi_point_tag, false>
+    : detail::concept_check::check<concept::MultiPoint<Geometry> >
+{};
+
+
+template <typename Geometry>
+struct check<Geometry, multi_linestring_tag, true>
+    : detail::concept_check::check<concept::ConstMultiLinestring<Geometry> >
+{};
+
+
+template <typename Geometry>
+struct check<Geometry, multi_linestring_tag, false>
+    : detail::concept_check::check<concept::MultiLinestring<Geometry> >
+{};
+
+
+template <typename Geometry>
+struct check<Geometry, multi_polygon_tag, true>
+    : detail::concept_check::check<concept::ConstMultiPolygon<Geometry> >
+{};
+
+
+template <typename Geometry>
+struct check<Geometry, multi_polygon_tag, false>
+    : detail::concept_check::check<concept::MultiPolygon<Geometry> >
+{};
+
+
 } // namespace dispatch
 #endif
 
diff --git a/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp b/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp
new file mode 100644
index 000000000..f13f7ac7e
--- /dev/null
+++ b/include/boost/geometry/geometries/concepts/multi_linestring_concept.hpp
@@ -0,0 +1,91 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
+
+
+#include <boost/concept_check.hpp>
+#include <boost/range/concepts.hpp>
+#include <boost/range/metafunctions.hpp>
+
+
+#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
+
+
+namespace boost { namespace geometry { namespace concept
+{
+
+
+/*!
+\brief multi-linestring concept
+\ingroup concepts
+\par Formal definition:
+The multi linestring concept is defined as following:
+- there must be a specialization of traits::tag defining multi_linestring_tag as
+  type
+- it must behave like a Boost.Range
+- its range value must fulfil the Linestring concept
+
+*/
+template <typename Geometry>
+class MultiLinestring
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type linestring_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::Linestring<linestring_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(MultiLinestring)
+    {
+        Geometry* mls = 0;
+        traits::clear<Geometry>::apply(*mls);
+        traits::resize<Geometry>::apply(*mls, 0);
+        linestring_type* ls = 0;
+        traits::push_back<Geometry>::apply(*mls, *ls);
+    }
+#endif
+};
+
+
+/*!
+\brief concept for multi-linestring (const version)
+\ingroup const_concepts
+*/
+template <typename Geometry>
+class ConstMultiLinestring
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type linestring_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::ConstLinestring<linestring_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(ConstMultiLinestring)
+    {
+    }
+#endif
+};
+
+}}} // namespace boost::geometry::concept
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
diff --git a/include/boost/geometry/geometries/concepts/multi_point_concept.hpp b/include/boost/geometry/geometries/concepts/multi_point_concept.hpp
new file mode 100644
index 000000000..81c087166
--- /dev/null
+++ b/include/boost/geometry/geometries/concepts/multi_point_concept.hpp
@@ -0,0 +1,90 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
+
+
+#include <boost/concept_check.hpp>
+#include <boost/range/concepts.hpp>
+#include <boost/range/metafunctions.hpp>
+
+
+#include <boost/geometry/geometries/concepts/point_concept.hpp>
+
+
+namespace boost { namespace geometry { namespace concept
+{
+
+
+/*!
+\brief MultiPoint concept
+\ingroup concepts
+\par Formal definition:
+The multi point concept is defined as following:
+- there must be a specialization of traits::tag defining multi_point_tag as type
+- it must behave like a Boost.Range
+- its range value must fulfil the Point concept
+
+*/
+template <typename Geometry>
+class MultiPoint
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type point_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::Point<point_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(MultiPoint)
+    {
+        Geometry* mp = 0;
+        traits::clear<Geometry>::apply(*mp);
+        traits::resize<Geometry>::apply(*mp, 0);
+        point_type* point = 0;
+        traits::push_back<Geometry>::apply(*mp, *point);
+    }
+#endif
+};
+
+
+/*!
+\brief concept for multi-point (const version)
+\ingroup const_concepts
+*/
+template <typename Geometry>
+class ConstMultiPoint
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type point_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::ConstPoint<point_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(ConstMultiPoint)
+    {
+    }
+#endif
+};
+
+}}} // namespace boost::geometry::concept
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
diff --git a/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp b/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp
new file mode 100644
index 000000000..b13d330f3
--- /dev/null
+++ b/include/boost/geometry/geometries/concepts/multi_polygon_concept.hpp
@@ -0,0 +1,91 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
+
+
+#include <boost/concept_check.hpp>
+#include <boost/range/concepts.hpp>
+#include <boost/range/metafunctions.hpp>
+
+#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
+
+
+namespace boost { namespace geometry { namespace concept
+{
+
+
+/*!
+\brief multi-polygon concept
+\ingroup concepts
+\par Formal definition:
+The multi polygon concept is defined as following:
+- there must be a specialization of traits::tag defining multi_polygon_tag
+  as type
+- it must behave like a Boost.Range
+- its range value must fulfil the Polygon concept
+
+*/
+template <typename Geometry>
+class MultiPolygon
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type polygon_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::Polygon<polygon_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(MultiPolygon)
+    {
+        Geometry* mp = 0;
+        traits::clear<Geometry>::apply(*mp);
+        traits::resize<Geometry>::apply(*mp, 0);
+        polygon_type* poly = 0;
+        traits::push_back<Geometry>::apply(*mp, *poly);
+    }
+#endif
+};
+
+
+/*!
+\brief concept for multi-polygon (const version)
+\ingroup const_concepts
+*/
+template <typename Geometry>
+class ConstMultiPolygon
+{
+#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
+    typedef typename boost::range_value<Geometry>::type polygon_type;
+
+    BOOST_CONCEPT_ASSERT( (concept::ConstPolygon<polygon_type>) );
+    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
+
+
+public :
+
+    BOOST_CONCEPT_USAGE(ConstMultiPolygon)
+    {
+    }
+#endif
+};
+
+
+}}} // namespace boost::geometry::concept
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
diff --git a/include/boost/geometry/geometries/geometries.hpp b/include/boost/geometry/geometries/geometries.hpp
index cda55c1d2..de9e2b1fd 100644
--- a/include/boost/geometry/geometries/geometries.hpp
+++ b/include/boost/geometry/geometries/geometries.hpp
@@ -18,6 +18,10 @@
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
+
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/segment.hpp>
diff --git a/include/boost/geometry/geometries/multi_linestring.hpp b/include/boost/geometry/geometries/multi_linestring.hpp
new file mode 100644
index 000000000..2ba8e7196
--- /dev/null
+++ b/include/boost/geometry/geometries/multi_linestring.hpp
@@ -0,0 +1,80 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_MULTI_LINESTRING_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_MULTI_LINESTRING_HPP
+
+#include <memory>
+#include <vector>
+
+#include <boost/concept/requires.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace model
+{
+
+/*!
+\brief multi_line, a collection of linestring
+\details Multi-linestring can be used to group lines belonging to each other,
+        e.g. a highway (with interruptions)
+\ingroup geometries
+
+\qbk{before.synopsis,
+[heading Model of]
+[link geometry.reference.concepts.concept_multi_linestring MultiLineString Concept]
+}
+*/
+template
+<
+    typename LineString,
+    template<typename, typename> class Container = std::vector,
+    template<typename> class Allocator = std::allocator
+>
+class multi_linestring : public Container<LineString, Allocator<LineString> >
+{
+    BOOST_CONCEPT_ASSERT( (concept::Linestring<LineString>) );
+};
+
+
+} // namespace model
+
+
+#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+namespace traits
+{
+
+template
+<
+    typename LineString,
+    template<typename, typename> class Container,
+    template<typename> class Allocator
+>
+struct tag< model::multi_linestring<LineString, Container, Allocator> >
+{
+    typedef multi_linestring_tag type;
+};
+
+} // namespace traits
+#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_MULTI_LINESTRING_HPP
diff --git a/include/boost/geometry/geometries/multi_point.hpp b/include/boost/geometry/geometries/multi_point.hpp
new file mode 100644
index 000000000..d0a782a1d
--- /dev/null
+++ b/include/boost/geometry/geometries/multi_point.hpp
@@ -0,0 +1,94 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_MULTI_POINT_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_MULTI_POINT_HPP
+
+#include <memory>
+#include <vector>
+
+#include <boost/concept/requires.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/point_concept.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace model
+{
+
+
+/*!
+\brief multi_point, a collection of points
+\ingroup geometries
+\tparam Point \tparam_point
+\tparam Container \tparam_container
+\tparam Allocator \tparam_allocator
+\details Multipoint can be used to group points belonging to each other,
+        e.g. a constellation, or the result set of an intersection
+\qbk{before.synopsis,
+[heading Model of]
+[link geometry.reference.concepts.concept_multi_point MultiPoint Concept]
+}
+*/
+template
+<
+    typename Point,
+    template<typename, typename> class Container = std::vector,
+    template<typename> class Allocator = std::allocator
+>
+class multi_point : public Container<Point, Allocator<Point> >
+{
+    BOOST_CONCEPT_ASSERT( (concept::Point<Point>) );
+
+    typedef Container<Point, Allocator<Point> > base_type;
+
+public :
+    /// \constructor_default{multi_point}
+    inline multi_point()
+        : base_type()
+    {}
+
+    /// \constructor_begin_end{multi_point}
+    template <typename Iterator>
+    inline multi_point(Iterator begin, Iterator end)
+        : base_type(begin, end)
+    {}
+};
+
+} // namespace model
+
+
+#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+namespace traits
+{
+
+template
+<
+    typename Point,
+    template<typename, typename> class Container,
+    template<typename> class Allocator
+>
+struct tag< model::multi_point<Point, Container, Allocator> >
+{
+    typedef multi_point_tag type;
+};
+
+} // namespace traits
+#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_MULTI_POINT_HPP
diff --git a/include/boost/geometry/geometries/multi_polygon.hpp b/include/boost/geometry/geometries/multi_polygon.hpp
new file mode 100644
index 000000000..228074cd3
--- /dev/null
+++ b/include/boost/geometry/geometries/multi_polygon.hpp
@@ -0,0 +1,77 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_MULTI_POLYGON_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_MULTI_POLYGON_HPP
+
+#include <memory>
+#include <vector>
+
+#include <boost/concept/requires.hpp>
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace model
+{
+
+/*!
+\brief multi_polygon, a collection of polygons
+\details Multi-polygon can be used to group polygons belonging to each other,
+        e.g. Hawaii
+\ingroup geometries
+
+\qbk{before.synopsis,
+[heading Model of]
+[link geometry.reference.concepts.concept_multi_polygon MultiPolygon Concept]
+}
+*/
+template
+<
+    typename Polygon,
+    template<typename, typename> class Container = std::vector,
+    template<typename> class Allocator = std::allocator
+>
+class multi_polygon : public Container<Polygon, Allocator<Polygon> >
+{
+    BOOST_CONCEPT_ASSERT( (concept::Polygon<Polygon>) );
+};
+
+
+} // namespace model
+
+
+#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+namespace traits
+{
+
+template
+<
+    typename Polygon,
+    template<typename, typename> class Container,
+    template<typename> class Allocator
+>
+struct tag< model::multi_polygon<Polygon, Container, Allocator> >
+{
+    typedef multi_polygon_tag type;
+};
+
+} // namespace traits
+#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_MULTI_POLYGON_HPP
diff --git a/include/boost/geometry/geometries/point.hpp b/include/boost/geometry/geometries/point.hpp
index 1a6382082..a25340c46 100644
--- a/include/boost/geometry/geometries/point.hpp
+++ b/include/boost/geometry/geometries/point.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace geometry
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4127)
 #endif
 
diff --git a/include/boost/geometry/geometries/register/box.hpp b/include/boost/geometry/geometries/register/box.hpp
index 838c2bb5f..71a7077a6 100644
--- a/include/boost/geometry/geometries/register/box.hpp
+++ b/include/boost/geometry/geometries/register/box.hpp
@@ -105,7 +105,7 @@ template <> struct indexed_access<Box, max_corner, 1> \
 /*!
 \brief \brief_macro{box}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX, box} The 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX, box} The
     box may contain template parameters, which must be specified then.
 \param Box \param_macro_type{Box}
 \param Point Point type on which box is based. Might be two or three-dimensional
@@ -128,7 +128,7 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{box}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX_TEMPLATED, box} 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX_TEMPLATED, box}
     \details_macro_templated{box, point}
 \param Box \param_macro_type{Box}
 \param MinCorner minimum corner (should be public member or method)
@@ -149,10 +149,10 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{box}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX_2D_4VALUES, box} 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_BOX_2D_4VALUES, box}
 \param Box \param_macro_type{Box}
 \param Point Point type reported as point_type by box. Must be two dimensional.
-    Note that these box tyeps do not contain points, but they must have a 
+    Note that these box tyeps do not contain points, but they must have a
     related point_type
 \param Left Left side (must be public member or method)
 \param Bottom Bottom side (must be public member or method)
diff --git a/include/boost/geometry/geometries/register/linestring.hpp b/include/boost/geometry/geometries/register/linestring.hpp
index b06439874..cfc7dcaed 100644
--- a/include/boost/geometry/geometries/register/linestring.hpp
+++ b/include/boost/geometry/geometries/register/linestring.hpp
@@ -22,7 +22,7 @@
 /*!
 \brief \brief_macro{linestring}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING, linestring} The 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING, linestring} The
     linestring may contain template parameters, which must be specified then.
 \param Linestring \param_macro_type{linestring}
 
@@ -41,7 +41,7 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{templated linestring}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED, templated linestring} 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED, templated linestring}
     \details_macro_templated{linestring, point}
 \param Linestring \param_macro_type{linestring (without template parameters)}
 
diff --git a/include/boost/geometry/geometries/register/multi_linestring.hpp b/include/boost/geometry/geometries/register/multi_linestring.hpp
new file mode 100644
index 000000000..ad11289d1
--- /dev/null
+++ b/include/boost/geometry/geometries/register/multi_linestring.hpp
@@ -0,0 +1,59 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+/*!
+\brief \brief_macro{multi_linestring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING, multi_linestring} The
+    multi_linestring may contain template parameters, which must be specified then.
+\param MultiLineString \param_macro_type{multi_linestring}
+
+\qbk{
+[heading Example]
+[register_multi_linestring]
+[register_multi_linestring_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING(MultiLineString) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<> struct tag<MultiLineString> { typedef multi_linestring_tag type; }; \
+}}}
+
+
+/*!
+\brief \brief_macro{templated multi_linestring}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING_TEMPLATED, templated multi_linestring}
+    \details_macro_templated{multi_linestring, linestring}
+\param MultiLineString \param_macro_type{multi_linestring (without template parameters)}
+
+\qbk{
+[heading Example]
+[register_multi_linestring_templated]
+[register_multi_linestring_templated_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING_TEMPLATED(MultiLineString) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<typename LineString> struct tag< MultiLineString<LineString> > { typedef multi_linestring_tag type; }; \
+}}}
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
diff --git a/include/boost/geometry/geometries/register/multi_point.hpp b/include/boost/geometry/geometries/register/multi_point.hpp
new file mode 100644
index 000000000..4e875ae0c
--- /dev/null
+++ b/include/boost/geometry/geometries/register/multi_point.hpp
@@ -0,0 +1,59 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POINT_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POINT_HPP
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+/*!
+\brief \brief_macro{multi_point}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POINT, multi_point} The
+    multi_point may contain template parameters, which must be specified then.
+\param MultiPoint \param_macro_type{multi_point}
+
+\qbk{
+[heading Example]
+[register_multi_point]
+[register_multi_point_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_POINT(MultiPoint) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<> struct tag<MultiPoint> { typedef multi_point_tag type; }; \
+}}}
+
+
+/*!
+\brief \brief_macro{templated multi_point}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED, templated multi_point}
+    \details_macro_templated{multi_point, point}
+\param MultiPoint \param_macro_type{multi_point (without template parameters)}
+
+\qbk{
+[heading Example]
+[register_multi_point_templated]
+[register_multi_point_templated_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED(MultiPoint) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<typename Point> struct tag< MultiPoint<Point> > { typedef multi_point_tag type; }; \
+}}}
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POINT_HPP
diff --git a/include/boost/geometry/geometries/register/multi_polygon.hpp b/include/boost/geometry/geometries/register/multi_polygon.hpp
new file mode 100644
index 000000000..1c3818b55
--- /dev/null
+++ b/include/boost/geometry/geometries/register/multi_polygon.hpp
@@ -0,0 +1,59 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#ifndef BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
+#define BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+/*!
+\brief \brief_macro{multi_polygon}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POLYGON, multi_polygon} The
+    multi_polygon may contain template parameters, which must be specified then.
+\param MultiPolygon \param_macro_type{multi_polygon}
+
+\qbk{
+[heading Example]
+[register_multi_polygon]
+[register_multi_polygon_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_POLYGON(MultiPolygon) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<> struct tag<MultiPolygon> { typedef multi_polygon_tag type; }; \
+}}}
+
+
+/*!
+\brief \brief_macro{templated multi_polygon}
+\ingroup register
+\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POLYGON_TEMPLATED, templated multi_polygon}
+    \details_macro_templated{multi_polygon, polygon}
+\param MultiPolygon \param_macro_type{multi_polygon (without template parameters)}
+
+\qbk{
+[heading Example]
+[register_multi_polygon_templated]
+[register_multi_polygon_templated_output]
+}
+*/
+#define BOOST_GEOMETRY_REGISTER_MULTI_POLYGON_TEMPLATED(MultiPolygon) \
+namespace boost { namespace geometry { namespace traits {  \
+    template<typename Polygon> struct tag< MultiPolygon<Polygon> > { typedef multi_polygon_tag type; }; \
+}}}
+
+
+#endif // BOOST_GEOMETRY_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
diff --git a/include/boost/geometry/geometries/register/ring.hpp b/include/boost/geometry/geometries/register/ring.hpp
index fb6cb6720..761e46fbc 100644
--- a/include/boost/geometry/geometries/register/ring.hpp
+++ b/include/boost/geometry/geometries/register/ring.hpp
@@ -22,7 +22,7 @@
 /*!
 \brief \brief_macro{ring}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_RING, ring} The 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_RING, ring} The
     ring may contain template parameters, which must be specified then.
 \param Ring \param_macro_type{ring}
 
@@ -41,7 +41,7 @@ namespace boost { namespace geometry { namespace traits {  \
 /*!
 \brief \brief_macro{templated ring}
 \ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_RING_TEMPLATED, templated ring} 
+\details \details_macro{BOOST_GEOMETRY_REGISTER_RING_TEMPLATED, templated ring}
     \details_macro_templated{ring, point}
 \param Ring \param_macro_type{ring (without template parameters)}
 
diff --git a/include/boost/geometry/geometry.hpp b/include/boost/geometry/geometry.hpp
index dce17e260..e17ace409 100644
--- a/include/boost/geometry/geometry.hpp
+++ b/include/boost/geometry/geometry.hpp
@@ -45,6 +45,7 @@
 #include <boost/geometry/algorithms/convex_hull.hpp>
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/crosses.hpp>
 #include <boost/geometry/algorithms/difference.hpp>
 #include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/distance.hpp>
@@ -61,6 +62,7 @@
 #include <boost/geometry/algorithms/num_points.hpp>
 #include <boost/geometry/algorithms/overlaps.hpp>
 #include <boost/geometry/algorithms/perimeter.hpp>
+#include <boost/geometry/algorithms/remove_spikes.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
 #include <boost/geometry/algorithms/sym_difference.hpp>
diff --git a/include/boost/geometry/index/detail/algorithms/bounds.hpp b/include/boost/geometry/index/detail/algorithms/bounds.hpp
index 58c575d26..4d2416e98 100644
--- a/include/boost/geometry/index/detail/algorithms/bounds.hpp
+++ b/include/boost/geometry/index/detail/algorithms/bounds.hpp
@@ -2,7 +2,7 @@
 //
 // n-dimensional bounds
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,6 +11,8 @@
 #ifndef BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_BOUNDS_HPP
 #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_BOUNDS_HPP
 
+#include <boost/geometry/index/detail/bounded_view.hpp>
+
 namespace boost { namespace geometry { namespace index { namespace detail {
 
 namespace dispatch {
@@ -27,6 +29,16 @@ struct bounds
     }
 };
 
+template <typename Geometry, typename Bounds>
+struct bounds<Geometry, Bounds, segment_tag, box_tag>
+{
+    static inline void apply(Geometry const& g, Bounds & b)
+    {
+        index::detail::bounded_view<Geometry, Bounds> v(g);
+        geometry::convert(v, b);
+    }
+};
+
 } // namespace dispatch
 
 template <typename Geometry, typename Bounds>
@@ -36,6 +48,43 @@ inline void bounds(Geometry const& g, Bounds & b)
     dispatch::bounds<Geometry, Bounds>::apply(g, b);
 }
 
+namespace dispatch {
+
+template <typename Geometry,
+          typename TagGeometry = typename geometry::tag<Geometry>::type>
+struct return_ref_or_bounds
+{
+    typedef Geometry const& result_type;
+
+    static inline result_type apply(Geometry const& g)
+    {
+        return g;
+    }
+};
+
+template <typename Geometry>
+struct return_ref_or_bounds<Geometry, segment_tag>
+{
+    typedef typename point_type<Geometry>::type point_type;
+    typedef geometry::model::box<point_type> bounds_type;
+    typedef index::detail::bounded_view<Geometry, bounds_type> result_type;
+
+    static inline result_type apply(Geometry const& g)
+    {
+        return result_type(g);
+    }
+};
+
+} // namespace dispatch
+
+template <typename Geometry>
+inline
+typename dispatch::return_ref_or_bounds<Geometry>::result_type
+return_ref_or_bounds(Geometry const& g)
+{
+    return dispatch::return_ref_or_bounds<Geometry>::apply(g);
+}
+
 }}}} // namespace boost::geometry::index::detail
 
 #endif // BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_BOUNDS_HPP
diff --git a/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
index 841876eb3..c4e44cae1 100644
--- a/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
+++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_centroid.hpp
@@ -2,7 +2,7 @@
 //
 // squared distance between point and centroid of the box or point
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -24,7 +24,7 @@ template <
     size_t N>
 struct sum_for_indexable<Point, PointIndexable, point_tag, comparable_distance_centroid_tag, N>
 {
-    typedef typename geometry::default_distance_result<Point, PointIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, PointIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, PointIndexable const& i)
     {
@@ -38,7 +38,7 @@ template <
     size_t DimensionIndex>
 struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_distance_centroid_tag, DimensionIndex>
 {
-    typedef typename geometry::default_distance_result<Point, BoxIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, BoxIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, BoxIndexable const& i)
     {
@@ -59,7 +59,7 @@ struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_dist
 };
 
 template <typename Point, typename Indexable>
-typename geometry::default_distance_result<Point, Indexable>::type
+typename geometry::default_comparable_distance_result<Point, Indexable>::type
 comparable_distance_centroid(Point const& pt, Indexable const& i)
 {
     return detail::sum_for_indexable<
diff --git a/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
index 07dfcfc0f..214fbf6aa 100644
--- a/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
+++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_far.hpp
@@ -2,7 +2,7 @@
 //
 // squared distance between point and furthest point of the box or point
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -26,7 +26,7 @@ template <
     size_t DimensionIndex>
 struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_distance_far_tag, DimensionIndex>
 {
-    typedef typename geometry::default_distance_result<Point, BoxIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, BoxIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, BoxIndexable const& i)
     {
@@ -49,7 +49,7 @@ struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_dist
 };
 
 template <typename Point, typename Indexable>
-typename geometry::default_distance_result<Point, Indexable>::type
+typename geometry::default_comparable_distance_result<Point, Indexable>::type
 comparable_distance_far(Point const& pt, Indexable const& i)
 {
     return detail::sum_for_indexable<
diff --git a/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp b/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
index 5584bf85e..15368a7d2 100644
--- a/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
+++ b/include/boost/geometry/index/detail/algorithms/comparable_distance_near.hpp
@@ -2,7 +2,7 @@
 //
 // squared distance between point and nearest point of the box or point
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -23,7 +23,7 @@ template <
     size_t N>
 struct sum_for_indexable<Point, PointIndexable, point_tag, comparable_distance_near_tag, N>
 {
-    typedef typename geometry::default_distance_result<Point, PointIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, PointIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, PointIndexable const& i)
     {
@@ -37,7 +37,7 @@ template <
     size_t DimensionIndex>
 struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_distance_near_tag, DimensionIndex>
 {
-    typedef typename geometry::default_distance_result<Point, BoxIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, BoxIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, BoxIndexable const& i)
     {
@@ -60,7 +60,7 @@ struct sum_for_indexable_dimension<Point, BoxIndexable, box_tag, comparable_dist
 };
 
 template <typename Point, typename Indexable>
-typename geometry::default_distance_result<Point, Indexable>::type
+typename geometry::default_comparable_distance_result<Point, Indexable>::type
 comparable_distance_near(Point const& pt, Indexable const& i)
 {
     return detail::sum_for_indexable<
diff --git a/include/boost/geometry/index/detail/algorithms/intersection_content.hpp b/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
index 955d6eb65..8e3db4530 100644
--- a/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
+++ b/include/boost/geometry/index/detail/algorithms/intersection_content.hpp
@@ -2,7 +2,7 @@
 //
 // boxes union/intersection area/volume
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,6 +12,7 @@
 #define BOOST_GEOMETRY_INDEX_DETAIL_ALGORITHMS_INTERSECTION_CONTENT_HPP
 
 #include <boost/geometry/algorithms/intersection.hpp>
+#include <boost/geometry/strategies/intersection.hpp>
 #include <boost/geometry/index/detail/algorithms/content.hpp>
 
 namespace boost { namespace geometry { namespace index { namespace detail {
diff --git a/include/boost/geometry/index/detail/algorithms/is_valid.hpp b/include/boost/geometry/index/detail/algorithms/is_valid.hpp
index 56c164dae..ee42e3936 100644
--- a/include/boost/geometry/index/detail/algorithms/is_valid.hpp
+++ b/include/boost/geometry/index/detail/algorithms/is_valid.hpp
@@ -2,7 +2,7 @@
 //
 // n-dimensional box's / point validity check
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -66,6 +66,15 @@ struct is_valid<Indexable, box_tag>
     }
 };
 
+template <typename Indexable>
+struct is_valid<Indexable, segment_tag>
+{
+    static inline bool apply(Indexable const&)
+    {
+        return true;
+    }
+};
+
 } // namespace dispatch
 
 template <typename Indexable>
diff --git a/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp b/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
index 680fb202b..ab6291504 100644
--- a/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
+++ b/include/boost/geometry/index/detail/algorithms/minmaxdist.hpp
@@ -2,7 +2,7 @@
 //
 // minmaxdist used in R-tree k nearest neighbors query
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -28,7 +28,7 @@ template <
     size_t DimensionIndex>
 struct smallest_for_indexable_dimension<Point, BoxIndexable, box_tag, minmaxdist_tag, DimensionIndex>
 {
-    typedef typename geometry::default_distance_result<Point, BoxIndexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, BoxIndexable>::type result_type;
 
     inline static result_type apply(Point const& pt, BoxIndexable const& i, result_type const& maxd)
     {
@@ -73,7 +73,7 @@ struct minmaxdist_impl
 template <typename Point, typename Indexable>
 struct minmaxdist_impl<Point, Indexable, point_tag>
 {
-    typedef typename geometry::default_distance_result<Point, Indexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, Indexable>::type result_type;
 
     inline static result_type apply(Point const& pt, Indexable const& i)
     {
@@ -84,7 +84,7 @@ struct minmaxdist_impl<Point, Indexable, point_tag>
 template <typename Point, typename Indexable>
 struct minmaxdist_impl<Point, Indexable, box_tag>
 {
-    typedef typename geometry::default_distance_result<Point, Indexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<Point, Indexable>::type result_type;
 
     inline static result_type apply(Point const& pt, Indexable const& i)
     {
@@ -104,7 +104,7 @@ struct minmaxdist_impl<Point, Indexable, box_tag>
  * This is comparable distace.
  */
 template <typename Point, typename Indexable>
-typename geometry::default_distance_result<Point, Indexable>::type
+typename geometry::default_comparable_distance_result<Point, Indexable>::type
 minmaxdist(Point const& pt, Indexable const& i)
 {
     return detail::minmaxdist_impl<
diff --git a/include/boost/geometry/index/detail/algorithms/path_intersection.hpp b/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
index a9e0f3dcb..fe92596ba 100644
--- a/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
+++ b/include/boost/geometry/index/detail/algorithms/path_intersection.hpp
@@ -2,7 +2,7 @@
 //
 // n-dimensional box-linestring intersection
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -23,6 +23,11 @@ struct path_intersection
     BOOST_MPL_ASSERT_MSG((false), NOT_IMPLEMENTED_FOR_THIS_GEOMETRY_OR_INDEXABLE, (path_intersection));
 };
 
+// TODO: FP type must be used as a relative distance type!
+// and default_distance_result can be some user-defined int type
+// BUT! This code is experimental and probably won't be released at all
+// since more flexible user-defined-nearest predicate should be added instead
+
 template <typename Indexable, typename Segment>
 struct path_intersection<Indexable, Segment, box_tag, segment_tag>
 {
diff --git a/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp b/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
index a6ad30181..ec7a88f49 100644
--- a/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
+++ b/include/boost/geometry/index/detail/algorithms/segment_intersection.hpp
@@ -2,7 +2,7 @@
 //
 // n-dimensional box-segment intersection
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -110,6 +110,9 @@ struct segment_intersection<Indexable, Point, box_tag>
     template <typename RelativeDistance>
     static inline bool apply(Indexable const& b, Point const& p0, Point const& p1, RelativeDistance & relative_distance)
     {
+
+// TODO: this ASSERT CHECK is wrong for user-defined CoordinateTypes!
+
         static const bool check = !::boost::is_integral<RelativeDistance>::value;
         BOOST_MPL_ASSERT_MSG(check, RELATIVE_DISTANCE_MUST_BE_FLOATING_POINT_TYPE, (RelativeDistance));
 
diff --git a/include/boost/geometry/index/detail/bounded_view.hpp b/include/boost/geometry/index/detail/bounded_view.hpp
new file mode 100644
index 000000000..572368e27
--- /dev/null
+++ b/include/boost/geometry/index/detail/bounded_view.hpp
@@ -0,0 +1,185 @@
+// Boost.Geometry Index
+//
+// This view makes possible to treat some simple primitives as its bounding geometry
+// e.g. box, nsphere, etc.
+//
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+//
+// 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)
+
+#ifndef BOOST_GEOMETRY_INDEX_DETAIL_BOUNDED_VIEW_HPP
+#define BOOST_GEOMETRY_INDEX_DETAIL_BOUNDED_VIEW_HPP
+
+namespace boost { namespace geometry {
+
+namespace index { namespace detail {
+
+template <typename Geometry,
+          typename BoundingGeometry,
+          typename Tag = typename geometry::tag<Geometry>::type,
+          typename BoundingTag = typename geometry::tag<BoundingGeometry>::type>
+struct bounded_view
+{
+    BOOST_MPL_ASSERT_MSG(
+        (false),
+        NOT_IMPLEMENTED_FOR_THOSE_GEOMETRIES,
+        (BoundingTag, Tag));
+};
+
+
+// Segment -> Box
+
+template <typename Segment, typename Box>
+struct bounded_view<Segment, Box, segment_tag, box_tag>
+{
+public:
+    typedef typename geometry::coordinate_type<Box>::type coordinate_type;
+
+    explicit bounded_view(Segment const& segment)
+        : m_segment(segment)
+    {}
+    
+    template <std::size_t Dimension>
+    inline coordinate_type get_min() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                (std::min)( geometry::get<0, Dimension>(m_segment),
+                            geometry::get<1, Dimension>(m_segment) ) );
+    }
+
+    template <std::size_t Dimension>
+    inline coordinate_type get_max() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                (std::max)( geometry::get<0, Dimension>(m_segment),
+                            geometry::get<1, Dimension>(m_segment) ) );
+    }
+
+private:
+    Segment const& m_segment;
+};
+
+// Box -> Box
+
+template <typename BoxIn, typename Box>
+struct bounded_view<BoxIn, Box, box_tag, box_tag>
+{
+public:
+    typedef typename geometry::coordinate_type<Box>::type coordinate_type;
+
+    explicit bounded_view(BoxIn const& box)
+        : m_box(box)
+    {}
+
+    template <std::size_t Dimension>
+    inline coordinate_type get_min() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                geometry::get<min_corner, Dimension>(m_box) );
+    }
+
+    template <std::size_t Dimension>
+    inline coordinate_type get_max() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                geometry::get<max_corner, Dimension>(m_box) );
+    }
+
+private:
+    BoxIn const& m_box;
+};
+
+// Point -> Box
+
+template <typename Point, typename Box>
+struct bounded_view<Point, Box, point_tag, box_tag>
+{
+public:
+    typedef typename geometry::coordinate_type<Box>::type coordinate_type;
+
+    explicit bounded_view(Point const& point)
+        : m_point(point)
+    {}
+
+    template <std::size_t Dimension>
+    inline coordinate_type get_min() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                geometry::get<Dimension>(m_point) );
+    }
+
+    template <std::size_t Dimension>
+    inline coordinate_type get_max() const
+    {
+        return boost::numeric_cast<coordinate_type>(
+                geometry::get<Dimension>(m_point) );
+    }
+
+private:
+    Point const& m_point;
+};
+
+}} // namespace index::detail
+
+// XXX -> Box
+
+#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+namespace traits
+{
+
+template <typename Geometry, typename Box, typename Tag>
+struct tag< index::detail::bounded_view<Geometry, Box, Tag, box_tag> >
+{
+    typedef box_tag type;
+};
+
+template <typename Segment, typename Box, typename Tag>
+struct point_type< index::detail::bounded_view<Segment, Box, Tag, box_tag> >
+{
+    typedef typename point_type<Box>::type type;
+};
+
+template <typename Segment, typename Box, typename Tag, std::size_t Dimension>
+struct indexed_access<index::detail::bounded_view<Segment, Box, Tag, box_tag>,
+                      min_corner, Dimension>
+{
+    typedef index::detail::bounded_view<Segment, Box, Tag, box_tag> box_type;
+    typedef typename geometry::coordinate_type<Box>::type coordinate_type;
+
+    static inline coordinate_type get(box_type const& b)
+    {
+        return b.template get_min<Dimension>();
+    }
+
+    //static inline void set(box_type & b, coordinate_type const& value)
+    //{
+    //    BOOST_ASSERT(false);
+    //}
+};
+
+template <typename Segment, typename Box, typename Tag, std::size_t Dimension>
+struct indexed_access<index::detail::bounded_view<Segment, Box, Tag, box_tag>,
+                      max_corner, Dimension>
+{
+    typedef index::detail::bounded_view<Segment, Box, Tag, box_tag> box_type;
+    typedef typename geometry::coordinate_type<Box>::type coordinate_type;
+
+    static inline coordinate_type get(box_type const& b)
+    {
+        return b.template get_max<Dimension>();
+    }
+
+    //static inline void set(box_type & b, coordinate_type const& value)
+    //{
+    //    BOOST_ASSERT(false);
+    //}
+};
+
+} // namespace traits
+#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_INDEX_DETAIL_BOUNDED_VIEW_HPP
diff --git a/include/boost/geometry/index/detail/distance_predicates.hpp b/include/boost/geometry/index/detail/distance_predicates.hpp
index c5c2c4c51..3e057290a 100644
--- a/include/boost/geometry/index/detail/distance_predicates.hpp
+++ b/include/boost/geometry/index/detail/distance_predicates.hpp
@@ -3,7 +3,7 @@
 // Spatial index distance predicates, calculators and checkers
 // used in nearest query - specialized for envelopes
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -108,11 +108,11 @@ struct calculate_distance< nearest<PointRelation>, Indexable, Tag >
 {
     typedef detail::relation<PointRelation> relation;
     typedef typename relation::value_type point_type;
-    typedef typename geometry::default_distance_result<point_type, Indexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
     static inline bool apply(nearest<PointRelation> const& p, Indexable const& i, result_type & result)
     {
-        result = index::detail::comparable_distance_near(relation::value(p.point_or_relation), i);
+        result = geometry::comparable_distance(relation::value(p.point_or_relation), i);
         return true;
     }
 };
@@ -121,7 +121,7 @@ template <typename Point, typename Indexable>
 struct calculate_distance< nearest< to_centroid<Point> >, Indexable, value_tag>
 {
     typedef Point point_type;
-    typedef typename geometry::default_distance_result<point_type, Indexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
     static inline bool apply(nearest< to_centroid<Point> > const& p, Indexable const& i, result_type & result)
     {
@@ -134,7 +134,7 @@ template <typename Point, typename Indexable>
 struct calculate_distance< nearest< to_furthest<Point> >, Indexable, value_tag>
 {
     typedef Point point_type;
-    typedef typename geometry::default_distance_result<point_type, Indexable>::type result_type;
+    typedef typename geometry::default_comparable_distance_result<point_type, Indexable>::type result_type;
 
     static inline bool apply(nearest< to_furthest<Point> > const& p, Indexable const& i, result_type & result)
     {
diff --git a/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
index 45bd18a79..1f649bbdf 100644
--- a/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
+++ b/include/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
@@ -3,7 +3,7 @@
 // R-tree linear split algorithm implementation
 //
 // Copyright (c) 2008 Federico J. Fernandez.
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,7 @@
 #include <boost/type_traits/is_unsigned.hpp>
 
 #include <boost/geometry/index/detail/algorithms/content.hpp>
+#include <boost/geometry/index/detail/bounded_view.hpp>
 
 #include <boost/geometry/index/detail/rtree/node/node.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
@@ -75,12 +76,6 @@ inline R difference(T const& from, T const& to)
 
 template <typename Elements, typename Parameters, typename Translator, typename Tag, size_t DimensionIndex>
 struct find_greatest_normalized_separation
-{
-    BOOST_MPL_ASSERT_MSG(false, NOT_IMPLEMENTED_FOR_THIS_TAG, (Tag));
-};
-
-template <typename Elements, typename Parameters, typename Translator, size_t DimensionIndex>
-struct find_greatest_normalized_separation<Elements, Parameters, Translator, box_tag, DimensionIndex>
 {
     typedef typename Elements::value_type element_type;
     typedef typename rtree::element_indexable_type<element_type, Translator>::type indexable_type;
@@ -92,6 +87,10 @@ struct find_greatest_normalized_separation<Elements, Parameters, Translator, box
         coordinate_type
     >::type separation_type;
 
+    typedef typename geometry::point_type<indexable_type>::type point_type;
+    typedef geometry::model::box<point_type> bounds_type;
+    typedef index::detail::bounded_view<indexable_type, bounds_type> bounded_view_type;
+
     static inline void apply(Elements const& elements,
                              Parameters const& parameters,
                              Translator const& translator,
@@ -104,15 +103,18 @@ struct find_greatest_normalized_separation<Elements, Parameters, Translator, box
         BOOST_GEOMETRY_INDEX_ASSERT(2 <= elements_count, "unexpected number of elements");
 
         // find the lowest low, highest high
-        coordinate_type lowest_low = geometry::get<min_corner, DimensionIndex>(rtree::element_indexable(elements[0], translator));
-        coordinate_type highest_high = geometry::get<max_corner, DimensionIndex>(rtree::element_indexable(elements[0], translator));
+        bounded_view_type bounded_indexable_0(rtree::element_indexable(elements[0], translator));
+        coordinate_type lowest_low = geometry::get<min_corner, DimensionIndex>(bounded_indexable_0);
+        coordinate_type highest_high = geometry::get<max_corner, DimensionIndex>(bounded_indexable_0);
+
         // and the lowest high
         coordinate_type lowest_high = highest_high;
         size_t lowest_high_index = 0;
         for ( size_t i = 1 ; i < elements_count ; ++i )
         {
-            coordinate_type min_coord = geometry::get<min_corner, DimensionIndex>(rtree::element_indexable(elements[i], translator));
-            coordinate_type max_coord = geometry::get<max_corner, DimensionIndex>(rtree::element_indexable(elements[i], translator));
+            bounded_view_type bounded_indexable(rtree::element_indexable(elements[i], translator));
+            coordinate_type min_coord = geometry::get<min_corner, DimensionIndex>(bounded_indexable);
+            coordinate_type max_coord = geometry::get<max_corner, DimensionIndex>(bounded_indexable);
 
             if ( max_coord < lowest_high )
             {
@@ -129,10 +131,12 @@ struct find_greatest_normalized_separation<Elements, Parameters, Translator, box
 
         // find the highest low
         size_t highest_low_index = lowest_high_index == 0 ? 1 : 0;
-        coordinate_type highest_low = geometry::get<min_corner, DimensionIndex>(rtree::element_indexable(elements[highest_low_index], translator));
+        bounded_view_type bounded_indexable_hl(rtree::element_indexable(elements[highest_low_index], translator));
+        coordinate_type highest_low = geometry::get<min_corner, DimensionIndex>(bounded_indexable_hl);
         for ( size_t i = highest_low_index ; i < elements_count ; ++i )
         {
-            coordinate_type min_coord = geometry::get<min_corner, DimensionIndex>(rtree::element_indexable(elements[i], translator));
+            bounded_view_type bounded_indexable(rtree::element_indexable(elements[i], translator));
+            coordinate_type min_coord = geometry::get<min_corner, DimensionIndex>(bounded_indexable);
             if ( highest_low < min_coord &&
                  i != lowest_high_index )
             {
@@ -325,7 +329,6 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, linear
         typedef typename rtree::elements_type<Node>::type elements_type;
         typedef typename elements_type::value_type element_type;
         typedef typename rtree::element_indexable_type<element_type, Translator>::type indexable_type;
-        typedef typename coordinate_type<indexable_type>::type coordinate_type;
         typedef typename index::detail::default_content_result<Box>::type content_type;
 
         elements_type & elements1 = rtree::elements(n);
diff --git a/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp b/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
index d5d68cbd1..5df869c95 100644
--- a/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
+++ b/include/boost/geometry/index/detail/rtree/node/node_s_mem_static.hpp
@@ -175,7 +175,7 @@ struct create_node<
         return create_static_node<
             typename Allocators::node_pointer,
             static_internal_node<Value, Parameters, Box, Allocators, node_s_mem_static_tag>
-        >::template apply(allocators.node_allocator());
+        >::apply(allocators.node_allocator());
     }
 };
 
@@ -191,7 +191,7 @@ struct create_node<
         return create_static_node<
             typename Allocators::node_pointer,
             static_leaf<Value, Parameters, Box, Allocators, node_s_mem_static_tag>
-        >::template apply(allocators.node_allocator());
+        >::apply(allocators.node_allocator());
     }
 };
 
diff --git a/include/boost/geometry/index/detail/rtree/options.hpp b/include/boost/geometry/index/detail/rtree/options.hpp
index b1bb60df1..b7947402c 100644
--- a/include/boost/geometry/index/detail/rtree/options.hpp
+++ b/include/boost/geometry/index/detail/rtree/options.hpp
@@ -66,7 +66,7 @@ struct options_type< index::linear<MaxElements, MinElements> >
         choose_by_content_diff_tag,
         split_default_tag,
         linear_tag,
-        node_d_mem_static_tag
+        node_s_mem_static_tag
     > type;
 };
 
@@ -79,7 +79,7 @@ struct options_type< index::quadratic<MaxElements, MinElements> >
         choose_by_content_diff_tag,
         split_default_tag,
         quadratic_tag,
-        node_d_mem_static_tag
+        node_s_mem_static_tag
     > type;
 };
 
@@ -92,7 +92,7 @@ struct options_type< index::rstar<MaxElements, MinElements, OverlapCostThreshold
         choose_by_overlap_diff_tag,
         split_default_tag,
         rstar_tag,
-        node_d_mem_static_tag
+        node_s_mem_static_tag
     > type;
 };
 
@@ -105,7 +105,7 @@ struct options_type< index::rstar<MaxElements, MinElements, OverlapCostThreshold
 //        choose_by_content_diff_tag, // change it?
 //        split_kmeans_tag,
 //        int, // dummy tag - not used for now
-//        node_d_mem_static_tag
+//        node_s_mem_static_tag
 //    > type;
 //};
 
@@ -118,7 +118,7 @@ struct options_type< index::dynamic_linear >
         choose_by_content_diff_tag,
         split_default_tag,
         linear_tag,
-        node_d_mem_dynamic_tag
+        node_s_mem_dynamic_tag
     > type;
 };
 
@@ -131,7 +131,7 @@ struct options_type< index::dynamic_quadratic >
         choose_by_content_diff_tag,
         split_default_tag,
         quadratic_tag,
-        node_d_mem_dynamic_tag
+        node_s_mem_dynamic_tag
     > type;
 };
 
@@ -144,7 +144,7 @@ struct options_type< index::dynamic_rstar >
         choose_by_overlap_diff_tag,
         split_default_tag,
         rstar_tag,
-        node_d_mem_dynamic_tag
+        node_s_mem_dynamic_tag
     > type;
 };
 
diff --git a/include/boost/geometry/index/detail/rtree/pack_create.hpp b/include/boost/geometry/index/detail/rtree/pack_create.hpp
index 44292f18c..e3ac16aef 100644
--- a/include/boost/geometry/index/detail/rtree/pack_create.hpp
+++ b/include/boost/geometry/index/detail/rtree/pack_create.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree initial packing
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -55,14 +55,14 @@ struct point_entries_comparer
 };
 
 template <std::size_t I, std::size_t Dimension>
-struct partial_sort_and_half_boxes
+struct nth_element_and_half_boxes
 {
     template <typename EIt, typename Box>
     static inline void apply(EIt first, EIt median, EIt last, Box const& box, Box & left, Box & right, std::size_t dim_index)
     {
         if ( I == dim_index )
         {
-            std::partial_sort(first, median, last, point_entries_comparer<I>());
+            std::nth_element(first, median, last, point_entries_comparer<I>());
 
             geometry::convert(box, left);
             geometry::convert(box, right);
@@ -74,12 +74,12 @@ struct partial_sort_and_half_boxes
             geometry::set<min_corner, I>(right, median);
         }
         else
-            partial_sort_and_half_boxes<I+1, Dimension>::apply(first, median, last, box, left, right, dim_index);
+            nth_element_and_half_boxes<I+1, Dimension>::apply(first, median, last, box, left, right, dim_index);
     }
 };
 
 template <std::size_t Dimension>
-struct partial_sort_and_half_boxes<Dimension, Dimension>
+struct nth_element_and_half_boxes<Dimension, Dimension>
 {
     template <typename EIt, typename Box>
     static inline void apply(EIt , EIt , EIt , Box const& , Box & , Box & , std::size_t ) {}
@@ -278,7 +278,7 @@ private:
         std::size_t greatest_dim_index = 0;
         pack_utils::biggest_edge<dimension>::apply(hint_box, greatest_length, greatest_dim_index);
         Box left, right;
-        pack_utils::partial_sort_and_half_boxes<0, dimension>
+        pack_utils::nth_element_and_half_boxes<0, dimension>
             ::apply(first, median, last, hint_box, left, right, greatest_dim_index);
         
         per_level_packets(first, median, left,
@@ -294,7 +294,7 @@ private:
     inline static
     subtree_elements_counts calculate_subtree_elements_counts(std::size_t elements_count, parameters_type const& parameters, size_type & leafs_level)
     {
-        (void)parameters;
+        boost::ignore_unused_variable_warning(parameters);
 
         subtree_elements_counts res(1, 1);
         leafs_level = 0;
diff --git a/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
index d18998970..90d080c54 100644
--- a/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
+++ b/include/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree quadratic split algorithm implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,6 +16,8 @@
 #include <boost/geometry/index/detail/algorithms/content.hpp>
 #include <boost/geometry/index/detail/algorithms/union_content.hpp>
 
+#include <boost/geometry/index/detail/bounded_view.hpp>
+
 #include <boost/geometry/index/detail/rtree/node/node.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
@@ -34,6 +36,7 @@ struct pick_seeds
     typedef typename coordinate_type<indexable_type>::type coordinate_type;
     typedef Box box_type;
     typedef typename index::detail::default_content_result<box_type>::type content_type;
+    typedef index::detail::bounded_view<indexable_type, box_type> bounded_indexable_view;
 
     static inline void apply(Elements const& elements,
                              Parameters const& parameters,
@@ -61,7 +64,11 @@ struct pick_seeds
                 detail::bounds(ind1, enlarged_box);
                 geometry::expand(enlarged_box, ind2);
 
-                content_type free_content = (index::detail::content(enlarged_box) - index::detail::content(ind1)) - index::detail::content(ind2);
+                bounded_indexable_view bounded_ind1(ind1);
+                bounded_indexable_view bounded_ind2(ind2);
+                content_type free_content = ( index::detail::content(enlarged_box)
+                                                - index::detail::content(bounded_ind1) )
+                                                    - index::detail::content(bounded_ind2);
                 
                 if ( greatest_free_content < free_content )
                 {
@@ -101,7 +108,6 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, quadra
         typedef typename rtree::elements_type<Node>::type elements_type;
         typedef typename elements_type::value_type element_type;
         typedef typename rtree::element_indexable_type<element_type, Translator>::type indexable_type;
-        typedef typename coordinate_type<indexable_type>::type coordinate_type;
 
         elements_type & elements1 = rtree::elements(n);
         elements_type & elements2 = rtree::elements(second_node);
diff --git a/include/boost/geometry/index/detail/rtree/rstar/insert.hpp b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
index 37bc31efa..c903d6ca2 100644
--- a/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
+++ b/include/boost/geometry/index/detail/rtree/rstar/insert.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree R*-tree insert algorithm implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -45,7 +45,9 @@ public:
         typedef typename elements_type::value_type element_type;
         typedef typename geometry::point_type<Box>::type point_type;
         // TODO: awulkiew - change second point_type to the point type of the Indexable?
-        typedef typename geometry::default_distance_result<point_type>::type distance_type;
+        typedef typename
+            geometry::default_comparable_distance_result<point_type>::type
+                comparable_distance_type;
 
         elements_type & elements = rtree::elements(n);
 
@@ -63,8 +65,9 @@ public:
         // fill the container of centers' distances of children from current node's center
         typedef typename index::detail::rtree::container_from_elements_type<
             elements_type,
-            std::pair<distance_type, element_type>
+            std::pair<comparable_distance_type, element_type>
         >::type sorted_elements_type;
+
         sorted_elements_type sorted_elements;
         // If constructor is used instead of resize() MS implementation leaks here
         sorted_elements.reserve(elements_count);                                                         // MAY THROW, STRONG (V, E: alloc, copy)
@@ -84,7 +87,7 @@ public:
             sorted_elements.begin(),
             sorted_elements.begin() + reinserted_elements_count,
             sorted_elements.end(),
-            distances_dsc<distance_type, element_type>);                                                // MAY THROW, BASIC (V, E: copy)
+            distances_dsc<comparable_distance_type, element_type>);                                                // MAY THROW, BASIC (V, E: copy)
 
         // copy elements which will be reinserted
         result_elements.clear();
diff --git a/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp b/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
index aedc2d1a4..69baf4726 100644
--- a/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
+++ b/include/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree R*-tree split algorithm implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -15,6 +15,8 @@
 #include <boost/geometry/index/detail/algorithms/union_content.hpp>
 #include <boost/geometry/index/detail/algorithms/margin.hpp>
 
+#include <boost/geometry/index/detail/bounded_view.hpp>
+
 #include <boost/geometry/index/detail/rtree/node/node.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/insert.hpp>
 #include <boost/geometry/index/detail/rtree/visitors/is_leaf.hpp>
@@ -28,7 +30,27 @@ namespace rstar {
 template <typename Element, typename Translator, typename Tag, size_t Corner, size_t AxisIndex>
 class element_axis_corner_less
 {
-    BOOST_MPL_ASSERT_MSG(false, NOT_IMPLEMENTED_FOR_THIS_TAG, (Tag));
+    typedef typename rtree::element_indexable_type<Element, Translator>::type indexable_type;
+    typedef typename geometry::point_type<indexable_type>::type point_type;
+    typedef geometry::model::box<point_type> bounds_type;
+    typedef index::detail::bounded_view<indexable_type, bounds_type> bounded_view_type;
+
+public:
+    element_axis_corner_less(Translator const& tr)
+        : m_tr(tr)
+    {}
+
+    bool operator()(Element const& e1, Element const& e2) const
+    {
+        bounded_view_type bounded_ind1(rtree::element_indexable(e1, m_tr));
+        bounded_view_type bounded_ind2(rtree::element_indexable(e2, m_tr));
+
+        return geometry::get<Corner, AxisIndex>(bounded_ind1)
+            < geometry::get<Corner, AxisIndex>(bounded_ind2);
+    }
+
+private:
+    Translator const& m_tr;
 };
 
 template <typename Element, typename Translator, size_t Corner, size_t AxisIndex>
@@ -129,14 +151,14 @@ struct choose_split_axis_and_index_for_corner
     }
 };
 
+//template <typename Parameters, typename Box, size_t AxisIndex, typename ElementIndexableTag>
+//struct choose_split_axis_and_index_for_axis
+//{
+//    BOOST_MPL_ASSERT_MSG(false, NOT_IMPLEMENTED_FOR_THIS_TAG, (ElementIndexableTag));
+//};
+
 template <typename Parameters, typename Box, size_t AxisIndex, typename ElementIndexableTag>
 struct choose_split_axis_and_index_for_axis
-{
-    BOOST_MPL_ASSERT_MSG(false, NOT_IMPLEMENTED_FOR_THIS_TAG, (ElementIndexableTag));
-};
-
-template <typename Parameters, typename Box, size_t AxisIndex>
-struct choose_split_axis_and_index_for_axis<Parameters, Box, AxisIndex, box_tag>
 {
     typedef typename index::detail::default_margin_result<Box>::type margin_type;
     typedef typename index::detail::default_content_result<Box>::type content_type;
@@ -403,11 +425,15 @@ struct redistribute_elements<Value, Options, Translator, Box, Allocators, rstar_
 
         // TODO: awulkiew - check if std::partial_sort produces the same result as std::sort
         if ( split_corner == static_cast<size_t>(min_corner) )
+        {
             rstar::partial_sort<min_corner, dimension>
                 ::apply(elements_copy, split_axis, split_index, translator);                            // MAY THROW, BASIC (copy)
+        }
         else
+        {
             rstar::partial_sort<max_corner, dimension>
                 ::apply(elements_copy, split_axis, split_index, translator);                            // MAY THROW, BASIC (copy)
+        }
 
         BOOST_TRY
         {
diff --git a/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp b/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
index f283c3e5b..d2caa3670 100644
--- a/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
+++ b/include/boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree boxes validating visitor implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -89,7 +89,9 @@ public:
             }
         
             Box box_exp;
-            geometry::convert(m_tr(elements.front()), box_exp);
+            geometry::convert(
+                index::detail::return_ref_or_bounds(m_tr(elements.front())),
+                box_exp);
             for(typename elements_type::const_iterator it = elements.begin() + 1;
                 it != elements.end() ; ++it)
             {
diff --git a/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp b/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
index 9b5e4d035..84201b6af 100644
--- a/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
+++ b/include/boost/geometry/index/detail/rtree/utilities/gl_draw.hpp
@@ -11,6 +11,8 @@
 #ifndef BOOST_GEOMETRY_INDEX_DETAIL_RTREE_UTILITIES_GL_DRAW_HPP
 #define BOOST_GEOMETRY_INDEX_DETAIL_RTREE_UTILITIES_GL_DRAW_HPP
 
+#include <boost/mpl/assert.hpp>
+
 namespace boost { namespace geometry { namespace index { namespace detail {
 
 namespace utilities {
@@ -26,8 +28,16 @@ struct gl_draw_point<Point, 2>
 {
     static inline void apply(Point const& p, typename coordinate_type<Point>::type z)
     {
-        glBegin(GL_POINT);
-        glVertex3f(geometry::get<0>(p), geometry::get<1>(p), z);
+        typename coordinate_type<Point>::type const& x = geometry::get<0>(p);
+        typename coordinate_type<Point>::type const& y = geometry::get<1>(p);
+        /*glBegin(GL_POINT);
+        glVertex3f(x, y, z);
+        glEnd();*/
+        glBegin(GL_QUADS);
+        glVertex3f(x+1, y, z);
+        glVertex3f(x, y+1, z);
+        glVertex3f(x-1, y, z);
+        glVertex3f(x, y-1, z);
         glEnd();
     }
 };
@@ -50,32 +60,42 @@ struct gl_draw_box<Box, 2>
     }
 };
 
+template <typename Segment, size_t Dimension>
+struct gl_draw_segment
+{};
+
+template <typename Segment>
+struct gl_draw_segment<Segment, 2>
+{
+    static inline void apply(Segment const& s, typename coordinate_type<Segment>::type z)
+    {
+        glBegin(GL_LINES);
+        glVertex3f(geometry::get<0, 0>(s), geometry::get<0, 1>(s), z);
+        glVertex3f(geometry::get<1, 0>(s), geometry::get<1, 1>(s), z);
+        glEnd();
+    }
+};
+
 template <typename Indexable, typename Tag>
 struct gl_draw_indexable
 {
+    BOOST_MPL_ASSERT_MSG((false), NOT_IMPLEMENTED_FOR_THIS_TAG, (Tag));
 };
 
-template <typename Indexable>
-struct gl_draw_indexable<Indexable, box_tag>
-{
-    static const size_t dimension = geometry::dimension<Indexable>::value;
+template <typename Box>
+struct gl_draw_indexable<Box, box_tag>
+    : gl_draw_box<Box, geometry::dimension<Box>::value>
+{};
 
-    static inline void apply(Indexable const& i, typename coordinate_type<Indexable>::type z)
-    {
-        gl_draw_box<Indexable, dimension>::apply(i, z);
-    }
-};
+template <typename Point>
+struct gl_draw_indexable<Point, point_tag>
+    : gl_draw_point<Point, geometry::dimension<Point>::value>
+{};
 
-template <typename Indexable>
-struct gl_draw_indexable<Indexable, point_tag>
-{
-    static const size_t dimension = geometry::dimension<Indexable>::value;
-
-    static inline void apply(Indexable const& i, typename coordinate_type<Indexable>::type z)
-    {
-        gl_draw_point<Indexable, dimension>::apply(i, z);
-    }
-};
+template <typename Segment>
+struct gl_draw_indexable<Segment, segment_tag>
+    : gl_draw_segment<Segment, geometry::dimension<Segment>::value>
+{};
 
 } // namespace dispatch
 
diff --git a/include/boost/geometry/index/detail/rtree/utilities/print.hpp b/include/boost/geometry/index/detail/rtree/utilities/print.hpp
index 452471061..4c42659c6 100644
--- a/include/boost/geometry/index/detail/rtree/utilities/print.hpp
+++ b/include/boost/geometry/index/detail/rtree/utilities/print.hpp
@@ -66,6 +66,7 @@ struct print_corner<Box, Corner, 1>
 template <typename Indexable, typename Tag>
 struct print_indexable
 {
+    BOOST_MPL_ASSERT_MSG((false), NOT_IMPLEMENTED_FOR_THIS_TAG, (Tag));
 };
 
 template <typename Indexable>
@@ -96,6 +97,21 @@ struct print_indexable<Indexable, point_tag>
     }
 };
 
+template <typename Indexable>
+struct print_indexable<Indexable, segment_tag>
+{
+    static const size_t dimension = geometry::dimension<Indexable>::value;
+
+    static inline void apply(std::ostream &os, Indexable const& i)
+    {
+        os << '(';
+        print_corner<Indexable, 0, dimension>::apply(os, i);
+        os << ")-(";
+        print_corner<Indexable, 1, dimension>::apply(os, i);
+        os << ')';
+    }
+};
+
 } // namespace dispatch
 
 template <typename Indexable> inline
diff --git a/include/boost/geometry/index/detail/rtree/visitors/count.hpp b/include/boost/geometry/index/detail/rtree/visitors/count.hpp
index 203422f33..f521944a4 100644
--- a/include/boost/geometry/index/detail/rtree/visitors/count.hpp
+++ b/include/boost/geometry/index/detail/rtree/visitors/count.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree count visitor implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -36,8 +36,12 @@ struct count
         for (typename elements_type::const_iterator it = elements.begin();
              it != elements.end(); ++it)
         {
-            if ( geometry::covered_by(indexable, it->first) )
+            if ( geometry::covered_by(
+                    return_ref_or_bounds(indexable),
+                    it->first) )
+            {
                 rtree::apply_visitor(*this, *it->second);
+            }
         }
     }
 
@@ -84,8 +88,12 @@ struct count<Value, Value, Options, Translator, Box, Allocators>
         for (typename elements_type::const_iterator it = elements.begin();
              it != elements.end(); ++it)
         {
-            if ( geometry::covered_by(tr(value), it->first) )
+            if ( geometry::covered_by(
+                    return_ref_or_bounds(tr(value)),
+                    it->first) )
+            {
                 rtree::apply_visitor(*this, *it->second);
+            }
         }
     }
 
diff --git a/include/boost/geometry/index/detail/rtree/visitors/remove.hpp b/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
index 19da61d49..d1c81219b 100644
--- a/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
+++ b/include/boost/geometry/index/detail/rtree/visitors/remove.hpp
@@ -2,7 +2,7 @@
 //
 // R-tree removing visitor implementation
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -68,7 +68,9 @@ public:
         size_t child_node_index = 0;
         for ( ; child_node_index < children.size() ; ++child_node_index )
         {
-            if ( geometry::covered_by(m_translator(m_value), children[child_node_index].first) )
+            if ( geometry::covered_by(
+                    return_ref_or_bounds(m_translator(m_value)),
+                    children[child_node_index].first) )
             {
                 // next traversing step
                 traverse_apply_visitor(n, child_node_index);                                                            // MAY THROW
diff --git a/include/boost/geometry/index/detail/tuples.hpp b/include/boost/geometry/index/detail/tuples.hpp
index 28e347bed..e7f6d2235 100644
--- a/include/boost/geometry/index/detail/tuples.hpp
+++ b/include/boost/geometry/index/detail/tuples.hpp
@@ -164,13 +164,16 @@ struct add_unique
     >::type type;
 };
 
-template <typename Tuple, typename T, size_t I, size_t N>
-struct push_back_impl
+template <typename Tuple,
+          typename T,
+          size_t I = 0,
+          size_t N = boost::tuples::length<Tuple>::value>
+struct push_back
 {
     typedef
     boost::tuples::cons<
         typename boost::tuples::element<I, Tuple>::type,
-        typename push_back_impl<Tuple, T, I+1, N>::type
+        typename push_back<Tuple, T, I+1, N>::type
     > type;
 
     static type apply(Tuple const& tup, T const& t)
@@ -178,13 +181,13 @@ struct push_back_impl
         return
         type(
             boost::get<I>(tup),
-            push_back_impl<Tuple, T, I+1, N>::apply(tup, t)
+            push_back<Tuple, T, I+1, N>::apply(tup, t)
         );
     }
 };
 
 template <typename Tuple, typename T, size_t N>
-struct push_back_impl<Tuple, T, N, N>
+struct push_back<Tuple, T, N, N>
 {
     typedef boost::tuples::cons<T, boost::tuples::null_type> type;
 
diff --git a/include/boost/geometry/index/detail/varray.hpp b/include/boost/geometry/index/detail/varray.hpp
index 78b90bd7e..a795b7c3f 100644
--- a/include/boost/geometry/index/detail/varray.hpp
+++ b/include/boost/geometry/index/detail/varray.hpp
@@ -178,7 +178,7 @@ class varray
 
     BOOST_COPYABLE_AND_MOVABLE(varray)
 
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
 public:
     template <std::size_t C>
     varray & operator=(varray<Value, C> & sv)
@@ -363,12 +363,7 @@ public:
     //! @par Complexity
     //!   Linear O(N).
     template <std::size_t C>
-// TEMPORARY WORKAROUND
-#if defined(BOOST_NO_RVALUE_REFERENCES)
-    varray & operator=(::boost::rv< varray<value_type, C> > const& other)
-#else
-    varray & operator=(varray<value_type, C> const& other)
-#endif
+    varray & operator=(BOOST_COPY_ASSIGN_REF_2_TEMPL_ARGS(varray, value_type, C) other)
     {
         this->assign(other.begin(), other.end());                                     // may throw
 
@@ -1951,7 +1946,6 @@ public:
     void insert(iterator, Iterator first, Iterator last)
     {
         // TODO - add MPL_ASSERT, check if Iterator is really an iterator
-        typedef typename boost::iterator_traversal<Iterator>::type traversal;
         errh::check_capacity(*this, std::distance(first, last));                    // may throw
     }
 
@@ -1975,7 +1969,6 @@ public:
     void assign(Iterator first, Iterator last)
     {
         // TODO - add MPL_ASSERT, check if Iterator is really an iterator
-        typedef typename boost::iterator_traversal<Iterator>::type traversal;
         errh::check_capacity(*this, std::distance(first, last));                    // may throw
     }
 
diff --git a/include/boost/geometry/index/detail/varray_detail.hpp b/include/boost/geometry/index/detail/varray_detail.hpp
index 2298ef4ce..962d4d828 100644
--- a/include/boost/geometry/index/detail/varray_detail.hpp
+++ b/include/boost/geometry/index/detail/varray_detail.hpp
@@ -600,7 +600,7 @@ void construct(DisableTrivialInit const&, I pos, BOOST_RV_REF(P) p)
 // Needed by emplace_back() and emplace()
 
 #if !defined(BOOST_CONTAINER_VARRAY_DISABLE_EMPLACE)
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 template <typename DisableTrivialInit, typename I, class ...Args>
 inline
@@ -612,10 +612,10 @@ void construct(DisableTrivialInit const&,
     new (static_cast<void*>(boost::addressof(*pos))) V(::boost::forward<Args>(args)...);    // may throw
 }
 
-#else // !BOOST_NO_VARIADIC_TEMPLATES
+#else // !BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
-// BOOST_NO_RVALUE_REFERENCES -> P0 const& p0
-// !BOOST_NO_RVALUE_REFERENCES -> P0 && p0
+// BOOST_NO_CXX11_RVALUE_REFERENCES -> P0 const& p0
+// !BOOST_NO_CXX11_RVALUE_REFERENCES -> P0 && p0
 // which means that version with one parameter may take V const& v
 
 #define BOOST_PP_LOCAL_MACRO(n)                                                                     \
@@ -635,7 +635,7 @@ void construct(DisableTrivialInit const&,
 #define BOOST_PP_LOCAL_LIMITS (1, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS)
 #include BOOST_PP_LOCAL_ITERATE()
 
-#endif // !BOOST_NO_VARIADIC_TEMPLATES
+#endif // !BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #endif // !BOOST_CONTAINER_VARRAY_DISABLE_EMPLACE
 
 // assign(I, V)
diff --git a/include/boost/geometry/index/equal_to.hpp b/include/boost/geometry/index/equal_to.hpp
index 8ce5074c3..5fbaa8209 100644
--- a/include/boost/geometry/index/equal_to.hpp
+++ b/include/boost/geometry/index/equal_to.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry Index
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -10,15 +10,15 @@
 #define BOOST_GEOMETRY_INDEX_EQUAL_TO_HPP
 
 #include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/index/indexable.hpp>
 
-namespace boost { namespace geometry { namespace index {
+namespace boost { namespace geometry { namespace index { namespace detail {
 
-namespace detail {
-
-template <typename Geometry, typename Tag>
+template <typename Geometry,
+          typename Tag = typename geometry::tag<Geometry>::type>
 struct equals
 {
-    static bool apply(Geometry const& g1, Geometry const& g2)
+    inline static bool apply(Geometry const& g1, Geometry const& g2)
     {
         return geometry::equals(g1, g2);
     }
@@ -27,7 +27,7 @@ struct equals
 template <typename T>
 struct equals<T, void>
 {
-    static bool apply(T const& v1, T const& v2)
+    inline static bool apply(T const& v1, T const& v2)
     {
         return v1 == v2;
     }
@@ -39,12 +39,9 @@ struct tuple_equals
     inline static bool apply(Tuple const& t1, Tuple const& t2)
     {
         typedef typename boost::tuples::element<I, Tuple>::type T;
-        return
-            equals<
-                T, typename geometry::traits::tag<T>::type
-            >::apply(boost::get<I>(t1), boost::get<I>(t2))
-            &&
-            tuple_equals<Tuple, I+1, N>::apply(t1, t2);
+
+        return equals<T>::apply(boost::get<I>(t1), boost::get<I>(t2))
+            && tuple_equals<Tuple, I+1, N>::apply(t1, t2);
     }
 };
 
@@ -57,7 +54,11 @@ struct tuple_equals<Tuple, I, I>
     }
 };
 
-} // namespace detail
+// TODO: Consider this: Since equal_to<> is using geometry::equals() it's possible that
+//       two compared Indexables are not exactly the same! They will be spatially equal
+//       but not strictly equal. Consider 2 Segments with reversed order of points.
+//       Therefore it's possible that during the Value removal different value will be
+//       removed than the one that was passed.
 
 /*!
 \brief The function object comparing Values.
@@ -67,8 +68,10 @@ The default version handles Values which are Indexables.
 This template is also specialized for std::pair<T1, T2> and boost::tuple<...>.
 
 \tparam Value       The type of objects which are compared by this function object.
+\tparam IsIndexable If true, Values are compared using boost::geometry::equals() functions.
 */
-template <typename Value>
+template <typename Value,
+          bool IsIndexable = is_indexable<Value>::value>
 struct equal_to
 {
     /*! \brief The type of result returned by function object. */
@@ -81,9 +84,9 @@ struct equal_to
     \param r Second value.
     \return true if values are equal.
     */
-    bool operator()(Value const& l, Value const& r) const
+    inline bool operator()(Value const& l, Value const& r) const
     {
-        return detail::equals<Value, typename geometry::traits::tag<Value>::type>::apply(l ,r);
+        return detail::equals<Value>::apply(l ,r);
     }
 };
 
@@ -97,7 +100,7 @@ It compares pairs' first values, then second values.
 \tparam T2       The second type.
 */
 template <typename T1, typename T2>
-struct equal_to< std::pair<T1, T2> >
+struct equal_to<std::pair<T1, T2>, false>
 {
     /*! \brief The type of result returned by function object. */
     typedef bool result_type;
@@ -109,12 +112,10 @@ struct equal_to< std::pair<T1, T2> >
     \param r Second value.
     \return true if values are equal.
     */
-    bool operator()(std::pair<T1, T2> const& l, std::pair<T1, T2> const& r) const
+    inline bool operator()(std::pair<T1, T2> const& l, std::pair<T1, T2> const& r) const
     {
-        typedef detail::equals<T1, typename geometry::traits::tag<T1>::type> equals1;
-        typedef detail::equals<T2, typename geometry::traits::tag<T2>::type> equals2;
-
-        return equals1::apply(l.first, r.first) && equals2::apply(l.second, r.second);
+        return detail::equals<T1>::apply(l.first, r.first)
+            && detail::equals<T2>::apply(l.second, r.second);
     }
 };
 
@@ -126,7 +127,7 @@ It compares all members of the tuple from the first one to the last one.
 */
 template <typename T0, typename T1, typename T2, typename T3, typename T4,
           typename T5, typename T6, typename T7, typename T8, typename T9>
-struct equal_to< boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+struct equal_to<boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, false>
 {
     typedef boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> value_type;
 
@@ -140,7 +141,7 @@ struct equal_to< boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
     \param r Second value.
     \return true if values are equal.
     */
-    bool operator()(value_type const& l, value_type const& r) const
+    inline bool operator()(value_type const& l, value_type const& r) const
     {
         return detail::tuple_equals<
             value_type, 0, boost::tuples::length<value_type>::value
@@ -148,15 +149,13 @@ struct equal_to< boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
     }
 };
 
-}}} // namespace boost::geometry::index
+}}}} // namespace boost::geometry::index::detail
 
 #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 #include <tuple>
 
-namespace boost { namespace geometry { namespace index {
-
-namespace detail {
+namespace boost { namespace geometry { namespace index { namespace detail {
 
 template <typename Tuple, size_t I, size_t N>
 struct std_tuple_equals
@@ -164,12 +163,9 @@ struct std_tuple_equals
     inline static bool apply(Tuple const& t1, Tuple const& t2)
     {
         typedef typename std::tuple_element<I, Tuple>::type T;
-        return
-            equals<
-                T, typename geometry::traits::tag<T>::type
-            >::apply(std::get<I>(t1), std::get<I>(t2))
-            &&
-            std_tuple_equals<Tuple, I+1, N>::apply(t1, t2);
+
+        return equals<T>::apply(std::get<I>(t1), std::get<I>(t2))
+            && std_tuple_equals<Tuple, I+1, N>::apply(t1, t2);
     }
 };
 
@@ -182,8 +178,6 @@ struct std_tuple_equals<Tuple, I, I>
     }
 };
 
-} // namespace detail
-
 /*!
 \brief The function object comparing Values.
 
@@ -192,7 +186,7 @@ It's defined if the compiler supports tuples and variadic templates.
 It compares all members of the tuple from the first one to the last one.
 */
 template <typename ...Args>
-struct equal_to< std::tuple<Args...> >
+struct equal_to<std::tuple<Args...>, false>
 {
     typedef std::tuple<Args...> value_type;
 
@@ -214,8 +208,42 @@ struct equal_to< std::tuple<Args...> >
     }
 };
 
-}}} // namespace boost::geometry::index
+}}}} // namespace boost::geometry::index::detail
 
 #endif // !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
+namespace boost { namespace geometry { namespace index {
+
+/*!
+\brief The function object comparing Values.
+
+The default version handles Values which are Indexables, std::pair<T1, T2>, boost::tuple<...>
+and std::tuple<...> if STD tuples and variadic templates are supported.
+All members are compared from left to right, Geometries using boost::geometry::equals() function,
+other types using operator==.
+
+\tparam Value       The type of objects which are compared by this function object.
+*/
+template <typename Value>
+struct equal_to
+    : detail::equal_to<Value>
+{
+    /*! \brief The type of result returned by function object. */
+    typedef typename detail::equal_to<Value>::result_type result_type;
+    
+    /*!
+    \brief Compare Values.
+    
+    \param l First value.
+    \param r Second value.
+    \return true if Values are equal.
+    */
+    inline bool operator()(Value const& l, Value const& r) const
+    {
+        return detail::equal_to<Value>::operator()(l ,r);
+    }
+};
+
+}}} // namespace boost::geometry::index
+
 #endif // BOOST_GEOMETRY_INDEX_EQUAL_TO_HPP
diff --git a/include/boost/geometry/index/indexable.hpp b/include/boost/geometry/index/indexable.hpp
index 9533fcf9e..5270ca22e 100644
--- a/include/boost/geometry/index/indexable.hpp
+++ b/include/boost/geometry/index/indexable.hpp
@@ -1,6 +1,6 @@
 // Boost.Geometry Index
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,9 +11,7 @@
 
 #include <boost/mpl/assert.hpp>
 
-namespace boost { namespace geometry { namespace index {
-
-namespace detail {
+namespace boost { namespace geometry { namespace index { namespace detail {
 
 template <typename Geometry, typename GeometryTag>
 struct is_indexable_impl { static const bool value = false; };
@@ -24,6 +22,9 @@ struct is_indexable_impl<Point, geometry::point_tag> { static const bool value =
 template <typename Box>
 struct is_indexable_impl<Box, geometry::box_tag> { static const bool value = true; };
 
+template <typename Segment>
+struct is_indexable_impl<Segment, geometry::segment_tag> { static const bool value = true; };
+
 template <typename Indexable>
 struct is_indexable
 {
@@ -31,17 +32,17 @@ struct is_indexable
         is_indexable_impl<Indexable, typename geometry::traits::tag<Indexable>::type>::value;
 };
 
-} // namespace detail
-
 /*!
 \brief The function object extracting Indexable from Value.
 
 It translates Value object to Indexable object. The default version handles Values which are Indexables.
-This template is also specialized for std::pair<Indexable, T2> and boost::tuple<Indexable, ...>.
+This template is also specialized for std::pair<Indexable, T2>, boost::tuple<Indexable, ...>
+and std::tuple<Indexable, ...>.
 
 \tparam Value       The Value type which may be translated directly to the Indexable.
+\tparam IsIndexable If true, the const reference to Value is returned.
 */
-template <typename Value>
+template <typename Value, bool IsIndexable = is_indexable<Value>::value>
 struct indexable
 {
     BOOST_MPL_ASSERT_MSG(
@@ -49,6 +50,7 @@ struct indexable
         NOT_VALID_INDEXABLE_TYPE,
         (Value)
     );
+
     /*! \brief The type of result returned by function object. */
     typedef Value const& result_type;
 
@@ -58,7 +60,7 @@ struct indexable
     \param v The value.
     \return The indexable.
     */
-    result_type operator()(Value const& v) const
+    inline result_type operator()(Value const& v) const
     {
         return v;
     }
@@ -73,7 +75,7 @@ This specialization translates from std::pair<Indexable, T2>.
 \tparam T2              The second type.
 */
 template <typename Indexable, typename T2>
-struct indexable< std::pair<Indexable, T2> >
+struct indexable<std::pair<Indexable, T2>, false>
 {
     BOOST_MPL_ASSERT_MSG(
         (detail::is_indexable<Indexable>::value),
@@ -90,7 +92,7 @@ struct indexable< std::pair<Indexable, T2> >
     \param v The value.
     \return The indexable.
     */
-    result_type operator()(std::pair<Indexable, T2> const& v) const
+    inline result_type operator()(std::pair<Indexable, T2> const& v) const
     {
         return v.first;
     }
@@ -105,7 +107,7 @@ This specialization translates from boost::tuple<Indexable, ...>.
 */
 template <typename Indexable, typename T1, typename T2, typename T3, typename T4,
           typename T5, typename T6, typename T7, typename T8, typename T9>
-struct indexable< boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
+struct indexable<boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9>, false>
 {
     typedef boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> value_type;
 
@@ -124,19 +126,19 @@ struct indexable< boost::tuple<Indexable, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
     \param v The value.
     \return The indexable.
     */
-    result_type operator()(value_type const& v) const
+    inline result_type operator()(value_type const& v) const
     {
         return boost::get<0>(v);
     }
 };
 
-}}} // namespace boost::geometry::index
+}}}} // namespace boost::geometry::index::detail
 
 #if !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 #include <tuple>
 
-namespace boost { namespace geometry { namespace index {
+namespace boost { namespace geometry { namespace index { namespace detail {
 
 /*!
 \brief The function object extracting Indexable from Value.
@@ -147,7 +149,7 @@ It's defined if the compiler supports tuples and variadic templates.
 \tparam Indexable   The Indexable type.
 */
 template <typename Indexable, typename ...Args>
-struct indexable< std::tuple<Indexable, Args...> >
+struct indexable<std::tuple<Indexable, Args...>, false>
 {
     typedef std::tuple<Indexable, Args...> value_type;
 
@@ -172,8 +174,40 @@ struct indexable< std::tuple<Indexable, Args...> >
     }
 };
 
-}}} // namespace boost::geometry::index
+}}}} // namespace boost::geometry::index::detail
 
 #endif // !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
+namespace boost { namespace geometry { namespace index {
+
+/*!
+\brief The function object extracting Indexable from Value.
+
+It translates Value object to Indexable object. By default, it can handle Values which are Indexables,
+std::pair<Indexable, T2>, boost::tuple<Indexable, ...> and std::tuple<Indexable, ...> if STD tuples
+and variadic templates are supported.
+
+\tparam Value       The Value type which may be translated directly to the Indexable.
+*/
+template <typename Value>
+struct indexable
+    : detail::indexable<Value>
+{
+    /*! \brief The type of result returned by function object. It should be const Indexable reference. */
+    typedef typename detail::indexable<Value>::result_type result_type;
+
+    /*!
+    \brief Return indexable extracted from the value.
+    
+    \param v The value.
+    \return The indexable.
+    */
+    inline result_type operator()(Value const& v) const
+    {
+        return detail::indexable<Value>::operator()(v);
+    }
+};
+
+}}} // namespace boost::geometry::index
+
 #endif // BOOST_GEOMETRY_INDEX_INDEXABLE_HPP
diff --git a/include/boost/geometry/index/predicates.hpp b/include/boost/geometry/index/predicates.hpp
index ad6a537f0..10033abff 100644
--- a/include/boost/geometry/index/predicates.hpp
+++ b/include/boost/geometry/index/predicates.hpp
@@ -2,7 +2,7 @@
 //
 // Spatial query predicates
 //
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -269,13 +269,15 @@ satisfies(UnaryPredicate const& pred)
 \brief Generate nearest() predicate.
 
 When nearest predicate is passed to the query, k-nearest neighbour search will be performed.
-\c nearest() predicate takes a \c Point from which distance to \c Values is calculated
-and the maximum number of \c Values that should be returned.
+\c nearest() predicate takes a \c Geometry from which distances to \c Values are calculated
+and the maximum number of \c Values that should be returned. Internally
+boost::geometry::comparable_distance() is used to perform the calculation.
 
 \par Example
 \verbatim
 bgi::query(spatial_index, bgi::nearest(pt, 5), std::back_inserter(result));
 bgi::query(spatial_index, bgi::nearest(pt, 5) && bgi::intersects(box), std::back_inserter(result));
+bgi::query(spatial_index, bgi::nearest(box, 5), std::back_inserter(result));
 \endverbatim
 
 \warning
@@ -283,14 +285,14 @@ Only one \c nearest() predicate may be used in a query.
 
 \ingroup predicates
 
-\param point        The point from which distance is calculated.
+\param geometry     The geometry from which distance is calculated.
 \param k            The maximum number of values to return.
 */
-template <typename Point> inline
-detail::nearest<Point>
-nearest(Point const& point, unsigned k)
+template <typename Geometry> inline
+detail::nearest<Geometry>
+nearest(Geometry const& geometry, unsigned k)
 {
-    return detail::nearest<Point>(point, k);
+    return detail::nearest<Geometry>(geometry, k);
 }
 
 #ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
@@ -362,11 +364,8 @@ operator&&(Pred1 const& p1, Pred2 const& p2)
 }
 
 template <typename Head, typename Tail, typename Pred> inline
-typename tuples::push_back_impl<
-    boost::tuples::cons<Head, Tail>,
-    Pred,
-    0,
-    boost::tuples::length<boost::tuples::cons<Head, Tail> >::value
+typename tuples::push_back<
+    boost::tuples::cons<Head, Tail>, Pred
 >::type
 operator&&(boost::tuples::cons<Head, Tail> const& t, Pred const& p)
 {
@@ -374,8 +373,8 @@ operator&&(boost::tuples::cons<Head, Tail> const& t, Pred const& p)
     namespace bt = boost::tuples;
 
     return
-    tuples::push_back_impl<
-        bt::cons<Head, Tail>, Pred, 0, bt::length< bt::cons<Head, Tail> >::value
+    tuples::push_back<
+        bt::cons<Head, Tail>, Pred
     >::apply(t, p);
 }
     
diff --git a/include/boost/geometry/index/rtree.hpp b/include/boost/geometry/index/rtree.hpp
index 6decfe70f..09f07ffe7 100644
--- a/include/boost/geometry/index/rtree.hpp
+++ b/include/boost/geometry/index/rtree.hpp
@@ -3,7 +3,7 @@
 // R-tree implementation
 //
 // Copyright (c) 2008 Federico J. Fernandez.
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 //
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,13 +12,30 @@
 #ifndef BOOST_GEOMETRY_INDEX_RTREE_HPP
 #define BOOST_GEOMETRY_INDEX_RTREE_HPP
 
+// STD
 #include <algorithm>
 
+// Boost
 #include <boost/tuple/tuple.hpp>
 #include <boost/move/move.hpp>
 
-#include <boost/geometry/geometry.hpp>
+// Boost.Geometry
+#include <boost/geometry/algorithms/detail/comparable_distance/interface.hpp>
+#include <boost/geometry/algorithms/centroid.hpp>
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+#include <boost/geometry/algorithms/overlaps.hpp>
+#include <boost/geometry/algorithms/touches.hpp>
+#include <boost/geometry/algorithms/within.hpp>
 
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+// Boost.Geometry.Index
 #include <boost/geometry/index/detail/config_begin.hpp>
 
 #include <boost/geometry/index/detail/assert.hpp>
@@ -101,8 +118,8 @@ Predefined algorithms with run-time parameters are:
 \par IndexableGetter
 The object of IndexableGetter type translates from Value to Indexable each time r-tree requires it. Which means that this
 operation is done for each Value access. Therefore the IndexableGetter should return the Indexable by
-const reference instead of a value. Default one can translate all types adapted to Point
-or Box concepts (called Indexables). It also handles <tt>std::pair<Indexable, T></tt> and
+const reference instead of a value. Default one can translate all types adapted to Point, Box or Segment
+concepts (called Indexables). It also handles <tt>std::pair<Indexable, T></tt> and
 <tt>boost::tuple<Indexable, ...></tt>. For example, if <tt>std::pair<Box, int></tt> is stored in the
 container, the default IndexableGetter translates from <tt>std::pair<Box, int> const&</tt> to <tt>Box const&</tt>.
 
@@ -1781,6 +1798,9 @@ inline void swap(rtree<Value, Parameters, IndexableGetter, EqualTo, Allocator> &
 
 }}} // namespace boost::geometry::index
 
+// TODO: don't include the implementation at the end of the file
+#include <boost/geometry/algorithms/detail/comparable_distance/implementation.hpp>
+
 #include <boost/geometry/index/detail/config_end.hpp>
 
 #endif // BOOST_GEOMETRY_INDEX_RTREE_HPP
diff --git a/include/boost/geometry/io/dsv/write.hpp b/include/boost/geometry/io/dsv/write.hpp
index 62929f807..f39a2489a 100644
--- a/include/boost/geometry/io/dsv/write.hpp
+++ b/include/boost/geometry/io/dsv/write.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -20,12 +21,14 @@
 
 #include <boost/concept_check.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
@@ -209,9 +212,10 @@ struct dsv_poly
 
         dsv_range<ring>::apply(os, exterior_ring(poly), settings);
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(poly);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             os << settings.list_separator;
             dsv_range<ring>::apply(os, *it, settings);
@@ -339,9 +343,61 @@ private:
     dsv_settings m_settings;
 };
 
+
+template <typename MultiGeometry>
+struct dsv_multi
+{
+    typedef dispatch::dsv
+                <
+                    typename single_tag_of
+                        <
+                            typename tag<MultiGeometry>::type
+                        >::type,
+                    typename boost::range_value<MultiGeometry>::type
+                > dispatch_one;
+
+    typedef typename boost::range_iterator
+        <
+            MultiGeometry const
+        >::type iterator;
+
+
+    template <typename Char, typename Traits>
+    static inline void apply(std::basic_ostream<Char, Traits>& os,
+                MultiGeometry const& multi,
+                dsv_settings const& settings)
+    {
+        os << settings.list_open;
+
+        bool first = true;
+        for(iterator it = boost::begin(multi);
+            it != boost::end(multi);
+            ++it, first = false)
+        {
+            os << (first ? "" : settings.list_separator);
+            dispatch_one::apply(os, *it, settings);
+        }
+        os << settings.list_close;
+    }
+};
+
 }} // namespace detail::dsv
 #endif // DOXYGEN_NO_DETAIL
 
+// TODO: The alternative to this could be a forward declaration of dispatch::dsv<>
+//       or braking the code into the interface and implementation part
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+template <typename Geometry>
+struct dsv<multi_tag, Geometry>
+    : detail::dsv::dsv_multi<Geometry>
+{};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
 /*!
 \brief Main DSV-streaming function
 \details DSV stands for Delimiter Separated Values. Geometries can be streamed
diff --git a/include/boost/geometry/io/svg/svg_mapper.hpp b/include/boost/geometry/io/svg/svg_mapper.hpp
index fbe0a37da..b53fef2ce 100644
--- a/include/boost/geometry/io/svg/svg_mapper.hpp
+++ b/include/boost/geometry/io/svg/svg_mapper.hpp
@@ -37,7 +37,6 @@
 #include <boost/geometry/strategies/transform/map_transformer.hpp>
 #include <boost/geometry/views/segment_view.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 
diff --git a/include/boost/geometry/io/svg/write_svg.hpp b/include/boost/geometry/io/svg/write_svg.hpp
index 15fa9c11c..fba3cbeba 100644
--- a/include/boost/geometry/io/svg/write_svg.hpp
+++ b/include/boost/geometry/io/svg/write_svg.hpp
@@ -1,6 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -18,8 +19,8 @@
 #include <boost/config.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
@@ -135,13 +136,14 @@ struct svg_poly
 
         // Inner rings:
         {
-            typename interior_return_type<Polygon const>::type rings
-                        = interior_rings(polygon);
-            for (BOOST_AUTO_TPL(rit, boost::begin(rings));
-                rit != boost::end(rings); ++rit)
+            typename interior_return_type<Polygon const>::type
+                rings = interior_rings(polygon);
+            for (typename detail::interior_iterator<Polygon const>::type
+                    rit = boost::begin(rings); rit != boost::end(rings); ++rit)
             {
                 first = true;
-                for (BOOST_AUTO_TPL(it, boost::begin(*rit)); it != boost::end(*rit);
+                for (typename detail::interior_ring_iterator<Polygon const>::type
+                        it = boost::begin(*rit); it != boost::end(*rit);
                     ++it, first = false)
                 {
                     os << (first ? "M" : " L") << " "
diff --git a/include/boost/geometry/io/wkt/detail/prefix.hpp b/include/boost/geometry/io/wkt/detail/prefix.hpp
index 45e43b88d..b566e02aa 100644
--- a/include/boost/geometry/io/wkt/detail/prefix.hpp
+++ b/include/boost/geometry/io/wkt/detail/prefix.hpp
@@ -17,10 +17,16 @@
 namespace boost { namespace geometry
 {
 
+
 #ifndef DOXYGEN_NO_DETAIL
 namespace detail { namespace wkt
 {
 
+struct prefix_null
+{
+    static inline const char* apply() { return ""; }
+};
+
 struct prefix_point
 {
     static inline const char* apply() { return "POINT"; }
@@ -36,6 +42,21 @@ struct prefix_linestring
     static inline const char* apply() { return "LINESTRING"; }
 };
 
+struct prefix_multipoint
+{
+    static inline const char* apply() { return "MULTIPOINT"; }
+};
+
+struct prefix_multilinestring
+{
+    static inline const char* apply() { return "MULTILINESTRING"; }
+};
+
+struct prefix_multipolygon
+{
+    static inline const char* apply() { return "MULTIPOLYGON"; }
+};
+
 }} // namespace wkt::impl
 #endif
 
diff --git a/include/boost/geometry/io/wkt/detail/wkt_multi.hpp b/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
index 0e5abbca8..2b2d1946a 100644
--- a/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
+++ b/include/boost/geometry/io/wkt/detail/wkt_multi.hpp
@@ -14,9 +14,8 @@
 #ifndef BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
 #define BOOST_GEOMETRY_DOMAINS_GIS_IO_WKT_DETAIL_WKT_MULTI_HPP
 
-
+#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/domains/gis/io/wkt/write.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
 
 namespace boost { namespace geometry
diff --git a/include/boost/geometry/io/wkt/read.hpp b/include/boost/geometry/io/wkt/read.hpp
index 24e93a02f..748eecdbe 100644
--- a/include/boost/geometry/io/wkt/read.hpp
+++ b/include/boost/geometry/io/wkt/read.hpp
@@ -14,6 +14,7 @@
 #ifndef BOOST_GEOMETRY_IO_WKT_READ_HPP
 #define BOOST_GEOMETRY_IO_WKT_READ_HPP
 
+#include <cstddef>
 #include <string>
 
 #include <boost/lexical_cast.hpp>
@@ -36,6 +37,8 @@
 #include <boost/geometry/core/geometry_id.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/mutable_range.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 
@@ -306,8 +309,6 @@ struct ring_parser
 };
 
 
-
-
 /*!
 \brief Internal, parses a polygon from a string like this "((x y,x y),(x y,x y))"
 \note used for parsing polygons and multi-polygons
@@ -358,6 +359,7 @@ struct polygon_parser
     }
 };
 
+
 inline bool one_of(tokenizer::iterator const& it, std::string const& value,
             bool& is_present)
 {
@@ -469,7 +471,101 @@ struct geometry_parser
 };
 
 
+template <typename MultiGeometry, template<typename> class Parser, typename PrefixPolicy>
+struct multi_parser
+{
+    static inline void apply(std::string const& wkt, MultiGeometry& geometry)
+    {
+        traits::clear<MultiGeometry>::apply(geometry);
 
+        tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
+        tokenizer::iterator it;
+        if (initialize<MultiGeometry>(tokens, PrefixPolicy::apply(), wkt, it))
+        {
+            handle_open_parenthesis(it, tokens.end(), wkt);
+
+            // Parse sub-geometries
+            while(it != tokens.end() && *it != ")")
+            {
+                traits::resize<MultiGeometry>::apply(geometry, boost::size(geometry) + 1);
+                Parser
+                    <
+                        typename boost::range_value<MultiGeometry>::type
+                    >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
+                if (it != tokens.end() && *it == ",")
+                {
+                    // Skip "," after multi-element is parsed
+                    ++it;
+                }
+            }
+
+            handle_close_parenthesis(it, tokens.end(), wkt);
+        }
+
+        check_end(it, tokens.end(), wkt);
+    }
+};
+
+template <typename P>
+struct noparenthesis_point_parser
+{
+    static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
+        std::string const& wkt, P& point)
+    {
+        parsing_assigner<P, 0, dimension<P>::value>::apply(it, end, point, wkt);
+    }
+};
+
+template <typename MultiGeometry, typename PrefixPolicy>
+struct multi_point_parser
+{
+    static inline void apply(std::string const& wkt, MultiGeometry& geometry)
+    {
+        traits::clear<MultiGeometry>::apply(geometry);
+
+        tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
+        tokenizer::iterator it;
+
+        if (initialize<MultiGeometry>(tokens, PrefixPolicy::apply(), wkt, it))
+        {
+            handle_open_parenthesis(it, tokens.end(), wkt);
+
+            // If first point definition starts with "(" then parse points as (x y)
+            // otherwise as "x y"
+            bool using_brackets = (it != tokens.end() && *it == "(");
+
+            while(it != tokens.end() && *it != ")")
+            {
+                traits::resize<MultiGeometry>::apply(geometry, boost::size(geometry) + 1);
+
+                if (using_brackets)
+                {
+                    point_parser
+                        <
+                            typename boost::range_value<MultiGeometry>::type
+                        >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
+                }
+                else
+                {
+                    noparenthesis_point_parser
+                        <
+                            typename boost::range_value<MultiGeometry>::type
+                        >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
+                }
+
+                if (it != tokens.end() && *it == ",")
+                {
+                    // Skip "," after point is parsed
+                    ++it;
+                }
+            }
+
+            handle_close_parenthesis(it, tokens.end(), wkt);
+        }
+
+        check_end(it, tokens.end(), wkt);
+    }
+};
 
 
 /*!
@@ -522,7 +618,7 @@ struct box_parser
         check_end(it, end, wkt);
 
         int index = 0;
-        int n = boost::size(points);
+        std::size_t n = boost::size(points);
         if (n == 2)
         {
             index = 1;
@@ -589,7 +685,6 @@ struct segment_parser
 };
 
 
-
 }} // namespace detail::wkt
 #endif // DOXYGEN_NO_DETAIL
 
@@ -643,6 +738,36 @@ struct read_wkt<polygon_tag, Geometry>
 {};
 
 
+template <typename MultiGeometry>
+struct read_wkt<multi_point_tag, MultiGeometry>
+    : detail::wkt::multi_point_parser
+            <
+                MultiGeometry,
+                detail::wkt::prefix_multipoint
+            >
+{};
+
+template <typename MultiGeometry>
+struct read_wkt<multi_linestring_tag, MultiGeometry>
+    : detail::wkt::multi_parser
+            <
+                MultiGeometry,
+                detail::wkt::linestring_parser,
+                detail::wkt::prefix_multilinestring
+            >
+{};
+
+template <typename MultiGeometry>
+struct read_wkt<multi_polygon_tag, MultiGeometry>
+    : detail::wkt::multi_parser
+            <
+                MultiGeometry,
+                detail::wkt::polygon_parser,
+                detail::wkt::prefix_multipolygon
+            >
+{};
+
+
 // Box (Non-OGC)
 template <typename Box>
 struct read_wkt<box_tag, Box>
@@ -662,28 +787,11 @@ struct read_wkt<segment_tag, Segment>
 /*!
 \brief Parses OGC Well-Known Text (\ref WKT) into a geometry (any geometry)
 \ingroup wkt
+\tparam Geometry \tparam_geometry
 \param wkt string containing \ref WKT
-\param geometry output geometry
-\par Example:
-\note It is case insensitive and can have the WKT forms "point", "point m", "point z", "point zm", "point mz"
-\note Empty sequences can have forms as "LINESTRING ()" or "POLYGON(())"
-Small example showing how to use read_wkt to build a point
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_point
-\line {
-\until }
-\par Example:
-Small example showing how to use read_wkt to build a linestring
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_linestring
-\line {
-\until }
-\par Example:
-Small example showing how to use read_wkt to build a polygon
-\dontinclude doxygen_1.cpp
-\skip example_from_wkt_polygon
-\line {
-\until }
+\param geometry \param_geometry output geometry
+\ingroup wkt
+\qbk{[include reference/io/read_wkt.qbk]}
 */
 template <typename Geometry>
 inline void read_wkt(std::string const& wkt, Geometry& geometry)
diff --git a/include/boost/geometry/io/wkt/stream.hpp b/include/boost/geometry/io/wkt/stream.hpp
index 86e49fdaf..3849dda59 100644
--- a/include/boost/geometry/io/wkt/stream.hpp
+++ b/include/boost/geometry/io/wkt/stream.hpp
@@ -22,10 +22,8 @@
 // Don't use namespace boost::geometry, to enable the library to stream custom
 // geometries which are living outside the namespace boost::geometry
 
-/*!
-\brief Streams a geometry as Well-Known Text
-\ingroup wkt
-*/
+// This is currently not documented on purpose: the Doxygen 2 QBK generator
+// should be updated w.r.t. << which in the end ruins the DocBook XML
 template<typename Char, typename Traits, typename Geometry>
 inline std::basic_ostream<Char, Traits>& operator<<
     (
diff --git a/include/boost/geometry/io/wkt/write.hpp b/include/boost/geometry/io/wkt/write.hpp
index 4ed02e0f8..6c1a2e153 100644
--- a/include/boost/geometry/io/wkt/write.hpp
+++ b/include/boost/geometry/io/wkt/write.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -19,23 +20,25 @@
 
 #include <boost/array.hpp>
 #include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
+#include <boost/variant/apply_visitor.hpp>
+#include <boost/variant/static_visitor.hpp>
+#include <boost/variant/variant_fwd.hpp>
 
+#include <boost/geometry/algorithms/detail/interior_iterator.hpp>
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
 #include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/core/interior_rings.hpp>
 #include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
 
 #include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 
 #include <boost/geometry/io/wkt/detail/prefix.hpp>
 
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/variant/static_visitor.hpp>
-#include <boost/variant/variant_fwd.hpp>
 
 namespace boost { namespace geometry
 {
@@ -119,31 +122,49 @@ struct wkt_range
 {
     template <typename Char, typename Traits>
     static inline void apply(std::basic_ostream<Char, Traits>& os,
-                Range const& range)
+                Range const& range, bool force_closed)
     {
         typedef typename boost::range_iterator<Range const>::type iterator_type;
 
+        typedef stream_coordinate
+            <
+                point_type, 0, dimension<point_type>::type::value
+            > stream_type;
+
         bool first = true;
 
         os << PrefixPolicy::apply();
 
         // TODO: check EMPTY here
 
-        for (iterator_type it = boost::begin(range);
-            it != boost::end(range);
-            ++it)
+        iterator_type begin = boost::begin(range);
+        iterator_type end = boost::end(range);
+        for (iterator_type it = begin; it != end; ++it)
         {
             os << (first ? "" : ",");
-            stream_coordinate
-                <
-                    point_type, 0, dimension<point_type>::type::value
-                >::apply(os, *it);
+            stream_type::apply(os, *it);
             first = false;
         }
 
+        // optionally, close range to ring by repeating the first point
+        if (force_closed 
+            && boost::size(range) > 1
+            && geometry::disjoint(*begin, *(end - 1)))
+        {
+            os << ",";
+            stream_type::apply(os, *begin);
+        }
+
         os << SuffixPolicy::apply();
     }
 
+    template <typename Char, typename Traits>
+    static inline void apply(std::basic_ostream<Char, Traits>& os,
+                Range const& range)
+    {
+        apply(os, range, false);
+    }
+
 private:
     typedef typename boost::range_value<Range>::type point_type;
 };
@@ -170,23 +191,52 @@ struct wkt_poly
                 Polygon const& poly)
     {
         typedef typename ring_type<Polygon const>::type ring;
+        bool const force_closed = true;
 
         os << PrefixPolicy::apply();
         // TODO: check EMPTY here
         os << "(";
-        wkt_sequence<ring>::apply(os, exterior_ring(poly));
+        wkt_sequence<ring>::apply(os, exterior_ring(poly), force_closed);
 
-        typename interior_return_type<Polygon const>::type rings
-                    = interior_rings(poly);
-        for (BOOST_AUTO_TPL(it, boost::begin(rings)); it != boost::end(rings); ++it)
+        typename interior_return_type<Polygon const>::type
+            rings = interior_rings(poly);
+        for (typename detail::interior_iterator<Polygon const>::type
+                it = boost::begin(rings); it != boost::end(rings); ++it)
         {
             os << ",";
-            wkt_sequence<ring>::apply(os, *it);
+            wkt_sequence<ring>::apply(os, *it, force_closed);
         }
         os << ")";
     }
 };
 
+template <typename Multi, typename StreamPolicy, typename PrefixPolicy>
+struct wkt_multi
+{
+    template <typename Char, typename Traits>
+    static inline void apply(std::basic_ostream<Char, Traits>& os,
+                Multi const& geometry)
+    {
+        os << PrefixPolicy::apply();
+        // TODO: check EMPTY here
+        os << "(";
+
+        for (typename boost::range_iterator<Multi const>::type
+                    it = boost::begin(geometry);
+            it != boost::end(geometry);
+            ++it)
+        {
+            if (it != boost::begin(geometry))
+            {
+                os << ",";
+            }
+            StreamPolicy::apply(os, *it);
+        }
+
+        os << ")";
+    }
+};
+
 template <typename Box>
 struct wkt_box
 {
@@ -316,6 +366,47 @@ struct wkt<Polygon, polygon_tag>
         >
 {};
 
+template <typename Multi>
+struct wkt<Multi, multi_point_tag>
+    : detail::wkt::wkt_multi
+        <
+            Multi,
+            detail::wkt::wkt_point
+                <
+                    typename boost::range_value<Multi>::type,
+                    detail::wkt::prefix_null
+                >,
+            detail::wkt::prefix_multipoint
+        >
+{};
+
+template <typename Multi>
+struct wkt<Multi, multi_linestring_tag>
+    : detail::wkt::wkt_multi
+        <
+            Multi,
+            detail::wkt::wkt_sequence
+                <
+                    typename boost::range_value<Multi>::type
+                >,
+            detail::wkt::prefix_multilinestring
+        >
+{};
+
+template <typename Multi>
+struct wkt<Multi, multi_polygon_tag>
+    : detail::wkt::wkt_multi
+        <
+            Multi,
+            detail::wkt::wkt_poly
+                <
+                    typename boost::range_value<Multi>::type,
+                    detail::wkt::prefix_null
+                >,
+            detail::wkt::prefix_multipolygon
+        >
+{};
+
 
 template <typename Geometry>
 struct devarianted_wkt
@@ -396,13 +487,10 @@ private:
 
 /*!
 \brief Main WKT-streaming function
+\tparam Geometry \tparam_geometry
+\param geometry \param_geometry
 \ingroup wkt
-\par Example:
-Small example showing how to use the wkt helper function
-\dontinclude doxygen_1.cpp
-\skip example_as_wkt_vector
-\line {
-\until }
+\qbk{[include reference/io/wkt.qbk]}
 */
 template <typename Geometry>
 inline wkt_manipulator<Geometry> wkt(Geometry const& geometry)
diff --git a/include/boost/geometry/iterators/concatenate_iterator.hpp b/include/boost/geometry/iterators/concatenate_iterator.hpp
new file mode 100644
index 000000000..e97061e1a
--- /dev/null
+++ b/include/boost/geometry/iterators/concatenate_iterator.hpp
@@ -0,0 +1,148 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
+
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/iterator.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+
+template <typename Iterator1, typename Iterator2, typename Value>
+class concatenate_iterator
+    : public boost::iterator_facade
+        <
+            concatenate_iterator<Iterator1, Iterator2, Value>,
+            Value,
+            boost::bidirectional_traversal_tag
+        >
+{
+private:
+    Iterator1 m_it1, m_end1;
+    Iterator2 m_begin2, m_it2;
+
+public:
+    typedef Iterator1 first_iterator_type;
+    typedef Iterator2 second_iterator_type;
+
+    // default constructor
+    concatenate_iterator() {}
+
+    // for begin
+    concatenate_iterator(Iterator1 it1, Iterator1 end1,
+                         Iterator2 begin2, Iterator2 it2)
+        : m_it1(it1), m_end1(end1), m_begin2(begin2), m_it2(it2)
+    {}
+
+    // for end
+    concatenate_iterator(Iterator1 end1, Iterator2 begin2, Iterator2 end2)
+        : m_it1(end1), m_end1(end1), m_begin2(begin2), m_it2(end2)
+    {}
+
+    template <typename OtherIt1, typename OtherIt2, typename OtherValue>
+    concatenate_iterator
+    (concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
+        : m_it1(other.m_it1)
+        , m_end1(other.m_end1)
+        , m_begin2(other.m_begin2)
+        , m_it2(other.m_it2)
+    {
+        static const bool are_conv
+            = boost::is_convertible<OtherIt1, Iterator1>::value
+           && boost::is_convertible<OtherIt2, Iterator2>::value;
+
+        BOOST_MPL_ASSERT_MSG((are_conv),
+                             NOT_CONVERTIBLE,
+                             (types<OtherIt1, OtherIt2>));
+    }
+
+    template <typename OtherIt1, typename OtherIt2, typename OtherValue>
+    concatenate_iterator
+    operator=(concatenate_iterator<OtherIt1, OtherIt2, OtherValue> const& other)
+    {
+        static const bool are_conv
+            = boost::is_convertible<OtherIt1, Iterator1>::value
+           && boost::is_convertible<OtherIt2, Iterator2>::value;
+
+        BOOST_MPL_ASSERT_MSG((are_conv),
+                             NOT_CONVERTIBLE,
+                             (types<OtherIt1, OtherIt2>));
+
+        m_it1 = other.m_it1;
+        m_end1 = other.m_end1;
+        m_begin2 = other.m_begin2;
+        m_it2 = other.m_it2;
+        return *this;
+    }
+
+private:
+    friend class boost::iterator_core_access;
+
+    template <typename It1, typename It2, typename V>
+    friend class concatenate_iterator;
+
+    inline Value& dereference() const
+    {
+        if ( m_it1 == m_end1 )
+        {
+            return *m_it2;
+        }
+        return *m_it1;
+    }
+
+    template <typename OtherIt1, typename OtherIt2, typename OtherValue>
+    inline bool equal(concatenate_iterator
+                      <
+                          OtherIt1,
+                          OtherIt2,
+                          OtherValue
+                      > const& other) const
+    {
+        return m_it1 == other.m_it1 && m_it2 == other.m_it2;
+    }
+
+    inline void increment()
+    {
+        if ( m_it1 == m_end1 )
+        {
+            ++m_it2;
+        }
+        else
+        {
+            ++m_it1;
+        }
+    }
+
+    inline void decrement()
+    {
+        if ( m_it2 == m_begin2 )
+        {
+            --m_it1;
+        }
+        else
+        {
+            --m_it2;
+        }
+    }
+};
+
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ITERATORS_CONCATENATE_ITERATOR_HPP
diff --git a/include/boost/geometry/iterators/dispatch/point_iterator.hpp b/include/boost/geometry/iterators/dispatch/point_iterator.hpp
new file mode 100644
index 000000000..938dfd8eb
--- /dev/null
+++ b/include/boost/geometry/iterators/dispatch/point_iterator.hpp
@@ -0,0 +1,47 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_HPP
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// dispatch for points_begin
+template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+struct points_begin
+    : not_implemented<Geometry>
+{};
+
+
+
+// dispatch for points_end
+template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+struct points_end
+    : not_implemented<Geometry>
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_HPP
diff --git a/include/boost/geometry/iterators/dispatch/point_iterator_type.hpp b/include/boost/geometry/iterators/dispatch/point_iterator_type.hpp
new file mode 100644
index 000000000..02c40acae
--- /dev/null
+++ b/include/boost/geometry/iterators/dispatch/point_iterator_type.hpp
@@ -0,0 +1,37 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_TYPE_HPP
+#define BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_TYPE_HPP
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+template <typename Geometry, typename Tag = typename tag<Geometry>::type>
+struct point_iterator_type
+    : not_implemented<Geometry>
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ITERATORS_DISPATCH_POINT_ITERATOR_TYPE_HPP
diff --git a/include/boost/geometry/iterators/ever_circling_iterator.hpp b/include/boost/geometry/iterators/ever_circling_iterator.hpp
index 8119a73b5..50b20480c 100644
--- a/include/boost/geometry/iterators/ever_circling_iterator.hpp
+++ b/include/boost/geometry/iterators/ever_circling_iterator.hpp
@@ -177,7 +177,7 @@ private:
 
     inline void advance(difference_type n)
     {
-        if (m_index >= 0 && m_index < m_size 
+        if (m_index >= 0 && m_index < m_size
             && m_index + n >= 0 && m_index + n < m_size)
         {
             m_index += n;
diff --git a/include/boost/geometry/iterators/flatten_iterator.hpp b/include/boost/geometry/iterators/flatten_iterator.hpp
new file mode 100644
index 000000000..42f755552
--- /dev/null
+++ b/include/boost/geometry/iterators/flatten_iterator.hpp
@@ -0,0 +1,248 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP
+
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/iterator.hpp>
+#include <boost/iterator/iterator_facade.hpp>
+#include <boost/iterator/iterator_categories.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+
+template
+<
+    typename OuterIterator,
+    typename InnerIterator,
+    typename Value,
+    typename AccessInnerBegin,
+    typename AccessInnerEnd
+>
+class flatten_iterator
+    : public boost::iterator_facade
+        <
+            flatten_iterator
+                <
+                    OuterIterator,
+                    InnerIterator,
+                    Value,
+                    AccessInnerBegin,
+                    AccessInnerEnd>,
+            Value,
+            boost::bidirectional_traversal_tag
+        >
+{
+private:
+    OuterIterator m_outer_it, m_outer_end;
+    InnerIterator m_inner_it;
+
+public:
+    typedef OuterIterator outer_iterator_type;
+    typedef InnerIterator inner_iterator_type;
+
+    // default constructor
+    flatten_iterator() {}
+
+    // for begin
+    flatten_iterator(OuterIterator outer_it, OuterIterator outer_end)
+        : m_outer_it(outer_it), m_outer_end(outer_end)
+    {
+        advance_through_empty();
+    }
+
+    // for end
+    flatten_iterator(OuterIterator outer_end)
+        : m_outer_it(outer_end), m_outer_end(outer_end)
+    {}
+
+    template
+    <
+        typename OtherOuterIterator, typename OtherInnerIterator,
+        typename OtherValue,
+        typename OtherAccessInnerBegin, typename OtherAccessInnerEnd
+    >
+    flatten_iterator(flatten_iterator
+                     <
+                         OtherOuterIterator,
+                         OtherInnerIterator,
+                         OtherValue,
+                         OtherAccessInnerBegin,
+                         OtherAccessInnerEnd
+                     > const& other)
+        : m_outer_it(other.m_outer_it),
+          m_outer_end(other.m_outer_end),
+          m_inner_it(other.m_inner_it)
+    {
+        static const bool are_conv
+            = boost::is_convertible
+                <
+                    OtherOuterIterator, OuterIterator
+                >::value
+           && boost::is_convertible
+                <
+                    OtherInnerIterator, InnerIterator
+                >::value;
+
+        BOOST_MPL_ASSERT_MSG((are_conv),
+                             NOT_CONVERTIBLE,
+                             (types<OtherOuterIterator, OtherInnerIterator>));
+    }
+
+    template
+    <
+        typename OtherOuterIterator,
+        typename OtherInnerIterator,
+        typename OtherValue,
+        typename OtherAccessInnerBegin,
+        typename OtherAccessInnerEnd
+    >
+    flatten_iterator operator=(flatten_iterator
+                               <
+                                   OtherOuterIterator,
+                                   OtherInnerIterator,
+                                   OtherValue,
+                                   OtherAccessInnerBegin,
+                                   OtherAccessInnerEnd
+                               > const& other)
+    {
+        static const bool are_conv
+            = boost::is_convertible
+                <
+                    OtherOuterIterator, OuterIterator
+                >::value
+           && boost::is_convertible
+                <
+                    OtherInnerIterator, InnerIterator
+                >::value;
+
+        BOOST_MPL_ASSERT_MSG((are_conv),
+                             NOT_CONVERTIBLE,
+                             (types<OtherOuterIterator, OtherInnerIterator>));
+             
+        m_outer_it = other.m_outer_it;
+        m_outer_end = other.m_outer_end;
+        m_inner_it = other.m_inner_it;
+        return *this;
+    }
+
+private:
+    friend class boost::iterator_core_access;
+
+    template
+    <
+        typename Outer,
+        typename Inner,
+        typename V,
+        typename InnerBegin,
+        typename InnerEnd
+    >
+    friend class flatten_iterator;
+
+    static inline bool empty(OuterIterator outer_it)
+    {
+        return
+            AccessInnerBegin::apply(*outer_it) == AccessInnerEnd::apply(*outer_it);
+    }
+
+    inline void advance_through_empty()
+    {
+        while ( m_outer_it != m_outer_end && empty(m_outer_it) )
+        {
+            ++m_outer_it;
+        }
+
+        if ( m_outer_it != m_outer_end )
+        {
+            m_inner_it = AccessInnerBegin::apply(*m_outer_it);
+        }
+    }
+
+    inline Value& dereference() const
+    {
+        BOOST_ASSERT( m_outer_it != m_outer_end );
+        BOOST_ASSERT( m_inner_it != AccessInnerEnd::apply(*m_outer_it) );
+        return *m_inner_it;
+    }
+
+
+    template
+    <
+        typename OtherOuterIterator,
+        typename OtherInnerIterator,
+        typename OtherValue,
+        typename OtherAccessInnerBegin,
+        typename OtherAccessInnerEnd
+    >
+    inline bool equal(flatten_iterator
+                      <
+                          OtherOuterIterator,
+                          OtherInnerIterator,
+                          OtherValue,
+                          OtherAccessInnerBegin,
+                          OtherAccessInnerEnd
+                      > const& other) const
+    {
+        if ( m_outer_it != other.m_outer_it )
+        {
+            return false;
+        }
+
+        if ( m_outer_it == m_outer_end )
+        {
+            return true;
+        }
+
+        return m_inner_it == other.m_inner_it;
+    }
+
+    inline void increment()
+    {
+        BOOST_ASSERT( m_outer_it != m_outer_end );
+        BOOST_ASSERT( m_inner_it != AccessInnerEnd::apply(*m_outer_it) );
+
+        ++m_inner_it;
+        if ( m_inner_it == AccessInnerEnd::apply(*m_outer_it) )
+        {
+            ++m_outer_it;
+            advance_through_empty();
+        }
+    }
+
+    inline void decrement()
+    {
+        if ( m_outer_it == m_outer_end
+             || m_inner_it == AccessInnerBegin::apply(*m_outer_it) )
+        {
+            do
+            {
+                --m_outer_it;
+            }
+            while ( empty(m_outer_it) );
+            m_inner_it = --AccessInnerEnd::apply(*m_outer_it);
+        }
+        else
+        {
+            --m_inner_it;
+        }
+    }
+};
+
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ITERATORS_FLATTEN_ITERATOR_HPP
diff --git a/include/boost/geometry/iterators/has_one_element.hpp b/include/boost/geometry/iterators/has_one_element.hpp
new file mode 100644
index 000000000..2f9acefc1
--- /dev/null
+++ b/include/boost/geometry/iterators/has_one_element.hpp
@@ -0,0 +1,29 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_HAS_ONE_ELEMENT_HPP
+#define BOOST_GEOMETRY_ITERATORS_HAS_ONE_ELEMENT_HPP
+
+
+namespace boost { namespace geometry
+{
+
+
+// free function to test if an iterator range has a single element
+template <typename Iterator>
+inline bool has_one_element(Iterator first, Iterator beyond)
+{
+    return first != beyond && ++first == beyond;
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ITERATORS_HAS_ONE_ELEMENT_HPP
diff --git a/include/boost/geometry/iterators/point_iterator.hpp b/include/boost/geometry/iterators/point_iterator.hpp
new file mode 100644
index 000000000..09134b6cd
--- /dev/null
+++ b/include/boost/geometry/iterators/point_iterator.hpp
@@ -0,0 +1,309 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
+
+#include <boost/assert.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/range.hpp>
+
+#include <boost/geometry/core/exterior_ring.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/iterators/dispatch/point_iterator.hpp>
+#include <boost/geometry/iterators/point_iterator_type.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// specializations for points_begin
+
+
+template <typename Linestring>
+struct points_begin<Linestring, linestring_tag>
+{
+    static inline typename point_iterator_type<Linestring>::type
+    apply(Linestring& linestring)
+    {
+        return boost::begin(linestring);
+    }
+};
+
+
+template <typename Ring>
+struct points_begin<Ring, ring_tag>
+{
+    static inline typename point_iterator_type<Ring>::type
+    apply(Ring& ring)
+    {
+        return boost::begin(ring);
+    }
+};
+
+
+template <typename Polygon>
+struct points_begin<Polygon, polygon_tag>
+{
+    typedef typename point_iterator_type<Polygon>::type return_type;
+
+    static inline return_type apply(Polygon& polygon)
+    {
+        typedef typename return_type::second_iterator_type flatten_iterator;
+
+        return return_type
+            (boost::begin(geometry::exterior_ring(polygon)),
+             boost::end(geometry::exterior_ring(polygon)),
+             flatten_iterator(boost::begin(geometry::interior_rings(polygon)),
+                              boost::end(geometry::interior_rings(polygon))
+                              ),
+             flatten_iterator(boost::begin(geometry::interior_rings(polygon)),
+                              boost::end(geometry::interior_rings(polygon))
+                              )
+             );
+    }
+};
+
+
+template <typename MultiPoint>
+struct points_begin<MultiPoint, multi_point_tag>
+{
+    static inline typename point_iterator_type<MultiPoint>::type
+    apply(MultiPoint& multipoint)
+    {
+        return boost::begin(multipoint);
+    }
+};
+
+
+template <typename MultiLinestring>
+struct points_begin<MultiLinestring, multi_linestring_tag>
+{
+    static inline typename point_iterator_type<MultiLinestring>::type
+    apply(MultiLinestring& multilinestring)
+    {
+        return typename point_iterator_type
+            <
+                MultiLinestring
+            >::type(boost::begin(multilinestring), boost::end(multilinestring));
+    }
+};
+
+
+template <typename MultiPolygon>
+struct points_begin<MultiPolygon, multi_polygon_tag>
+{
+    static inline typename point_iterator_type<MultiPolygon>::type
+    apply(MultiPolygon& multipolygon)
+    {
+        return typename point_iterator_type
+            <
+                MultiPolygon
+            >::type(boost::begin(multipolygon), boost::end(multipolygon));
+    }
+};
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+// specializations for points_end
+
+
+template <typename Linestring>
+struct points_end<Linestring, linestring_tag>
+{
+    static inline typename point_iterator_type<Linestring>::type
+    apply(Linestring& linestring)
+    {
+        return boost::end(linestring);
+    }
+};
+
+
+template <typename Ring>
+struct points_end<Ring, ring_tag>
+{
+    static inline typename point_iterator_type<Ring>::type
+    apply(Ring& ring)
+    {
+        return boost::end(ring);
+    }
+};
+
+
+template <typename Polygon>
+struct points_end<Polygon, polygon_tag>
+{
+    typedef typename point_iterator_type<Polygon>::type return_type;
+
+    static inline return_type apply(Polygon& polygon)
+    {
+        typedef typename return_type::second_iterator_type flatten_iterator;
+
+        return return_type
+            (boost::end(geometry::exterior_ring(polygon)),
+             flatten_iterator(boost::begin(geometry::interior_rings(polygon)),
+                              boost::end(geometry::interior_rings(polygon))
+                              ),
+             flatten_iterator( boost::end(geometry::interior_rings(polygon)) )
+             );
+    }
+};
+
+
+template <typename MultiPoint>
+struct points_end<MultiPoint, multi_point_tag>
+{
+    static inline typename point_iterator_type<MultiPoint>::type
+    apply(MultiPoint& multipoint)
+    {
+        return boost::end(multipoint);
+    }
+};
+
+
+template <typename MultiLinestring>
+struct points_end<MultiLinestring, multi_linestring_tag>
+{
+    static inline typename point_iterator_type<MultiLinestring>::type
+    apply(MultiLinestring& multilinestring)
+    {
+        return typename point_iterator_type
+            <
+                MultiLinestring
+            >::type(boost::end(multilinestring));
+    }
+};
+
+
+template <typename MultiPolygon>
+struct points_end<MultiPolygon, multi_polygon_tag>
+{
+    static inline typename point_iterator_type<MultiPolygon>::type
+    apply(MultiPolygon& multipolygon)
+    {
+        return typename point_iterator_type
+            <
+                MultiPolygon
+            >::type(boost::end(multipolygon));
+    }
+};
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+class point_iterator
+    : public dispatch::point_iterator_type<Geometry>::type
+{
+private:
+    typedef typename dispatch::point_iterator_type<Geometry>::type base;
+
+    base* base_ptr()
+    {
+        return this;
+    }
+
+    base const* base_ptr() const
+    {
+        return this;
+    }
+
+    template <typename OtherGeometry> friend class point_iterator;
+    template <typename G> friend inline point_iterator<G> points_begin(G&);
+    template <typename G> friend inline point_iterator<G> points_end(G&);
+
+    point_iterator(base const& base_it) : base(base_it) {}
+
+public:
+    point_iterator() {}
+
+    template <typename OtherGeometry>
+    point_iterator(point_iterator<OtherGeometry> const& other)
+        : base(*other.base_ptr())
+    {
+        static const bool is_conv
+            = boost::is_convertible<
+                typename dispatch::point_iterator_type<OtherGeometry>::type,
+                typename dispatch::point_iterator_type<Geometry>::type
+            >::value;
+
+        BOOST_MPL_ASSERT_MSG((is_conv),
+                             NOT_CONVERTIBLE,
+                             (point_iterator<OtherGeometry>));
+    }
+};
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline point_iterator<Geometry>
+points_begin(Geometry& geometry)
+{
+    return dispatch::points_begin<Geometry>::apply(geometry);
+}
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline point_iterator<Geometry>
+points_end(Geometry& geometry)
+{
+    return dispatch::points_end<Geometry>::apply(geometry);
+}
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline typename point_type<Geometry>::type
+points_front(Geometry& geometry)
+{
+    BOOST_ASSERT( dispatch::points_begin<Geometry>::apply(geometry)
+                  != dispatch::points_end<Geometry>::apply(geometry) );
+    return *dispatch::points_begin<Geometry>::apply(geometry);
+}
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline typename point_type<Geometry>::type
+points_back(Geometry& geometry)
+{
+    BOOST_ASSERT( dispatch::points_begin<Geometry>::apply(geometry)
+                  != dispatch::points_end<Geometry>::apply(geometry) );
+    return *--dispatch::points_end<Geometry>::apply(geometry);
+}
+
+
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_HPP
diff --git a/include/boost/geometry/iterators/point_iterator_type.hpp b/include/boost/geometry/iterators/point_iterator_type.hpp
new file mode 100644
index 000000000..4991b2718
--- /dev/null
+++ b/include/boost/geometry/iterators/point_iterator_type.hpp
@@ -0,0 +1,207 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_TYPE_HPP
+#define BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_TYPE_HPP
+
+#include <boost/geometry/iterators/dispatch/point_iterator_type.hpp>
+#include <boost/geometry/iterators/dispatch/point_iterator.hpp>
+
+#include <boost/range.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/mpl/if.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/iterators/flatten_iterator.hpp>
+#include <boost/geometry/iterators/concatenate_iterator.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail_dispatch
+{
+
+
+template <typename Geometry>
+struct point_iterator_value_type
+{
+    typedef typename boost::mpl::if_c
+        <
+            !boost::is_const<Geometry>::type::value,
+            typename geometry::point_type<Geometry>::type,
+            typename geometry::point_type<Geometry>::type const
+        >::type type;
+};
+
+
+
+
+template
+<
+    typename Geometry, 
+    typename Tag = typename tag<Geometry>::type
+>
+struct point_iterator_inner_range_type
+{
+    typedef typename boost::mpl::if_c
+        <
+            !boost::is_const<Geometry>::type::value,
+            typename boost::range_value<Geometry>::type,
+            typename boost::range_value<Geometry>::type const
+        >::type type;
+};
+
+
+template <typename Polygon>
+struct point_iterator_inner_range_type<Polygon, polygon_tag>
+{
+    typedef typename boost::mpl::if_c
+        <
+            !boost::is_const<Polygon>::type::value,
+            typename geometry::ring_type<Polygon>::type,
+            typename geometry::ring_type<Polygon>::type const
+        >::type type;
+};
+
+
+
+} // namespace detail_dispatch
+#endif // DOXYGEN_NO_DETAIL
+
+
+
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template <typename Linestring>
+struct point_iterator_type<Linestring, linestring_tag>
+{
+    typedef typename boost::range_iterator<Linestring>::type type;
+};
+
+
+template <typename Ring>
+struct point_iterator_type<Ring, ring_tag>
+{
+    typedef typename boost::range_iterator<Ring>::type type;
+};
+
+
+template <typename Polygon>
+class point_iterator_type<Polygon, polygon_tag>
+{
+private:
+    typedef typename detail_dispatch::point_iterator_inner_range_type
+        <
+            Polygon
+        >::type inner_range;
+
+public:
+    typedef concatenate_iterator
+        <
+            typename boost::range_iterator<inner_range>::type,
+            flatten_iterator
+                <
+                    typename boost::range_iterator
+                        <
+                            typename geometry::interior_type<Polygon>::type
+                        >::type,
+                    typename dispatch::point_iterator_type
+                        <
+                            inner_range
+                        >::type,
+                    typename detail_dispatch::point_iterator_value_type
+                        <
+                            Polygon
+                        >::type,
+                    dispatch::points_begin<inner_range>,
+                    dispatch::points_end<inner_range>
+                >,
+            typename detail_dispatch::point_iterator_value_type<Polygon>::type
+        > type;
+};
+
+
+template <typename MultiPoint>
+struct point_iterator_type<MultiPoint, multi_point_tag>
+{
+    typedef typename boost::range_iterator<MultiPoint>::type type;
+};
+
+
+template <typename MultiLinestring>
+class point_iterator_type<MultiLinestring, multi_linestring_tag>
+{
+private:
+    typedef typename detail_dispatch::point_iterator_inner_range_type
+        <
+            MultiLinestring
+        >::type inner_range;
+
+public:
+    typedef flatten_iterator
+        <
+            typename boost::range_iterator<MultiLinestring>::type,
+            typename dispatch::point_iterator_type<inner_range>::type,
+            typename detail_dispatch::point_iterator_value_type
+                <
+                    MultiLinestring
+                >::type,
+            dispatch::points_begin<inner_range>,
+            dispatch::points_end<inner_range>
+        > type;
+};
+
+
+template <typename MultiPolygon>
+class point_iterator_type<MultiPolygon, multi_polygon_tag>
+{
+private:
+    typedef typename detail_dispatch::point_iterator_inner_range_type
+        <
+            MultiPolygon
+        >::type inner_range;
+
+public:
+    typedef flatten_iterator
+        <
+            typename boost::range_iterator<MultiPolygon>::type,
+            typename dispatch::point_iterator_type<inner_range>::type,
+            typename detail_dispatch::point_iterator_value_type
+                <
+                    MultiPolygon
+                >::type,
+            dispatch::points_begin<inner_range>,
+            dispatch::points_end<inner_range>
+        > type;
+};
+
+
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ITERATORS_POINT_ITERATOR_TYPE_HPP
diff --git a/include/boost/geometry/iterators/point_reverse_iterator.hpp b/include/boost/geometry/iterators/point_reverse_iterator.hpp
new file mode 100644
index 000000000..5cce66795
--- /dev/null
+++ b/include/boost/geometry/iterators/point_reverse_iterator.hpp
@@ -0,0 +1,97 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ITERATORS_POINT_REVERSE_ITERATOR_HPP
+#define BOOST_GEOMETRY_ITERATORS_POINT_REVERSE_ITERATOR_HPP
+
+#include <iterator>
+
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+
+#include <boost/geometry/iterators/point_iterator.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+class point_reverse_iterator
+    : public std::reverse_iterator<point_iterator<Geometry> >
+{
+private:
+    typedef std::reverse_iterator<point_iterator<Geometry> > base;
+
+    base* base_ptr()
+    {
+        return this;
+    }
+
+    base const* base_ptr() const
+    {
+        return this;
+    }
+
+    template <typename OtherGeometry> friend class point_reverse_iterator;
+    template <typename G>
+    friend inline point_reverse_iterator<G> points_rbegin(G&);
+
+    template <typename G>
+    friend inline point_reverse_iterator<G> points_rend(G&);
+
+    point_reverse_iterator(base const& base_it) : base(base_it) {}
+
+public:
+    point_reverse_iterator() {}
+
+    template <typename OtherGeometry>
+    point_reverse_iterator(point_reverse_iterator<OtherGeometry> const& other)
+        : base(*other.base_ptr())
+    {
+        static const bool is_conv = boost::is_convertible
+            <
+                std::reverse_iterator<point_iterator<Geometry> >,
+                std::reverse_iterator<point_iterator<OtherGeometry> >
+            >::value;
+
+        BOOST_MPL_ASSERT_MSG((is_conv),
+                             NOT_CONVERTIBLE,
+                             (point_reverse_iterator<OtherGeometry>));
+    }
+};
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline point_reverse_iterator<Geometry>
+points_rbegin(Geometry& geometry)
+{
+    return std::reverse_iterator
+        <
+            point_iterator<Geometry>
+        >(points_end(geometry));
+}
+
+
+// MK:: need to add doc here
+template <typename Geometry>
+inline point_reverse_iterator<Geometry>
+points_rend(Geometry& geometry)
+{
+    return std::reverse_iterator
+        <
+            point_iterator<Geometry>
+        >(points_begin(geometry));
+}
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_ITERATORS_POINT_REVERSE_ITERATOR_HPP
diff --git a/include/boost/geometry/multi/algorithms/append.hpp b/include/boost/geometry/multi/algorithms/append.hpp
index bb97af1aa..2a2596c54 100644
--- a/include/boost/geometry/multi/algorithms/append.hpp
+++ b/include/boost/geometry/multi/algorithms/append.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -16,13 +21,41 @@
 
 #include <boost/geometry/algorithms/append.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 
 namespace boost { namespace geometry
 {
 
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace append
+{
+
+
+template <typename MultiGeometry, typename RangeOrPoint>
+struct append_to_multigeometry
+{
+    static inline void apply(MultiGeometry& multigeometry,
+                             RangeOrPoint const& range_or_point,
+                             int ring_index, int multi_index)
+    {
+        
+        dispatch::append
+            <
+                typename boost::range_value<MultiGeometry>::type,
+                RangeOrPoint
+            >::apply(multigeometry[multi_index], range_or_point, ring_index);
+    }
+};
+
+
+}} // namespace detail::append
+#endif // DOXYGEN_NO_DETAIL
+
+
+
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
 {
@@ -40,6 +73,26 @@ struct append_range<multi_point_tag, Geometry, Range>
     : detail::append::append_range<Geometry, Range>
 {};
 
+template <typename MultiGeometry, typename RangeOrPoint>
+struct append_point<multi_linestring_tag, MultiGeometry, RangeOrPoint>
+    : detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
+{};
+
+template <typename MultiGeometry, typename RangeOrPoint>
+struct append_range<multi_linestring_tag, MultiGeometry, RangeOrPoint>
+    : detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
+{};
+
+template <typename MultiGeometry, typename RangeOrPoint>
+struct append_point<multi_polygon_tag, MultiGeometry, RangeOrPoint>
+    : detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
+{};
+
+template <typename MultiGeometry, typename RangeOrPoint>
+struct append_range<multi_polygon_tag, MultiGeometry, RangeOrPoint>
+    : detail::append::append_to_multigeometry<MultiGeometry, RangeOrPoint>
+{};
+
 }
 
 
diff --git a/include/boost/geometry/multi/algorithms/area.hpp b/include/boost/geometry/multi/algorithms/area.hpp
index 333499748..0e25ffc64 100644
--- a/include/boost/geometry/multi/algorithms/area.hpp
+++ b/include/boost/geometry/multi/algorithms/area.hpp
@@ -15,44 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/area.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-template <typename MultiGeometry>
-struct area<MultiGeometry, multi_polygon_tag> : detail::multi_sum
-{
-    template <typename Strategy>
-    static inline typename Strategy::return_type
-    apply(MultiGeometry const& multi, Strategy const& strategy)
-    {
-        return multi_sum::apply
-               <
-                   typename Strategy::return_type,
-                   area<typename boost::range_value<MultiGeometry>::type>
-               >(multi, strategy);
-    }
-};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_AREA_HPP
diff --git a/include/boost/geometry/multi/algorithms/centroid.hpp b/include/boost/geometry/multi/algorithms/centroid.hpp
index 82e6a8af8..1c9902f2b 100644
--- a/include/boost/geometry/multi/algorithms/centroid.hpp
+++ b/include/boost/geometry/multi/algorithms/centroid.hpp
@@ -15,119 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
 
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/centroid.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace centroid
-{
-
-
-/*!
-    \brief Building block of a multi-point, to be used as Policy in the
-        more generec centroid_multi
-*/
-struct centroid_multi_point_state
-{
-    template <typename Point, typename Strategy>
-    static inline void apply(Point const& point,
-            Strategy const& strategy, typename Strategy::state_type& state)
-    {
-        strategy.apply(point, state);
-    }
-};
-
-
-
-/*!
-    \brief Generic implementation which calls a policy to calculate the
-        centroid of the total of its single-geometries
-    \details The Policy is, in general, the single-version, with state. So
-        detail::centroid::centroid_polygon_state is used as a policy for this
-        detail::centroid::centroid_multi
-
-*/
-template <typename Policy>
-struct centroid_multi
-{
-    template <typename Multi, typename Point, typename Strategy>
-    static inline void apply(Multi const& multi, Point& centroid,
-            Strategy const& strategy)
-    {
-#if ! defined(BOOST_GEOMETRY_CENTROID_NO_THROW)
-        // If there is nothing in any of the ranges, it is not possible
-        // to calculate the centroid
-        if (geometry::num_points(multi) == 0)
-        {
-            throw centroid_exception();
-        }
-#endif
-
-        typename Strategy::state_type state;
-
-        for (typename boost::range_iterator<Multi const>::type
-                it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            Policy::apply(*it, strategy, state);
-        }
-        Strategy::result(state, centroid);
-    }
-};
-
-
-
-}} // namespace detail::centroid
-#endif // DOXYGEN_NO_DETAIL
-
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiLinestring>
-struct centroid<MultiLinestring, multi_linestring_tag>
-    : detail::centroid::centroid_multi
-        <
-            detail::centroid::centroid_range_state<closed>
-        >
-{};
-
-template <typename MultiPolygon>
-struct centroid<MultiPolygon, multi_polygon_tag>
-    : detail::centroid::centroid_multi
-        <
-            detail::centroid::centroid_polygon_state
-        >
-{};
-
-
-template <typename MultiPoint>
-struct centroid<MultiPoint, multi_point_tag>
-    : detail::centroid::centroid_multi
-        <
-            detail::centroid::centroid_multi_point_state
-        >
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_CENTROID_HPP
diff --git a/include/boost/geometry/multi/algorithms/clear.hpp b/include/boost/geometry/multi/algorithms/clear.hpp
index ea32ee8b4..6d9e284d0 100644
--- a/include/boost/geometry/multi/algorithms/clear.hpp
+++ b/include/boost/geometry/multi/algorithms/clear.hpp
@@ -15,30 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CLEAR_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/clear.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Geometry>
-struct clear<Geometry, multi_tag>
-    : detail::clear::collection_clear<Geometry>
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_CLEAR_HPP
diff --git a/include/boost/geometry/multi/algorithms/convert.hpp b/include/boost/geometry/multi/algorithms/convert.hpp
index 1712964d4..0e7b2946d 100644
--- a/include/boost/geometry/multi/algorithms/convert.hpp
+++ b/include/boost/geometry/multi/algorithms/convert.hpp
@@ -15,115 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CONVERT_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/convert.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace conversion
-{
-
-template <typename Single, typename Multi, typename Policy>
-struct single_to_multi: private Policy
-{
-    static inline void apply(Single const& single, Multi& multi)
-    {
-        traits::resize<Multi>::apply(multi, 1);
-        Policy::apply(single, *boost::begin(multi));
-    }
-};
-
-
-
-template <typename Multi1, typename Multi2, typename Policy>
-struct multi_to_multi: private Policy
-{
-    static inline void apply(Multi1 const& multi1, Multi2& multi2)
-    {
-        traits::resize<Multi2>::apply(multi2, boost::size(multi1));
-
-        typename boost::range_iterator<Multi1 const>::type it1
-                = boost::begin(multi1);
-        typename boost::range_iterator<Multi2>::type it2
-                = boost::begin(multi2);
-
-        for (; it1 != boost::end(multi1); ++it1, ++it2)
-        {
-            Policy::apply(*it1, *it2);
-        }
-    }
-};
-
-
-}} // namespace detail::convert
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-// Dispatch for multi <-> multi, specifying their single-version as policy.
-// Note that, even if the multi-types are mutually different, their single
-// version types might be the same and therefore we call boost::is_same again
-
-template <typename Multi1, typename Multi2, std::size_t DimensionCount>
-struct convert<Multi1, Multi2, multi_tag, multi_tag, DimensionCount, false>
-    : detail::conversion::multi_to_multi
-        <
-            Multi1, 
-            Multi2,
-            convert
-                <
-                    typename boost::range_value<Multi1>::type,
-                    typename boost::range_value<Multi2>::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi1>::type
-                                >::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi2>::type
-                                >::type,
-                    DimensionCount
-                >
-        >
-{};
-
-template <typename Single, typename Multi, typename SingleTag, std::size_t DimensionCount>
-struct convert<Single, Multi, SingleTag, multi_tag, DimensionCount, false>
-    : detail::conversion::single_to_multi
-        <
-            Single, 
-            Multi,
-            convert
-                <
-                    Single,
-                    typename boost::range_value<Multi>::type,
-                    typename tag<Single>::type,
-                    typename single_tag_of
-                                <
-                                    typename tag<Multi>::type
-                                >::type,
-                    DimensionCount,
-                    false
-                >
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_CONVERT_HPP
diff --git a/include/boost/geometry/multi/algorithms/correct.hpp b/include/boost/geometry/multi/algorithms/correct.hpp
index d28d1e78e..83d26ca60 100644
--- a/include/boost/geometry/multi/algorithms/correct.hpp
+++ b/include/boost/geometry/multi/algorithms/correct.hpp
@@ -15,53 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_CORRECT_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/correct.hpp>
-#include <boost/geometry/multi/algorithms/detail/modify.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiPoint>
-struct correct<MultiPoint, multi_point_tag>
-    : detail::correct::correct_nop<MultiPoint>
-{};
-
-
-template <typename MultiLineString>
-struct correct<MultiLineString, multi_linestring_tag>
-    : detail::correct::correct_nop<MultiLineString>
-{};
-
-
-template <typename Geometry>
-struct correct<Geometry, multi_polygon_tag>
-    : detail::multi_modify
-        <
-            Geometry,
-            detail::correct::correct_polygon
-                <
-                    typename boost::range_value<Geometry>::type
-                >
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_CORRECT_HPP
diff --git a/include/boost/geometry/multi/algorithms/covered_by.hpp b/include/boost/geometry/multi/algorithms/covered_by.hpp
index c957c485b..706bc7847 100644
--- a/include/boost/geometry/multi/algorithms/covered_by.hpp
+++ b/include/boost/geometry/multi/algorithms/covered_by.hpp
@@ -3,6 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -11,61 +15,13 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
 
 
 #include <boost/geometry/algorithms/covered_by.hpp>
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/within.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Point, typename MultiPolygon>
-struct covered_by<Point, MultiPolygon, point_tag, multi_polygon_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, 
-                MultiPolygon const& multi_polygon, Strategy const& strategy)
-    {
-        return detail::within::geometry_multi_within_code
-            <
-                Point,
-                MultiPolygon,
-                Strategy,
-                detail::within::point_in_polygon
-                        <
-                            Point,
-                            typename boost::range_value<MultiPolygon>::type,
-                            order_as_direction
-                                <
-                                    geometry::point_order<MultiPolygon>::value
-                                >::value,
-                            geometry::closure<MultiPolygon>::value,
-                            Strategy
-                        >
-            >::apply(point, multi_polygon, strategy) >= 0;
-    }
-};
-
-
-} // namespace dispatch
-
-
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_COVERED_BY_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp b/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
new file mode 100644
index 000000000..da2ac5e9f
--- /dev/null
+++ b/include/boost/geometry/multi/algorithms/detail/extreme_points.hpp
@@ -0,0 +1,19 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
+#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
+
+
+#include <boost/geometry/algorithms/detail/extreme_points.hpp>
+
+
+#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_EXTREME_POINTS_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
index 0938d6a2e..2fe475ed5 100644
--- a/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/for_each_range.hpp
@@ -15,73 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP
 
 
-#include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
-
 #include <boost/geometry/algorithms/detail/for_each_range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each
-{
-
-
-template <typename Multi, typename Actor, bool IsConst>
-struct fe_range_multi
-{
-    static inline void apply(
-                    typename add_const_if_c<IsConst, Multi>::type& multi,
-                    Actor& actor)
-    {
-        for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it)
-        {
-            geometry::detail::for_each_range(*it, actor);
-        }
-    }
-};
-
-
-
-}} // namespace detail::for_each
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename MultiPoint, typename Actor, bool IsConst>
-struct for_each_range<multi_point_tag, MultiPoint, Actor, IsConst>
-    : detail::for_each::fe_range_range<MultiPoint, Actor, IsConst>
-{};
-
-template <typename Geometry, typename Actor, bool IsConst>
-struct for_each_range<multi_linestring_tag, Geometry, Actor, IsConst>
-    :
-    detail::for_each::fe_range_multi<Geometry, Actor, IsConst>
-{};
-
-template <typename Geometry, typename Actor, bool IsConst>
-struct for_each_range<multi_polygon_tag, Geometry, Actor, IsConst>
-    :
-    detail::for_each::fe_range_multi<Geometry, Actor, IsConst>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_FOR_EACH_RANGE_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/modify.hpp b/include/boost/geometry/multi/algorithms/detail/modify.hpp
index b52efd251..ae52e002f 100644
--- a/include/boost/geometry/multi/algorithms/detail/modify.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/modify.hpp
@@ -15,39 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_HPP
 
 
-#include <boost/range.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-
-template <typename MultiGeometry, typename Policy>
-struct multi_modify
-{
-    static inline void apply(MultiGeometry& multi)
-    {
-        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
-        for (iterator_type it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            Policy::apply(*it);
-        }
-    }
-};
-
-
-} // namespace detail
-#endif
-
-
-}} // namespace boost::geometry
+#include <boost/geometry/algorithms/detail/multi_modify.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp b/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
index 4ae79058d..1a82a6714 100644
--- a/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp
@@ -15,38 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_WITH_PREDICATE_HPP
 
 
-#include <boost/range.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-template <typename MultiGeometry, typename Predicate, typename Policy>
-struct multi_modify_with_predicate
-{
-    static inline void apply(MultiGeometry& multi, Predicate const& predicate)
-    {
-        typedef typename boost::range_iterator<MultiGeometry>::type iterator_type;
-        for (iterator_type it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            Policy::apply(*it, predicate);
-        }
-    }
-};
-
-
-} // namespace detail
-#endif
-
-
-}} // namespace boost::geometry
+#include <boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MODIFY_WITH_PREDICATE_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp b/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
index 704c3e6a9..b91970a16 100644
--- a/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/multi_sum.hpp
@@ -11,42 +11,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_MULTI_SUM_HPP
-#define BOOST_GEOMETRY_MULTI_SUM_HPP
-
-#include <boost/range.hpp>
+#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MULTI_SUM_HPP
+#define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MULTI_SUM_HPP
 
 
-namespace boost { namespace geometry
-{
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-struct multi_sum
-{
-    template <typename ReturnType, typename Policy, typename MultiGeometry, typename Strategy>
-    static inline ReturnType apply(MultiGeometry const& geometry, Strategy const& strategy)
-    {
-        ReturnType sum = ReturnType();
-        for (typename boost::range_iterator
-                <
-                    MultiGeometry const
-                >::type it = boost::begin(geometry);
-            it != boost::end(geometry);
-            ++it)
-        {
-            sum += Policy::apply(*it, strategy);
-        }
-        return sum;
-    }
-};
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 
 
-} // namespace detail
-#endif
-
-}} // namespace boost::geometry
-
-
-#endif // BOOST_GEOMETRY_MULTI_SUM_HPP
+#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_MULTI_SUM_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
index 940480b3c..5e23cf4ba 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp
@@ -2,6 +2,9 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // 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)
@@ -10,93 +13,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP
 
 
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy_segments
-{
-
-
-template
-<
-    typename MultiGeometry,
-    typename SegmentIdentifier,
-    typename PointOut,
-    typename Policy
->
-struct copy_segment_point_multi
-{
-    static inline bool apply(MultiGeometry const& multi,
-                SegmentIdentifier const& seg_id, bool second,
-                PointOut& point)
-    {
-
-        BOOST_ASSERT
-            (
-                seg_id.multi_index >= 0
-                && seg_id.multi_index < int(boost::size(multi))
-            );
-
-        // Call the single-version
-        return Policy::apply(multi[seg_id.multi_index], seg_id, second, point);
-    }
-};
-
-
-}} // namespace detail::copy_segments
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename MultiGeometry,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename PointOut
->
-struct copy_segment_point
-    <
-        multi_polygon_tag,
-        MultiGeometry,
-        Reverse,
-        SegmentIdentifier,
-        PointOut
-    >
-    : detail::copy_segments::copy_segment_point_multi
-        <
-            MultiGeometry,
-            SegmentIdentifier,
-            PointOut,
-            detail::copy_segments::copy_segment_point_polygon
-                <
-                    typename boost::range_value<MultiGeometry>::type,
-                    Reverse,
-                    SegmentIdentifier,
-                    PointOut
-                >
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENT_POINT_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
index f3a0532ac..54114bfae 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp
@@ -10,96 +10,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
 
 
-#include <boost/assert.hpp>
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
 
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace copy_segments
-{
-
-
-template
-<
-    typename MultiGeometry,
-    typename SegmentIdentifier,
-    typename RangeOut,
-    typename Policy
->
-struct copy_segments_multi
-{
-    static inline void apply(MultiGeometry const& multi_geometry,
-            SegmentIdentifier const& seg_id, int to_index,
-            RangeOut& current_output)
-    {
-
-        BOOST_ASSERT
-            (
-                seg_id.multi_index >= 0
-                && seg_id.multi_index < int(boost::size(multi_geometry))
-            );
-
-        // Call the single-version
-        Policy::apply(multi_geometry[seg_id.multi_index],
-                    seg_id, to_index, current_output);
-    }
-};
-
-
-}} // namespace detail::copy_segments
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename MultiPolygon,
-    bool Reverse,
-    typename SegmentIdentifier,
-    typename RangeOut
->
-struct copy_segments
-    <
-        multi_polygon_tag,
-        MultiPolygon,
-        Reverse,
-        SegmentIdentifier,
-        RangeOut
-    >
-    : detail::copy_segments::copy_segments_multi
-        <
-            MultiPolygon,
-            SegmentIdentifier,
-            RangeOut,
-            detail::copy_segments::copy_segments_polygon
-                <
-                    typename boost::range_value<MultiPolygon>::type,
-                    Reverse,
-                    SegmentIdentifier,
-                    RangeOut
-                >
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_COPY_SEGMENTS_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
index 2d04f7ccd..65e00d064 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp
@@ -10,47 +10,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_RING_HPP
 
 
-#include <boost/assert.hpp>
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay
-{
-
-template<>
-struct get_ring<multi_polygon_tag>
-{
-    template<typename MultiPolygon>
-    static inline typename ring_type<MultiPolygon>::type const& apply(
-                ring_identifier const& id,
-                MultiPolygon const& multi_polygon)
-    {
-        BOOST_ASSERT
-            (
-                id.multi_index >= 0
-                && id.multi_index < int(boost::size(multi_polygon))
-            );
-        return get_ring<polygon_tag>::apply(id,
-                    multi_polygon[id.multi_index]);
-    }
-};
-
-
-
-}} // namespace detail::overlay
-#endif // DOXYGEN_NO_DETAIL
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_RING_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
index 6bc0aae25..a83fb7739 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp
@@ -10,104 +10,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
 
 
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 
-#include <boost/geometry/multi/algorithms/distance.hpp>
-#include <boost/geometry/multi/views/detail/range_type.hpp>
-
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace get_turns
-{
-
-template
-<
-    typename Multi, typename Box,
-    bool Reverse, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
->
-struct get_turns_multi_polygon_cs
-{
-    static inline void apply(
-            int source_id1, Multi const& multi,
-            int source_id2, Box const& box,
-            Turns& turns, InterruptPolicy& interrupt_policy)
-    {
-        typedef typename boost::range_iterator
-            <
-                Multi const
-            >::type iterator_type;
-
-        int i = 0;
-        for (iterator_type it = boost::begin(multi);
-             it != boost::end(multi);
-             ++it, ++i)
-        {
-            // Call its single version
-            get_turns_polygon_cs
-                <
-                    typename boost::range_value<Multi>::type, Box,
-                    Reverse, ReverseBox,
-                    Turns, TurnPolicy, InterruptPolicy
-                >::apply(source_id1, *it, source_id2, box,
-                            turns, interrupt_policy, i);
-        }
-    }
-};
-
-}} // namespace detail::get_turns
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename MultiPolygon,
-    typename Box,
-    bool ReverseMultiPolygon, bool ReverseBox,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
->
-struct get_turns
-    <
-        multi_polygon_tag, box_tag,
-        MultiPolygon, Box,
-        ReverseMultiPolygon, ReverseBox,
-        Turns,
-        TurnPolicy, InterruptPolicy
-    >
-    : detail::get_turns::get_turns_multi_polygon_cs
-        <
-            MultiPolygon, Box,
-            ReverseMultiPolygon, ReverseBox,
-            Turns,
-            TurnPolicy, InterruptPolicy
-        >
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_GET_TURNS_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
index acb91f7dd..c780c4cd9 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp
@@ -10,56 +10,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELECT_RINGS_HPP
 
 
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay
-{
-
-namespace dispatch
-{
-
-    template <typename Multi>
-    struct select_rings<multi_polygon_tag, Multi>
-    {
-        template <typename Geometry, typename Map>
-        static inline void apply(Multi const& multi, Geometry const& geometry,
-                    ring_identifier id, Map& map, bool midpoint)
-        {
-            typedef typename boost::range_iterator
-                <
-                    Multi const
-                >::type iterator_type;
-
-            typedef select_rings<polygon_tag, typename boost::range_value<Multi>::type> per_polygon;
-
-            id.multi_index = 0;
-            for (iterator_type it = boost::begin(multi); it != boost::end(multi); ++it)
-            {
-                id.ring_index = -1;
-                per_polygon::apply(*it, geometry, id, map, midpoint);
-                id.multi_index++;
-            }
-        }
-    };
-}
-
-
-}} // namespace detail::overlay
-#endif // DOXYGEN_NO_DETAIL
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELECT_RINGS_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp b/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
index d9820837b..39bfea2fb 100644
--- a/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp
@@ -10,48 +10,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename MultiPolygon,
-    typename Turns,
-    typename TurnPolicy,
-    typename InterruptPolicy
->
-struct self_get_turn_points
-    <
-        multi_polygon_tag, MultiPolygon,
-        Turns,
-        TurnPolicy, InterruptPolicy
-    >
-    : detail::self_get_turn_points::get_turns
-        <
-            MultiPolygon,
-            Turns,
-            TurnPolicy,
-            InterruptPolicy
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_OVERLAY_SELF_TURN_POINTS_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp b/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
index dd3bcd5d1..2ee789c5d 100644
--- a/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/point_on_border.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -14,83 +17,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
 
-#include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/point_on_border.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace point_on_border
-{
-
-
-template
-<
-    typename Point,
-    typename MultiGeometry,
-    typename Policy
->
-struct point_on_multi
-{
-    static inline bool apply(Point& point, MultiGeometry const& multi, bool midpoint)
-    {
-        // Take a point on the first multi-geometry
-        // (i.e. the first that is not empty)
-        for (typename boost::range_iterator
-                <
-                    MultiGeometry const
-                >::type it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            if (Policy::apply(point, *it, midpoint))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-};
-
-
-
-
-}} // namespace detail::point_on_border
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template<typename Point, typename Multi>
-struct point_on_border<multi_polygon_tag, Point, Multi>
-    : detail::point_on_border::point_on_multi
-        <
-            Point,
-            Multi,
-            detail::point_on_border::point_on_polygon
-                <
-                    Point,
-                    typename boost::range_value<Multi>::type
-                >
-        >
-{};
-
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-
-}} // namespace boost::geometry
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_POINT_ON_BORDER_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp b/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
index 47bc8a863..5604d9d74 100644
--- a/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -11,81 +14,13 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
 
 
-#include <boost/assert.hpp>
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/core/ring_type.hpp>
 #include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace section
-{
-
-
-template
-<
-    typename MultiGeometry,
-    typename Section,
-    typename Policy
->
-struct full_section_multi
-{
-    static inline typename ring_return_type<MultiGeometry const>::type apply(
-                MultiGeometry const& multi, Section const& section)
-    {
-        BOOST_ASSERT
-            (
-                section.ring_id.multi_index >= 0
-                && section.ring_id.multi_index < int(boost::size(multi))
-            );
-
-        return Policy::apply(multi[section.ring_id.multi_index], section);
-    }
-};
-
-
-}} // namespace detail::section
-#endif
-
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename MultiPolygon, typename Section>
-struct range_by_section<multi_polygon_tag, MultiPolygon, Section>
-    : detail::section::full_section_multi
-        <
-            MultiPolygon,
-            Section,
-            detail::section::full_section_polygon
-                <
-                    typename boost::range_value<MultiPolygon>::type,
-                    Section
-                >
-       >
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-
-
-}} // namespace boost::geometry
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_RANGE_BY_SECTION_HPP
diff --git a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
index 1e1056f37..ef9802123 100644
--- a/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
+++ b/include/boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -14,84 +17,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
 
-#include <cstddef>
-#include <vector>
 
-#include <boost/concept/requires.hpp>
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace sectionalize
-{
-
-
-template <typename MultiGeometry, typename Sections, std::size_t DimensionCount, typename Policy>
-struct sectionalize_multi
-{
-    static inline void apply(MultiGeometry const& multi, Sections& sections, ring_identifier ring_id)
-    {
-        ring_id.multi_index = 0;
-        for (typename boost::range_iterator<MultiGeometry const>::type
-                    it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it, ++ring_id.multi_index)
-        {
-            Policy::apply(*it, sections, ring_id);
-        }
-    }
-};
-
-
-}} // namespace detail::sectionalize
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template
-<
-    typename MultiPolygon,
-    bool Reverse,
-    typename Sections,
-    std::size_t DimensionCount,
-    std::size_t MaxCount
->
-struct sectionalize<multi_polygon_tag, MultiPolygon, Reverse, Sections, DimensionCount, MaxCount>
-    : detail::sectionalize::sectionalize_multi
-        <
-            MultiPolygon,
-            Sections,
-            DimensionCount,
-            detail::sectionalize::sectionalize_polygon
-                <
-                    typename boost::range_value<MultiPolygon>::type,
-                    Reverse,
-                    Sections,
-                    DimensionCount,
-                    MaxCount
-                >
-        >
-
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DETAIL_SECTIONS_SECTIONALIZE_HPP
diff --git a/include/boost/geometry/multi/algorithms/disjoint.hpp b/include/boost/geometry/multi/algorithms/disjoint.hpp
index c01e520f5..55f0f01cd 100644
--- a/include/boost/geometry/multi/algorithms/disjoint.hpp
+++ b/include/boost/geometry/multi/algorithms/disjoint.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2012-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2012-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2012-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,34 +16,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
 
-
 #include <boost/geometry/algorithms/disjoint.hpp>
-#include <boost/geometry/multi/algorithms/covered_by.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Point, typename MultiPolygon>
-struct disjoint<Point, MultiPolygon, 2, point_tag, multi_polygon_tag, false>
-    : detail::disjoint::reverse_covered_by<Point, MultiPolygon>
-{};
-
-} // namespace dispatch
-
-
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DISJOINT_HPP
diff --git a/include/boost/geometry/multi/algorithms/distance.hpp b/include/boost/geometry/multi/algorithms/distance.hpp
index 92352d5fe..4946b6f3e 100644
--- a/include/boost/geometry/multi/algorithms/distance.hpp
+++ b/include/boost/geometry/multi/algorithms/distance.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,155 +19,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 
-
-#include <boost/numeric/conversion/bounds.hpp>
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+// this file is intentionally empty (with the exception of the #include below)
+// it is used for backward compatinility and may be removed in the future
 
 #include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/util/select_coordinate_type.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace distance
-{
-
-
-template<typename Geometry, typename MultiGeometry, typename Strategy>
-struct distance_single_to_multi
-    : private dispatch::distance
-      <
-          Geometry,
-          typename range_value<MultiGeometry>::type,
-          Strategy
-      >
-{
-    typedef typename strategy::distance::services::return_type
-                     <
-                         Strategy,
-                         typename point_type<Geometry>::type,
-                         typename point_type<MultiGeometry>::type
-                     >::type return_type;
-
-    static inline return_type apply(Geometry const& geometry,
-                MultiGeometry const& multi,
-                Strategy const& strategy)
-    {
-        return_type mindist = return_type();
-        bool first = true;
-
-        for(typename range_iterator<MultiGeometry const>::type it = boost::begin(multi);
-                it != boost::end(multi);
-                ++it, first = false)
-        {
-            return_type dist = dispatch::distance
-                <
-                    Geometry,
-                    typename range_value<MultiGeometry>::type,
-                    Strategy
-                >::apply(geometry, *it, strategy);
-
-            if (first || dist < mindist)
-            {
-                mindist = dist;
-            }
-        }
-
-        return mindist;
-    }
-};
-
-template<typename Multi1, typename Multi2, typename Strategy>
-struct distance_multi_to_multi
-    : private distance_single_to_multi
-      <
-          typename range_value<Multi1>::type,
-          Multi2,
-          Strategy
-      >
-{
-    typedef typename strategy::distance::services::return_type
-                     <
-                         Strategy,
-                         typename point_type<Multi1>::type,
-                         typename point_type<Multi2>::type
-                     >::type return_type;
-
-    static inline return_type apply(Multi1 const& multi1,
-                Multi2 const& multi2, Strategy const& strategy)
-    {
-        return_type mindist = return_type();
-        bool first = true;
-
-        for(typename range_iterator<Multi1 const>::type it = boost::begin(multi1);
-                it != boost::end(multi1);
-                ++it, first = false)
-        {
-            return_type dist = distance_single_to_multi
-                <
-                    typename range_value<Multi1>::type,
-                    Multi2,
-                    Strategy
-                >::apply(*it, multi2, strategy);
-            if (first || dist < mindist)
-            {
-                mindist = dist;
-            }
-        }
-
-        return mindist;
-    }
-};
-
-
-}} // namespace detail::distance
-#endif
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template
-<
-    typename G1,
-    typename G2,
-    typename Strategy,
-    typename SingleGeometryTag
->
-struct distance
-<
-    G1, G2, Strategy,
-    SingleGeometryTag, multi_tag, strategy_tag_distance_point_point,
-    false
->
-    : detail::distance::distance_single_to_multi<G1, G2, Strategy>
-{};
-
-template <typename G1, typename G2, typename Strategy>
-struct distance
-<
-    G1, G2, Strategy,
-    multi_tag, multi_tag, strategy_tag_distance_point_point,
-    false
->
-    : detail::distance::distance_multi_to_multi<G1, G2, Strategy>
-{};
-
-} // namespace dispatch
-#endif
-
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
diff --git a/include/boost/geometry/multi/algorithms/envelope.hpp b/include/boost/geometry/multi/algorithms/envelope.hpp
index b70aab41e..457dfaf3b 100644
--- a/include/boost/geometry/multi/algorithms/envelope.hpp
+++ b/include/boost/geometry/multi/algorithms/envelope.hpp
@@ -14,94 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_ENVELOPE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_ENVELOPE_HPP
 
-#include <vector>
 
-#include <boost/range/metafunctions.hpp>
-
-
-#include <boost/geometry/core/exterior_ring.hpp>
 #include <boost/geometry/algorithms/envelope.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-
-namespace detail { namespace envelope
-{
-
-
-struct envelope_multi_linestring
-{
-    template<typename MultiLinestring, typename Box>
-    static inline void apply(MultiLinestring const& mp, Box& mbr)
-    {
-        assign_inverse(mbr);
-        for (typename boost::range_iterator<MultiLinestring const>::type
-                    it = mp.begin();
-            it != mp.end();
-            ++it)
-        {
-            envelope_range_additional(*it, mbr);
-        }
-    }
-};
-
-
-// version for multi_polygon: outer ring's of all polygons
-struct envelope_multi_polygon
-{
-    template<typename MultiPolygon, typename Box>
-    static inline void apply(MultiPolygon const& mp, Box& mbr)
-    {
-        assign_inverse(mbr);
-        for (typename boost::range_const_iterator<MultiPolygon>::type
-                    it = mp.begin();
-            it != mp.end();
-            ++it)
-        {
-            envelope_range_additional(exterior_ring(*it), mbr);
-        }
-    }
-};
-
-
-}} // namespace detail::envelope
-
-#endif
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Multi>
-struct envelope<Multi, multi_point_tag>
-    : detail::envelope::envelope_range
-{};
-
-template <typename Multi>
-struct envelope<Multi, multi_linestring_tag>
-    : detail::envelope::envelope_multi_linestring
-{};
-
-
-template <typename Multi>
-struct envelope<Multi, multi_polygon_tag>
-    : detail::envelope::envelope_multi_polygon
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_ENVELOPE_HPP
diff --git a/include/boost/geometry/multi/algorithms/equals.hpp b/include/boost/geometry/multi/algorithms/equals.hpp
index 54cd07504..0f045fff9 100644
--- a/include/boost/geometry/multi/algorithms/equals.hpp
+++ b/include/boost/geometry/multi/algorithms/equals.hpp
@@ -15,51 +15,8 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_EQUALS_HPP
 
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/equals.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename MultiPolygon1, typename MultiPolygon2, bool Reverse>
-struct equals
-    <
-        MultiPolygon1, MultiPolygon2,
-        multi_polygon_tag, multi_polygon_tag,
-        2,
-        Reverse
-    >
-    : detail::equals::equals_by_collection<detail::equals::area_check>
-{};
-
-
-template <typename Polygon, typename MultiPolygon, bool Reverse>
-struct equals
-    <
-        Polygon, MultiPolygon,
-        polygon_tag, multi_polygon_tag,
-        2,
-        Reverse
-    >
-    : detail::equals::equals_by_collection<detail::equals::area_check>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_EQUALS_HPP
 
diff --git a/include/boost/geometry/multi/algorithms/for_each.hpp b/include/boost/geometry/multi/algorithms/for_each.hpp
index 9712b9c45..d8b3af1ff 100644
--- a/include/boost/geometry/multi/algorithms/for_each.hpp
+++ b/include/boost/geometry/multi/algorithms/for_each.hpp
@@ -15,87 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_FOR_EACH_HPP
 
 
-#include <boost/range.hpp>
-#include <boost/typeof/typeof.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
 #include <boost/geometry/algorithms/for_each.hpp>
 
 
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace for_each
-{
-
-// Implementation of multi, for both point and segment,
-// just calling the single version.
-template <typename Policy>
-struct for_each_multi
-{
-    template <typename MultiGeometry, typename Functor>
-    static inline void apply(MultiGeometry& multi, Functor& f)
-    {
-        for(BOOST_AUTO_TPL(it, boost::begin(multi)); it != boost::end(multi); ++it)
-        {
-            Policy::apply(*it, f);
-        }
-    }
-};
-
-
-}} // namespace detail::for_each
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiGeometry>
-struct for_each_point<MultiGeometry, multi_tag>
-    : detail::for_each::for_each_multi
-        <
-            // Specify the dispatch of the single-version as policy
-            for_each_point
-                <
-                    typename add_const_if_c
-                        <
-                            is_const<MultiGeometry>::value,
-                            typename boost::range_value<MultiGeometry>::type
-                        >::type
-                >
-        >
-{};
-
-
-template <typename MultiGeometry>
-struct for_each_segment<MultiGeometry, multi_tag>
-    : detail::for_each::for_each_multi
-        <
-            // Specify the dispatch of the single-version as policy
-            for_each_segment
-                <
-                    typename add_const_if_c
-                        <
-                            is_const<MultiGeometry>::value,
-                            typename boost::range_value<MultiGeometry>::type
-                        >::type
-                >
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_FOR_EACH_HPP
diff --git a/include/boost/geometry/multi/algorithms/intersection.hpp b/include/boost/geometry/multi/algorithms/intersection.hpp
index ddb9aed81..e0f3592e8 100644
--- a/include/boost/geometry/multi/algorithms/intersection.hpp
+++ b/include/boost/geometry/multi/algorithms/intersection.hpp
@@ -9,27 +9,27 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_INTERSECTION_HPP
 
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
+#include <boost/geometry/core/is_areal.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/is_areal.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+// TODO: those headers probably may be removed
+#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
+
+#include <boost/geometry/algorithms/intersection.hpp>
 
 #include <boost/geometry/multi/algorithms/covered_by.hpp>
 #include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
-
-#include <boost/geometry/algorithms/intersection.hpp>
-
 
 namespace boost { namespace geometry
 {
@@ -45,10 +45,13 @@ struct intersection_multi_linestring_multi_linestring_point
     template
     <
         typename MultiLinestring1, typename MultiLinestring2,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring1 const& ml1,
-            MultiLinestring2 const& ml2, OutputIterator out,
+            MultiLinestring2 const& ml2,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& strategy)
     {
         // Note, this loop is quadratic w.r.t. number of linestrings per input.
@@ -68,7 +71,7 @@ struct intersection_multi_linestring_multi_linestring_point
                 ++it2)
             {
                 out = intersection_linestring_linestring_point<PointOut>
-                      ::apply(*it1, *it2, out, strategy);
+                      ::apply(*it1, *it2, robust_policy, out, strategy);
             }
         }
 
@@ -83,10 +86,13 @@ struct intersection_linestring_multi_linestring_point
     template
     <
         typename Linestring, typename MultiLinestring,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Linestring const& linestring,
-            MultiLinestring const& ml, OutputIterator out,
+            MultiLinestring const& ml,
+            RobustPolicy const& robust_policy,
+            OutputIterator out,
             Strategy const& strategy)
     {
         for (typename boost::range_iterator
@@ -97,7 +103,7 @@ struct intersection_linestring_multi_linestring_point
             ++it)
         {
             out = intersection_linestring_linestring_point<PointOut>
-                  ::apply(linestring, *it, out, strategy);
+                  ::apply(linestring, *it, robust_policy, out, strategy);
         }
 
         return out;
@@ -118,9 +124,11 @@ struct intersection_of_multi_linestring_with_areal
     template
     <
         typename MultiLinestring, typename Areal,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring const& ml, Areal const& areal,
+            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
@@ -134,7 +142,7 @@ struct intersection_of_multi_linestring_with_areal
             out = intersection_of_linestring_with_areal
                 <
                     ReverseAreal, LineStringOut, OverlayType
-                >::apply(*it, areal, out, strategy);
+                >::apply(*it, areal, robust_policy, out, strategy);
         }
 
         return out;
@@ -154,16 +162,18 @@ struct intersection_of_areal_with_multi_linestring
     template
     <
         typename Areal, typename MultiLinestring,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(Areal const& areal, MultiLinestring const& ml,
+            RobustPolicy const& robust_policy,
             OutputIterator out,
             Strategy const& strategy)
     {
         return intersection_of_multi_linestring_with_areal
             <
                 ReverseAreal, LineStringOut, OverlayType
-            >::apply(ml, areal, out, strategy);
+            >::apply(ml, areal, robust_policy, out, strategy);
     }
 };
 
@@ -175,10 +185,13 @@ struct clip_multi_linestring
     template
     <
         typename MultiLinestring, typename Box,
+        typename RobustPolicy,
         typename OutputIterator, typename Strategy
     >
     static inline OutputIterator apply(MultiLinestring const& multi_linestring,
-            Box const& box, OutputIterator out, Strategy const& )
+            Box const& box,
+            RobustPolicy const& robust_policy,
+            OutputIterator out, Strategy const& )
     {
         typedef typename point_type<LinestringOut>::type point_type;
         strategy::intersection::liang_barsky<Box, point_type> lb_strategy;
@@ -187,7 +200,7 @@ struct clip_multi_linestring
             it != boost::end(multi_linestring); ++it)
         {
             out = detail::intersection::clip_range_with_box
-                <LinestringOut>(box, *it, out, lb_strategy);
+                <LinestringOut>(box, *it, robust_policy, out, lb_strategy);
         }
         return out;
     }
diff --git a/include/boost/geometry/multi/algorithms/length.hpp b/include/boost/geometry/multi/algorithms/length.hpp
index e18cbe3d9..168e6a732 100644
--- a/include/boost/geometry/multi/algorithms/length.hpp
+++ b/include/boost/geometry/multi/algorithms/length.hpp
@@ -15,48 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/length.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiLinestring>
-struct length<MultiLinestring, multi_linestring_tag> : detail::multi_sum
-{
-    template <typename Strategy>
-    static inline typename default_length_result<MultiLinestring>::type
-    apply(MultiLinestring const& multi, Strategy const& strategy)
-    {
-        return multi_sum::apply
-               <
-                   typename default_length_result<MultiLinestring>::type,
-                   detail::length::range_length
-                   <
-                       typename boost::range_value<MultiLinestring>::type,
-                       closed // no need to close it explicitly
-                   >
-               >(multi, strategy);
-
-    }
-};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_LENGTH_HPP
diff --git a/include/boost/geometry/multi/algorithms/num_geometries.hpp b/include/boost/geometry/multi/algorithms/num_geometries.hpp
index a102d08f2..3a85f4e4b 100644
--- a/include/boost/geometry/multi/algorithms/num_geometries.hpp
+++ b/include/boost/geometry/multi/algorithms/num_geometries.hpp
@@ -16,38 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_GEOMETRIES_HPP
 
 
-#include <cstddef>
-
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/num_geometries.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiGeometry>
-struct num_geometries<MultiGeometry, multi_tag>
-{
-    static inline std::size_t apply(MultiGeometry const& multi_geometry)
-    {
-        return boost::size(multi_geometry);
-    }
-};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_NUM_GEOMETRIES_HPP
diff --git a/include/boost/geometry/multi/algorithms/num_interior_rings.hpp b/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
index e43b31d16..5b52508b7 100644
--- a/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
+++ b/include/boost/geometry/multi/algorithms/num_interior_rings.hpp
@@ -20,8 +20,7 @@
 
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/algorithms/num_interior_rings.hpp>
 
diff --git a/include/boost/geometry/multi/algorithms/num_points.hpp b/include/boost/geometry/multi/algorithms/num_points.hpp
index 294c08603..180523a98 100644
--- a/include/boost/geometry/multi/algorithms/num_points.hpp
+++ b/include/boost/geometry/multi/algorithms/num_points.hpp
@@ -18,8 +18,8 @@
 
 #include <boost/range.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 #include <boost/geometry/algorithms/num_points.hpp>
 
 
diff --git a/include/boost/geometry/multi/algorithms/perimeter.hpp b/include/boost/geometry/multi/algorithms/perimeter.hpp
index 5b37525b8..4820111f1 100644
--- a/include/boost/geometry/multi/algorithms/perimeter.hpp
+++ b/include/boost/geometry/multi/algorithms/perimeter.hpp
@@ -15,42 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/perimeter.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-template <typename MultiPolygon>
-struct perimeter<MultiPolygon, multi_polygon_tag> : detail::multi_sum
-{
-    template <typename Strategy>
-    static inline typename default_length_result<MultiPolygon>::type
-    apply(MultiPolygon const& multi, Strategy const& strategy)
-    {
-        return multi_sum::apply
-               <
-                   typename default_length_result<MultiPolygon>::type,
-                   perimeter<typename boost::range_value<MultiPolygon>::type>
-               >(multi, strategy);
-    }
-};
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_PERIMETER_HPP
diff --git a/include/boost/geometry/multi/algorithms/remove_spikes.hpp b/include/boost/geometry/multi/algorithms/remove_spikes.hpp
new file mode 100644
index 000000000..af224ec47
--- /dev/null
+++ b/include/boost/geometry/multi/algorithms/remove_spikes.hpp
@@ -0,0 +1,19 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
+#define BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
+
+
+#include <boost/geometry/algorithms/remove_spikes.hpp>
+
+
+#endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_REMOVE_SPIKES_HPP
diff --git a/include/boost/geometry/multi/algorithms/reverse.hpp b/include/boost/geometry/multi/algorithms/reverse.hpp
index 7a4938ef8..a7872bdd2 100644
--- a/include/boost/geometry/multi/algorithms/reverse.hpp
+++ b/include/boost/geometry/multi/algorithms/reverse.hpp
@@ -15,49 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_REVERSE_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/algorithms/reverse.hpp>
-#include <boost/geometry/multi/algorithms/detail/modify.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename Geometry>
-struct reverse<Geometry, multi_linestring_tag>
-    : detail::multi_modify
-        <
-            Geometry,
-            detail::reverse::range_reverse
-        >
-{};
-
-
-template <typename Geometry>
-struct reverse<Geometry, multi_polygon_tag>
-    : detail::multi_modify
-        <
-            Geometry,
-            detail::reverse::polygon_reverse
-        >
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_REVERSE_HPP
diff --git a/include/boost/geometry/multi/algorithms/simplify.hpp b/include/boost/geometry/multi/algorithms/simplify.hpp
index 2c7461b66..8648d366d 100644
--- a/include/boost/geometry/multi/algorithms/simplify.hpp
+++ b/include/boost/geometry/multi/algorithms/simplify.hpp
@@ -14,79 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
 
-#include <boost/range.hpp>
 
-#include <boost/geometry/core/mutable_range.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-#include <boost/geometry/multi/algorithms/clear.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace simplify
-{
-
-template<typename Policy>
-struct simplify_multi
-{
-    template <typename MultiGeometry, typename Strategy>
-    static inline void apply(MultiGeometry const& multi, MultiGeometry& out,
-                    double max_distance, Strategy const& strategy)
-    {
-        traits::resize<MultiGeometry>::apply(out, boost::size(multi));
-
-        typename boost::range_iterator<MultiGeometry>::type it_out
-                = boost::begin(out);
-        for (typename boost::range_iterator<MultiGeometry const>::type it_in
-                    = boost::begin(multi);
-            it_in != boost::end(multi);
-            ++it_in, ++it_out)
-        {
-            Policy::apply(*it_in, *it_out, max_distance, strategy);
-        }
-    }
-};
-
-
-
-}} // namespace detail::simplify
-#endif // DOXYGEN_NO_DETAIL
-
-
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiPoint>
-struct simplify<MultiPoint, multi_point_tag>
-    : detail::simplify::simplify_copy
-{};
-
-
-template <typename MultiLinestring>
-struct simplify<MultiLinestring, multi_linestring_tag>
-    : detail::simplify::simplify_multi<detail::simplify::simplify_range<2> >
-{};
-
-
-template <typename MultiPolygon>
-struct simplify<MultiPolygon, multi_polygon_tag>
-    : detail::simplify::simplify_multi<detail::simplify::simplify_polygon>
-{};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
-
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_SIMPLIFY_HPP
diff --git a/include/boost/geometry/multi/algorithms/transform.hpp b/include/boost/geometry/multi/algorithms/transform.hpp
index 13c53e615..7aa691ec4 100644
--- a/include/boost/geometry/multi/algorithms/transform.hpp
+++ b/include/boost/geometry/multi/algorithms/transform.hpp
@@ -14,78 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
 
-#include <boost/range.hpp>
 
-#include <boost/geometry/core/mutable_range.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace transform
-{
-
-/*!
-    \brief Is able to transform any multi-geometry, calling the single-version as policy
-*/
-template <typename Policy>
-struct transform_multi
-{
-    template <typename Multi1, typename Multi2, typename S>
-    static inline bool apply(Multi1 const& multi1, Multi2& multi2, S const& strategy)
-    {
-        traits::resize<Multi2>::apply(multi2, boost::size(multi1));
-
-        typename boost::range_iterator<Multi1 const>::type it1
-                = boost::begin(multi1);
-        typename boost::range_iterator<Multi2>::type it2
-                = boost::begin(multi2);
-
-        for (; it1 != boost::end(multi1); ++it1, ++it2)
-        {
-            if (! Policy::apply(*it1, *it2, strategy))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-};
-
-
-}} // namespace detail::transform
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Multi1, typename Multi2>
-struct transform
-    <
-        Multi1, Multi2,
-        multi_tag, multi_tag
-    >
-    : detail::transform::transform_multi
-        <
-            transform
-                <
-                    typename boost::range_value<Multi1>::type,
-                    typename boost::range_value<Multi2>::type
-                >
-        >
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_TRANSFORM_HPP
diff --git a/include/boost/geometry/multi/algorithms/unique.hpp b/include/boost/geometry/multi/algorithms/unique.hpp
index 64c56aafb..fa063a312 100644
--- a/include/boost/geometry/multi/algorithms/unique.hpp
+++ b/include/boost/geometry/multi/algorithms/unique.hpp
@@ -15,72 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_UNIQUE_HPP
 
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/unique.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace unique
-{
-
-
-template <typename Policy>
-struct multi_unique
-{
-    template <typename MultiGeometry, typename ComparePolicy>
-    static inline void apply(MultiGeometry& multi, ComparePolicy const& compare)
-    {
-        for (typename boost::range_iterator<MultiGeometry>::type
-                it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            Policy::apply(*it, compare);
-        }
-    }
-};
-
-
-}} // namespace detail::unique
-#endif // DOXYGEN_NO_DETAIL
-
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-// For points, unique is not applicable and does nothing
-// (Note that it is not "spatially unique" but that it removes duplicate coordinates,
-//  like std::unique does). Spatially unique is "dissolve" which can (or will be)
-//  possible for multi-points as well, removing points at the same location.
-
-
-template <typename MultiLineString>
-struct unique<MultiLineString, multi_linestring_tag>
-    : detail::unique::multi_unique<detail::unique::range_unique>
-{};
-
-
-template <typename MultiPolygon>
-struct unique<MultiPolygon, multi_polygon_tag>
-    : detail::unique::multi_unique<detail::unique::polygon_unique>
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_UNIQUE_HPP
diff --git a/include/boost/geometry/multi/algorithms/within.hpp b/include/boost/geometry/multi/algorithms/within.hpp
index 4094dcc2d..9fdc5dd39 100644
--- a/include/boost/geometry/multi/algorithms/within.hpp
+++ b/include/boost/geometry/multi/algorithms/within.hpp
@@ -3,6 +3,10 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -11,95 +15,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
 
-
-#include <boost/range.hpp>
-
 #include <boost/geometry/algorithms/within.hpp>
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace within
-{
-
-
-template
-<
-    typename Geometry,
-    typename MultiGeometry,
-    typename Strategy,
-    typename Policy
->
-struct geometry_multi_within_code
-{
-    static inline int apply(Geometry const& geometry,
-            MultiGeometry const& multi,
-            Strategy const& strategy)
-    {
-        for (typename boost::range_iterator<MultiGeometry const>::type it
-                    = boost::begin(multi);
-            it != boost::end(multi);
-            ++it)
-        {
-            // Geometry coding on multi: 1 (within) if within one of them;
-            // 0 (touch) if on border of one of them
-            int const code = Policy::apply(geometry, *it, strategy);
-            if (code != -1)
-            {
-                return code;
-            }
-        }
-        return -1;
-    }
-};
-
-
-}} // namespace detail::within
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Point, typename MultiPolygon>
-struct within<Point, MultiPolygon, point_tag, multi_polygon_tag>
-{
-    template <typename Strategy>
-    static inline bool apply(Point const& point, 
-                MultiPolygon const& multi_polygon, Strategy const& strategy)
-    {
-        return detail::within::geometry_multi_within_code
-            <
-                Point,
-                MultiPolygon,
-                Strategy,
-                detail::within::point_in_polygon
-                        <
-                            Point,
-                            typename boost::range_value<MultiPolygon>::type,
-                            order_as_direction
-                                <
-                                    geometry::point_order<MultiPolygon>::value
-                                >::value,
-                            geometry::closure<MultiPolygon>::value,
-                            Strategy
-                        >
-            >::apply(point, multi_polygon, strategy) == 1;
-    }
-};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_WITHIN_HPP
diff --git a/include/boost/geometry/multi/core/closure.hpp b/include/boost/geometry/multi/core/closure.hpp
index 3964db256..9e7cf3c24 100644
--- a/include/boost/geometry/multi/core/closure.hpp
+++ b/include/boost/geometry/multi/core/closure.hpp
@@ -14,45 +14,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
 
-
-#include <boost/mpl/assert.hpp>
-#include <boost/range.hpp>
-#include <boost/type_traits/remove_const.hpp>
-
 #include <boost/geometry/core/closure.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename Multi>
-struct closure<multi_point_tag, Multi> : public core_detail::closure::closed {};
-
-template <typename Multi>
-struct closure<multi_linestring_tag, Multi> : public core_detail::closure::closed {};
-
-// Specialization for polygon: the closure is the closure of its rings
-template <typename MultiPolygon>
-struct closure<multi_polygon_tag, MultiPolygon>
-{
-    static const closure_selector value = core_dispatch::closure
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::value ;
-};
-
-
-} // namespace core_dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_CLOSURE_HPP
diff --git a/include/boost/geometry/multi/core/geometry_id.hpp b/include/boost/geometry/multi/core/geometry_id.hpp
index 9d69cb20d..7d5e888ba 100644
--- a/include/boost/geometry/multi/core/geometry_id.hpp
+++ b/include/boost/geometry/multi/core/geometry_id.hpp
@@ -15,42 +15,6 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
 
-
-#include <boost/mpl/int.hpp>
-#include <boost/type_traits.hpp>
-
-
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/core/tags.hpp>
 #include <boost/geometry/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <>
-struct geometry_id<multi_point_tag>      : boost::mpl::int_<4> {};
-
-
-template <>
-struct geometry_id<multi_linestring_tag> : boost::mpl::int_<5> {};
-
-
-template <>
-struct geometry_id<multi_polygon_tag>    : boost::mpl::int_<6> {};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_GEOMETRY_ID_HPP
diff --git a/include/boost/geometry/multi/core/interior_rings.hpp b/include/boost/geometry/multi/core/interior_rings.hpp
index 5a200d486..deeeff81d 100644
--- a/include/boost/geometry/multi/core/interior_rings.hpp
+++ b/include/boost/geometry/multi/core/interior_rings.hpp
@@ -16,40 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
 
 
-#include <cstddef>
-
-#include <boost/range.hpp>
-
 #include <boost/geometry/core/interior_rings.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-
-template <typename MultiPolygon>
-struct interior_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename core_dispatch::interior_type
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::type type;
-};
-
-
-} // namespace core_dispatch
-#endif
-
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_INTERIOR_RINGS_HPP
diff --git a/include/boost/geometry/multi/core/is_areal.hpp b/include/boost/geometry/multi/core/is_areal.hpp
index ad8daeb49..30f98527a 100644
--- a/include/boost/geometry/multi/core/is_areal.hpp
+++ b/include/boost/geometry/multi/core/is_areal.hpp
@@ -16,28 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
 
 
-#include <boost/type_traits.hpp>
-
-
 #include <boost/geometry/core/is_areal.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <> struct is_areal<multi_polygon_tag> : boost::true_type {};
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_IS_AREAL_HPP
diff --git a/include/boost/geometry/multi/core/point_order.hpp b/include/boost/geometry/multi/core/point_order.hpp
index 6b08468e8..119e55c3b 100644
--- a/include/boost/geometry/multi/core/point_order.hpp
+++ b/include/boost/geometry/multi/core/point_order.hpp
@@ -15,43 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
 
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/core/point_order.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename Multi>
-struct point_order<multi_point_tag, Multi>
-    : public detail::point_order::clockwise {};
-
-template <typename Multi>
-struct point_order<multi_linestring_tag, Multi>
-    : public detail::point_order::clockwise {};
-
-
-// Specialization for multi_polygon: the order is the order of its polygons
-template <typename MultiPolygon>
-struct point_order<multi_polygon_tag, MultiPolygon>
-{
-    static const order_selector value = core_dispatch::point_order
-        <
-            polygon_tag,
-            typename boost::range_value<MultiPolygon>::type
-        >::value ;
-};
-
-} // namespace core_dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_POINT_ORDER_HPP
diff --git a/include/boost/geometry/multi/core/point_type.hpp b/include/boost/geometry/multi/core/point_type.hpp
index 3c77e973b..a7277d09a 100644
--- a/include/boost/geometry/multi/core/point_type.hpp
+++ b/include/boost/geometry/multi/core/point_type.hpp
@@ -16,49 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename MultiPoint>
-struct point_type<multi_point_tag, MultiPoint>
-{
-    typedef typename boost::range_value<MultiPoint>::type type;
-};
-
-
-template <typename MultiLinestring>
-struct point_type<multi_linestring_tag, MultiLinestring>
-{
-    typedef typename point_type<linestring_tag,
-        typename boost::range_value<MultiLinestring>::type>::type type;
-};
-
-
-
-template <typename MultiPolygon>
-struct point_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename point_type<polygon_tag,
-        typename boost::range_value<MultiPolygon>::type>::type type;
-};
-
-
-}
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_POINT_TYPE_HPP
diff --git a/include/boost/geometry/multi/core/ring_type.hpp b/include/boost/geometry/multi/core/ring_type.hpp
index faafaed02..b27b5527c 100644
--- a/include/boost/geometry/multi/core/ring_type.hpp
+++ b/include/boost/geometry/multi/core/ring_type.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -16,51 +19,7 @@
 #define BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
 
 
-#include <boost/range/metafunctions.hpp>
-
 #include <boost/geometry/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <typename MultiPolygon>
-struct ring_return_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename ring_return_type
-        <
-            polygon_tag,
-            typename mpl::if_
-                <
-                    boost::is_const<MultiPolygon>,
-                    typename boost::range_value<MultiPolygon>::type const,
-                    typename boost::range_value<MultiPolygon>::type
-                >::type
-        >::type type;
-};
-
-
-template <typename MultiPolygon>
-struct ring_type<multi_polygon_tag, MultiPolygon>
-{
-    typedef typename boost::remove_reference
-        <
-            typename ring_return_type<multi_polygon_tag, MultiPolygon>::type
-        >::type type;
-};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_RING_TYPE_HPP
diff --git a/include/boost/geometry/multi/core/tags.hpp b/include/boost/geometry/multi/core/tags.hpp
index dcfca65b2..fb0758d95 100644
--- a/include/boost/geometry/multi/core/tags.hpp
+++ b/include/boost/geometry/multi/core/tags.hpp
@@ -15,57 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 #define BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
 
+
 #include <boost/geometry/core/tags.hpp>
 
-namespace boost { namespace geometry
-{
-
-/// OGC Multi point identifying tag
-struct multi_point_tag : multi_tag, pointlike_tag  {};
-
-/// OGC Multi linestring identifying tag
-struct multi_linestring_tag : multi_tag, linear_tag {};
-
-/// OGC Multi polygon identifying tag
-struct multi_polygon_tag : multi_tag, polygonal_tag {};
-
-/// OGC Geometry Collection identifying tag
-struct geometry_collection_tag : multi_tag {};
-
-
-
-
-/*!
-\brief Meta-function to get for a tag of a multi-geometry
-    the tag of the corresponding single-geometry
-*/
-template <typename Tag>
-struct single_tag_of
-{};
-
-#ifndef DOXYGEN_NO_DETAIL
-
-template <>
-struct single_tag_of<multi_point_tag>
-{
-    typedef point_tag type;
-};
-
-template <>
-struct single_tag_of<multi_linestring_tag>
-{
-    typedef linestring_tag type;
-};
-
-template <>
-struct single_tag_of<multi_polygon_tag>
-{
-    typedef polygon_tag type;
-};
-
-#endif
-
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_CORE_TAGS_HPP
diff --git a/include/boost/geometry/multi/core/topological_dimension.hpp b/include/boost/geometry/multi/core/topological_dimension.hpp
index 55118f1c7..b4f1e89ae 100644
--- a/include/boost/geometry/multi/core/topological_dimension.hpp
+++ b/include/boost/geometry/multi/core/topological_dimension.hpp
@@ -16,37 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_TOPOLOGICAL_DIMENSION_HPP
 
 
-#include <boost/mpl/int.hpp>
-
-
 #include <boost/geometry/core/topological_dimension.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace core_dispatch
-{
-
-template <>
-struct top_dim<multi_point_tag> : boost::mpl::int_<0> {};
-
-
-template <>
-struct top_dim<multi_linestring_tag> : boost::mpl::int_<1> {};
-
-
-template <>
-struct top_dim<multi_polygon_tag> : boost::mpl::int_<2> {};
-
-
-} // namespace core_dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif
diff --git a/include/boost/geometry/multi/geometries/concepts/check.hpp b/include/boost/geometry/multi/geometries/concepts/check.hpp
index 61afc913c..c741afd79 100644
--- a/include/boost/geometry/multi/geometries/concepts/check.hpp
+++ b/include/boost/geometry/multi/geometries/concepts/check.hpp
@@ -16,68 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_CHECK_HPP
 
 
-
-#include <boost/type_traits/is_const.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-
 #include <boost/geometry/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_point_concept.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-
-template <typename Geometry>
-struct check<Geometry, multi_point_tag, true>
-    : detail::concept_check::check<concept::ConstMultiPoint<Geometry> >
-{};
-
-
-template <typename Geometry>
-struct check<Geometry, multi_point_tag, false>
-    : detail::concept_check::check<concept::MultiPoint<Geometry> >
-{};
-
-
-template <typename Geometry>
-struct check<Geometry, multi_linestring_tag, true>
-    : detail::concept_check::check<concept::ConstMultiLinestring<Geometry> >
-{};
-
-
-template <typename Geometry>
-struct check<Geometry, multi_linestring_tag, false>
-    : detail::concept_check::check<concept::MultiLinestring<Geometry> >
-{};
-
-
-template <typename Geometry>
-struct check<Geometry, multi_polygon_tag, true>
-    : detail::concept_check::check<concept::ConstMultiPolygon<Geometry> >
-{};
-
-
-template <typename Geometry>
-struct check<Geometry, multi_polygon_tag, false>
-    : detail::concept_check::check<concept::MultiPolygon<Geometry> >
-{};
-
-
-} // namespace dispatch
-#endif
-
-
-}} // namespace boost::geometry
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_CHECK_HPP
diff --git a/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp b/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
index d232fa8c8..9a9438efc 100644
--- a/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
+++ b/include/boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp
@@ -16,76 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
 
 
-#include <boost/concept_check.hpp>
-#include <boost/range/concepts.hpp>
-#include <boost/range/metafunctions.hpp>
-
-
-#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
-
-
-namespace boost { namespace geometry { namespace concept
-{
-
-
-/*!
-\brief multi-linestring concept
-\ingroup concepts
-\par Formal definition:
-The multi linestring concept is defined as following:
-- there must be a specialization of traits::tag defining multi_linestring_tag as
-  type
-- it must behave like a Boost.Range
-- its range value must fulfil the Linestring concept
-
-*/
-template <typename Geometry>
-class MultiLinestring
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type linestring_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::Linestring<linestring_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(MultiLinestring)
-    {
-        Geometry* mls = 0;
-        traits::clear<Geometry>::apply(*mls);
-        traits::resize<Geometry>::apply(*mls, 0); 
-        linestring_type* ls = 0;
-        traits::push_back<Geometry>::apply(*mls, *ls);
-    }
-#endif
-};
-
-
-/*!
-\brief concept for multi-linestring (const version)
-\ingroup const_concepts
-*/
-template <typename Geometry>
-class ConstMultiLinestring
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type linestring_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::ConstLinestring<linestring_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(ConstMultiLinestring)
-    {
-    }
-#endif
-};
-
-}}} // namespace boost::geometry::concept
+#include <boost/geometry/geometries/concepts/multi_linestring_concept.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_LINESTRING_CONCEPT_HPP
diff --git a/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp b/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
index 7d04248a5..14c1d25e5 100644
--- a/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
+++ b/include/boost/geometry/multi/geometries/concepts/multi_point_concept.hpp
@@ -16,75 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
 
 
-#include <boost/concept_check.hpp>
-#include <boost/range/concepts.hpp>
-#include <boost/range/metafunctions.hpp>
-
-
-#include <boost/geometry/geometries/concepts/point_concept.hpp>
-
-
-namespace boost { namespace geometry { namespace concept
-{
-
-
-/*!
-\brief MultiPoint concept
-\ingroup concepts
-\par Formal definition:
-The multi point concept is defined as following:
-- there must be a specialization of traits::tag defining multi_point_tag as type
-- it must behave like a Boost.Range
-- its range value must fulfil the Point concept
-
-*/
-template <typename Geometry>
-class MultiPoint
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type point_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::Point<point_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(MultiPoint)
-    {
-        Geometry* mp = 0;
-        traits::clear<Geometry>::apply(*mp);
-        traits::resize<Geometry>::apply(*mp, 0); 
-        point_type* point = 0;
-        traits::push_back<Geometry>::apply(*mp, *point);
-    }
-#endif
-};
-
-
-/*!
-\brief concept for multi-point (const version)
-\ingroup const_concepts
-*/
-template <typename Geometry>
-class ConstMultiPoint
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type point_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::ConstPoint<point_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(ConstMultiPoint)
-    {
-    }
-#endif
-};
-
-}}} // namespace boost::geometry::concept
+#include <boost/geometry/geometries/concepts/multi_point_concept.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POINT_CONCEPT_HPP
diff --git a/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp b/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
index ec37ef15a..5e46fb753 100644
--- a/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
+++ b/include/boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp
@@ -16,76 +16,7 @@
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
 
 
-#include <boost/concept_check.hpp>
-#include <boost/range/concepts.hpp>
-#include <boost/range/metafunctions.hpp>
-
-#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
-
-
-namespace boost { namespace geometry { namespace concept
-{
-
-
-/*!
-\brief multi-polygon concept
-\ingroup concepts
-\par Formal definition:
-The multi polygon concept is defined as following:
-- there must be a specialization of traits::tag defining multi_polygon_tag
-  as type
-- it must behave like a Boost.Range
-- its range value must fulfil the Polygon concept
-
-*/
-template <typename Geometry>
-class MultiPolygon
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type polygon_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::Polygon<polygon_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(MultiPolygon)
-    {
-        Geometry* mp = 0;
-        traits::clear<Geometry>::apply(*mp);
-        traits::resize<Geometry>::apply(*mp, 0);
-        polygon_type* poly = 0;
-        traits::push_back<Geometry>::apply(*mp, *poly);
-    }
-#endif
-};
-
-
-/*!
-\brief concept for multi-polygon (const version)
-\ingroup const_concepts
-*/
-template <typename Geometry>
-class ConstMultiPolygon
-{
-#ifndef DOXYGEN_NO_CONCEPT_MEMBERS
-    typedef typename boost::range_value<Geometry>::type polygon_type;
-
-    BOOST_CONCEPT_ASSERT( (concept::ConstPolygon<polygon_type>) );
-    BOOST_CONCEPT_ASSERT( (boost::RandomAccessRangeConcept<Geometry>) );
-
-
-public :
-
-    BOOST_CONCEPT_USAGE(ConstMultiPolygon)
-    {
-    }
-#endif
-};
-
-
-}}} // namespace boost::geometry::concept
+#include <boost/geometry/geometries/concepts/multi_polygon_concept.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_CONCEPTS_MULTI_POLYGON_CONCEPT_HPP
diff --git a/include/boost/geometry/multi/geometries/multi_geometries.hpp b/include/boost/geometry/multi/geometries/multi_geometries.hpp
index 90cf85a0f..53042091b 100644
--- a/include/boost/geometry/multi/geometries/multi_geometries.hpp
+++ b/include/boost/geometry/multi/geometries/multi_geometries.hpp
@@ -14,8 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_GEOMETRIES_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_GEOMETRIES_HPP
 
-#include <boost/geometry/multi/geometries/multi_point.hpp>
-#include <boost/geometry/multi/geometries/multi_linestring.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_GEOMETRIES_HPP
diff --git a/include/boost/geometry/multi/geometries/multi_linestring.hpp b/include/boost/geometry/multi/geometries/multi_linestring.hpp
index 67d4da06b..696d907dc 100644
--- a/include/boost/geometry/multi/geometries/multi_linestring.hpp
+++ b/include/boost/geometry/multi/geometries/multi_linestring.hpp
@@ -11,70 +11,11 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_LINESTRING_HPP
-#define BOOST_GEOMETRY_MULTI_GEOMETRIES_LINESTRING_HPP
-
-#include <memory>
-#include <vector>
-
-#include <boost/concept/requires.hpp>
-
-#include <boost/geometry/geometries/concepts/linestring_concept.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
+#ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_LINESTRING_HPP
+#define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_LINESTRING_HPP
 
 
-namespace model
-{
-
-/*!
-\brief multi_line, a collection of linestring
-\details Multi-linestring can be used to group lines belonging to each other,
-        e.g. a highway (with interruptions)
-\ingroup geometries
-
-\qbk{before.synopsis,
-[heading Model of]
-[link geometry.reference.concepts.concept_multi_linestring MultiLineString Concept]
-}
-*/
-template
-<
-    typename LineString,
-    template<typename, typename> class Container = std::vector,
-    template<typename> class Allocator = std::allocator
->
-class multi_linestring : public Container<LineString, Allocator<LineString> >
-{
-    BOOST_CONCEPT_ASSERT( (concept::Linestring<LineString>) );
-};
+#include <boost/geometry/geometries/multi_linestring.hpp>
 
 
-} // namespace model
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-template
-<
-    typename LineString,
-    template<typename, typename> class Container,
-    template<typename> class Allocator
->
-struct tag< model::multi_linestring<LineString, Container, Allocator> >
-{
-    typedef multi_linestring_tag type;
-};
-
-} // namespace traits
-#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-
-
-}} // namespace boost::geometry
-
-#endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_LINESTRING_HPP
+#endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_LINESTRING_HPP
diff --git a/include/boost/geometry/multi/geometries/multi_point.hpp b/include/boost/geometry/multi/geometries/multi_point.hpp
index 002d8f8a4..750ad7802 100644
--- a/include/boost/geometry/multi/geometries/multi_point.hpp
+++ b/include/boost/geometry/multi/geometries/multi_point.hpp
@@ -14,81 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POINT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POINT_HPP
 
-#include <memory>
-#include <vector>
 
-#include <boost/concept/requires.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
 
-#include <boost/geometry/geometries/concepts/point_concept.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-
-namespace boost { namespace geometry
-{
-
-namespace model
-{
-
-
-/*!
-\brief multi_point, a collection of points
-\ingroup geometries
-\tparam Point \tparam_point
-\tparam Container \tparam_container
-\tparam Allocator \tparam_allocator
-\details Multipoint can be used to group points belonging to each other,
-        e.g. a constellation, or the result set of an intersection
-\qbk{before.synopsis,
-[heading Model of]
-[link geometry.reference.concepts.concept_multi_point MultiPoint Concept]
-}
-*/
-template
-<
-    typename Point,
-    template<typename, typename> class Container = std::vector,
-    template<typename> class Allocator = std::allocator
->
-class multi_point : public Container<Point, Allocator<Point> >
-{
-    BOOST_CONCEPT_ASSERT( (concept::Point<Point>) );
-
-    typedef Container<Point, Allocator<Point> > base_type;
-
-public :
-    /// \constructor_default{multi_point}
-    inline multi_point()
-        : base_type()
-    {}
-
-    /// \constructor_begin_end{multi_point}
-    template <typename Iterator>
-    inline multi_point(Iterator begin, Iterator end)
-        : base_type(begin, end)
-    {}
-};
-
-} // namespace model
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-template
-<
-    typename Point,
-    template<typename, typename> class Container,
-    template<typename> class Allocator
->
-struct tag< model::multi_point<Point, Container, Allocator> >
-{
-    typedef multi_point_tag type;
-};
-
-} // namespace traits
-#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POINT_HPP
diff --git a/include/boost/geometry/multi/geometries/multi_polygon.hpp b/include/boost/geometry/multi/geometries/multi_polygon.hpp
index af8d04287..06fefc785 100644
--- a/include/boost/geometry/multi/geometries/multi_polygon.hpp
+++ b/include/boost/geometry/multi/geometries/multi_polygon.hpp
@@ -14,65 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POLYGON_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POLYGON_HPP
 
-#include <memory>
-#include <vector>
 
-#include <boost/concept/requires.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
-#include <boost/geometry/multi/core/tags.hpp>
-
-#include <boost/geometry/geometries/concepts/polygon_concept.hpp>
-
-namespace boost { namespace geometry
-{
-
-namespace model
-{
-
-/*!
-\brief multi_polygon, a collection of polygons
-\details Multi-polygon can be used to group polygons belonging to each other,
-        e.g. Hawaii
-\ingroup geometries
-
-\qbk{before.synopsis,
-[heading Model of]
-[link geometry.reference.concepts.concept_multi_polygon MultiPolygon Concept]
-}
-*/
-template
-<
-    typename Polygon,
-    template<typename, typename> class Container = std::vector,
-    template<typename> class Allocator = std::allocator
->
-class multi_polygon : public Container<Polygon, Allocator<Polygon> >
-{
-    BOOST_CONCEPT_ASSERT( (concept::Polygon<Polygon>) );
-};
-
-
-} // namespace model
-
-
-#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-namespace traits
-{
-
-template
-<
-    typename Polygon,
-    template<typename, typename> class Container,
-    template<typename> class Allocator
->
-struct tag< model::multi_polygon<Polygon, Container, Allocator> >
-{
-    typedef multi_polygon_tag type;
-};
-
-} // namespace traits
-#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_MULTI_POLYGON_HPP
diff --git a/include/boost/geometry/multi/geometries/register/multi_linestring.hpp b/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
index 5ececdb8e..2783a8455 100644
--- a/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
+++ b/include/boost/geometry/multi/geometries/register/multi_linestring.hpp
@@ -15,45 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
 
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
-/*!
-\brief \brief_macro{multi_linestring}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING, multi_linestring} The 
-    multi_linestring may contain template parameters, which must be specified then.
-\param MultiLineString \param_macro_type{multi_linestring}
-
-\qbk{
-[heading Example]
-[register_multi_linestring]
-[register_multi_linestring_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING(MultiLineString) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<> struct tag<MultiLineString> { typedef multi_linestring_tag type; }; \
-}}}
-
-
-/*!
-\brief \brief_macro{templated multi_linestring}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING_TEMPLATED, templated multi_linestring} 
-    \details_macro_templated{multi_linestring, linestring}
-\param MultiLineString \param_macro_type{multi_linestring (without template parameters)}
-
-\qbk{
-[heading Example]
-[register_multi_linestring_templated]
-[register_multi_linestring_templated_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_LINESTRING_TEMPLATED(MultiLineString) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<typename LineString> struct tag< MultiLineString<LineString> > { typedef multi_linestring_tag type; }; \
-}}}
+#include <boost/geometry/geometries/register/multi_linestring.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_LINESTRING_HPP
diff --git a/include/boost/geometry/multi/geometries/register/multi_point.hpp b/include/boost/geometry/multi/geometries/register/multi_point.hpp
index 813f54733..6063492c2 100644
--- a/include/boost/geometry/multi/geometries/register/multi_point.hpp
+++ b/include/boost/geometry/multi/geometries/register/multi_point.hpp
@@ -15,45 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POINT_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POINT_HPP
 
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
-/*!
-\brief \brief_macro{multi_point}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POINT, multi_point} The 
-    multi_point may contain template parameters, which must be specified then.
-\param MultiPoint \param_macro_type{multi_point}
-
-\qbk{
-[heading Example]
-[register_multi_point]
-[register_multi_point_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_POINT(MultiPoint) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<> struct tag<MultiPoint> { typedef multi_point_tag type; }; \
-}}}
-
-
-/*!
-\brief \brief_macro{templated multi_point}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED, templated multi_point} 
-    \details_macro_templated{multi_point, point}
-\param MultiPoint \param_macro_type{multi_point (without template parameters)}
-
-\qbk{
-[heading Example]
-[register_multi_point_templated]
-[register_multi_point_templated_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED(MultiPoint) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<typename Point> struct tag< MultiPoint<Point> > { typedef multi_point_tag type; }; \
-}}}
+#include <boost/geometry/geometries/register/multi_point.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POINT_HPP
diff --git a/include/boost/geometry/multi/geometries/register/multi_polygon.hpp b/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
index 801b98cf2..6a3e47e3d 100644
--- a/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
+++ b/include/boost/geometry/multi/geometries/register/multi_polygon.hpp
@@ -15,45 +15,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
 #define BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
 
-#include <boost/geometry/core/tag.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
 
-/*!
-\brief \brief_macro{multi_polygon}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POLYGON, multi_polygon} The 
-    multi_polygon may contain template parameters, which must be specified then.
-\param MultiPolygon \param_macro_type{multi_polygon}
-
-\qbk{
-[heading Example]
-[register_multi_polygon]
-[register_multi_polygon_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_POLYGON(MultiPolygon) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<> struct tag<MultiPolygon> { typedef multi_polygon_tag type; }; \
-}}}
-
-
-/*!
-\brief \brief_macro{templated multi_polygon}
-\ingroup register
-\details \details_macro{BOOST_GEOMETRY_REGISTER_MULTI_POLYGON_TEMPLATED, templated multi_polygon} 
-    \details_macro_templated{multi_polygon, polygon}
-\param MultiPolygon \param_macro_type{multi_polygon (without template parameters)}
-
-\qbk{
-[heading Example]
-[register_multi_polygon_templated]
-[register_multi_polygon_templated_output]
-}
-*/
-#define BOOST_GEOMETRY_REGISTER_MULTI_POLYGON_TEMPLATED(MultiPolygon) \
-namespace boost { namespace geometry { namespace traits {  \
-    template<typename Polygon> struct tag< MultiPolygon<Polygon> > { typedef multi_polygon_tag type; }; \
-}}}
+#include <boost/geometry/geometries/register/multi_polygon.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_GEOMETRIES_REGISTER_MULTI_POLYGON_HPP
diff --git a/include/boost/geometry/multi/io/dsv/write.hpp b/include/boost/geometry/multi/io/dsv/write.hpp
index 1a054659a..092869f56 100644
--- a/include/boost/geometry/multi/io/dsv/write.hpp
+++ b/include/boost/geometry/multi/io/dsv/write.hpp
@@ -14,73 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_DSV_WRITE_HPP
 #define BOOST_GEOMETRY_MULTI_IO_DSV_WRITE_HPP
 
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
 
 #include <boost/geometry/io/dsv/write.hpp>
 
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace dsv
-{
-
-template <typename MultiGeometry>
-struct dsv_multi
-{
-    typedef dispatch::dsv
-                <
-                    typename single_tag_of
-                        <
-                            typename tag<MultiGeometry>::type
-                        >::type,
-                    typename boost::range_value<MultiGeometry>::type
-                > dispatch_one;
-
-    typedef typename boost::range_iterator
-        <
-            MultiGeometry const
-        >::type iterator;
-
-
-    template <typename Char, typename Traits>
-    static inline void apply(std::basic_ostream<Char, Traits>& os,
-                MultiGeometry const& multi,
-                dsv_settings const& settings)
-    {
-        os << settings.list_open;
-
-        bool first = true;
-        for(iterator it = boost::begin(multi);
-            it != boost::end(multi);
-            ++it, first = false)
-        {
-            os << (first ? "" : settings.list_separator);
-            dispatch_one::apply(os, *it, settings);
-        }
-        os << settings.list_close;
-    }
-};
-
-}} // namespace detail::dsv
-#endif // DOXYGEN_NO_DETAIL
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Geometry>
-struct dsv<multi_tag, Geometry>
-    : detail::dsv::dsv_multi<Geometry>
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_IO_DSV_WRITE_HPP
diff --git a/include/boost/geometry/multi/io/wkt/detail/prefix.hpp b/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
index 37b07979b..34e2b241d 100644
--- a/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
+++ b/include/boost/geometry/multi/io/wkt/detail/prefix.hpp
@@ -14,38 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
 
-#include <boost/geometry/multi/core/tags.hpp>
 
-namespace boost { namespace geometry
-{
+#include <boost/geometry/io/wkt/detail/prefix.hpp>
 
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt
-{
-
-struct prefix_null
-{
-    static inline const char* apply() { return ""; }
-};
-
-struct prefix_multipoint
-{
-    static inline const char* apply() { return "MULTIPOINT"; }
-};
-
-struct prefix_multilinestring
-{
-    static inline const char* apply() { return "MULTILINESTRING"; }
-};
-
-struct prefix_multipolygon
-{
-    static inline const char* apply() { return "MULTIPOLYGON"; }
-};
-
-}} // namespace wkt::impl
-#endif
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_IO_WKT_DETAIL_PREFIX_HPP
diff --git a/include/boost/geometry/multi/io/wkt/read.hpp b/include/boost/geometry/multi/io/wkt/read.hpp
index c72f5e128..37e5f9e72 100644
--- a/include/boost/geometry/multi/io/wkt/read.hpp
+++ b/include/boost/geometry/multi/io/wkt/read.hpp
@@ -14,155 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_READ_MULTI_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_READ_MULTI_HPP
 
-#include <string>
 
-#include <boost/geometry/core/mutable_range.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/io/wkt/detail/prefix.hpp>
 #include <boost/geometry/io/wkt/read.hpp>
 
-namespace boost { namespace geometry
-{
-
-namespace detail { namespace wkt
-{
-
-template <typename MultiGeometry, template<typename> class Parser, typename PrefixPolicy>
-struct multi_parser
-{
-    static inline void apply(std::string const& wkt, MultiGeometry& geometry)
-    {
-        traits::clear<MultiGeometry>::apply(geometry);
-
-        tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
-        tokenizer::iterator it;
-        if (initialize<MultiGeometry>(tokens, PrefixPolicy::apply(), wkt, it))
-        {
-            handle_open_parenthesis(it, tokens.end(), wkt);
-
-            // Parse sub-geometries
-            while(it != tokens.end() && *it != ")")
-            {
-                traits::resize<MultiGeometry>::apply(geometry, boost::size(geometry) + 1);
-                Parser
-                    <
-                        typename boost::range_value<MultiGeometry>::type
-                    >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
-                if (it != tokens.end() && *it == ",")
-                {
-                    // Skip "," after multi-element is parsed
-                    ++it;
-                }
-            }
-
-            handle_close_parenthesis(it, tokens.end(), wkt);
-        }
-        
-        check_end(it, tokens.end(), wkt);
-    }
-};
-
-template <typename P>
-struct noparenthesis_point_parser
-{
-    static inline void apply(tokenizer::iterator& it, tokenizer::iterator end,
-        std::string const& wkt, P& point)
-    {
-        parsing_assigner<P, 0, dimension<P>::value>::apply(it, end, point, wkt);
-    }
-};
-
-template <typename MultiGeometry, typename PrefixPolicy>
-struct multi_point_parser
-{
-    static inline void apply(std::string const& wkt, MultiGeometry& geometry)
-    {
-        traits::clear<MultiGeometry>::apply(geometry);
-
-        tokenizer tokens(wkt, boost::char_separator<char>(" ", ",()"));
-        tokenizer::iterator it;
-
-        if (initialize<MultiGeometry>(tokens, PrefixPolicy::apply(), wkt, it))
-        {
-            handle_open_parenthesis(it, tokens.end(), wkt);
-
-            // If first point definition starts with "(" then parse points as (x y)
-            // otherwise as "x y"
-            bool using_brackets = (it != tokens.end() && *it == "(");
-            
-            while(it != tokens.end() && *it != ")")
-            {
-                traits::resize<MultiGeometry>::apply(geometry, boost::size(geometry) + 1);
-                
-                if (using_brackets)
-                {
-                    point_parser
-                        <
-                            typename boost::range_value<MultiGeometry>::type
-                        >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
-                }
-                else
-                {
-                    noparenthesis_point_parser
-                        <
-                            typename boost::range_value<MultiGeometry>::type
-                        >::apply(it, tokens.end(), wkt, *(boost::end(geometry) - 1));
-                }
-                    
-                if (it != tokens.end() && *it == ",")
-                {
-                    // Skip "," after point is parsed
-                    ++it;
-                }
-            }
-            
-            handle_close_parenthesis(it, tokens.end(), wkt);
-        }
-        
-        check_end(it, tokens.end(), wkt);
-    }
-};
-
-}} // namespace detail::wkt
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename MultiGeometry>
-struct read_wkt<multi_point_tag, MultiGeometry>
-    : detail::wkt::multi_point_parser
-            <
-                MultiGeometry,
-                detail::wkt::prefix_multipoint
-            >
-{};
-
-template <typename MultiGeometry>
-struct read_wkt<multi_linestring_tag, MultiGeometry>
-    : detail::wkt::multi_parser
-            <
-                MultiGeometry,
-                detail::wkt::linestring_parser,
-                detail::wkt::prefix_multilinestring
-            >
-{};
-
-template <typename MultiGeometry>
-struct read_wkt<multi_polygon_tag, MultiGeometry>
-    : detail::wkt::multi_parser
-            <
-                MultiGeometry,
-                detail::wkt::polygon_parser,
-                detail::wkt::prefix_multipolygon
-            >
-{};
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_IO_WKT_READ_MULTI_HPP
diff --git a/include/boost/geometry/multi/io/wkt/wkt.hpp b/include/boost/geometry/multi/io/wkt/wkt.hpp
index 55f1713d4..a6159e140 100644
--- a/include/boost/geometry/multi/io/wkt/wkt.hpp
+++ b/include/boost/geometry/multi/io/wkt/wkt.hpp
@@ -14,7 +14,7 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_WKT_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_WKT_HPP
 
-#include <boost/geometry/multi/io/wkt/read.hpp>
-#include <boost/geometry/multi/io/wkt/write.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
 
 #endif // BOOST_GEOMETRY_MULTI_IO_WKT_WKT_HPP
diff --git a/include/boost/geometry/multi/io/wkt/write.hpp b/include/boost/geometry/multi/io/wkt/write.hpp
index 47087e944..2c26d3d2e 100644
--- a/include/boost/geometry/multi/io/wkt/write.hpp
+++ b/include/boost/geometry/multi/io/wkt/write.hpp
@@ -14,96 +14,8 @@
 #ifndef BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
 #define BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
 
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/io/wkt/detail/prefix.hpp>
+
 #include <boost/geometry/io/wkt/write.hpp>
 
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace wkt
-{
-
-template <typename Multi, typename StreamPolicy, typename PrefixPolicy>
-struct wkt_multi
-{
-    template <typename Char, typename Traits>
-    static inline void apply(std::basic_ostream<Char, Traits>& os,
-                Multi const& geometry)
-    {
-        os << PrefixPolicy::apply();
-        // TODO: check EMPTY here
-        os << "(";
-
-        for (typename boost::range_iterator<Multi const>::type
-                    it = boost::begin(geometry);
-            it != boost::end(geometry);
-            ++it)
-        {
-            if (it != boost::begin(geometry))
-            {
-                os << ",";
-            }
-            StreamPolicy::apply(os, *it);
-        }
-
-        os << ")";
-    }
-};
-
-}} // namespace wkt::impl
-#endif
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template <typename Multi>
-struct wkt<Multi, multi_point_tag>
-    : detail::wkt::wkt_multi
-        <
-            Multi,
-            detail::wkt::wkt_point
-                <
-                    typename boost::range_value<Multi>::type,
-                    detail::wkt::prefix_null
-                >,
-            detail::wkt::prefix_multipoint
-        >
-{};
-
-template <typename Multi>
-struct wkt<Multi, multi_linestring_tag>
-    : detail::wkt::wkt_multi
-        <
-            Multi,
-            detail::wkt::wkt_sequence
-                <
-                    typename boost::range_value<Multi>::type
-                >,
-            detail::wkt::prefix_multilinestring
-        >
-{};
-
-template <typename Multi>
-struct wkt<Multi, multi_polygon_tag>
-    : detail::wkt::wkt_multi
-        <
-            Multi,
-            detail::wkt::wkt_poly
-                <
-                    typename boost::range_value<Multi>::type,
-                    detail::wkt::prefix_null
-                >,
-            detail::wkt::prefix_multipolygon
-        >
-{};
-
-} // namespace dispatch
-#endif
-
-}} // namespace boost::geometry
 
 #endif // BOOST_GEOMETRY_MULTI_IO_WKT_WRITE_HPP
diff --git a/include/boost/geometry/multi/multi.hpp b/include/boost/geometry/multi/multi.hpp
index df10392cb..24e39c3c7 100644
--- a/include/boost/geometry/multi/multi.hpp
+++ b/include/boost/geometry/multi/multi.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -15,64 +18,65 @@
 #define BOOST_GEOMETRY_MULTI_HPP
 
 
-#include <boost/geometry/multi/core/closure.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/interior_rings.hpp>
-#include <boost/geometry/multi/core/is_areal.hpp>
-#include <boost/geometry/multi/core/point_order.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
-#include <boost/geometry/multi/core/ring_type.hpp>
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/topological_dimension.hpp>
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/geometry_id.hpp>
+#include <boost/geometry/core/interior_rings.hpp>
+#include <boost/geometry/core/is_areal.hpp>
+#include <boost/geometry/core/point_order.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/topological_dimension.hpp>
+
+#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry/algorithms/centroid.hpp>
+#include <boost/geometry/algorithms/clear.hpp>
+#include <boost/geometry/algorithms/convert.hpp>
+#include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/algorithms/covered_by.hpp>
+#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/distance.hpp>
+#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/for_each.hpp>
+#include <boost/geometry/algorithms/length.hpp>
+#include <boost/geometry/algorithms/num_geometries.hpp>
+#include <boost/geometry/algorithms/perimeter.hpp>
+#include <boost/geometry/algorithms/remove_spikes.hpp>
+#include <boost/geometry/algorithms/reverse.hpp>
+#include <boost/geometry/algorithms/simplify.hpp>
+#include <boost/geometry/algorithms/transform.hpp>
+#include <boost/geometry/algorithms/unique.hpp>
+#include <boost/geometry/algorithms/within.hpp>
 
 #include <boost/geometry/multi/algorithms/append.hpp>
-#include <boost/geometry/multi/algorithms/area.hpp>
-#include <boost/geometry/multi/algorithms/centroid.hpp>
-#include <boost/geometry/multi/algorithms/clear.hpp>
-#include <boost/geometry/multi/algorithms/convert.hpp>
-#include <boost/geometry/multi/algorithms/correct.hpp>
-#include <boost/geometry/multi/algorithms/covered_by.hpp>
-#include <boost/geometry/multi/algorithms/disjoint.hpp>
-#include <boost/geometry/multi/algorithms/distance.hpp>
-#include <boost/geometry/multi/algorithms/envelope.hpp>
-#include <boost/geometry/multi/algorithms/equals.hpp>
-#include <boost/geometry/multi/algorithms/for_each.hpp>
 #include <boost/geometry/multi/algorithms/intersection.hpp>
-#include <boost/geometry/multi/algorithms/length.hpp>
-#include <boost/geometry/multi/algorithms/num_geometries.hpp>
 #include <boost/geometry/multi/algorithms/num_interior_rings.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/multi/algorithms/perimeter.hpp>
-#include <boost/geometry/multi/algorithms/reverse.hpp>
-#include <boost/geometry/multi/algorithms/simplify.hpp>
-#include <boost/geometry/multi/algorithms/transform.hpp>
-#include <boost/geometry/multi/algorithms/unique.hpp>
-#include <boost/geometry/multi/algorithms/within.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
-#include <boost/geometry/multi/algorithms/detail/modify_with_predicate.hpp>
-#include <boost/geometry/multi/algorithms/detail/multi_sum.hpp>
+#include <boost/geometry/algorithms/detail/point_on_border.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
-#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
+#include <boost/geometry/algorithms/detail/for_each_range.hpp>
+#include <boost/geometry/algorithms/detail/multi_modify_with_predicate.hpp>
+#include <boost/geometry/algorithms/detail/multi_sum.hpp>
 
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_ring.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/select_rings.hpp>
-#include <boost/geometry/multi/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/algorithms/detail/sections/sectionalize.hpp>
 
-#include <boost/geometry/multi/geometries/concepts/check.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_point_concept.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_linestring_concept.hpp>
-#include <boost/geometry/multi/geometries/concepts/multi_polygon_concept.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segment_point.hpp>
+#include <boost/geometry/algorithms/detail/overlay/copy_segments.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_ring.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/select_rings.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
 
-#include <boost/geometry/multi/views/detail/range_type.hpp>
-#include <boost/geometry/multi/strategies/cartesian/centroid_average.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
 
-#include <boost/geometry/multi/io/dsv/write.hpp>
-#include <boost/geometry/multi/io/wkt/wkt.hpp>
+#include <boost/geometry/views/detail/range_type.hpp>
+#include <boost/geometry/strategies/cartesian/centroid_average.hpp>
+
+#include <boost/geometry/io/dsv/write.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_HPP
diff --git a/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp b/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
index f28daf20b..ce614e2e7 100644
--- a/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
+++ b/include/boost/geometry/multi/strategies/cartesian/centroid_average.hpp
@@ -15,102 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
 
 
-#include <boost/numeric/conversion/cast.hpp>
-#include <boost/type_traits.hpp>
-
-#include <boost/geometry/core/coordinate_type.hpp>
-#include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/arithmetic/arithmetic.hpp>
-#include <boost/geometry/strategies/centroid.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-namespace strategy { namespace centroid
-{
-
-
-/*!
-\brief Centroid calculation taking average of points
-\ingroup strategies
-*/
-template
-<
-    typename PointCentroid,
-    typename Point = PointCentroid
->
-class average
-{
-private :
-
-    /*! subclass to keep state */
-    class sum
-    {
-        friend class average;
-        int count;
-        PointCentroid centroid;
-
-    public :
-        inline sum()
-            : count(0)
-        {
-            assign_zero(centroid);
-        }
-    };
-
-public :
-    typedef sum state_type;
-    typedef PointCentroid centroid_point_type;
-    typedef Point point_type;
-
-    static inline void apply(Point const& p, sum& state)
-    {
-        add_point(state.centroid, p);
-        state.count++;
-    }
-
-    static inline void result(sum const& state, PointCentroid& centroid)
-    {
-        centroid = state.centroid;
-        divide_value(centroid, state.count);
-    }
-
-};
-
-
-#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
-
-
-namespace services
-{
-
-template <typename Point, std::size_t DimensionCount, typename Geometry>
-struct default_strategy
-<
-    cartesian_tag,
-    pointlike_tag,
-    DimensionCount,
-    Point,
-    Geometry
->
-{
-    typedef average
-        <
-            Point,
-            typename point_type<Geometry>::type
-        > type;
-};
-
-} // namespace services
-
-#endif
-
-
-}} // namespace strategy::centroid
-
-
-}} // namespace boost::geometry
+#include <boost/geometry/strategies/cartesian/centroid_average.hpp>
 
 
 #endif // BOOST_GEOMETRY_MULTI_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
diff --git a/include/boost/geometry/multi/views/detail/range_type.hpp b/include/boost/geometry/multi/views/detail/range_type.hpp
index 172feb251..f8cb0e6e5 100644
--- a/include/boost/geometry/multi/views/detail/range_type.hpp
+++ b/include/boost/geometry/multi/views/detail/range_type.hpp
@@ -15,48 +15,7 @@
 #define BOOST_GEOMETRY_MULTI_VIEWS_DETAIL_RANGE_TYPE_HPP
 
 
-#include <boost/range.hpp>
-
 #include <boost/geometry/views/detail/range_type.hpp>
 
 
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-// multi-point acts itself as a range
-template <typename Geometry>
-struct range_type<multi_point_tag, Geometry>
-{
-    typedef Geometry type;
-};
-
-
-template <typename Geometry>
-struct range_type<multi_linestring_tag, Geometry>
-{
-    typedef typename boost::range_value<Geometry>::type type;
-};
-
-
-template <typename Geometry>
-struct range_type<multi_polygon_tag, Geometry>
-{
-    // Call its single-version
-    typedef typename geometry::detail::range_type
-        <
-            typename boost::range_value<Geometry>::type
-        >::type type;
-};
-
-
-} // namespace dispatch
-#endif // DOXYGEN_NO_DISPATCH
-
-
-}} // namespace boost::geometry
-
 #endif // BOOST_GEOMETRY_MULTI_VIEWS_DETAIL_RANGE_TYPE_HPP
diff --git a/include/boost/geometry/policies/disjoint_interrupt_policy.hpp b/include/boost/geometry/policies/disjoint_interrupt_policy.hpp
new file mode 100644
index 000000000..2a6e54b07
--- /dev/null
+++ b/include/boost/geometry/policies/disjoint_interrupt_policy.hpp
@@ -0,0 +1,67 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013-2014.
+// Modifications copyright (c) 2013-2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_POLICIES_DISJOINT_INTERRUPT_POLICY_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_POLICIES_DISJOINT_INTERRUPT_POLICY_HPP
+
+#include <boost/range.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace disjoint
+{
+
+
+struct disjoint_interrupt_policy
+{
+    static bool const enabled = true;
+    bool has_intersections;
+
+    inline disjoint_interrupt_policy()
+        : has_intersections(false)
+    {}
+
+    template <typename Range>
+    inline bool apply(Range const& range)
+    {
+        // If there is any IP in the range, it is NOT disjoint
+        if (boost::size(range) > 0)
+        {
+            has_intersections = true;
+            return true;
+        }
+        return false;
+    }
+};
+
+
+
+}} // namespace detail::disjoint
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_POLICIES_DISJOINT_INTERRUPT_POLICY_HPP
diff --git a/include/boost/geometry/policies/relate/de9im.hpp b/include/boost/geometry/policies/relate/de9im.hpp
index 766d80b22..e2d6b5111 100644
--- a/include/boost/geometry/policies/relate/de9im.hpp
+++ b/include/boost/geometry/policies/relate/de9im.hpp
@@ -158,15 +158,6 @@ struct segments_de9im
                      false, false, false, true);
     }
 
-    static inline return_type collinear_disjoint()
-    {
-        return de9im_segment(0,0,
-                -1, -1, 1,
-                -1, -1, 0,
-                 1,  0, 2,
-                true);
-    }
-
 };
 
 
diff --git a/include/boost/geometry/policies/relate/direction.hpp b/include/boost/geometry/policies/relate/direction.hpp
index 62859f33b..02fed94b1 100644
--- a/include/boost/geometry/policies/relate/direction.hpp
+++ b/include/boost/geometry/policies/relate/direction.hpp
@@ -88,7 +88,8 @@ struct direction_type
 
     // New information
     side_info sides;
-    int arrival[2]; // 1=arrival, -1departure, 0=neutral; == how_a//how_b
+    // THIS IS EQUAL TO arrival_a, arrival_b - they probably can go now we have robust fractions
+    int arrival[2]; // 1=arrival, -1=departure, 0=neutral; == how_a//how_b
 
 
     // About arrival[0] (== arrival of a2 w.r.t. b) for COLLINEAR cases
@@ -110,28 +111,19 @@ struct direction_type
 
 };
 
-
-template <typename S1, typename S2, typename CalculationType = void>
 struct segments_direction
 {
     typedef direction_type return_type;
-    typedef S1 segment_type1;
-    typedef S2 segment_type2;
-    typedef typename select_calculation_type
-        <
-            S1, S2, CalculationType
-        >::type coordinate_type;
 
-    // Get the same type, but at least a double
-    typedef typename select_most_precise<coordinate_type, double>::type rtype;
-
-
-    template <typename R>
-    static inline return_type segments_intersect(side_info const& sides,
-                    R const&,
-                    coordinate_type const& dx1, coordinate_type const& dy1,
-                    coordinate_type const& dx2, coordinate_type const& dy2,
-                    S1 const& s1, S2 const& s2)
+    template
+    <
+        typename Segment1,
+        typename Segment2,
+        typename SegmentIntersectionInfo
+    >
+    static inline return_type segments_crosses(side_info const& sides,
+                    SegmentIntersectionInfo const& ,
+                    Segment1 const& , Segment2 const& )
     {
         bool const ra0 = sides.get<0,0>() == 0;
         bool const ra1 = sides.get<0,1>() == 0;
@@ -140,104 +132,157 @@ struct segments_direction
 
         return
             // opposite and same starting point (FROM)
-            ra0 && rb0 ? calculate_side<1>(sides, dx1, dy1, s1, s2, 'f', -1, -1)
+            ra0 && rb0 ? calculate_side<1>(sides, 'f', -1, -1)
 
             // opposite and point to each other (TO)
-            : ra1 && rb1 ? calculate_side<0>(sides, dx1, dy1, s1, s2, 't', 1, 1)
+            : ra1 && rb1 ? calculate_side<0>(sides, 't', 1, 1)
 
             // not opposite, forming an angle, first a then b,
             // directed either both left, or both right
             // Check side of B2 from A. This is not calculated before
-            : ra1 && rb0 ? angle<1>(sides, dx1, dy1, s1, s2, 'a', 1, -1)
+            : ra1 && rb0 ? angle<1>(sides, 'a', 1, -1)
 
             // not opposite, forming a angle, first b then a,
             // directed either both left, or both right
-            : ra0 && rb1 ? angle<0>(sides, dx1, dy1, s1, s2, 'a', -1, 1)
+            : ra0 && rb1 ? angle<0>(sides, 'a', -1, 1)
 
             // b starts from interior of a
-            : rb0 ? starts_from_middle(sides, dx1, dy1, s1, s2, 'B', 0, -1)
+            : rb0 ? starts_from_middle(sides, 'B', 0, -1)
 
             // a starts from interior of b (#39)
-            : ra0 ? starts_from_middle(sides, dx1, dy1, s1, s2, 'A', -1, 0)
+            : ra0 ? starts_from_middle(sides, 'A', -1, 0)
 
             // b ends at interior of a, calculate direction of A from IP
-            : rb1 ? b_ends_at_middle(sides, dx2, dy2, s1, s2)
+            : rb1 ? b_ends_at_middle(sides)
 
             // a ends at interior of b
-            : ra1 ? a_ends_at_middle(sides, dx1, dy1, s1, s2)
+            : ra1 ? a_ends_at_middle(sides)
 
             // normal intersection
-            : calculate_side<1>(sides, dx1, dy1, s1, s2, 'i', -1, -1)
+            : calculate_side<1>(sides, 'i', -1, -1)
             ;
     }
 
-    static inline return_type collinear_touch(
-                coordinate_type const& ,
-                coordinate_type const& , int arrival_a, int arrival_b)
+    template <typename Ratio>
+    static inline int arrival_value(Ratio const& r_from, Ratio const& r_to)
     {
-        // Though this is 'collinear', we handle it as To/From/Angle because it is the same.
-        // It only does NOT have a direction.
-        side_info sides;
-        //int const arrive = how == 'T' ? 1 : -1;
-        bool opposite = arrival_a == arrival_b;
-        return
-            ! opposite
-            ? return_type(sides, 'a', arrival_a, arrival_b)
-            : return_type(sides, arrival_a == 0 ? 't' : 'f', arrival_a, arrival_b, 0, 0, true);
+        //     a1--------->a2
+        // b1----->b2
+        // a departs: -1
+
+        // a1--------->a2
+        //         b1----->b2
+        // a arrives: 1
+
+        // a1--------->a2
+        //     b1----->b2
+        // both arrive there -> r-to = 1/1, or 0/1 (on_segment)
+
+        // First check the TO (for arrival), then FROM (for departure)
+        return r_to.in_segment() ? 1
+            : r_to.on_segment() ? 0
+            : r_from.on_segment() ? -1
+            : -1
+            ;
     }
 
-    template <typename S>
-    static inline return_type collinear_interior_boundary_intersect(S const& , bool,
-                    int arrival_a, int arrival_b, bool opposite)
+    template <typename Ratio>
+    static inline void analyze(Ratio const& r,
+        int& in_segment_count,
+        int& on_end_count,
+        int& outside_segment_count)
     {
+        if (r.on_end())
+        {
+            on_end_count++;
+        }
+        else if (r.in_segment())
+        {
+            in_segment_count++;
+        }
+        else
+        {
+            outside_segment_count++;
+        }
+    }
+
+    template <typename Segment1, typename Segment2, typename Ratio>
+    static inline return_type segments_collinear(
+        Segment1 const& , Segment2 const&,
+        Ratio const& ra_from_wrt_b, Ratio const& ra_to_wrt_b,
+        Ratio const& rb_from_wrt_a, Ratio const& rb_to_wrt_a)
+    {
+        // If segments are opposite, the ratio of the FROM w.r.t. the other
+        // is larger than the ratio of the TO w.r.t. the other
+        bool const opposite = ra_to_wrt_b < ra_from_wrt_b;
+
         return_type r('c', opposite);
-        r.arrival[0] = arrival_a;
-        r.arrival[1] = arrival_b;
+
+        // IMPORTANT: the order of conditions is different as in intersection_points.hpp
+        // We assign A in 0 and B in 1
+        r.arrival[0] = arrival_value(ra_from_wrt_b, ra_to_wrt_b);
+        r.arrival[1] = arrival_value(rb_from_wrt_a, rb_to_wrt_a);
+
+        // Analyse them
+        int a_in_segment_count = 0;
+        int a_on_end_count = 0;
+        int a_outside_segment_count = 0;
+        int b_in_segment_count = 0;
+        int b_on_end_count = 0;
+        int b_outside_segment_count = 0;
+        analyze(ra_from_wrt_b,
+            a_in_segment_count, a_on_end_count, a_outside_segment_count);
+        analyze(ra_to_wrt_b,
+            a_in_segment_count, a_on_end_count, a_outside_segment_count);
+        analyze(rb_from_wrt_a,
+            b_in_segment_count, b_on_end_count, b_outside_segment_count);
+        analyze(rb_to_wrt_a,
+            b_in_segment_count, b_on_end_count, b_outside_segment_count);
+
+        if (a_on_end_count == 1
+            && b_on_end_count == 1
+            && a_outside_segment_count == 1
+            && b_outside_segment_count == 1)
+        {
+            // This is a collinear touch
+            // -------->             A (or B)
+            //         <----------   B (or A)
+            // We adapt the "how"
+            // TODO: how was to be refactored anyway,
+            if (! opposite)
+            {
+                r.how = 'a';
+            }
+            else
+            {
+                r.how = r.arrival[0] == 0 ? 't' : 'f';
+            }
+        }
+        else if (a_on_end_count == 2
+                 && b_on_end_count == 2)
+        {
+            r.how = 'e';
+        }
+
         return r;
     }
 
-    static inline return_type collinear_a_in_b(S1 const& , bool opposite)
-    {
-        return_type r('c', opposite);
-        r.arrival[0] = 1;
-        r.arrival[1] = -1;
-        return r;
-    }
-    static inline return_type collinear_b_in_a(S2 const& , bool opposite)
-    {
-        return_type r('c', opposite);
-        r.arrival[0] = -1;
-        r.arrival[1] = 1;
-        return r;
-    }
-
-    static inline return_type collinear_overlaps(
-                    coordinate_type const& , coordinate_type const& ,
-                    coordinate_type const& , coordinate_type const& ,
-                    int arrival_a, int arrival_b, bool opposite)
-    {
-        return_type r('c', opposite);
-        r.arrival[0] = arrival_a;
-        r.arrival[1] = arrival_b;
-        return r;
-    }
-
-    static inline return_type segment_equal(S1 const& , bool opposite)
-    {
-        return return_type('e', opposite);
-    }
-
-    static inline return_type degenerate(S1 const& , bool)
+    template <typename Segment>
+    static inline return_type degenerate(Segment const& , bool)
     {
         return return_type('0', false);
     }
 
-    static inline return_type disjoint()
+    template <typename Segment, typename Ratio>
+    static inline return_type one_degenerate(Segment const& ,
+            Ratio const& ,
+            bool)
     {
-        return return_type('d', false);
+        // To be decided
+        return return_type('0', false);
     }
 
-    static inline return_type collinear_disjoint()
+    static inline return_type disjoint()
     {
         return return_type('d', false);
     }
@@ -252,62 +297,29 @@ struct segments_direction
 
 private :
 
-    static inline bool is_left
-        (
-            coordinate_type const& ux, 
-            coordinate_type const& uy,
-            coordinate_type const& vx,
-            coordinate_type const& vy
-        )
-    {
-        // This is a "side calculation" as in the strategies, but here terms are precalculated
-        // We might merge this with side, offering a pre-calculated term (in fact already done using cross-product)
-        // Waiting for implementing spherical...
-
-        rtype const zero = rtype();
-        return geometry::detail::determinant<rtype>(ux, uy, vx, vy) > zero;
-    }
-
     template <std::size_t I>
     static inline return_type calculate_side(side_info const& sides,
-                coordinate_type const& dx1, coordinate_type const& dy1,
-                S1 const& s1, S2 const& s2,
                 char how, int how_a, int how_b)
     {
-        coordinate_type dpx = get<I, 0>(s2) - get<0, 0>(s1);
-        coordinate_type dpy = get<I, 1>(s2) - get<0, 1>(s1);
-
-        return is_left(dx1, dy1, dpx, dpy)
-            ? return_type(sides, how, how_a, how_b, -1, 1)
-            : return_type(sides, how, how_a, how_b, 1, -1);
+        int const dir = sides.get<1, I>() == 1 ? 1 : -1;
+        return return_type(sides, how, how_a, how_b, -dir, dir);
     }
 
     template <std::size_t I>
     static inline return_type angle(side_info const& sides,
-                coordinate_type const& dx1, coordinate_type const& dy1,
-                S1 const& s1, S2 const& s2,
                 char how, int how_a, int how_b)
     {
-        coordinate_type dpx = get<I, 0>(s2) - get<0, 0>(s1);
-        coordinate_type dpy = get<I, 1>(s2) - get<0, 1>(s1);
-
-        return is_left(dx1, dy1, dpx, dpy)
-            ? return_type(sides, how, how_a, how_b, 1, 1)
-            : return_type(sides, how, how_a, how_b, -1, -1);
+        int const dir = sides.get<1, I>() == 1 ? 1 : -1;
+        return return_type(sides, how, how_a, how_b, dir, dir);
     }
 
 
     static inline return_type starts_from_middle(side_info const& sides,
-                coordinate_type const& dx1, coordinate_type const& dy1,
-                S1 const& s1, S2 const& s2,
                 char which,
                 int how_a, int how_b)
     {
         // Calculate ARROW of b segment w.r.t. s1
-        coordinate_type dpx = get<1, 0>(s2) - get<0, 0>(s1);
-        coordinate_type dpy = get<1, 1>(s2) - get<0, 1>(s1);
-
-        int dir = is_left(dx1, dy1, dpx, dpy) ? 1 : -1;
+        int dir = sides.get<1, 1>() == 1 ? 1 : -1;
 
         // From other perspective, then reverse
         bool const is_a = which == 'A';
@@ -326,31 +338,19 @@ private :
 
 
     // To be harmonized
-    static inline return_type a_ends_at_middle(side_info const& sides,
-                coordinate_type const& dx, coordinate_type const& dy,
-                S1 const& s1, S2 const& s2)
+    static inline return_type a_ends_at_middle(side_info const& sides)
     {
-        coordinate_type dpx = get<1, 0>(s2) - get<0, 0>(s1);
-        coordinate_type dpy = get<1, 1>(s2) - get<0, 1>(s1);
-
         // Ending at the middle, one ARRIVES, the other one is NEUTRAL
-        // (because it both "arrives"  and "departs"  there
-        return is_left(dx, dy, dpx, dpy)
-            ? return_type(sides, 'm', 1, 0, 1, 1)
-            : return_type(sides, 'm', 1, 0, -1, -1);
+        // (because it both "arrives"  and "departs" there)
+        int const dir = sides.get<1, 1>() == 1 ? 1 : -1;
+        return return_type(sides, 'm', 1, 0, dir, dir);
     }
 
 
-    static inline return_type b_ends_at_middle(side_info const& sides,
-                coordinate_type const& dx, coordinate_type const& dy,
-                S1 const& s1, S2 const& s2)
+    static inline return_type b_ends_at_middle(side_info const& sides)
     {
-        coordinate_type dpx = get<1, 0>(s1) - get<0, 0>(s2);
-        coordinate_type dpy = get<1, 1>(s1) - get<0, 1>(s2);
-
-        return is_left(dx, dy, dpx, dpy)
-            ? return_type(sides, 'm', 0, 1, 1, 1)
-            : return_type(sides, 'm', 0, 1, -1, -1);
+        int const dir = sides.get<0, 1>() == 1 ? 1 : -1;
+        return return_type(sides, 'm', 0, 1, dir, dir);
     }
 
 };
diff --git a/include/boost/geometry/policies/relate/intersection_points.hpp b/include/boost/geometry/policies/relate/intersection_points.hpp
index ff8ec1949..f16c00795 100644
--- a/include/boost/geometry/policies/relate/intersection_points.hpp
+++ b/include/boost/geometry/policies/relate/intersection_points.hpp
@@ -16,12 +16,12 @@
 #include <boost/concept_check.hpp>
 #include <boost/numeric/conversion/cast.hpp>
 
-#include <boost/geometry/arithmetic/determinant.hpp>
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/strategies/side_info.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
-
+#include <boost/geometry/util/math.hpp>
 
 namespace boost { namespace geometry
 {
@@ -30,106 +30,153 @@ namespace policies { namespace relate
 {
 
 
-template <typename S1, typename S2, typename ReturnType, typename CalculationType = void>
+/*!
+\brief Policy calculating the intersection points themselves
+ */
+template
+<
+    typename ReturnType
+>
 struct segments_intersection_points
 {
     typedef ReturnType return_type;
-    typedef S1 segment_type1;
-    typedef S2 segment_type2;
 
-    typedef typename select_calculation_type
-        <
-            S1, S2, CalculationType
-        >::type coordinate_type;
-
-    template <typename R>
-    static inline return_type segments_intersect(side_info const&,
-                    R const& r,
-                    coordinate_type const& dx1, coordinate_type const& dy1,
-                    coordinate_type const& , coordinate_type const& ,
-                    S1 const& s1, S2 const& )
+    template
+    <
+        typename Point,
+        typename Segment,
+        typename SegmentRatio,
+        typename T
+    >
+    static inline void assign(Point& point,
+                Segment const& segment,
+                SegmentRatio const& ratio,
+                T const& dx, T const& dy)
     {
-        typedef typename geometry::coordinate_type
-            <
-                typename return_type::point_type
-            >::type return_coordinate_type;
+        typedef typename geometry::coordinate_type<Point>::type coordinate_type;
 
-        coordinate_type const s1x = get<0, 0>(s1);
-        coordinate_type const s1y = get<0, 1>(s1);
-
-        return_type result;
-        result.count = 1;
-        set<0>(result.intersections[0],
-            boost::numeric_cast<return_coordinate_type>(R(s1x) + r * R(dx1)));
-        set<1>(result.intersections[0],
-            boost::numeric_cast<return_coordinate_type>(R(s1y) + r * R(dy1)));
-
-        return result;
+        // Calculate the intersection point based on segment_ratio
+        // Up to know, division was postponed. Here we divide using numerator/
+        // denominator. In case of integer this might result in an integer
+        // division.
+        BOOST_ASSERT(ratio.denominator() != 0);
+        set<0>(point, boost::numeric_cast<coordinate_type>(
+                get<0, 0>(segment)
+                    + ratio.numerator() * dx / ratio.denominator()));
+        set<1>(point, boost::numeric_cast<coordinate_type>(
+                get<0, 1>(segment)
+                    + ratio.numerator() * dy / ratio.denominator()));
     }
 
-    static inline return_type collinear_touch(coordinate_type const& x,
-                coordinate_type const& y, int, int)
+
+    template
+    <
+        typename Segment1,
+        typename Segment2,
+        typename SegmentIntersectionInfo
+    >
+    static inline return_type segments_crosses(side_info const&,
+                    SegmentIntersectionInfo const& sinfo,
+                    Segment1 const& s1, Segment2 const& s2)
     {
         return_type result;
         result.count = 1;
-        set<0>(result.intersections[0], x);
-        set<1>(result.intersections[0], y);
+
+        if (sinfo.robust_ra < sinfo.robust_rb)
+        {
+            assign(result.intersections[0], s1, sinfo.robust_ra,
+                sinfo.dx_a, sinfo.dy_a);
+        }
+        else
+        {
+            assign(result.intersections[0], s2, sinfo.robust_rb,
+                sinfo.dx_b, sinfo.dy_b);
+        }
+
+        result.fractions[0].assign(sinfo);
+
         return result;
     }
 
-    template <typename S>
-    static inline return_type collinear_inside(S const& s, int index1 = 0, int index2 = 1)
+    template <typename Segment1, typename Segment2, typename Ratio>
+    static inline return_type segments_collinear(
+        Segment1 const& a, Segment2 const& b,
+        Ratio const& ra_from_wrt_b, Ratio const& ra_to_wrt_b,
+        Ratio const& rb_from_wrt_a, Ratio const& rb_to_wrt_a)
     {
         return_type result;
-        result.count = 2;
-        set<0>(result.intersections[index1], get<0, 0>(s));
-        set<1>(result.intersections[index1], get<0, 1>(s));
-        set<0>(result.intersections[index2], get<1, 0>(s));
-        set<1>(result.intersections[index2], get<1, 1>(s));
-        return result;
-    }
+        int index = 0, count_a = 0, count_b = 0;
+        Ratio on_a[2];
 
-    template <typename S>
-    static inline return_type collinear_interior_boundary_intersect(S const& s, bool a_in_b,
-                int, int, bool opposite)
-    {
-        int index1 = opposite && ! a_in_b ? 1 : 0;
-        return collinear_inside(s, index1, 1 - index1);
-    }
+        // The conditions "index < 2" are necessary for non-robust handling,
+        // if index would be 2 this indicate an (currently uncatched) error
 
-    static inline return_type collinear_a_in_b(S1 const& s, bool)
-    {
-        return collinear_inside(s);
-    }
-    static inline return_type collinear_b_in_a(S2 const& s, bool opposite)
-    {
-        int index1 = opposite ? 1 : 0;
-        return collinear_inside(s, index1, 1 - index1);
-    }
+        // IMPORTANT: the order of conditions is different as in direction.hpp
+        if (ra_from_wrt_b.on_segment()
+            && index < 2)
+        {
+            //     a1--------->a2
+            // b1----->b2
+            //
+            // ra1 (relative to b) is between 0/1:
+            // -> First point of A is intersection point
+            detail::assign_point_from_index<0>(a, result.intersections[index]);
+            result.fractions[index].assign(Ratio::zero(), ra_from_wrt_b);
+            on_a[index] = Ratio::zero();
+            index++;
+            count_a++;
+        }
+        if (rb_from_wrt_a.in_segment()
+            && index < 2)
+        {
+            // We take the first intersection point of B
+            // a1--------->a2
+            //         b1----->b2
+            // But only if it is not located on A
+            // a1--------->a2
+            // b1----->b2      rb_from_wrt_a == 0/1 -> a already taken
 
-    static inline return_type collinear_overlaps(
-                coordinate_type const& x1, coordinate_type const& y1,
-                coordinate_type const& x2, coordinate_type const& y2,
-                int, int, bool)
-    {
-        return_type result;
-        result.count = 2;
-        set<0>(result.intersections[0], x1);
-        set<1>(result.intersections[0], y1);
-        set<0>(result.intersections[1], x2);
-        set<1>(result.intersections[1], y2);
-        return result;
-    }
+            detail::assign_point_from_index<0>(b, result.intersections[index]);
+            result.fractions[index].assign(rb_from_wrt_a, Ratio::zero());
+            on_a[index] = rb_from_wrt_a;
+            index++;
+            count_b++;
+        }
+
+        if (ra_to_wrt_b.on_segment()
+            && index < 2)
+        {
+            // Similarly, second IP (here a2)
+            // a1--------->a2
+            //         b1----->b2
+            detail::assign_point_from_index<1>(a, result.intersections[index]);
+            result.fractions[index].assign(Ratio::one(), ra_to_wrt_b);
+            on_a[index] = Ratio::one();
+            index++;
+            count_a++;
+        }
+        if (rb_to_wrt_a.in_segment()
+            && index < 2)
+        {
+            detail::assign_point_from_index<1>(b, result.intersections[index]);
+            result.fractions[index].assign(rb_to_wrt_a, Ratio::one());
+            on_a[index] = rb_to_wrt_a;
+            index++;
+            count_b++;
+        }
+
+        // TEMPORARY
+        // If both are from b, and b is reversed w.r.t. a, we swap IP's
+        // to align them w.r.t. a
+        // get_turn_info still relies on some order (in some collinear cases)
+        if (index == 2 && on_a[1] < on_a[0])
+        {
+            std::swap(result.fractions[0], result.fractions[1]);
+            std::swap(result.intersections[0], result.intersections[1]);
+        }
+
+        result.count = index;
 
-    static inline return_type segment_equal(S1 const& s, bool)
-    {
-        return_type result;
-        result.count = 2;
-        // TODO: order of IP's
-        set<0>(result.intersections[0], get<0, 0>(s));
-        set<1>(result.intersections[0], get<0, 1>(s));
-        set<0>(result.intersections[1], get<1, 0>(s));
-        set<1>(result.intersections[1], get<1, 1>(s));
         return result;
     }
 
@@ -142,17 +189,35 @@ struct segments_intersection_points
         return return_type();
     }
 
-    static inline return_type collinear_disjoint()
-    {
-        return return_type();
-    }
-
-    static inline return_type degenerate(S1 const& s, bool)
+    // Both degenerate
+    template <typename Segment>
+    static inline return_type degenerate(Segment const& segment, bool)
     {
         return_type result;
         result.count = 1;
-        set<0>(result.intersections[0], get<0, 0>(s));
-        set<1>(result.intersections[0], get<0, 1>(s));
+        set<0>(result.intersections[0], get<0, 0>(segment));
+        set<1>(result.intersections[0], get<0, 1>(segment));
+        return result;
+    }
+
+    // One degenerate
+    template <typename Segment, typename Ratio>
+    static inline return_type one_degenerate(Segment const& degenerate_segment,
+            Ratio const& ratio, bool a_degenerate)
+    {
+        return_type result;
+        result.count = 1;
+        set<0>(result.intersections[0], get<0, 0>(degenerate_segment));
+        set<1>(result.intersections[0], get<0, 1>(degenerate_segment));
+        if (a_degenerate)
+        {
+            // IP lies on ratio w.r.t. segment b
+            result.fractions[0].assign(Ratio::zero(), ratio);
+        }
+        else
+        {
+            result.fractions[0].assign(ratio, Ratio::zero());
+        }
         return result;
     }
 };
diff --git a/include/boost/geometry/policies/relate/intersection_ratios.hpp b/include/boost/geometry/policies/relate/intersection_ratios.hpp
new file mode 100644
index 000000000..81ecba0b5
--- /dev/null
+++ b/include/boost/geometry/policies/relate/intersection_ratios.hpp
@@ -0,0 +1,127 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 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)
+
+#ifndef BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_RATIOS_HPP
+#define BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_RATIOS_HPP
+
+
+#include <algorithm>
+#include <string>
+
+#include <boost/concept_check.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/strategies/side_info.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace policies { namespace relate
+{
+
+
+/*!
+\brief Policy returning segment ratios
+\note Template argument FractionType should be a fraction_type<SegmentRatio>
+ */
+template
+<
+    typename FractionType
+>
+struct segments_intersection_ratios
+{
+    typedef FractionType return_type;
+
+    template
+    <
+        typename Segment1,
+        typename Segment2,
+        typename SegmentIntersectionInfo
+    >
+    static inline return_type segments_crosses(side_info const&,
+                    SegmentIntersectionInfo const& sinfo,
+                    Segment1 const& , Segment2 const& )
+    {
+        return_type result;
+        result.assign(sinfo);
+        return result;
+    }
+
+    template <typename Segment1, typename Segment2, typename Ratio>
+    static inline return_type segments_collinear(
+        Segment1 const& , Segment2 const& ,
+        Ratio const& ra_from_wrt_b, Ratio const& ra_to_wrt_b,
+        Ratio const& rb_from_wrt_a, Ratio const& rb_to_wrt_a)
+    {
+        // We have only one result, for (potentially) two IP's,
+        // so we take a first one
+        return_type result;
+
+        if (ra_from_wrt_b.on_segment())
+        {
+            result.assign(Ratio::zero(), ra_from_wrt_b);
+        }
+        else if (rb_from_wrt_a.in_segment())
+        {
+            result.assign(rb_from_wrt_a, Ratio::zero());
+        }
+        else if (ra_to_wrt_b.on_segment())
+        {
+            result.assign(Ratio::one(), ra_to_wrt_b);
+        }
+        else if (rb_to_wrt_a.in_segment())
+        {
+            result.assign(rb_to_wrt_a, Ratio::one());
+        }
+
+        return result;
+    }
+
+    static inline return_type disjoint()
+    {
+        return return_type();
+    }
+    static inline return_type error(std::string const&)
+    {
+        return return_type();
+    }
+
+    template <typename Segment>
+    static inline return_type degenerate(Segment const& segment, bool)
+    {
+        return return_type();
+    }
+
+    template <typename Segment, typename Ratio>
+    static inline return_type one_degenerate(Segment const& ,
+            Ratio const& ratio, bool a_degenerate)
+    {
+        return_type result;
+        if (a_degenerate)
+        {
+            // IP lies on ratio w.r.t. segment b
+            result.assign(Ratio::zero(), ratio);
+        }
+        else
+        {
+            result.assign(ratio, Ratio::zero());
+        }
+        return result;
+    }
+
+};
+
+
+}} // namespace policies::relate
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_GEOMETRY_POLICIES_RELATE_INTERSECTION_RATIOS_HPP
diff --git a/include/boost/geometry/policies/relate/tupled.hpp b/include/boost/geometry/policies/relate/tupled.hpp
index e78ccfbc1..6da9095c4 100644
--- a/include/boost/geometry/policies/relate/tupled.hpp
+++ b/include/boost/geometry/policies/relate/tupled.hpp
@@ -14,8 +14,6 @@
 
 #include <boost/tuple/tuple.hpp>
 #include <boost/geometry/strategies/side_info.hpp>
-#include <boost/geometry/util/select_calculation_type.hpp>
-#include <boost/geometry/util/select_most_precise.hpp>
 
 namespace boost { namespace geometry
 {
@@ -26,7 +24,7 @@ namespace policies { namespace relate
 
 // "tupled" to return intersection results together.
 // Now with two, with some meta-programming and derivations it can also be three (or more)
-template <typename Policy1, typename Policy2, typename CalculationType = void>
+template <typename Policy1, typename Policy2>
 struct segments_tupled
 {
     typedef boost::tuple
@@ -35,101 +33,32 @@ struct segments_tupled
             typename Policy2::return_type
         > return_type;
 
-    // Take segments of first policy, they should be equal
-    typedef typename Policy1::segment_type1 segment_type1;
-    typedef typename Policy1::segment_type2 segment_type2;
-
-    typedef typename select_calculation_type
-        <
-            segment_type1,
-            segment_type2,
-            CalculationType
-        >::type coordinate_type;
-
-    // Get the same type, but at least a double
-    typedef typename select_most_precise<coordinate_type, double>::type rtype;
-
-    template <typename R>
-    static inline return_type segments_intersect(side_info const& sides,
-                    R const& r,
-                    coordinate_type const& dx1, coordinate_type const& dy1,
-                    coordinate_type const& dx2, coordinate_type const& dy2,
-                    segment_type1 const& s1, segment_type2 const& s2)
+    template <typename Segment1, typename Segment2, typename SegmentIntersectionInfo>
+    static inline return_type segments_crosses(side_info const& sides,
+                    SegmentIntersectionInfo const& sinfo,
+                    Segment1 const& s1, Segment2 const& s2)
     {
         return boost::make_tuple
             (
-                Policy1::segments_intersect(sides, r,
-                    dx1, dy1, dx2, dy2, s1, s2),
-                Policy2::segments_intersect(sides, r,
-                    dx1, dy1, dx2, dy2, s1, s2)
+                Policy1::segments_crosses(sides, sinfo, s1, s2),
+                Policy2::segments_crosses(sides, sinfo, s1, s2)
             );
     }
 
-    static inline return_type collinear_touch(coordinate_type const& x,
-                coordinate_type const& y, int arrival_a, int arrival_b)
+    template <typename Segment1, typename Segment2, typename Ratio>
+    static inline return_type segments_collinear(
+        Segment1 const& segment1, Segment2 const& segment2,
+        Ratio const& ra1, Ratio const& ra2, Ratio const& rb1, Ratio const& rb2)
     {
         return boost::make_tuple
             (
-                Policy1::collinear_touch(x, y, arrival_a, arrival_b),
-                Policy2::collinear_touch(x, y, arrival_a, arrival_b)
+                Policy1::segments_collinear(segment1, segment2, ra1, ra2, rb1, rb2),
+                Policy2::segments_collinear(segment1, segment2, ra1, ra2, rb1, rb2)
             );
     }
 
-    template <typename S>
-    static inline return_type collinear_interior_boundary_intersect(S const& segment,
-                bool a_within_b,
-                int arrival_a, int arrival_b, bool opposite)
-    {
-        return boost::make_tuple
-            (
-                Policy1::collinear_interior_boundary_intersect(segment, a_within_b, arrival_a, arrival_b, opposite),
-                Policy2::collinear_interior_boundary_intersect(segment, a_within_b, arrival_a, arrival_b, opposite)
-            );
-    }
-
-    static inline return_type collinear_a_in_b(segment_type1 const& segment,
-                bool opposite)
-    {
-        return boost::make_tuple
-            (
-                Policy1::collinear_a_in_b(segment, opposite),
-                Policy2::collinear_a_in_b(segment, opposite)
-            );
-    }
-    static inline return_type collinear_b_in_a(segment_type2 const& segment,
-                    bool opposite)
-    {
-        return boost::make_tuple
-            (
-                Policy1::collinear_b_in_a(segment, opposite),
-                Policy2::collinear_b_in_a(segment, opposite)
-            );
-    }
-
-
-    static inline return_type collinear_overlaps(
-                    coordinate_type const& x1, coordinate_type const& y1,
-                    coordinate_type const& x2, coordinate_type const& y2,
-                    int arrival_a, int arrival_b, bool opposite)
-    {
-        return boost::make_tuple
-            (
-                Policy1::collinear_overlaps(x1, y1, x2, y2, arrival_a, arrival_b, opposite),
-                Policy2::collinear_overlaps(x1, y1, x2, y2, arrival_a, arrival_b, opposite)
-            );
-    }
-
-    static inline return_type segment_equal(segment_type1 const& s,
-                bool opposite)
-    {
-        return boost::make_tuple
-            (
-                Policy1::segment_equal(s, opposite),
-                Policy2::segment_equal(s, opposite)
-            );
-    }
-
-    static inline return_type degenerate(segment_type1 const& segment,
+    template <typename Segment>
+    static inline return_type degenerate(Segment const& segment,
                 bool a_degenerate)
     {
         return boost::make_tuple
@@ -139,6 +68,18 @@ struct segments_tupled
             );
     }
 
+    template <typename Segment, typename Ratio>
+    static inline return_type one_degenerate(Segment const& segment,
+            Ratio const& ratio,
+            bool a_degenerate)
+    {
+        return boost::make_tuple
+            (
+                Policy1::one_degenerate(segment, ratio, a_degenerate),
+                Policy2::one_degenerate(segment, ratio, a_degenerate)
+            );
+    }
+
     static inline return_type disjoint()
     {
         return boost::make_tuple
@@ -157,15 +98,6 @@ struct segments_tupled
             );
     }
 
-    static inline return_type collinear_disjoint()
-    {
-        return boost::make_tuple
-            (
-                Policy1::collinear_disjoint(),
-                Policy2::collinear_disjoint()
-            );
-    }
-
 };
 
 }} // namespace policies::relate
diff --git a/include/boost/geometry/policies/robustness/get_rescale_policy.hpp b/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
new file mode 100644
index 000000000..ed7c1eb94
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/get_rescale_policy.hpp
@@ -0,0 +1,290 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
+
+
+#include <cstddef>
+
+#include <boost/type_traits.hpp>
+#include <boost/mpl/assert.hpp>
+
+#include <boost/geometry/core/tag_cast.hpp>
+
+#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
+#include <boost/geometry/algorithms/detail/get_max_size.hpp>
+#include <boost/geometry/policies/robustness/robust_type.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <boost/geometry/policies/robustness/no_rescale_policy.hpp>
+#include <boost/geometry/policies/robustness/rescale_policy.hpp>
+
+#include <boost/geometry/util/promote_floating_point.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail { namespace get_rescale_policy
+{
+
+template <typename Point, typename RobustPoint, typename Geometry, typename Factor>
+static inline void init_rescale_policy(Geometry const& geometry,
+        Point& min_point,
+        RobustPoint& min_robust_point,
+        Factor& factor)
+{
+    // Get bounding boxes
+    model::box<Point> env = geometry::return_envelope<model::box<Point> >(geometry);
+
+    // Scale this to integer-range
+    typedef typename promote_floating_point
+        <
+            typename geometry::coordinate_type<Point>::type
+        >::type num_type;
+    num_type const diff = boost::numeric_cast<num_type>(detail::get_max_size(env));
+    num_type const range = 10000000.0; // Define a large range to get precise integer coordinates
+    num_type const half = 0.5;
+    factor = math::equals(diff, num_type()) ? 1
+        : boost::numeric_cast<num_type>(
+            boost::numeric_cast<boost::long_long_type>(half + range / diff));
+
+    // Assign input/output minimal points
+    detail::assign_point_from_index<0>(env, min_point);
+    num_type const two = 2;
+    boost::long_long_type const min_coordinate
+        = boost::numeric_cast<boost::long_long_type>(-range / two);
+    assign_values(min_robust_point, min_coordinate, min_coordinate);
+}
+
+template <typename Point, typename RobustPoint, typename Geometry1, typename Geometry2, typename Factor>
+static inline void init_rescale_policy(Geometry1 const& geometry1,
+        Geometry2 const& geometry2,
+        Point& min_point,
+        RobustPoint& min_robust_point,
+        Factor& factor)
+{
+    // Get bounding boxes
+    model::box<Point> env = geometry::return_envelope<model::box<Point> >(geometry1);
+    model::box<Point> env2 = geometry::return_envelope<model::box<Point> >(geometry2);
+    geometry::expand(env, env2);
+
+    // TODO: merge this with implementation above
+    // Scale this to integer-range
+    typedef typename promote_floating_point
+        <
+            typename geometry::coordinate_type<Point>::type
+        >::type num_type;
+    num_type const diff = boost::numeric_cast<num_type>(detail::get_max_size(env));
+    num_type const range = 10000000.0; // Define a large range to get precise integer coordinates
+    num_type const half = 0.5;
+    factor = math::equals(diff, num_type()) ? 1
+        : boost::numeric_cast<num_type>(
+            boost::numeric_cast<boost::long_long_type>(half + range / diff));
+
+    // Assign input/output minimal points
+    detail::assign_point_from_index<0>(env, min_point);
+    num_type const two = 2;
+    boost::long_long_type const min_coordinate
+        = boost::numeric_cast<boost::long_long_type>(-range / two);
+    assign_values(min_robust_point, min_coordinate, min_coordinate);
+}
+
+
+template
+<
+    typename Point,
+    bool IsFloatingPoint
+>
+struct rescale_policy_type
+{
+    typedef no_rescale_policy type;
+};
+
+// We rescale only all FP types
+template
+<
+    typename Point
+>
+struct rescale_policy_type<Point, true>
+{
+    typedef typename geometry::coordinate_type<Point>::type coordinate_type;
+    typedef model::point
+    <
+        typename detail::robust_type<coordinate_type>::type,
+        geometry::dimension<Point>::value,
+        typename geometry::coordinate_system<Point>::type
+    > robust_point_type;
+    typedef typename promote_floating_point<coordinate_type>::type factor_type;
+    typedef detail::robust_policy<Point, robust_point_type, factor_type> type;
+};
+
+template <typename Policy>
+struct get_rescale_policy
+{
+    template <typename Geometry>
+    static inline Policy apply(Geometry const& geometry)
+    {
+        typedef typename point_type<Geometry>::type point_type;
+        typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
+        typedef typename promote_floating_point<coordinate_type>::type factor_type;
+        typedef model::point
+        <
+            typename detail::robust_type<coordinate_type>::type,
+            geometry::dimension<point_type>::value,
+            typename geometry::coordinate_system<point_type>::type
+        > robust_point_type;
+
+        point_type min_point;
+        robust_point_type min_robust_point;
+        factor_type factor;
+        init_rescale_policy(geometry, min_point, min_robust_point, factor);
+
+        return Policy(min_point, min_robust_point, factor);
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline Policy apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        typedef typename point_type<Geometry1>::type point_type;
+        typedef typename geometry::coordinate_type<Geometry1>::type coordinate_type;
+        typedef typename promote_floating_point<coordinate_type>::type factor_type;
+        typedef model::point
+        <
+            typename detail::robust_type<coordinate_type>::type,
+            geometry::dimension<point_type>::value,
+            typename geometry::coordinate_system<point_type>::type
+        > robust_point_type;
+
+        point_type min_point;
+        robust_point_type min_robust_point;
+        factor_type factor;
+        init_rescale_policy(geometry1, geometry2, min_point, min_robust_point, factor);
+
+        return Policy(min_point, min_robust_point, factor);
+    }
+};
+
+// Specialization for no-rescaling
+template <>
+struct get_rescale_policy<no_rescale_policy>
+{
+    template <typename Geometry>
+    static inline no_rescale_policy apply(Geometry const& )
+    {
+        return no_rescale_policy();
+    }
+
+    template <typename Geometry1, typename Geometry2>
+    static inline no_rescale_policy apply(Geometry1 const& , Geometry2 const& )
+    {
+        return no_rescale_policy();
+    }
+};
+
+
+}} // namespace detail::get_rescale_policy
+#endif // DOXYGEN_NO_DETAIL
+
+template<typename Point>
+struct rescale_policy_type
+    : public detail::get_rescale_policy::rescale_policy_type
+    <
+        Point,
+#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+        false
+#else
+        boost::is_floating_point
+        <
+            typename geometry::coordinate_type<Point>::type
+        >::type::value
+#endif
+    >
+{
+    static const bool is_point
+        = boost::is_same
+            <
+                typename geometry::tag<Point>::type,
+                geometry::point_tag
+            >::type::value;
+
+    BOOST_MPL_ASSERT_MSG((is_point),
+                         INVALID_INPUT_GEOMETRY,
+                         (typename geometry::tag<Point>::type));
+};
+
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename Tag1 = typename tag_cast
+    <
+        typename tag<Geometry1>::type,
+        box_tag,
+        pointlike_tag,
+        linear_tag,
+        areal_tag
+    >::type,
+    typename Tag2 = typename tag_cast
+    <
+        typename tag<Geometry2>::type,
+        box_tag,
+        pointlike_tag,
+        linear_tag,
+        areal_tag
+    >::type
+>
+struct rescale_overlay_policy_type
+    // Default: no rescaling
+    : public detail::get_rescale_policy::rescale_policy_type
+        <
+            typename geometry::point_type<Geometry1>::type,
+            false
+        >
+{};
+
+// Areal/areal: get rescale policy based on coordinate type
+template
+<
+    typename Geometry1,
+    typename Geometry2
+>
+struct rescale_overlay_policy_type<Geometry1, Geometry2, areal_tag, areal_tag>
+    : public rescale_policy_type
+        <
+            typename geometry::point_type<Geometry1>::type
+        >
+{};
+
+
+template <typename Policy, typename Geometry>
+inline Policy get_rescale_policy(Geometry const& geometry)
+{
+    return detail::get_rescale_policy::get_rescale_policy<Policy>::apply(geometry);
+}
+
+template <typename Policy, typename Geometry1, typename Geometry2>
+inline Policy get_rescale_policy(Geometry1 const& geometry1, Geometry2 const& geometry2)
+{
+    return detail::get_rescale_policy::get_rescale_policy<Policy>::apply(geometry1, geometry2);
+}
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_GET_RESCALE_POLICY_HPP
diff --git a/include/boost/geometry/policies/robustness/no_rescale_policy.hpp b/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
new file mode 100644
index 000000000..a7899842c
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/no_rescale_policy.hpp
@@ -0,0 +1,66 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
+
+#include <stddef.h>
+
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+// Probably this will be moved out of namespace detail
+struct no_rescale_policy
+{
+    static bool const enabled = false;
+
+    // We don't rescale but return the reference of the input
+    template <std::size_t Dimension, typename Value>
+    inline Value const& apply(Value const& value) const
+    {
+        return value;
+    }
+};
+
+} // namespace detail
+#endif
+
+
+// Implement meta-functions for this policy
+template <typename Point>
+struct robust_point_type<Point, detail::no_rescale_policy>
+{
+    // The point itself
+    typedef Point type;
+};
+
+template <typename Point>
+struct segment_ratio_type<Point, detail::no_rescale_policy>
+{
+    // Define a segment_ratio defined on coordinate type, e.g.
+    // int/int or float/float
+    typedef typename geometry::coordinate_type<Point>::type coordinate_type;
+    typedef segment_ratio<coordinate_type> type;
+};
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_NO_RESCALE_POLICY_HPP
diff --git a/include/boost/geometry/policies/robustness/rescale_policy.hpp b/include/boost/geometry/policies/robustness/rescale_policy.hpp
new file mode 100644
index 000000000..5b3b56697
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/rescale_policy.hpp
@@ -0,0 +1,83 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
+
+#include <cstddef>
+
+#include <boost/type_traits.hpp>
+
+#include <boost/geometry/policies/robustness/segment_ratio.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <typename FpPoint, typename IntPoint, typename CalculationType>
+struct robust_policy
+{
+    static bool const enabled = true;
+
+    typedef typename geometry::coordinate_type<IntPoint>::type output_ct;
+
+    robust_policy(FpPoint const& fp_min, IntPoint const& int_min, CalculationType const& the_factor)
+        : m_fp_min(fp_min)
+        , m_int_min(int_min)
+        , m_multiplier(the_factor)
+    {
+    }
+
+    template <std::size_t Dimension, typename Value>
+    inline output_ct apply(Value const& value) const
+    {
+        // a + (v-b)*f
+        CalculationType const a = static_cast<CalculationType>(get<Dimension>(m_int_min));
+        CalculationType const b = static_cast<CalculationType>(get<Dimension>(m_fp_min));
+        CalculationType const result = a + (value - b) * m_multiplier;
+        return static_cast<output_ct>(result);
+    }
+
+    FpPoint m_fp_min;
+    IntPoint m_int_min;
+    CalculationType m_multiplier;
+};
+
+} // namespace detail
+#endif
+
+
+// Implement meta-functions for this policy
+
+// Define the IntPoint as a robust-point type
+template <typename Point, typename FpPoint, typename IntPoint, typename CalculationType>
+struct robust_point_type<Point, detail::robust_policy<FpPoint, IntPoint, CalculationType> >
+{
+    typedef IntPoint type;
+};
+
+// Meta function for rescaling, if rescaling is done segment_ratio is based on long long
+template <typename Point, typename FpPoint, typename IntPoint, typename CalculationType>
+struct segment_ratio_type<Point, detail::robust_policy<FpPoint, IntPoint, CalculationType> >
+{
+    typedef segment_ratio<boost::long_long_type> type;
+};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_RESCALE_POLICY_HPP
diff --git a/include/boost/geometry/policies/robustness/robust_point_type.hpp b/include/boost/geometry/policies/robustness/robust_point_type.hpp
new file mode 100644
index 000000000..35f719865
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/robust_point_type.hpp
@@ -0,0 +1,28 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+namespace boost { namespace geometry
+{
+
+// Meta-function to typedef a robust point type for a policy
+template <typename Point, typename Policy>
+struct robust_point_type {}; //: not_implemented<> {};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_POINT_TYPE_HPP
diff --git a/include/boost/geometry/policies/robustness/robust_type.hpp b/include/boost/geometry/policies/robustness/robust_type.hpp
new file mode 100644
index 000000000..4cfb2c4d9
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/robust_type.hpp
@@ -0,0 +1,67 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
+
+
+#include <boost/type_traits.hpp>
+#include <boost/config.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+
+namespace detail_dispatch
+{
+
+template <typename CoordinateType, typename IsFloatingPoint>
+struct robust_type
+{
+};
+
+template <typename CoordinateType>
+struct robust_type<CoordinateType, boost::false_type>
+{
+    typedef CoordinateType type;
+};
+
+template <typename CoordinateType>
+struct robust_type<CoordinateType, boost::true_type>
+{
+    typedef boost::long_long_type type;
+};
+
+} // namespace detail_dispatch
+
+namespace detail
+{
+
+template <typename CoordinateType>
+struct robust_type
+{
+    typedef typename detail_dispatch::robust_type
+        <
+            CoordinateType,
+            typename boost::is_floating_point<CoordinateType>::type
+        >::type type;
+};
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_ROBUST_TYPE_HPP
diff --git a/include/boost/geometry/policies/robustness/segment_ratio.hpp b/include/boost/geometry/policies/robustness/segment_ratio.hpp
new file mode 100644
index 000000000..d55e8492e
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/segment_ratio.hpp
@@ -0,0 +1,236 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_HPP
+
+#include <boost/assert.hpp>
+#include <boost/config.hpp>
+#include <boost/rational.hpp>
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/promote_floating_point.hpp>
+
+namespace boost { namespace geometry
+{
+
+
+namespace detail { namespace segment_ratio
+{
+
+template
+<
+    typename Type,
+    bool IsIntegral = boost::is_integral<Type>::type::value
+>
+struct less {};
+
+template <typename Type>
+struct less<Type, true>
+{
+    template <typename Ratio>
+    static inline bool apply(Ratio const& lhs, Ratio const& rhs)
+    {
+        return boost::rational<Type>(lhs.numerator(), lhs.denominator())
+             < boost::rational<Type>(rhs.numerator(), rhs.denominator());
+    }
+};
+
+template <typename Type>
+struct less<Type, false>
+{
+    template <typename Ratio>
+    static inline bool apply(Ratio const& lhs, Ratio const& rhs)
+    {
+        BOOST_ASSERT(lhs.denominator() != 0);
+        BOOST_ASSERT(rhs.denominator() != 0);
+        return lhs.numerator() * rhs.denominator()
+             < rhs.numerator() * lhs.denominator();
+    }
+};
+
+template
+<
+    typename Type,
+    bool IsIntegral = boost::is_integral<Type>::type::value
+>
+struct equal {};
+
+template <typename Type>
+struct equal<Type, true>
+{
+    template <typename Ratio>
+    static inline bool apply(Ratio const& lhs, Ratio const& rhs)
+    {
+        return boost::rational<Type>(lhs.numerator(), lhs.denominator())
+            == boost::rational<Type>(rhs.numerator(), rhs.denominator());
+    }
+};
+
+template <typename Type>
+struct equal<Type, false>
+{
+    template <typename Ratio>
+    static inline bool apply(Ratio const& lhs, Ratio const& rhs)
+    {
+        BOOST_ASSERT(lhs.denominator() != 0);
+        BOOST_ASSERT(rhs.denominator() != 0);
+        return geometry::math::equals
+            (
+                lhs.numerator() * rhs.denominator(),
+                rhs.numerator() * lhs.denominator()
+            );
+    }
+};
+
+}}
+
+//! Small class to keep a ratio (e.g. 1/4)
+//! Main purpose is intersections and checking on 0, 1, and smaller/larger
+//! The prototype used Boost.Rational. However, we also want to store FP ratios,
+//! (so numerator/denominator both in float)
+//! and Boost.Rational starts with GCD which we prefer to avoid if not necessary
+//! On a segment means: this ratio is between 0 and 1 (both inclusive)
+//!
+template <typename Type>
+class segment_ratio
+{
+public :
+    typedef Type numeric_type;
+
+    // Type-alias for the type itself
+    typedef segment_ratio<Type> thistype;
+
+    inline segment_ratio()
+        : m_numerator(0)
+        , m_denominator(1)
+        , m_approximation(0)
+    {}
+
+    inline segment_ratio(const Type& nominator, const Type& denominator)
+        : m_numerator(nominator)
+        , m_denominator(denominator)
+    {
+        initialize();
+    }
+
+    inline Type const& numerator() const { return m_numerator; }
+    inline Type const& denominator() const { return m_denominator; }
+
+    inline void assign(const Type& nominator, const Type& denominator)
+    {
+        m_numerator = nominator;
+        m_denominator = denominator;
+        initialize();
+    }
+
+    inline void initialize()
+    {
+        // Minimal normalization
+        // 1/-4 => -1/4, -1/-4 => 1/4
+        if (m_denominator < 0)
+        {
+            m_numerator = -m_numerator;
+            m_denominator = -m_denominator;
+        }
+
+        typedef typename promote_floating_point<Type>::type num_type;
+        static const num_type scale = 1000000.0;
+        m_approximation =
+            m_denominator == 0 ? 0
+            : boost::numeric_cast<int>
+                (
+                    boost::numeric_cast<num_type>(m_numerator) * scale
+                  / boost::numeric_cast<num_type>(m_denominator)
+                );
+    }
+
+    inline bool is_zero() const { return math::equals(m_numerator, 0); }
+    inline bool is_one() const { return math::equals(m_numerator, m_denominator); }
+    inline bool on_segment() const
+    {
+        // e.g. 0/4 or 4/4 or 2/4
+        return m_numerator >= 0 && m_numerator <= m_denominator;
+    }
+    inline bool in_segment() const
+    {
+        // e.g. 1/4
+        return m_numerator > 0 && m_numerator < m_denominator;
+    }
+    inline bool on_end() const
+    {
+        // e.g. 0/4 or 4/4
+        return is_zero() || is_one();
+    }
+    inline bool left() const
+    {
+        // e.g. -1/4
+        return m_numerator < 0;
+    }
+    inline bool right() const
+    {
+        // e.g. 5/4
+        return m_numerator > m_denominator;
+    }
+
+    inline bool close_to(thistype const& other) const
+    {
+        return geometry::math::abs(m_approximation - other.m_approximation) < 2;
+    }
+
+    inline bool operator< (thistype const& other) const
+    {
+        return close_to(other)
+            ? detail::segment_ratio::less<Type>::apply(*this, other)
+            : m_approximation < other.m_approximation;
+    }
+
+    inline bool operator== (thistype const& other) const
+    {
+        return close_to(other)
+            && detail::segment_ratio::equal<Type>::apply(*this, other);
+    }
+
+    static inline thistype zero()
+    {
+        static thistype result(0, 1);
+        return result;
+    }
+
+    static inline thistype one()
+    {
+        static thistype result(1, 1);
+        return result;
+    }
+
+#if defined(BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO)
+    friend std::ostream& operator<<(std::ostream &os, segment_ratio const& ratio)
+    {
+        os << ratio.m_numerator << "/" << ratio.m_denominator;
+        return os;
+    }
+#endif
+
+
+
+private :
+    Type m_numerator;
+    Type m_denominator;
+
+    // Contains ratio on scale 0..1000000 (for 0..1)
+    // This is an approximation for fast and rough comparisons
+    // Boost.Rational is used if the approximations are close.
+    // Reason: performance, Boost.Rational does a GCD by default and also the
+    // comparisons contain while-loops.
+    int m_approximation;
+};
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_HPP
diff --git a/include/boost/geometry/policies/robustness/segment_ratio_type.hpp b/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
new file mode 100644
index 000000000..19e935bbb
--- /dev/null
+++ b/include/boost/geometry/policies/robustness/segment_ratio_type.hpp
@@ -0,0 +1,28 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
+#define BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+namespace boost { namespace geometry
+{
+
+// Meta-function to access segment-ratio for a policy
+template <typename Point, typename Policy>
+struct segment_ratio_type {}; // : not_implemented<> {};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_POLICIES_ROBUSTNESS_SEGMENT_RATIO_TYPE_HPP
diff --git a/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp b/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp
new file mode 100644
index 000000000..204a97324
--- /dev/null
+++ b/include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp
@@ -0,0 +1,61 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_ASYMMETRIC_HPP
+#define BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_ASYMMETRIC_HPP
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace buffer
+{
+
+
+template<typename CoordinateType>
+class distance_asymmetric
+{
+public :
+    distance_asymmetric(CoordinateType const& left,
+                CoordinateType const& right)
+        : m_left(left)
+        , m_right(right)
+    {}
+
+    template <typename Point>
+    inline CoordinateType apply(Point const& , Point const& ,
+                buffer_side_selector side)  const
+    {
+        CoordinateType result = side == buffer_side_left ? m_left : m_right;
+        return negative() ? math::abs(result) : result;
+    }
+
+    inline int factor() const
+    {
+        return m_left < 0 ? -1 : 1;
+    }
+
+    inline bool negative() const
+    {
+        return m_left < 0 && m_right < 0;
+    }
+
+private :
+    CoordinateType m_left;
+    CoordinateType m_right;
+};
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_ASYMMETRIC_HPP
diff --git a/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp
new file mode 100644
index 000000000..8a830e3a5
--- /dev/null
+++ b/include/boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp
@@ -0,0 +1,57 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_SYMMETRIC_HPP
+#define BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_SYMMETRIC_HPP
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace buffer
+{
+
+
+template<typename CoordinateType>
+class distance_symmetric
+{
+public :
+    inline distance_symmetric(CoordinateType const& distance)
+        : m_distance(distance)
+    {}
+
+    template <typename Point>
+    inline CoordinateType apply(Point const& , Point const& ,
+                buffer_side_selector side)  const
+    {
+        return m_distance;
+    }
+
+    inline int factor() const
+    {
+        return 1;
+    }
+
+    inline bool negative() const
+    {
+        return m_distance < 0;
+    }
+
+private :
+    CoordinateType m_distance;
+};
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_DISTANCE_SYMMETRIC_HPP
diff --git a/include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp b/include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp
new file mode 100644
index 000000000..798980194
--- /dev/null
+++ b/include/boost/geometry/strategies/agnostic/buffer_end_skip.hpp
@@ -0,0 +1,54 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_END_SKIP_HPP
+#define BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_END_SKIP_HPP
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace buffer
+{
+
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+class end_skip
+{
+public :
+
+    template <typename RangeOut, typename DistanceStrategy>
+    inline void apply(PointIn const& ,
+                PointIn const& ,
+                PointIn const& ,
+                PointIn const& ,
+                buffer_side_selector ,
+                DistanceStrategy const& ,
+                RangeOut& ) const
+    {
+    }
+
+    static inline piece_type get_piece_type()
+    {
+        return buffered_flat_end;
+    }
+};
+
+
+}} // namespace strategy::buffer
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_AGNOSTIC_BUFFER_END_SKIP_HPP
diff --git a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
index 747c14075..98d2f8949 100644
--- a/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
+++ b/include/boost/geometry/strategies/agnostic/hull_graham_andrew.hpp
@@ -230,7 +230,7 @@ public:
         // For the left boundary it is important that multiple points
         // are sorted from bottom to top. Therefore the less predicate
         // does not take the x-only template parameter (this fixes ticket #6019.
-        // For the right boundary it is not necessary (though also not harmful), 
+        // For the right boundary it is not necessary (though also not harmful),
         // because points are sorted from bottom to top in a later stage.
         // For symmetry and to get often more balanced lower/upper halves
         // we keep it.
@@ -319,7 +319,7 @@ private:
         typedef typename strategy::side::services::default_strategy<cs_tag>::type side;
 
         output.push_back(p);
-        register std::size_t output_size = output.size();
+        std::size_t output_size = output.size();
         while (output_size >= 3)
         {
             rev_iterator rit = output.rbegin();
diff --git a/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp b/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
index 1398ddb68..968f9fecb 100644
--- a/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
+++ b/include/boost/geometry/strategies/agnostic/point_in_box_by_side.hpp
@@ -22,9 +22,9 @@
 #include <boost/geometry/strategies/within.hpp>
 
 
-namespace boost { namespace geometry { namespace strategy 
+namespace boost { namespace geometry { namespace strategy
 {
-    
+
 namespace within
 {
 
@@ -71,11 +71,11 @@ struct point_in_box_by_side
         boost::array<typename point_type<Box>::type, 5> bp;
         geometry::detail::assign_box_corners_oriented<true>(box, bp);
         bp[4] = bp[0];
-        
+
         bool result = true;
         side_strategy_type strategy;
         boost::ignore_unused_variable_warning(strategy);
-        
+
         for (int i = 1; i < 5; i++)
         {
             int const side = strategy.apply(point, bp[i - 1], bp[i]);
@@ -84,7 +84,7 @@ struct point_in_box_by_side
                 return result;
             }
         }
-    
+
         return result;
     }
 };
@@ -102,9 +102,9 @@ namespace within { namespace services
 template <typename Point, typename Box>
 struct default_strategy
     <
-        point_tag, box_tag, 
-        point_tag, areal_tag, 
-        spherical_tag, spherical_tag, 
+        point_tag, box_tag,
+        point_tag, areal_tag,
+        spherical_tag, spherical_tag,
         Point, Box
     >
 {
@@ -126,9 +126,9 @@ namespace covered_by { namespace services
 template <typename Point, typename Box>
 struct default_strategy
     <
-        point_tag, box_tag, 
-        point_tag, areal_tag, 
-        spherical_tag, spherical_tag, 
+        point_tag, box_tag,
+        point_tag, areal_tag,
+        spherical_tag, spherical_tag,
         Point, Box
     >
 {
diff --git a/include/boost/geometry/strategies/agnostic/point_in_point.hpp b/include/boost/geometry/strategies/agnostic/point_in_point.hpp
new file mode 100644
index 000000000..e4f9bec4c
--- /dev/null
+++ b/include/boost/geometry/strategies/agnostic/point_in_point.hpp
@@ -0,0 +1,136 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_STRATEGY_AGNOSTIC_POINT_IN_POINT_HPP
+#define BOOST_GEOMETRY_STRATEGY_AGNOSTIC_POINT_IN_POINT_HPP
+
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+
+#include <boost/geometry/strategies/covered_by.hpp>
+#include <boost/geometry/strategies/within.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace within
+{
+
+template
+<
+    typename Point1, typename Point2
+>
+struct point_in_point
+{
+    static inline bool apply(Point1 const& point1, Point2 const& point2)
+    {
+        return detail::equals::equals_point_point(point1, point2);
+    }
+};
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+namespace services
+{
+
+template <typename Point1, typename Point2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, cartesian_tag, cartesian_tag, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point1, typename Point2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, spherical_tag, spherical_tag, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point1, typename Point2, typename AnyCS1, typename AnyCS2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, AnyCS1, AnyCS2, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point, typename MultiPoint>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, cartesian_tag, cartesian_tag, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+template <typename Point, typename MultiPoint>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, spherical_tag, spherical_tag, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+template <typename Point, typename MultiPoint, typename AnyCS1, typename AnyCS2>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, AnyCS1, AnyCS2, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+} // namespace services
+
+#endif
+
+
+}} // namespace strategy::within
+
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace strategy { namespace covered_by { namespace services
+{
+
+template <typename Point1, typename Point2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, cartesian_tag, cartesian_tag, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point1, typename Point2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, spherical_tag, spherical_tag, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point1, typename Point2, typename AnyCS1, typename AnyCS2>
+struct default_strategy<point_tag, point_tag, point_tag, point_tag, AnyCS1, AnyCS2, Point1, Point2>
+{
+    typedef strategy::within::point_in_point<Point1, Point2> type;
+};
+
+template <typename Point, typename MultiPoint>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, cartesian_tag, cartesian_tag, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+template <typename Point, typename MultiPoint>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, spherical_tag, spherical_tag, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+template <typename Point, typename MultiPoint, typename AnyCS1, typename AnyCS2>
+struct default_strategy<point_tag, multi_point_tag, point_tag, multi_point_tag, AnyCS1, AnyCS2, Point, MultiPoint>
+{
+    typedef strategy::within::point_in_point<Point, typename point_type<MultiPoint>::type> type;
+};
+
+}}} // namespace strategy::covered_by::services
+#endif
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGY_AGNOSTIC_POINT_IN_POINT_HPP
diff --git a/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp b/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
index 69188650d..24d7470ae 100644
--- a/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
+++ b/include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp
@@ -1,6 +1,10 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014 Oracle and/or its affiliates.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -9,6 +13,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_STRATEGY_AGNOSTIC_POINT_IN_POLY_WINDING_HPP
 #define BOOST_GEOMETRY_STRATEGY_AGNOSTIC_POINT_IN_POLY_WINDING_HPP
 
@@ -194,6 +200,19 @@ struct default_strategy<point_tag, AnyTag, point_tag, areal_tag, spherical_tag,
     typedef winding<Point, typename geometry::point_type<Geometry>::type> type;
 };
 
+// TODO: use linear_tag and pointlike_tag the same way how areal_tag is used
+
+template <typename Point, typename Geometry, typename AnyTag>
+struct default_strategy<point_tag, AnyTag, point_tag, AnyTag, cartesian_tag, cartesian_tag, Point, Geometry>
+{
+    typedef winding<Point, typename geometry::point_type<Geometry>::type> type;
+};
+
+template <typename Point, typename Geometry, typename AnyTag>
+struct default_strategy<point_tag, AnyTag, point_tag, AnyTag, spherical_tag, spherical_tag, Point, Geometry>
+{
+    typedef winding<Point, typename geometry::point_type<Geometry>::type> type;
+};
 
 } // namespace services
 
@@ -221,6 +240,19 @@ struct default_strategy<point_tag, AnyTag, point_tag, areal_tag, spherical_tag,
     typedef strategy::within::winding<Point, typename geometry::point_type<Geometry>::type> type;
 };
 
+// TODO: use linear_tag and pointlike_tag the same way how areal_tag is used
+
+template <typename Point, typename Geometry, typename AnyTag>
+struct default_strategy<point_tag, AnyTag, point_tag, AnyTag, cartesian_tag, cartesian_tag, Point, Geometry>
+{
+    typedef strategy::within::winding<Point, typename geometry::point_type<Geometry>::type> type;
+};
+
+template <typename Point, typename Geometry, typename AnyTag>
+struct default_strategy<point_tag, AnyTag, point_tag, AnyTag, spherical_tag, spherical_tag, Point, Geometry>
+{
+    typedef strategy::within::winding<Point, typename geometry::point_type<Geometry>::type> type;
+};
 
 }}} // namespace strategy::covered_by::services
 #endif
diff --git a/include/boost/geometry/strategies/agnostic/relate.hpp b/include/boost/geometry/strategies/agnostic/relate.hpp
new file mode 100644
index 000000000..318047fad
--- /dev/null
+++ b/include/boost/geometry/strategies/agnostic/relate.hpp
@@ -0,0 +1,91 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_STRATEGY_AGNOSTIC_RELATE_HPP
+#define BOOST_GEOMETRY_STRATEGY_AGNOSTIC_RELATE_HPP
+
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace relate
+{
+
+template <typename StaticMask>
+struct relate
+{
+    template <typename Geometry1, typename Geometry2>
+    static inline bool apply(Geometry1 const& geometry1, Geometry2 const& geometry2)
+    {
+        return detail::relate::relate<StaticMask>(geometry1, geometry2);
+    }
+};
+
+} // namespace relate
+
+namespace within
+{
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+namespace services
+{
+
+
+template <typename Geometry1, typename Geometry2, typename AnyTag1, typename AnyTag2, typename AnyCS>
+struct default_strategy<AnyTag1, AnyTag2, AnyTag1, AnyTag2, AnyCS, AnyCS, Geometry1, Geometry2>
+{
+    typedef strategy::relate::relate<detail::relate::static_mask_within> type;
+};
+
+template <typename Geometry1, typename Geometry2, typename AnyTag1, typename AnyTag2, typename AnyCS>
+struct default_strategy<AnyTag1, AnyTag2, AnyTag1, areal_tag, AnyCS, AnyCS, Geometry1, Geometry2>
+{
+    typedef strategy::relate::relate<detail::relate::static_mask_within> type;
+};
+
+
+} // namespace services
+
+#endif
+
+
+}} // namespace strategy::within
+
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace strategy { namespace covered_by { namespace services
+{
+
+
+template <typename Geometry1, typename Geometry2, typename AnyTag1, typename AnyTag2, typename AnyCS>
+struct default_strategy<AnyTag1, AnyTag2, AnyTag1, AnyTag2, AnyCS, AnyCS, Geometry1, Geometry2>
+{
+    typedef strategy::relate::relate<detail::relate::static_mask_covered_by> type;
+};
+
+template <typename Geometry1, typename Geometry2, typename AnyTag1, typename AnyTag2, typename AnyCS>
+struct default_strategy<AnyTag1, AnyTag2, AnyTag1, areal_tag, AnyCS, AnyCS, Geometry1, Geometry2>
+{
+    typedef strategy::relate::relate<detail::relate::static_mask_covered_by> type;
+};
+
+
+}}} // namespace strategy::covered_by::services
+#endif
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGY_AGNOSTIC_RELATE_HPP
diff --git a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
index f59fa55d6..af3728929 100644
--- a/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
+++ b/include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp
@@ -156,7 +156,7 @@ private :
 #ifdef GL_DEBUG_DOUGLAS_PEUCKER
             std::cout << "consider " << dsv(it->p)
                 << " at " << double(dist)
-                << ((dist > max_dist) ? " maybe" : " no") 
+                << ((dist > max_dist) ? " maybe" : " no")
                 << std::endl;
 
 #endif
diff --git a/include/boost/geometry/strategies/buffer.hpp b/include/boost/geometry/strategies/buffer.hpp
new file mode 100644
index 000000000..5de08eab7
--- /dev/null
+++ b/include/boost/geometry/strategies/buffer.hpp
@@ -0,0 +1,73 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_HPP
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace buffer
+{
+
+/*
+
+   A Buffer-join strategy gets 4 input points.
+   On the two consecutive segments s1 and s2 (joining at vertex v):
+
+   The lines from parallel at s1, s2 (at buffer-distance) end/start
+   in two points perpendicular to the segments: p1 and p2.
+   These parallel lines interesct in point ip
+
+             (s2)
+              |
+              |
+              ^
+              |
+        (p2)  |(v)
+        *     +----<--- (s1)
+
+        x(ip) *(p1)
+
+
+    So, in clockwise order:
+        v : vertex point
+        p1: perpendicular on left side of segment1<1> (perp1)
+        ip: intersection point
+        p2: perpendicular on left side of segment2<0> (perp2)
+*/
+
+
+
+/*!
+\brief Enumerates options for side of buffer (left/right w.r.t. directed
+    segment)
+\ingroup enum
+\details Around a linestring, a buffer can be defined left or right.
+    Around a polygon, assumed clockwise internally,
+    a buffer is either on the left side (inflates the polygon), or on the
+    right side (deflates the polygon)
+*/
+enum buffer_side_selector { buffer_side_left, buffer_side_right };
+
+/*!
+\brief Enumerates types of pieces (parts of buffer) around geometries
+\ingroup enum
+*/
+enum piece_type
+{
+    buffered_segment, buffered_join, buffered_round_end, buffered_flat_end, buffered_circle
+};
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_HPP
diff --git a/include/boost/geometry/strategies/cartesian/box_in_box.hpp b/include/boost/geometry/strategies/cartesian/box_in_box.hpp
index 7680b8362..9889658a1 100644
--- a/include/boost/geometry/strategies/cartesian/box_in_box.hpp
+++ b/include/boost/geometry/strategies/cartesian/box_in_box.hpp
@@ -3,6 +3,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -21,10 +22,10 @@
 #include <boost/geometry/strategies/within.hpp>
 
 
-namespace boost { namespace geometry { namespace strategy 
+namespace boost { namespace geometry { namespace strategy
 {
-    
-   
+
+
 namespace within
 {
 
@@ -36,7 +37,8 @@ struct box_within_range
                 , BoxContainingValue const& bing_min
                 , BoxContainingValue const& bing_max)
     {
-        return bed_min > bing_min && bed_max < bing_max;
+        return bing_min <= bed_min && bed_max <= bing_max // contained in containing
+            && bed_min < bed_max;                         // interiors overlap
     }
 };
 
@@ -69,9 +71,9 @@ struct relate_box_box_loop
         assert_dimension_equal<Box1, Box2>();
 
         if (! SubStrategy::apply(
-                    get<min_corner, Dimension>(b_contained), 
-                    get<max_corner, Dimension>(b_contained), 
-                    get<min_corner, Dimension>(b_containing), 
+                    get<min_corner, Dimension>(b_contained),
+                    get<max_corner, Dimension>(b_contained),
+                    get<min_corner, Dimension>(b_containing),
                     get<max_corner, Dimension>(b_containing)
                 )
             )
@@ -115,7 +117,7 @@ struct box_in_box
     {
         return relate_box_box_loop
             <
-                SubStrategy, 
+                SubStrategy,
                 Box1, Box2, 0, dimension<Box1>::type::value
             >::apply(box1, box2);
     }
@@ -134,9 +136,9 @@ namespace within { namespace services
 template <typename BoxContained, typename BoxContaining>
 struct default_strategy
     <
-        box_tag, box_tag, 
-        box_tag, areal_tag, 
-        cartesian_tag, cartesian_tag, 
+        box_tag, box_tag,
+        box_tag, areal_tag,
+        cartesian_tag, cartesian_tag,
         BoxContained, BoxContaining
     >
 {
@@ -152,9 +154,9 @@ namespace covered_by { namespace services
 template <typename BoxContained, typename BoxContaining>
 struct default_strategy
     <
-        box_tag, box_tag, 
-        box_tag, areal_tag, 
-        cartesian_tag, cartesian_tag, 
+        box_tag, box_tag,
+        box_tag, areal_tag,
+        cartesian_tag, cartesian_tag,
         BoxContained, BoxContaining
     >
 {
diff --git a/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp b/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
new file mode 100644
index 000000000..871902c5f
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/buffer_end_flat.hpp
@@ -0,0 +1,94 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_FLAT_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_FLAT_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace buffer
+{
+
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+class end_flat
+{
+    typedef typename strategy::side::services::default_strategy<typename cs_tag<PointIn>::type>::type side;
+    typedef typename coordinate_type<PointOut>::type coordinate_type;
+
+    typedef typename geometry::select_most_precise
+        <
+            typename geometry::select_most_precise
+                <
+                    typename geometry::coordinate_type<PointIn>::type,
+                    typename geometry::coordinate_type<PointOut>::type
+                >::type,
+            double
+        >::type promoted_type;
+
+
+public :
+
+    template <typename RangeOut, typename DistanceStrategy>
+    inline void apply(PointIn const& penultimate_point,
+                PointIn const& perp_left_point,
+                PointIn const& ultimate_point,
+                PointIn const& perp_right_point,
+                buffer_side_selector side,
+                DistanceStrategy const& distance,
+                RangeOut& range_out) const
+    {
+        promoted_type const dist_left = distance.apply(penultimate_point, ultimate_point, buffer_side_left);
+        promoted_type const dist_right = distance.apply(penultimate_point, ultimate_point, buffer_side_right);
+
+        bool reversed = (side == buffer_side_left && dist_right < 0 && -dist_right > dist_left)
+                    || (side == buffer_side_right && dist_left < 0 && -dist_left > dist_right)
+                    ;
+        if (reversed)
+        {
+            range_out.push_back(perp_right_point);
+            range_out.push_back(perp_left_point);
+        }
+        else
+        {
+            range_out.push_back(perp_left_point);
+            range_out.push_back(perp_right_point);
+        }
+        // Don't add the ultimate_point (endpoint of the linestring).
+        // The buffer might be generated completely at one side.
+        // In other cases it does no harm but is further useless
+    }
+
+    static inline piece_type get_piece_type()
+    {
+        return buffered_flat_end;
+    }
+};
+
+
+}} // namespace strategy::buffer
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_FLAT_HPP
diff --git a/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
new file mode 100644
index 000000000..76f9411ab
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/buffer_end_round.hpp
@@ -0,0 +1,137 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_ROUND_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_ROUND_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace buffer
+{
+
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+class end_round
+{
+    typedef typename strategy::side::services::default_strategy<typename cs_tag<PointIn>::type>::type side;
+    typedef typename coordinate_type<PointOut>::type coordinate_type;
+
+    typedef typename geometry::select_most_precise
+        <
+            typename geometry::select_most_precise
+                <
+                    typename geometry::coordinate_type<PointIn>::type,
+                    typename geometry::coordinate_type<PointOut>::type
+                >::type,
+            double
+        >::type promoted_type;
+
+    int m_steps_per_circle;
+
+    template <typename RangeOut>
+    inline void generate_points(PointIn const& point,
+                promoted_type alpha,
+                promoted_type const& buffer_distance,
+                RangeOut& range_out) const
+    {
+        promoted_type const two = 2.0;
+        promoted_type const two_pi = two * geometry::math::pi<promoted_type>();
+
+        int point_buffer_count = m_steps_per_circle;
+
+        promoted_type const diff = two_pi / promoted_type(point_buffer_count);
+
+        // For half circle:
+        point_buffer_count /= 2;
+        point_buffer_count++;
+
+        for (int i = 0; i < point_buffer_count; i++, alpha -= diff)
+        {
+            typename boost::range_value<RangeOut>::type p;
+            set<0>(p, get<0>(point) + buffer_distance * cos(alpha));
+            set<1>(p, get<1>(point) + buffer_distance * sin(alpha));
+            range_out.push_back(p);
+        }
+    }
+
+    template <typename T, typename P1, typename P2>
+    static inline T calculate_angle(P1 const& from_point, P2 const& to_point)
+    {
+        typedef P1 vector_type;
+        vector_type v = from_point;
+        geometry::subtract_point(v, to_point);
+        return atan2(geometry::get<1>(v), geometry::get<0>(v));
+    }
+
+public :
+    inline end_round(int steps_per_circle = 100)
+        : m_steps_per_circle(steps_per_circle)
+    {}
+
+    template <typename RangeOut, typename DistanceStrategy>
+    inline void apply(PointIn const& penultimate_point,
+                PointIn const& perp_left_point,
+                PointIn const& ultimate_point,
+                PointIn const& ,
+                buffer_side_selector side,
+                DistanceStrategy const& distance,
+                RangeOut& range_out) const
+    {
+        promoted_type alpha = calculate_angle<promoted_type>(perp_left_point, ultimate_point);
+
+        promoted_type const dist_left = distance.apply(penultimate_point, ultimate_point, buffer_side_left);
+        promoted_type const dist_right = distance.apply(penultimate_point, ultimate_point, buffer_side_right);
+        if (geometry::math::equals(dist_left, dist_right))
+        {
+            generate_points(ultimate_point, alpha, dist_left, range_out);
+        }
+        else
+        {
+            promoted_type const two = 2.0;
+            promoted_type dist_half_diff = (dist_left - dist_right) / two;
+
+            if (side == buffer_side_right)
+            {
+                dist_half_diff = -dist_half_diff;
+            }
+
+            PointIn shifted_point;
+            set<0>(shifted_point, get<0>(ultimate_point) + dist_half_diff * cos(alpha));
+            set<1>(shifted_point, get<1>(ultimate_point) + dist_half_diff * sin(alpha));
+            generate_points(shifted_point, alpha, (dist_left + dist_right) / two, range_out);
+        }
+    }
+
+    static inline piece_type get_piece_type()
+    {
+        return buffered_round_end;
+    }
+};
+
+
+}} // namespace strategy::buffer
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_END_ROUND_HPP
diff --git a/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp b/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp
new file mode 100644
index 000000000..4d0ed3665
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/buffer_join_miter.hpp
@@ -0,0 +1,97 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_MITER_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_MITER_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace buffer
+{
+
+// TODO: condider merging/baseclassing join strategies to avoid duplicate code
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+struct join_miter
+{
+    typedef typename strategy::side::services::default_strategy<typename cs_tag<PointIn>::type>::type side;
+    typedef typename coordinate_type<PointIn>::type coordinate_type;
+
+    // Constructor compatible with other join strategies:
+    inline join_miter(int = 0)
+    {}
+
+    template <typename RangeOut>
+    inline void apply(PointIn const& ip, PointIn const& vertex,
+                PointIn const& perp1, PointIn const& perp2,
+                coordinate_type const& buffer_distance,
+                RangeOut& range_out) const
+    {
+        coordinate_type zero = 0;
+        int signum = buffer_distance > zero ? 1
+                   : buffer_distance < zero ? -1
+                   : 0;
+
+        if (side::apply(perp1, ip, perp2) == signum)
+        {
+        }
+        else
+        {
+            PointIn p = ip;
+
+            // Normalize it and give it X*dist.
+            coordinate_type dx = get<0>(ip) - get<0>(vertex);
+            coordinate_type dy = get<1>(ip) - get<1>(vertex);
+
+            coordinate_type length = geometry::math::sqrt(dx * dx + dy * dy);
+
+            // TODO: make max-mitre-limit flexible
+            coordinate_type ten = 10.0;
+            coordinate_type zero_seven = 0.7;
+
+            coordinate_type max = ten * geometry::math::abs(buffer_distance);
+
+            if (length > max)
+            {
+
+                coordinate_type prop = zero_seven * buffer_distance;
+                prop /= length;
+                set<0>(p, get<0>(vertex) + dx * prop);
+                set<1>(p, get<1>(vertex) + dy * prop);
+            }
+
+            range_out.push_back(perp1);
+            range_out.push_back(p);
+            range_out.push_back(perp2);
+        }
+
+    }
+};
+
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_MITER_HPP
diff --git a/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp b/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
new file mode 100644
index 000000000..f28d741e2
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
@@ -0,0 +1,163 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/policies/compare.hpp>
+#include <boost/geometry/strategies/buffer.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace buffer
+{
+
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+class join_round
+{
+private :
+    geometry::equal_to<PointIn> equals;
+
+public :
+
+    inline join_round(int steps_per_circle = 100)
+        : m_steps_per_circle(steps_per_circle)
+    {}
+
+    typedef typename strategy::side::services::default_strategy<typename cs_tag<PointIn>::type>::type side;
+    typedef typename coordinate_type<PointOut>::type coordinate_type;
+
+    typedef typename geometry::select_most_precise
+        <
+            typename geometry::select_most_precise
+                <
+                    typename geometry::coordinate_type<PointIn>::type,
+                    typename geometry::coordinate_type<PointOut>::type
+                >::type,
+            double
+        >::type promoted_type;
+
+    int m_steps_per_circle;
+
+    template <typename RangeOut>
+    inline void generate_points(PointIn const& vertex,
+                PointIn const& perp1, PointIn const& perp2,
+                promoted_type const& buffer_distance,
+                RangeOut& range_out) const
+    {
+        promoted_type dx1 = get<0>(perp1) - get<0>(vertex);
+        promoted_type dy1 = get<1>(perp1) - get<1>(vertex);
+        promoted_type dx2 = get<0>(perp2) - get<0>(vertex);
+        promoted_type dy2 = get<1>(perp2) - get<1>(vertex);
+
+        dx1 /= buffer_distance;
+        dy1 /= buffer_distance;
+        dx2 /= buffer_distance;
+        dy2 /= buffer_distance;
+
+        promoted_type angle_diff = acos(dx1 * dx2 + dy1 * dy2);
+
+        promoted_type two = 2.0;
+        promoted_type steps = m_steps_per_circle;
+        int n = boost::numeric_cast<int>(steps * angle_diff
+                    / (two * geometry::math::pi<promoted_type>()));
+
+        if (n > 1000)
+        {
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+            // TODO change this / verify this
+            std::cout << dx1 << ", " << dy1 << " .. " << dx2 << ", " << dy2 << std::endl;
+            std::cout << angle_diff << " -> " << n << std::endl;
+            n = 1000;
+#endif
+        }
+        else if (n <= 1)
+        {
+            return;
+        }
+
+        promoted_type const angle1 = atan2(dy1, dx1);
+        promoted_type diff = angle_diff / promoted_type(n);
+        promoted_type a = angle1 - diff;
+
+        for (int i = 0; i < n - 1; i++, a -= diff)
+        {
+            PointIn p;
+            set<0>(p, get<0>(vertex) + buffer_distance * cos(a));
+            set<1>(p, get<1>(vertex) + buffer_distance * sin(a));
+            range_out.push_back(p);
+        }
+    }
+
+    template <typename RangeOut>
+    inline void apply(PointIn const& ip, PointIn const& vertex,
+                PointIn const& perp1, PointIn const& perp2,
+                coordinate_type const& buffer_distance,
+                RangeOut& range_out) const
+    {
+        if (equals(perp1, perp2))
+        {
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+            std::cout << "Corner for equal points " << geometry::wkt(ip) << " " << geometry::wkt(perp1) << std::endl;
+#endif
+            return;
+        }
+
+        coordinate_type zero = 0;
+        int signum = buffer_distance > zero ? 1
+                   : buffer_distance < zero ? -1
+                   : 0;
+
+        if (side::apply(perp1, ip, perp2) == signum)
+        {
+        }
+        else
+        {
+            // Generate 'vectors'
+            coordinate_type vix = (get<0>(ip) - get<0>(vertex));
+            coordinate_type viy = (get<1>(ip) - get<1>(vertex));
+
+            coordinate_type length_i =
+                geometry::math::sqrt(vix * vix + viy * viy);
+
+            coordinate_type const bd = geometry::math::abs(buffer_distance);
+            coordinate_type prop = bd / length_i;
+
+            PointIn bp;
+            set<0>(bp, get<0>(vertex) + vix * prop);
+            set<1>(bp, get<1>(vertex) + viy * prop);
+
+            range_out.push_back(perp1);
+            generate_points(vertex, perp1, perp2, bd, range_out);
+            range_out.push_back(perp2);
+        }
+    }
+};
+
+
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_HPP
diff --git a/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp b/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
new file mode 100644
index 000000000..37292cf2c
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
@@ -0,0 +1,161 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2012-2014 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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_BY_DIVIDE_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_BY_DIVIDE_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/policies/compare.hpp>
+#include <boost/geometry/strategies/buffer.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+#include <boost/geometry/strategies/side.hpp>
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/select_most_precise.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace strategy { namespace buffer
+{
+
+
+template
+<
+    typename PointIn,
+    typename PointOut
+>
+class join_round_by_divide
+{
+private :
+    geometry::equal_to<PointIn> equals;
+
+public :
+
+    inline join_round_by_divide(int max_level = 4)
+        : m_max_level(max_level)
+    {}
+
+    typedef typename strategy::side::services::default_strategy<typename cs_tag<PointIn>::type>::type side;
+    typedef typename coordinate_type<PointOut>::type coordinate_type;
+
+    typedef typename geometry::select_most_precise
+        <
+            typename geometry::select_most_precise
+                <
+                    typename geometry::coordinate_type<PointIn>::type,
+                    typename geometry::coordinate_type<PointOut>::type
+                >::type,
+            double
+        >::type promoted_type;
+
+
+    int m_max_level;
+
+    template <typename RangeOut>
+    inline void mid_points(PointIn const& vertex,
+                PointIn const& p1, PointIn const& p2,
+                coordinate_type const& buffer_distance,
+                RangeOut& range_out,
+                int level = 1) const
+    {
+        // Generate 'vectors'
+        coordinate_type vp1_x = get<0>(p1) - get<0>(vertex);
+        coordinate_type vp1_y = get<1>(p1) - get<1>(vertex);
+
+        coordinate_type vp2_x = (get<0>(p2) - get<0>(vertex));
+        coordinate_type vp2_y = (get<1>(p2) - get<1>(vertex));
+
+        // Average them to generate vector in between
+        coordinate_type two = 2;
+        coordinate_type v_x = (vp1_x + vp2_x) / two;
+        coordinate_type v_y = (vp1_y + vp2_y) / two;
+
+        coordinate_type length2 = geometry::math::sqrt(v_x * v_x + v_y * v_y);
+
+        coordinate_type prop = buffer_distance / length2;
+
+        PointIn mid_point;
+        set<0>(mid_point, get<0>(vertex) + v_x * prop);
+        set<1>(mid_point, get<1>(vertex) + v_y * prop);
+
+        if (level < m_max_level)
+        {
+            mid_points(vertex, p1, mid_point, buffer_distance, range_out, level + 1);
+        }
+        range_out.push_back(mid_point);
+        if (level < m_max_level)
+        {
+            mid_points(vertex, mid_point, p2, buffer_distance, range_out, level + 1);
+        }
+    }
+
+    template <typename RangeOut>
+    inline void apply(PointIn const& ip, PointIn const& vertex,
+                PointIn const& perp1, PointIn const& perp2,
+                coordinate_type const& buffer_distance,
+                RangeOut& range_out) const
+    {
+        if (equals(perp1, perp2))
+        {
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+            std::cout << "Corner for equal points " << geometry::wkt(ip) << " " << geometry::wkt(perp1) << std::endl;
+#endif
+            return;
+        }
+
+        coordinate_type zero = 0;
+        int signum = buffer_distance > zero ? 1
+                   : buffer_distance < zero ? -1
+                   : 0;
+
+        if (side::apply(perp1, ip, perp2) == signum)
+        {
+        }
+        else
+        {
+            // Generate 'vectors'
+            coordinate_type vix = (get<0>(ip) - get<0>(vertex));
+            coordinate_type viy = (get<1>(ip) - get<1>(vertex));
+
+            coordinate_type length_i =
+                geometry::math::sqrt(vix * vix + viy * viy);
+
+            coordinate_type const bd = geometry::math::abs(buffer_distance);
+            coordinate_type prop = bd / length_i;
+
+            PointIn bp;
+            set<0>(bp, get<0>(vertex) + vix * prop);
+            set<1>(bp, get<1>(vertex) + viy * prop);
+
+            range_out.push_back(perp1);
+
+            if (m_max_level > 1)
+            {
+                mid_points(vertex, perp1, bp, bd, range_out);
+                range_out.push_back(bp);
+                mid_points(vertex, bp, perp2, bd, range_out);
+            }
+            else if (m_max_level == 1)
+            {
+                range_out.push_back(bp);
+            }
+
+            range_out.push_back(perp2);
+        }
+    }
+};
+
+
+}} // namespace strategy::buffer
+
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_BUFFER_JOIN_ROUND_BY_DIVIDE_HPP
diff --git a/include/boost/geometry/strategies/cartesian/cart_intersect.hpp b/include/boost/geometry/strategies/cartesian/cart_intersect.hpp
index 9680f6a4f..66af2d2e9 100644
--- a/include/boost/geometry/strategies/cartesian/cart_intersect.hpp
+++ b/include/boost/geometry/strategies/cartesian/cart_intersect.hpp
@@ -19,6 +19,9 @@
 
 #include <boost/geometry/arithmetic/determinant.hpp>
 #include <boost/geometry/algorithms/detail/assign_values.hpp>
+#include <boost/geometry/algorithms/detail/assign_indexed_point.hpp>
+#include <boost/geometry/algorithms/detail/equals/point_point.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
 
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
@@ -28,6 +31,15 @@
 #include <boost/geometry/strategies/cartesian/side_by_triangle.hpp>
 
 #include <boost/geometry/strategies/side_info.hpp>
+#include <boost/geometry/strategies/intersection_result.hpp>
+
+#include <boost/geometry/policies/robustness/robust_point_type.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
+
+
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+#  include <boost/geometry/io/wkt/write.hpp>
+#endif
 
 
 namespace boost { namespace geometry
@@ -38,50 +50,6 @@ namespace strategy { namespace intersection
 {
 
 
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail
-{
-
-template <std::size_t Dimension, typename Segment, typename T>
-static inline void segment_arrange(Segment const& s, T& s_1, T& s_2, bool& swapped)
-{
-    s_1 = get<0, Dimension>(s);
-    s_2 = get<1, Dimension>(s);
-    if (s_1 > s_2)
-    {
-        std::swap(s_1, s_2);
-        swapped = true;
-    }
-}
-
-template <std::size_t Index, typename Segment>
-inline typename geometry::point_type<Segment>::type get_from_index(
-            Segment const& segment)
-{
-    typedef typename geometry::point_type<Segment>::type point_type;
-    point_type point;
-    geometry::detail::assign::assign_point_from_index
-        <
-            Segment, point_type, Index, 0, dimension<Segment>::type::value
-        >::apply(segment, point);
-    return point;
-}
-
-}
-#endif
-
-/***
-template <typename T>
-inline std::string rdebug(T const& value)
-{
-    if (math::equals(value, 0)) return "'0'";
-    if (math::equals(value, 1)) return "'1'";
-    if (value < 0) return "<0";
-    if (value > 1) return ">1";
-    return "<0..1>";
-}
-***/
-
 /*!
     \see http://mathworld.wolfram.com/Line-LineIntersection.html
  */
@@ -89,97 +57,91 @@ template <typename Policy, typename CalculationType = void>
 struct relate_cartesian_segments
 {
     typedef typename Policy::return_type return_type;
-    typedef typename Policy::segment_type1 segment_type1;
-    typedef typename Policy::segment_type2 segment_type2;
 
-    //typedef typename point_type<segment_type1>::type point_type;
-    //BOOST_CONCEPT_ASSERT( (concept::Point<point_type>) );
-
-    BOOST_CONCEPT_ASSERT( (concept::ConstSegment<segment_type1>) );
-    BOOST_CONCEPT_ASSERT( (concept::ConstSegment<segment_type2>) );
-
-    typedef typename select_calculation_type
-        <segment_type1, segment_type2, CalculationType>::type coordinate_type;
-
-    /// Relate segments a and b
-    static inline return_type apply(segment_type1 const& a, segment_type2 const& b)
+    template <typename D, typename W, typename ResultType>
+    static inline void cramers_rule(D const& dx_a, D const& dy_a,
+        D const& dx_b, D const& dy_b, W const& wx, W const& wy,
+        // out:
+        ResultType& d, ResultType& da)
     {
-        coordinate_type const dx_a = get<1, 0>(a) - get<0, 0>(a); // distance in x-dir
-        coordinate_type const dx_b = get<1, 0>(b) - get<0, 0>(b);
-        coordinate_type const dy_a = get<1, 1>(a) - get<0, 1>(a); // distance in y-dir
-        coordinate_type const dy_b = get<1, 1>(b) - get<0, 1>(b);
-        return apply(a, b, dx_a, dy_a, dx_b, dy_b);
+        // Cramers rule
+        d = geometry::detail::determinant<ResultType>(dx_a, dy_a, dx_b, dy_b);
+        da = geometry::detail::determinant<ResultType>(dx_b, dy_b, wx, wy);
+        // Ratio is da/d , collinear if d == 0, intersecting if 0 <= r <= 1
+        // IntersectionPoint = (x1 + r * dx_a, y1 + r * dy_a)
     }
 
 
-    // Relate segments a and b using precalculated differences.
-    // This can save two or four subtractions in many cases
-    static inline return_type apply(segment_type1 const& a, segment_type2 const& b,
-            coordinate_type const& dx_a, coordinate_type const& dy_a,
-            coordinate_type const& dx_b, coordinate_type const& dy_b)
+    // Relate segments a and b
+    template <typename Segment1, typename Segment2, typename RobustPolicy>
+    static inline return_type apply(Segment1 const& a, Segment2 const& b,
+                RobustPolicy const& robust_policy)
     {
-        typedef side::side_by_triangle<coordinate_type> side;
-        side_info sides;
+        // type them all as in Segment1 - TODO reconsider this, most precise?
+        typedef typename geometry::point_type<Segment1>::type point_type;
 
-        coordinate_type const zero = 0;
-        bool const a_is_point = math::equals(dx_a, zero) && math::equals(dy_a, zero);
-        bool const b_is_point = math::equals(dx_b, zero) && math::equals(dy_b, zero);
+        typedef typename geometry::robust_point_type
+            <
+                point_type, RobustPolicy
+            >::type robust_point_type;
+
+        point_type a0, a1, b0, b1;
+        robust_point_type a0_rob, a1_rob, b0_rob, b1_rob;
+
+        detail::assign_point_from_index<0>(a, a0);
+        detail::assign_point_from_index<1>(a, a1);
+        detail::assign_point_from_index<0>(b, b0);
+        detail::assign_point_from_index<1>(b, b1);
+
+        geometry::recalculate(a0_rob, a0, robust_policy);
+        geometry::recalculate(a1_rob, a1, robust_policy);
+        geometry::recalculate(b0_rob, b0, robust_policy);
+        geometry::recalculate(b1_rob, b1, robust_policy);
+
+        return apply(a, b, robust_policy, a0_rob, a1_rob, b0_rob, b1_rob);
+    }
+
+    // The main entry-routine, calculating intersections of segments a / b
+    template <typename Segment1, typename Segment2, typename RobustPolicy, typename RobustPoint>
+    static inline return_type apply(Segment1 const& a, Segment2 const& b,
+            RobustPolicy const& robust_policy,
+            RobustPoint const& robust_a1, RobustPoint const& robust_a2,
+            RobustPoint const& robust_b1, RobustPoint const& robust_b2)
+    {
+        BOOST_CONCEPT_ASSERT( (concept::ConstSegment<Segment1>) );
+        BOOST_CONCEPT_ASSERT( (concept::ConstSegment<Segment2>) );
+
+        boost::ignore_unused_variable_warning(robust_policy);
+
+        typedef typename select_calculation_type
+            <Segment1, Segment2, CalculationType>::type coordinate_type;
+
+        using geometry::detail::equals::equals_point_point;
+        bool const a_is_point = equals_point_point(robust_a1, robust_a2);
+        bool const b_is_point = equals_point_point(robust_b1, robust_b2);
+
+        typedef side::side_by_triangle<coordinate_type> side;
 
         if(a_is_point && b_is_point)
         {
-            if(math::equals(get<1,0>(a), get<1,0>(b)) && math::equals(get<1,1>(a), get<1,1>(b)))
-            {
-                 Policy::degenerate(a, true);
-            }
-            else
-            {
-                return Policy::disjoint();                
-            }
+            return equals_point_point(robust_a1, robust_b2)
+                ? Policy::degenerate(a, true)
+                : Policy::disjoint()
+                ;
         }
 
-        bool collinear_use_first = math::abs(dx_a) + math::abs(dx_b) >= math::abs(dy_a) + math::abs(dy_b);
-
-        sides.set<0>
-            (
-                side::apply(detail::get_from_index<0>(b)
-                    , detail::get_from_index<1>(b)
-                    , detail::get_from_index<0>(a)),
-                side::apply(detail::get_from_index<0>(b)
-                    , detail::get_from_index<1>(b)
-                    , detail::get_from_index<1>(a))
-            );
-        sides.set<1>
-            (
-                side::apply(detail::get_from_index<0>(a)
-                    , detail::get_from_index<1>(a)
-                    , detail::get_from_index<0>(b)),
-                side::apply(detail::get_from_index<0>(a)
-                    , detail::get_from_index<1>(a)
-                    , detail::get_from_index<1>(b))
-            );
+        side_info sides;
+        sides.set<0>(side::apply(robust_b1, robust_b2, robust_a1),
+                     side::apply(robust_b1, robust_b2, robust_a2));
+        sides.set<1>(side::apply(robust_a1, robust_a2, robust_b1),
+                     side::apply(robust_a1, robust_a2, robust_b2));
 
         bool collinear = sides.collinear();
 
-        robustness_verify_collinear(a, b, a_is_point, b_is_point, sides, collinear);
-        robustness_verify_meeting(a, b, sides, collinear, collinear_use_first);
-
         if (sides.same<0>() || sides.same<1>())
         {
             // Both points are at same side of other segment, we can leave
-            if (robustness_verify_same_side(a, b, sides))
-            {
-                return Policy::disjoint();
-            }
-        }
-
-        // Degenerate cases: segments of single point, lying on other segment, non disjoint
-        if (a_is_point)
-        {
-            return Policy::degenerate(a, true);
-        }
-        if (b_is_point)
-        {
-            return Policy::degenerate(b, false);
+            return Policy::disjoint();
         }
 
         typedef typename select_most_precise
@@ -187,560 +149,209 @@ struct relate_cartesian_segments
                 coordinate_type, double
             >::type promoted_type;
 
+        typedef typename geometry::coordinate_type
+            <
+                RobustPoint
+            >::type robust_coordinate_type;
+
+        typedef typename segment_ratio_type
+        <
+            typename geometry::point_type<Segment1>::type, // TODO: most precise point?
+            RobustPolicy
+        >::type ratio_type;
+
+        segment_intersection_info
+        <
+            coordinate_type,
+            promoted_type,
+            ratio_type
+        > sinfo;
+
+        sinfo.dx_a = get<1, 0>(a) - get<0, 0>(a); // distance in x-dir
+        sinfo.dx_b = get<1, 0>(b) - get<0, 0>(b);
+        sinfo.dy_a = get<1, 1>(a) - get<0, 1>(a); // distance in y-dir
+        sinfo.dy_b = get<1, 1>(b) - get<0, 1>(b);
+
+        robust_coordinate_type const robust_dx_a = get<0>(robust_a2) - get<0>(robust_a1);
+        robust_coordinate_type const robust_dx_b = get<0>(robust_b2) - get<0>(robust_b1);
+        robust_coordinate_type const robust_dy_a = get<1>(robust_a2) - get<1>(robust_a1);
+        robust_coordinate_type const robust_dy_b = get<1>(robust_b2) - get<1>(robust_b1);
+
         // r: ratio 0-1 where intersection divides A/B
         // (only calculated for non-collinear segments)
-        promoted_type r;
         if (! collinear)
         {
-            // Calculate determinants - Cramers rule
-            coordinate_type const wx = get<0, 0>(a) - get<0, 0>(b);
-            coordinate_type const wy = get<0, 1>(a) - get<0, 1>(b);
-            coordinate_type const d = geometry::detail::determinant<coordinate_type>(dx_a, dy_a, dx_b, dy_b);
-            coordinate_type const da = geometry::detail::determinant<coordinate_type>(dx_b, dy_b, wx, wy);
+            robust_coordinate_type robust_da0, robust_da;
+            robust_coordinate_type robust_db0, robust_db;
 
-            coordinate_type const zero = coordinate_type();
-            if (math::equals(d, zero))
+            cramers_rule(robust_dx_a, robust_dy_a, robust_dx_b, robust_dy_b,
+                get<0>(robust_a1) - get<0>(robust_b1),
+                get<1>(robust_a1) - get<1>(robust_b1),
+                robust_da0, robust_da);
+
+            cramers_rule(robust_dx_b, robust_dy_b, robust_dx_a, robust_dy_a,
+                get<0>(robust_b1) - get<0>(robust_a1),
+                get<1>(robust_b1) - get<1>(robust_a1),
+                robust_db0, robust_db);
+
+            if (robust_da0 == 0)
             {
-                // This is still a collinear case (because of FP imprecision this can occur here)
-                // sides.debug();
+                // If this is the case, no rescaling is done for FP precision.
+                // We set it to collinear, but it indicates a robustness issue.
                 sides.set<0>(0,0);
                 sides.set<1>(0,0);
                 collinear = true;
             }
             else
             {
-                r = promoted_type(da) / promoted_type(d);
-
-                if (! robustness_verify_r(a, b, r))
-                {
-                    return Policy::disjoint();
-                }
-
-                //robustness_handle_meeting(a, b, sides, dx_a, dy_a, wx, wy, d, r);
-
-                if (robustness_verify_disjoint_at_one_collinear(a, b, sides))
-                {
-                    return Policy::disjoint();
-                }
-
+                sinfo.robust_ra.assign(robust_da, robust_da0);
+                sinfo.robust_rb.assign(robust_db, robust_db0);
             }
         }
 
-        if(collinear)
+        if (collinear)
         {
+            bool const collinear_use_first
+                    = geometry::math::abs(robust_dx_a) + geometry::math::abs(robust_dx_b)
+                    >= geometry::math::abs(robust_dy_a) + geometry::math::abs(robust_dy_b);
+
+            // Degenerate cases: segments of single point, lying on other segment, are not disjoint
+            // This situation is collinear too
+
             if (collinear_use_first)
             {
-                return relate_collinear<0>(a, b);
+                return relate_collinear<0, ratio_type>(a, b,
+                        robust_a1, robust_a2, robust_b1, robust_b2,
+                        a_is_point, b_is_point);
             }
             else
             {
                 // Y direction contains larger segments (maybe dx is zero)
-                return relate_collinear<1>(a, b);
+                return relate_collinear<1, ratio_type>(a, b,
+                        robust_a1, robust_a2, robust_b1, robust_b2,
+                        a_is_point, b_is_point);
             }
         }
 
-        return Policy::segments_intersect(sides, r,
-            dx_a, dy_a, dx_b, dy_b,
-            a, b);
+        return Policy::segments_crosses(sides, sinfo, a, b);
     }
 
-private :
-
-
-    // Ratio should lie between 0 and 1
-    // Also these three conditions might be of FP imprecision, the segments were actually (nearly) collinear
-    template <typename T>
-    static inline bool robustness_verify_r(
-                segment_type1 const& a, segment_type2 const& b,
-                T& r)
+private:
+    template
+    <
+        std::size_t Dimension,
+        typename RatioType,
+        typename Segment1,
+        typename Segment2,
+        typename RobustPoint
+    >
+    static inline return_type relate_collinear(Segment1 const& a,
+            Segment2 const& b,
+            RobustPoint const& robust_a1, RobustPoint const& robust_a2,
+            RobustPoint const& robust_b1, RobustPoint const& robust_b2,
+            bool a_is_point, bool b_is_point)
     {
-        T const zero = 0;
-        T const one = 1;
-        if (r < zero || r > one)
+        if (a_is_point)
         {
-            if (verify_disjoint<0>(a, b) || verify_disjoint<1>(a, b))
-            {
-                // Can still be disjoint (even if not one is left or right from another)
-                // This is e.g. in case #snake4 of buffer test.
-                return false;
-            }
-
-            //std::cout << "ROBUSTNESS: correction of r " << r << std::endl;
-            // sides.debug();
-
-            // ROBUSTNESS: the r value can in epsilon-cases much larger than 1, while (with perfect arithmetic)
-            // it should be one. It can be 1.14 or even 1.98049 or 2 (while still intersecting)
-
-            // If segments are crossing (we can see that with the sides)
-            // and one is inside the other, there must be an intersection point.
-            // We correct for that.
-            // This is (only) in case #ggl_list_20110820_christophe in unit tests
-
-            // If segments are touching (two sides zero), of course they should intersect
-            // This is (only) in case #buffer_rt_i in the unit tests)
-
-            // If one touches in the middle, they also should intersect (#buffer_rt_j)
-
-            // Note that even for ttmath r is occasionally > 1, e.g. 1.0000000000000000000000036191231203575
-
-            if (r > one)
-            {
-                r = one;
-            }
-            else if (r < zero)
-            {
-                r = zero;
-            }
+            return relate_one_degenerate<RatioType>(a,
+                get<Dimension>(robust_a1),
+                get<Dimension>(robust_b1), get<Dimension>(robust_b2),
+                true);
         }
-        return true;
-    }
-
-    static inline void robustness_verify_collinear(
-                segment_type1 const& , segment_type2 const& ,
-                bool a_is_point, bool b_is_point, 
-                side_info& sides,
-                bool& collinear)
-    {
-        if ((sides.zero<0>() && ! b_is_point && ! sides.zero<1>()) || (sides.zero<1>() && ! a_is_point && ! sides.zero<0>()))
+        if (b_is_point)
         {
-            // If one of the segments is collinear, the other must be as well.
-            // So handle it as collinear.
-            // (In float/double epsilon margins it can easily occur that one or two of them are -1/1)
-            // sides.debug();
-            sides.set<0>(0,0);
-            sides.set<1>(0,0);
-            collinear = true;
+            return relate_one_degenerate<RatioType>(b,
+                get<Dimension>(robust_b1),
+                get<Dimension>(robust_a1), get<Dimension>(robust_a2),
+                false);
         }
-    }
-
-    static inline void robustness_verify_meeting(
-                segment_type1 const& a, segment_type2 const& b,
-                side_info& sides,
-                bool& collinear, bool& collinear_use_first)
-    {
-        if (sides.meeting())
-        {
-            // If two segments meet each other at their segment-points, two sides are zero,
-            // the other two are not (unless collinear but we don't mean those here).
-            // However, in near-epsilon ranges it can happen that two sides are zero
-            // but they do not meet at their segment-points.
-            // In that case they are nearly collinear and handled as such.
-            if (! point_equals
-                    (
-                        select(sides.zero_index<0>(), a),
-                        select(sides.zero_index<1>(), b)
-                    )
-                )
-            {
-                sides.set<0>(0,0);
-                sides.set<1>(0,0);
-                collinear = true;
-
-                if (collinear_use_first && analyse_equal<0>(a, b))
-                {
-                    collinear_use_first = false;
-                }
-                else if (! collinear_use_first && analyse_equal<1>(a, b))
-                {
-                    collinear_use_first = true;
-                }
-
-            }
-        }
-    }
-
-    // Verifies and if necessary correct missed touch because of robustness
-    // This is the case at multi_polygon_buffer unittest #rt_m
-    static inline bool robustness_verify_same_side(
-                segment_type1 const& a, segment_type2 const& b,
-                side_info& sides)
-    {
-        int corrected = 0;
-        if (sides.one_touching<0>())
-        {
-            if (point_equals(
-                        select(sides.zero_index<0>(), a),
-                        select(0, b)
-                    ))
-            {
-                sides.correct_to_zero<1, 0>();
-                corrected = 1;
-            }
-            if (point_equals
-                    (
-                        select(sides.zero_index<0>(), a),
-                        select(1, b)
-                    ))
-            {
-                sides.correct_to_zero<1, 1>();
-                corrected = 2;
-            }
-        }
-        else if (sides.one_touching<1>())
-        {
-            if (point_equals(
-                        select(sides.zero_index<1>(), b),
-                        select(0, a)
-                    ))
-            {
-                sides.correct_to_zero<0, 0>();
-                corrected = 3;
-            }
-            if (point_equals
-                    (
-                        select(sides.zero_index<1>(), b),
-                        select(1, a)
-                    ))
-            {
-                sides.correct_to_zero<0, 1>();
-                corrected = 4;
-            }
-        }
-
-        return corrected == 0;
-    }
-
-    static inline bool robustness_verify_disjoint_at_one_collinear(
-                segment_type1 const& a, segment_type2 const& b,
-                side_info const& sides)
-    {
-        if (sides.one_of_all_zero())
-        {
-            if (verify_disjoint<0>(a, b) || verify_disjoint<1>(a, b))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-/*
-    // If r is one, or zero, segments should meet and their endpoints.
-    // Robustness issue: check if this is really the case.
-    // It turns out to be no problem, see buffer test #rt_s1 (and there are many cases generated)
-    // It generates an "ends in the middle" situation which is correct.
-    template <typename T, typename R>
-    static inline void robustness_handle_meeting(segment_type1 const& a, segment_type2 const& b,
-                side_info& sides,
-                T const& dx_a, T const& dy_a, T const& wx, T const& wy,
-                T const& d, R const& r)
-    {
-        return;
-
-        T const db = geometry::detail::determinant<T>(dx_a, dy_a, wx, wy);
-
-        R const zero = 0;
-        R const one = 1;
-        if (math::equals(r, zero) || math::equals(r, one))
-        {
-            R rb = db / d;
-            if (rb <= 0 || rb >= 1 || math::equals(rb, 0) || math::equals(rb, 1))
-            {
-                if (sides.one_zero<0>() && ! sides.one_zero<1>()) // or vice versa
-                {
-#if defined(BOOST_GEOMETRY_COUNT_INTERSECTION_EQUAL)
-                    extern int g_count_intersection_equal;
-                    g_count_intersection_equal++;
-#endif
-                    sides.debug();
-                    std::cout << "E r=" << r << " r.b=" << rb << " ";
-                }
-            }
-        }
-    }
-*/
-    template <std::size_t Dimension>
-    static inline bool verify_disjoint(segment_type1 const& a,
-                    segment_type2 const& b)
-    {
-        coordinate_type a_1, a_2, b_1, b_2;
-        bool a_swapped = false, b_swapped = false;
-        detail::segment_arrange<Dimension>(a, a_1, a_2, a_swapped);
-        detail::segment_arrange<Dimension>(b, b_1, b_2, b_swapped);
-        return math::smaller(a_2, b_1) || math::larger(a_1, b_2);
-    }
-
-    template <typename Segment>
-    static inline typename point_type<Segment>::type select(int index, Segment const& segment)
-    {
-        return index == 0 
-            ? detail::get_from_index<0>(segment)
-            : detail::get_from_index<1>(segment)
-            ;
-    }
-
-    // We cannot use geometry::equals here. Besides that this will be changed
-    // to compare segment-coordinate-values directly (not necessary to retrieve point first)
-    template <typename Point1, typename Point2>
-    static inline bool point_equals(Point1 const& point1, Point2 const& point2)
-    {
-        return math::equals(get<0>(point1), get<0>(point2))
-            && math::equals(get<1>(point1), get<1>(point2))
-            ;
-    }
-
-    // We cannot use geometry::equals here. Besides that this will be changed
-    // to compare segment-coordinate-values directly (not necessary to retrieve point first)
-    template <typename Point1, typename Point2>
-    static inline bool point_equality(Point1 const& point1, Point2 const& point2,
-                    bool& equals_0, bool& equals_1)
-    {
-        equals_0 = math::equals(get<0>(point1), get<0>(point2));
-        equals_1 = math::equals(get<1>(point1), get<1>(point2));
-        return equals_0 && equals_1;
-    }
-
-    template <std::size_t Dimension>
-    static inline bool analyse_equal(segment_type1 const& a, segment_type2 const& b)
-    {
-        coordinate_type const a_1 = geometry::get<0, Dimension>(a);
-        coordinate_type const a_2 = geometry::get<1, Dimension>(a);
-        coordinate_type const b_1 = geometry::get<0, Dimension>(b);
-        coordinate_type const b_2 = geometry::get<1, Dimension>(b);
-        return math::equals(a_1, b_1)
-            || math::equals(a_2, b_1)
-            || math::equals(a_1, b_2)
-            || math::equals(a_2, b_2)
-            ;
-    }
-
-    template <std::size_t Dimension>
-    static inline return_type relate_collinear(segment_type1 const& a,
-                                               segment_type2 const& b)
-    {
-        coordinate_type a_1, a_2, b_1, b_2;
-        bool a_swapped = false, b_swapped = false;
-        detail::segment_arrange<Dimension>(a, a_1, a_2, a_swapped);
-        detail::segment_arrange<Dimension>(b, b_1, b_2, b_swapped);
-        if (math::smaller(a_2, b_1) || math::larger(a_1, b_2))
-        //if (a_2 < b_1 || a_1 > b_2)
-        {
-            return Policy::disjoint();
-        }
-        return relate_collinear(a, b, a_1, a_2, b_1, b_2, a_swapped, b_swapped);
+        return relate_collinear<RatioType>(a, b,
+                                get<Dimension>(robust_a1),
+                                get<Dimension>(robust_a2),
+                                get<Dimension>(robust_b1),
+                                get<Dimension>(robust_b2));
     }
 
     /// Relate segments known collinear
-    static inline return_type relate_collinear(segment_type1 const& a
-            , segment_type2 const& b
-            , coordinate_type a_1, coordinate_type a_2
-            , coordinate_type b_1, coordinate_type b_2
-            , bool a_swapped, bool b_swapped)
+    template
+    <
+        typename RatioType,
+        typename Segment1,
+        typename Segment2,
+        typename RobustType
+    >
+    static inline return_type relate_collinear(Segment1 const& a
+            , Segment2 const& b
+            , RobustType oa_1, RobustType oa_2
+            , RobustType ob_1, RobustType ob_2
+            )
     {
-        // All ca. 150 lines are about collinear rays
-        // The intersections, if any, are always boundary points of the segments. No need to calculate anything.
-        // However we want to find out HOW they intersect, there are many cases.
-        // Most sources only provide the intersection (above) or that there is a collinearity (but not the points)
-        // or some spare sources give the intersection points (calculated) but not how they align.
-        // This source tries to give everything and still be efficient.
-        // It is therefore (and because of the extensive clarification comments) rather long...
+        // Calculate the ratios where a starts in b, b starts in a
+        //         a1--------->a2         (2..7)
+        //                b1----->b2      (5..8)
+        // length_a: 7-2=5
+        // length_b: 8-5=3
+        // b1 is located w.r.t. a at ratio: (5-2)/5=3/5 (on a)
+        // b2 is located w.r.t. a at ratio: (8-2)/5=6/5 (right of a)
+        // a1 is located w.r.t. b at ratio: (2-5)/3=-3/3 (left of b)
+        // a2 is located w.r.t. b at ratio: (7-5)/3=2/3 (on b)
+        // A arrives (a2 on b), B departs (b1 on a)
 
-        // \see http://mpa.itc.it/radim/g50history/CMP/4.2.1-CERL-beta-libes/file475.txt
-        // \see http://docs.codehaus.org/display/GEOTDOC/Point+Set+Theory+and+the+DE-9IM+Matrix
-        // \see http://mathworld.wolfram.com/Line-LineIntersection.html
+        // If both are reversed:
+        //         a2<---------a1         (7..2)
+        //                b2<-----b1      (8..5)
+        // length_a: 2-7=-5
+        // length_b: 5-8=-3
+        // b1 is located w.r.t. a at ratio: (8-7)/-5=-1/5 (before a starts)
+        // b2 is located w.r.t. a at ratio: (5-7)/-5=2/5 (on a)
+        // a1 is located w.r.t. b at ratio: (7-8)/-3=1/3 (on b)
+        // a2 is located w.r.t. b at ratio: (2-8)/-3=6/3 (after b ends)
 
-        // Because of collinearity the case is now one-dimensional and can be checked using intervals
-        // This function is called either horizontally or vertically
-        // We get then two intervals:
-        // a_1-------------a_2 where a_1 < a_2
-        // b_1-------------b_2 where b_1 < b_2
-        // In all figures below a_1/a_2 denotes arranged intervals, a1-a2 or a2-a1 are still unarranged
+        // If both one is reversed:
+        //         a1--------->a2         (2..7)
+        //                b2<-----b1      (8..5)
+        // length_a: 7-2=+5
+        // length_b: 5-8=-3
+        // b1 is located w.r.t. a at ratio: (8-2)/5=6/5 (after a ends)
+        // b2 is located w.r.t. a at ratio: (5-2)/5=3/5 (on a)
+        // a1 is located w.r.t. b at ratio: (2-8)/-3=6/3 (after b ends)
+        // a2 is located w.r.t. b at ratio: (7-8)/-3=1/3 (on b)
+        RobustType const length_a = oa_2 - oa_1; // no abs, see above
+        RobustType const length_b = ob_2 - ob_1;
 
-        // Handle "equal", in polygon neighbourhood comparisons a common case
+        RatioType const ra_from(oa_1 - ob_1, length_b);
+        RatioType const ra_to(oa_2 - ob_1, length_b);
+        RatioType const rb_from(ob_1 - oa_1, length_a);
+        RatioType const rb_to(ob_2 - oa_1, length_a);
 
-        bool const opposite = a_swapped ^ b_swapped;
-        bool const both_swapped = a_swapped && b_swapped;
-
-        // Check if segments are equal or opposite equal...
-        bool const swapped_a1_eq_b1 = math::equals(a_1, b_1);
-        bool const swapped_a2_eq_b2 = math::equals(a_2, b_2);
-
-        if (swapped_a1_eq_b1 && swapped_a2_eq_b2)
+        if ((ra_from.left() && ra_to.left()) || (ra_from.right() && ra_to.right()))
         {
-            return Policy::segment_equal(a, opposite);
+            return Policy::disjoint();
         }
 
-        bool const swapped_a2_eq_b1 = math::equals(a_2, b_1);
-        bool const swapped_a1_eq_b2 = math::equals(a_1, b_2);
+        return Policy::segments_collinear(a, b, ra_from, ra_to, rb_from, rb_to);
+    }
 
-        bool const a1_eq_b1 = both_swapped ? swapped_a2_eq_b2 : a_swapped ? swapped_a2_eq_b1 : b_swapped ? swapped_a1_eq_b2 : swapped_a1_eq_b1;
-        bool const a2_eq_b2 = both_swapped ? swapped_a1_eq_b1 : a_swapped ? swapped_a1_eq_b2 : b_swapped ? swapped_a2_eq_b1 : swapped_a2_eq_b2;
-
-        bool const a1_eq_b2 = both_swapped ? swapped_a2_eq_b1 : a_swapped ? swapped_a2_eq_b2 : b_swapped ? swapped_a1_eq_b1 : swapped_a1_eq_b2;
-        bool const a2_eq_b1 = both_swapped ? swapped_a1_eq_b2 : a_swapped ? swapped_a1_eq_b1 : b_swapped ? swapped_a2_eq_b2 : swapped_a2_eq_b1;
-
-
-
-
-        // The rest below will return one or two intersections.
-        // The delegated class can decide which is the intersection point, or two, build the Intersection Matrix (IM)
-        // For IM it is important to know which relates to which. So this information is given,
-        // without performance penalties to intersection calculation
-
-        bool const has_common_points = swapped_a1_eq_b1 || swapped_a1_eq_b2 || swapped_a2_eq_b1 || swapped_a2_eq_b2;
-
-
-        // "Touch" -> one intersection point -> one but not two common points
-        // -------->             A (or B)
-        //         <----------   B (or A)
-        //        a_2==b_1         (b_2==a_1 or a_2==b1)
-
-        // The check a_2/b_1 is necessary because it excludes cases like
-        // ------->
-        //     --->
-        // ... which are handled lateron
-
-        // Corresponds to 4 cases, of which the equal points are determined above
-        // #1: a1---->a2 b1--->b2   (a arrives at b's border)
-        // #2: a2<----a1 b2<---b1   (b arrives at a's border)
-        // #3: a1---->a2 b2<---b1   (both arrive at each others border)
-        // #4: a2<----a1 b1--->b2   (no arrival at all)
-        // Where the arranged forms have two forms:
-        //    a_1-----a_2/b_1-------b_2 or reverse (B left of A)
-        if ((swapped_a2_eq_b1 || swapped_a1_eq_b2) && ! swapped_a1_eq_b1 && ! swapped_a2_eq_b2)
-        {
-            if (a2_eq_b1) return Policy::collinear_touch(get<1, 0>(a), get<1, 1>(a), 0, -1);
-            if (a1_eq_b2) return Policy::collinear_touch(get<0, 0>(a), get<0, 1>(a), -1, 0);
-            if (a2_eq_b2) return Policy::collinear_touch(get<1, 0>(a), get<1, 1>(a), 0, 0);
-            if (a1_eq_b1) return Policy::collinear_touch(get<0, 0>(a), get<0, 1>(a), -1, -1);
-        }
-
-
-        // "Touch/within" -> there are common points and also an intersection of interiors:
-        // Corresponds to many cases:
-        // #1a: a1------->a2  #1b:        a1-->a2
-        //          b1--->b2         b1------->b2
-        // #2a: a2<-------a1  #2b:        a2<--a1
-        //          b1--->b2         b1------->b2
-        // #3a: a1------->a2  #3b:        a1-->a2
-        //          b2<---b1         b2<-------b1
-        // #4a: a2<-------a1  #4b:        a2<--a1
-        //          b2<---b1         b2<-------b1
-
-        // Note: next cases are similar and handled by the code
-        // #4c: a1--->a2
-        //      b1-------->b2
-        // #4d: a1-------->a2
-        //      b1-->b2
-
-        // For case 1-4: a_1 < (b_1 or b_2) < a_2, two intersections are equal to segment B
-        // For case 5-8: b_1 < (a_1 or a_2) < b_2, two intersections are equal to segment A
-        if (has_common_points)
-        {
-            // Either A is in B, or B is in A, or (in case of robustness/equals)
-            // both are true, see below
-            bool a_in_b = (b_1 < a_1 && a_1 < b_2) || (b_1 < a_2 && a_2 < b_2);
-            bool b_in_a = (a_1 < b_1 && b_1 < a_2) || (a_1 < b_2 && b_2 < a_2);
-
-            if (a_in_b && b_in_a)
-            {
-                // testcase "ggl_list_20110306_javier"
-                // In robustness it can occur that a point of A is inside B AND a point of B is inside A,
-                // still while has_common_points is true (so one point equals the other).
-                // If that is the case we select on length.
-                coordinate_type const length_a = geometry::math::abs(a_1 - a_2);
-                coordinate_type const length_b = geometry::math::abs(b_1 - b_2);
-                if (length_a > length_b)
-                {
-                    a_in_b = false;
-                }
-                else
-                {
-                    b_in_a = false;
-                }
-            }
-
-            int const arrival_a = a_in_b ? 1 : -1;
-            if (a2_eq_b2) return Policy::collinear_interior_boundary_intersect(a_in_b ? a : b, a_in_b, 0, 0, false);
-            if (a1_eq_b2) return Policy::collinear_interior_boundary_intersect(a_in_b ? a : b, a_in_b, arrival_a, 0, true);
-            if (a2_eq_b1) return Policy::collinear_interior_boundary_intersect(a_in_b ? a : b, a_in_b, 0, -arrival_a, true);
-            if (a1_eq_b1) return Policy::collinear_interior_boundary_intersect(a_in_b ? a : b, a_in_b, arrival_a, -arrival_a, false);
-        }
-
-
-
-        // "Inside", a completely within b or b completely within a
-        // 2 cases:
-        // case 1:
-        //        a_1---a_2        -> take A's points as intersection points
-        //   b_1------------b_2
-        // case 2:
-        //   a_1------------a_2
-        //       b_1---b_2         -> take B's points
-        if (a_1 > b_1 && a_2 < b_2)
-        {
-            // A within B
-            return Policy::collinear_a_in_b(a, opposite);
-        }
-        if (b_1 > a_1 && b_2 < a_2)
-        {
-            // B within A
-            return Policy::collinear_b_in_a(b, opposite);
-        }
-
-
-        /*
-
-        Now that all cases with equal,touch,inside,disjoint,
-        degenerate are handled the only thing left is an overlap
-
-        Either a1 is between b1,b2
-        or a2 is between b1,b2 (a2 arrives)
-
-        Next table gives an overview.
-        The IP's are ordered following the line A1->A2
-
-             |                                 |
-             |          a_2 in between         |       a_1 in between
-             |                                 |
-        -----+---------------------------------+--------------------------
-             |   a1--------->a2                |       a1--------->a2
-             |          b1----->b2             |   b1----->b2
-             |   (b1,a2), a arrives            |   (a1,b2), b arrives
-             |                                 |
-        -----+---------------------------------+--------------------------
-        a sw.|   a2<---------a1*               |       a2<---------a1*
-             |           b1----->b2            |   b1----->b2
-             |   (a1,b1), no arrival           |   (b2,a2), a and b arrive
-             |                                 |
-        -----+---------------------------------+--------------------------
-             |   a1--------->a2                |       a1--------->a2
-        b sw.|           b2<-----b1            |   b2<-----b1
-             |   (b2,a2), a and b arrive       |   (a1,b1), no arrival
-             |                                 |
-        -----+---------------------------------+--------------------------
-        a sw.|    a2<---------a1*              |       a2<---------a1*
-        b sw.|            b2<-----b1           |   b2<-----b1
-             |   (a1,b2), b arrives            |   (b1,a2), a arrives
-             |                                 |
-        -----+---------------------------------+--------------------------
-        * Note that a_1 < a_2, and a1 <> a_1; if a is swapped,
-          the picture might seem wrong but it (supposed to be) is right.
-        */
-
-        if (b_1 < a_2 && a_2 < b_2)
-        {
-            // Left column, from bottom to top
-            return
-                both_swapped ? Policy::collinear_overlaps(get<0, 0>(a), get<0, 1>(a), get<1, 0>(b), get<1, 1>(b), -1,  1, opposite)
-                : b_swapped  ? Policy::collinear_overlaps(get<1, 0>(b), get<1, 1>(b), get<1, 0>(a), get<1, 1>(a),  1,  1, opposite)
-                : a_swapped  ? Policy::collinear_overlaps(get<0, 0>(a), get<0, 1>(a), get<0, 0>(b), get<0, 1>(b), -1, -1, opposite)
-                :              Policy::collinear_overlaps(get<0, 0>(b), get<0, 1>(b), get<1, 0>(a), get<1, 1>(a),  1, -1, opposite)
-                ;
-        }
-        if (b_1 < a_1 && a_1 < b_2)
-        {
-            // Right column, from bottom to top
-            return
-                both_swapped ? Policy::collinear_overlaps(get<0, 0>(b), get<0, 1>(b), get<1, 0>(a), get<1, 1>(a),  1, -1, opposite)
-                : b_swapped  ? Policy::collinear_overlaps(get<0, 0>(a), get<0, 1>(a), get<0, 0>(b), get<0, 1>(b), -1, -1, opposite)
-                : a_swapped  ? Policy::collinear_overlaps(get<1, 0>(b), get<1, 1>(b), get<1, 0>(a), get<1, 1>(a),  1,  1, opposite)
-                :              Policy::collinear_overlaps(get<0, 0>(a), get<0, 1>(a), get<1, 0>(b), get<1, 1>(b), -1,  1, opposite)
-                ;
-        }
-        // Nothing should goes through. If any we have made an error
-        // std::cout << "Robustness issue, non-logical behaviour" << std::endl;
-        return Policy::error("Robustness issue, non-logical behaviour");
+    /// Relate segments where one is degenerate
+    template
+    <
+        typename RatioType,
+        typename DegenerateSegment,
+        typename RobustType
+    >
+    static inline return_type relate_one_degenerate(
+            DegenerateSegment const& degenerate_segment
+            , RobustType d
+            , RobustType s1, RobustType s2
+            , bool a_degenerate
+            )
+    {
+        // Calculate the ratios where ds starts in s
+        //         a1--------->a2         (2..6)
+        //              b1/b2      (4..4)
+        // Ratio: (4-2)/(6-2)
+        RatioType const ratio(d - s1, s2 - s1);
+        return Policy::one_degenerate(degenerate_segment, ratio, a_degenerate);
     }
 };
 
diff --git a/include/boost/geometry/strategies/cartesian/centroid_average.hpp b/include/boost/geometry/strategies/cartesian/centroid_average.hpp
new file mode 100644
index 000000000..76e2f7144
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/centroid_average.hpp
@@ -0,0 +1,114 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
+
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/arithmetic/arithmetic.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/strategies/centroid.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace centroid
+{
+
+
+/*!
+\brief Centroid calculation taking average of points
+\ingroup strategies
+*/
+template
+<
+    typename PointCentroid,
+    typename Point = PointCentroid
+>
+class average
+{
+private :
+
+    /*! subclass to keep state */
+    class sum
+    {
+        friend class average;
+        int count;
+        PointCentroid centroid;
+
+    public :
+        inline sum()
+            : count(0)
+        {
+            assign_zero(centroid);
+        }
+    };
+
+public :
+    typedef sum state_type;
+    typedef PointCentroid centroid_point_type;
+    typedef Point point_type;
+
+    static inline void apply(Point const& p, sum& state)
+    {
+        add_point(state.centroid, p);
+        state.count++;
+    }
+
+    static inline void result(sum const& state, PointCentroid& centroid)
+    {
+        centroid = state.centroid;
+        divide_value(centroid, state.count);
+    }
+
+};
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+
+namespace services
+{
+
+template <typename Point, std::size_t DimensionCount, typename Geometry>
+struct default_strategy
+<
+    cartesian_tag,
+    pointlike_tag,
+    DimensionCount,
+    Point,
+    Geometry
+>
+{
+    typedef average
+        <
+            Point,
+            typename point_type<Geometry>::type
+        > type;
+};
+
+} // namespace services
+
+#endif
+
+
+}} // namespace strategy::centroid
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_AVERAGE_HPP
diff --git a/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp b/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
index 48feae51d..b788738d1 100644
--- a/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
+++ b/include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp
@@ -13,7 +13,8 @@
 #ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP
 #define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_CENTROID_WEIGHTED_LENGTH_HPP
 
-#include <boost/geometry/algorithms/distance.hpp>
+#include <boost/geometry/algorithms/detail/distance/interface.hpp>
+#include <boost/geometry/algorithms/detail/distance/point_to_geometry.hpp>
 #include <boost/geometry/arithmetic/arithmetic.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 #include <boost/geometry/strategies/centroid.hpp>
diff --git a/include/boost/geometry/strategies/cartesian/distance_comparable_to_regular.hpp b/include/boost/geometry/strategies/cartesian/distance_comparable_to_regular.hpp
new file mode 100644
index 000000000..cf432ee82
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/distance_comparable_to_regular.hpp
@@ -0,0 +1,107 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_COMPARABLE_TO_REGULAR_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_COMPARABLE_TO_REGULAR_HPP
+
+
+#include <cmath>
+#include <boost/geometry/strategies/distance_comparable_to_regular.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace distance
+{
+
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace services
+{
+
+
+template
+<
+    typename ComparableStrategy,
+    typename Strategy,
+    typename Geometry1,
+    typename Geometry2
+>
+struct comparable_to_regular
+    <
+        ComparableStrategy, Strategy,
+        Geometry1, Geometry2,
+        cartesian_tag, cartesian_tag
+    >
+{
+    typedef typename return_type
+        <
+            Strategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type calculation_type;
+
+    typedef typename return_type
+        <
+            ComparableStrategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type comparable_calculation_type;
+
+    static inline calculation_type apply(comparable_calculation_type const& cd)
+    {
+        return math::sqrt( boost::numeric_cast<calculation_type>(cd) );
+    }
+};
+
+
+
+template <typename ComparableStrategy, typename Geometry1, typename Geometry2>
+struct comparable_to_regular
+    <
+        ComparableStrategy,
+        ComparableStrategy,
+        Geometry1,
+        Geometry2,
+        cartesian_tag,
+        cartesian_tag
+    >
+{
+    typedef typename return_type
+        <
+            ComparableStrategy,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type comparable_calculation_type;
+
+    static inline comparable_calculation_type
+    apply(comparable_calculation_type const& cd)
+    {
+        return cd;
+    }
+};
+
+
+
+
+
+
+
+} // namespace services
+#endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+
+}} // namespace strategy::distance
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_COMPARABLE_TO_REGULAR_HPP
diff --git a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
index 620b5bf4c..5bcad4fee 100644
--- a/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
+++ b/include/boost/geometry/strategies/cartesian/distance_projected_point.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2008-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2008-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -112,7 +117,7 @@ public :
         // For convenience
         typedef fp_point_type fp_vector_type;
 
-        /* 
+        /*
             Algorithm [p1: (x1,y1), p2: (x2,y2), p: (px,py)]
             VECTOR v(x2 - x1, y2 - y1)
             VECTOR w(px - x1, py - y1)
@@ -124,12 +129,13 @@ public :
 
         // v is multiplied below with a (possibly) FP-value, so should be in FP
         // For consistency we define w also in FP
-        fp_vector_type v, w;
+        fp_vector_type v, w, projected;
 
         geometry::convert(p2, v);
         geometry::convert(p, w);
-        subtract_point(v, p1);
-        subtract_point(w, p1);
+        geometry::convert(p1, projected);
+        subtract_point(v, projected);
+        subtract_point(w, projected);
 
         Strategy strategy;
         boost::ignore_unused_variable_warning(strategy);
@@ -149,8 +155,6 @@ public :
         // See above, c1 > 0 AND c2 > c1 so: c2 != 0
         calculation_type const b = c1 / c2;
 
-        fp_point_type projected;
-        geometry::convert(p1, projected);
         multiply_value(v, b);
         add_point(projected, v);
 
@@ -174,11 +178,6 @@ struct return_type<projected_point<CalculationType, Strategy>, P, PS>
     : projected_point<CalculationType, Strategy>::template calculation_type<P, PS>
 {};
 
-template <typename CalculationType, typename Strategy>
-struct strategy_point_point<projected_point<CalculationType, Strategy> >
-{
-    typedef Strategy type;
-};
 
 
 template <typename CalculationType, typename Strategy>
@@ -230,7 +229,11 @@ public :
 // of point-to-segment or point-to-linestring.
 // Convenient for geographic coordinate systems especially.
 template <typename Point, typename PointOfSegment, typename Strategy>
-struct default_strategy<segment_tag, Point, PointOfSegment, cartesian_tag, cartesian_tag, Strategy>
+struct default_strategy
+    <
+        point_tag, segment_tag, Point, PointOfSegment,
+        cartesian_tag, cartesian_tag, Strategy
+    >
 {
     typedef strategy::distance::projected_point
     <
@@ -240,7 +243,7 @@ struct default_strategy<segment_tag, Point, PointOfSegment, cartesian_tag, carte
                 boost::is_void<Strategy>,
                 typename default_strategy
                     <
-                        point_tag, Point, PointOfSegment,
+                        point_tag, point_tag, Point, PointOfSegment,
                         cartesian_tag, cartesian_tag
                     >::type,
                 Strategy
@@ -248,6 +251,20 @@ struct default_strategy<segment_tag, Point, PointOfSegment, cartesian_tag, carte
     > type;
 };
 
+template <typename PointOfSegment, typename Point, typename Strategy>
+struct default_strategy
+    <
+        segment_tag, point_tag, PointOfSegment, Point,
+        cartesian_tag, cartesian_tag, Strategy
+    >
+{
+    typedef typename default_strategy
+        <
+            point_tag, segment_tag, Point, PointOfSegment,
+            cartesian_tag, cartesian_tag, Strategy
+        >::type type;
+};
+
 
 } // namespace services
 #endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
diff --git a/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp b/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
index 4fe651b16..77bdc966a 100644
--- a/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
+++ b/include/boost/geometry/strategies/cartesian/distance_pythagoras.hpp
@@ -22,6 +22,7 @@
 
 #include <boost/geometry/strategies/distance.hpp>
 
+#include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/calculation_type.hpp>
 
 
@@ -85,7 +86,9 @@ public :
           <
               Point1,
               Point2,
-              CalculationType
+              CalculationType,
+              double,
+              double
           >
     {};
 
@@ -156,7 +159,7 @@ public :
     apply(P1 const& p1, P2 const& p2)
     {
         // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
-        return std::sqrt
+        return math::sqrt
             (
                  boost::numeric_cast<typename calculation_type<P1, P2>::type>
                     (
@@ -268,7 +271,10 @@ public :
 
 
 template <typename Point1, typename Point2>
-struct default_strategy<point_tag, Point1, Point2, cartesian_tag, cartesian_tag, void>
+struct default_strategy
+    <
+        point_tag, point_tag, Point1, Point2, cartesian_tag, cartesian_tag
+    >
 {
     typedef pythagoras<> type;
 };
diff --git a/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp b/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
new file mode 100644
index 000000000..de31bf8f3
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp
@@ -0,0 +1,338 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2008-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_BOX_BOX_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_BOX_BOX_HPP
+
+
+#include <boost/geometry/core/access.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/calculation_type.hpp>
+
+
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace distance
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <std::size_t I>
+struct compute_pythagoras_box_box
+{
+    template <typename Box1, typename Box2, typename T>
+    static inline void apply(Box1 const& box1, Box2 const& box2, T& result)
+    {
+        T const b1_min_coord =
+            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box1));
+        T const b1_max_coord =
+            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box1));
+
+        T const b2_min_coord =
+            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box2));
+        T const b2_max_coord =
+            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box2));
+
+        if ( b1_max_coord < b2_min_coord )
+        {
+            T diff = b2_min_coord - b1_max_coord;
+            result += diff * diff;
+        }
+        if ( b1_min_coord > b2_max_coord )
+        {
+            T diff = b1_min_coord - b2_max_coord;
+            result += diff * diff;
+        }
+
+        compute_pythagoras_box_box<I-1>::apply(box1, box2, result);
+    }
+};
+
+template <>
+struct compute_pythagoras_box_box<0>
+{
+    template <typename Box1, typename Box2, typename T>
+    static inline void apply(Box1 const&, Box2 const&, T&)
+    {
+    }
+};
+
+}
+#endif // DOXYGEN_NO_DETAIL
+
+
+namespace comparable
+{
+
+/*!
+\brief Strategy to calculate comparable distance between two boxes
+\ingroup strategies
+\tparam Box1 \tparam_first_box
+\tparam Box2 \tparam_second_box
+\tparam CalculationType \tparam_calculation
+*/
+template <typename CalculationType = void>
+class pythagoras_box_box
+{
+public :
+
+    template <typename Box1, typename Box2>
+    struct calculation_type
+    {
+        typedef typename util::calculation_type::geometric::binary
+            <
+                Box1,
+                Box2,
+                CalculationType
+            >::type type;
+    };
+
+    template <typename Box1, typename Box2>
+    static inline typename calculation_type<Box1, Box2>::type
+    apply(Box1 const& box1, Box2 const& box2)
+    {
+        BOOST_CONCEPT_ASSERT
+            ( (concept::ConstPoint<typename point_type<Box1>::type>) );
+        BOOST_CONCEPT_ASSERT
+            ( (concept::ConstPoint<typename point_type<Box2>::type>) );
+
+        // Calculate distance using Pythagoras
+        // (Leave comment above for Doxygen)
+
+        assert_dimension_equal<Box1, Box2>();
+
+        typename calculation_type<Box1, Box2>::type result(0);
+        
+        detail::compute_pythagoras_box_box
+            <
+                dimension<Box1>::value
+            >::apply(box1, box2, result);
+
+        return result;
+    }
+};
+
+} // namespace comparable
+
+
+/*!
+\brief Strategy to calculate the distance between two points or boxes
+\ingroup strategies
+\tparam CalculationType \tparam_calculation
+
+\qbk{
+[heading Notes]
+[note Can be used for boxes with two\, three or more dimensions]
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance (with strategy)]
+}
+
+*/
+template
+<
+    typename CalculationType = void
+>
+class pythagoras_box_box
+{
+public :
+
+    template <typename Box1, typename Box2>
+    struct calculation_type
+        : util::calculation_type::geometric::binary
+          <
+              Box1,
+              Box2,
+              CalculationType,
+              double,
+              double // promote integer to double
+          >
+    {};
+
+    /*!
+    \brief applies the distance calculation using pythagoras_box_box
+    \return the calculated distance (including taking the square root)
+    \param box1 first box
+    \param box2 second box
+    */
+    template <typename Box1, typename Box2>
+    static inline typename calculation_type<Box1, Box2>::type
+    apply(Box1 const& box1, Box2 const& box2)
+    {
+        // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
+        return math::sqrt
+            (
+                 boost::numeric_cast<typename calculation_type
+                     <
+                         Box1, Box2
+                     >::type>
+                    (
+                        comparable::pythagoras_box_box
+                            <
+                                CalculationType
+                            >::apply(box1, box2)
+                    )
+            );
+    }
+};
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace services
+{
+
+template <typename CalculationType>
+struct tag<pythagoras_box_box<CalculationType> >
+{
+    typedef strategy_tag_distance_box_box type;
+};
+
+
+template <typename CalculationType, typename Box1, typename Box2>
+struct return_type<distance::pythagoras_box_box<CalculationType>, Box1, Box2>
+    : pythagoras_box_box<CalculationType>::template calculation_type<Box1, Box2>
+{};
+
+
+template <typename CalculationType>
+struct comparable_type<pythagoras_box_box<CalculationType> >
+{
+    typedef comparable::pythagoras_box_box<CalculationType> type;
+};
+
+
+template <typename CalculationType>
+struct get_comparable<pythagoras_box_box<CalculationType> >
+{
+    typedef comparable::pythagoras_box_box<CalculationType> comparable_type;
+public :
+    static inline comparable_type
+    apply(pythagoras_box_box<CalculationType> const& )
+    {
+        return comparable_type();
+    }
+};
+
+
+template <typename CalculationType, typename Box1, typename Box2>
+struct result_from_distance<pythagoras_box_box<CalculationType>, Box1, Box2>
+{
+private:
+    typedef typename return_type
+        <
+            pythagoras_box_box<CalculationType>, Box1, Box2
+        >::type return_type;
+public:
+    template <typename T>
+    static inline return_type
+    apply(pythagoras_box_box<CalculationType> const& , T const& value)
+    {
+        return return_type(value);
+    }
+};
+
+
+// Specializations for comparable::pythagoras_box_box
+template <typename CalculationType>
+struct tag<comparable::pythagoras_box_box<CalculationType> >
+{
+    typedef strategy_tag_distance_box_box type;
+};
+
+
+template <typename CalculationType, typename Box1, typename Box2>
+struct return_type<comparable::pythagoras_box_box<CalculationType>, Box1, Box2>
+    : comparable::pythagoras_box_box
+        <
+            CalculationType
+        >::template calculation_type<Box1, Box2>
+{};
+
+
+
+
+template <typename CalculationType>
+struct comparable_type<comparable::pythagoras_box_box<CalculationType> >
+{
+    typedef comparable::pythagoras_box_box<CalculationType> type;
+};
+
+
+template <typename CalculationType>
+struct get_comparable<comparable::pythagoras_box_box<CalculationType> >
+{
+    typedef comparable::pythagoras_box_box<CalculationType> comparable_type;
+public :
+    static inline comparable_type apply(comparable_type const& )
+    {
+        return comparable_type();
+    }
+};
+
+
+template <typename CalculationType, typename Box1, typename Box2>
+struct result_from_distance
+    <
+        comparable::pythagoras_box_box<CalculationType>, Box1, Box2
+    >
+{
+private :
+    typedef typename return_type
+        <
+            comparable::pythagoras_box_box<CalculationType>, Box1, Box2
+        >::type return_type;
+public :
+    template <typename T>
+    static inline return_type
+    apply(comparable::pythagoras_box_box<CalculationType> const&,
+          T const& value)
+    {
+        return_type const v = value;
+        return v * v;
+    }
+};
+
+
+template <typename BoxPoint1, typename BoxPoint2>
+struct default_strategy
+    <
+        box_tag, box_tag, BoxPoint1, BoxPoint2, cartesian_tag, cartesian_tag
+    >
+{
+    typedef pythagoras_box_box<> type;
+};
+
+
+} // namespace services
+#endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+
+}} // namespace strategy::distance
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_BOX_BOX_HPP
diff --git a/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp b/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
new file mode 100644
index 000000000..2641e7829
--- /dev/null
+++ b/include/boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp
@@ -0,0 +1,348 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2008-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_POINT_BOX_HPP
+#define BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_POINT_BOX_HPP
+
+
+#include <boost/geometry/core/access.hpp>
+
+#include <boost/geometry/strategies/distance.hpp>
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/util/calculation_type.hpp>
+
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace distance
+{
+
+#ifndef DOXYGEN_NO_DETAIL
+namespace detail
+{
+
+template <size_t I>
+struct compute_pythagoras_point_box
+{
+    template <typename Point, typename Box, typename T>
+    static inline void apply(Point const& point, Box const& box, T& result)
+    {
+        T const p_coord = boost::numeric_cast<T>(geometry::get<I-1>(point));
+        T const b_min_coord =
+            boost::numeric_cast<T>(geometry::get<min_corner, I-1>(box));
+        T const b_max_coord =
+            boost::numeric_cast<T>(geometry::get<max_corner, I-1>(box));
+
+        if ( p_coord < b_min_coord )
+        {
+            T diff = b_min_coord - p_coord;
+            result += diff * diff;
+        }
+        if ( p_coord > b_max_coord )
+        {
+            T diff = p_coord - b_max_coord;
+            result += diff * diff;
+        }
+
+        compute_pythagoras_point_box<I-1>::apply(point, box, result);
+    }
+};
+
+template <>
+struct compute_pythagoras_point_box<0>
+{
+    template <typename Point, typename Box, typename T>
+    static inline void apply(Point const&, Box const&, T&)
+    {
+    }
+};
+
+
+} // namespace detail
+#endif // DOXYGEN_NO_DETAIL
+
+
+namespace comparable
+{
+
+/*!
+\brief Strategy to calculate comparable distance between two points
+\ingroup strategies
+\tparam Point \tparam_first_point
+\tparam Box \tparam_second_box
+\tparam CalculationType \tparam_calculation
+*/
+template <typename CalculationType = void>
+class pythagoras_point_box
+{
+public :
+
+    template <typename Point, typename Box>
+    struct calculation_type
+    {
+        typedef typename util::calculation_type::geometric::binary
+            <
+                Point, Box, CalculationType
+            >::type type;
+    };
+
+    template <typename Point, typename Box>
+    static inline typename calculation_type<Point, Box>::type
+    apply(Point const& point, Box const& box)
+    {
+        BOOST_CONCEPT_ASSERT( (concept::ConstPoint<Point>) );
+        BOOST_CONCEPT_ASSERT
+            ( (concept::ConstPoint<typename point_type<Box>::type>) );
+
+        // Calculate distance using Pythagoras
+        // (Leave comment above for Doxygen)
+
+        assert_dimension_equal<Point, Box>();
+
+        typename calculation_type<Point, Box>::type result(0);
+        
+        detail::compute_pythagoras_point_box
+            <
+                dimension<Point>::value
+            >::apply(point, box, result);
+
+        return result;
+    }
+};
+
+} // namespace comparable
+
+
+/*!
+\brief Strategy to calculate the distance between two points or boxes
+\ingroup strategies
+\tparam CalculationType \tparam_calculation
+
+\qbk{
+[heading Notes]
+[note Can be used for points and boxes with two\, three or more dimensions]
+[heading See also]
+[link geometry.reference.algorithms.distance.distance_3_with_strategy distance (with strategy)]
+}
+
+*/
+template
+<
+    typename CalculationType = void
+>
+class pythagoras_point_box
+{
+public :
+
+    template <typename Point, typename Box>
+    struct calculation_type
+        : util::calculation_type::geometric::binary
+          <
+              Point,
+              Box,
+              CalculationType,
+              double,
+              double // promote integer to double
+          >
+    {};
+
+    /*!
+    \brief applies the distance calculation using pythagoras
+    \return the calculated distance (including taking the square root)
+    \param point point
+    \param box box
+    */
+    template <typename Point, typename Box>
+    static inline typename calculation_type<Point, Box>::type
+    apply(Point const& point, Box const& box)
+    {
+        // The cast is necessary for MSVC which considers sqrt __int64 as an ambiguous call
+        return math::sqrt
+            (
+                 boost::numeric_cast<typename calculation_type
+                     <
+                         Point, Box
+                     >::type>
+                    (
+                        comparable::pythagoras_point_box
+                            <
+                                CalculationType
+                            >::apply(point, box)
+                    )
+            );
+    }
+};
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace services
+{
+
+template <typename CalculationType>
+struct tag<pythagoras_point_box<CalculationType> >
+{
+    typedef strategy_tag_distance_point_box type;
+};
+
+
+template <typename CalculationType, typename Point, typename Box>
+struct return_type<distance::pythagoras_point_box<CalculationType>, Point, Box>
+    : pythagoras_point_box
+        <
+            CalculationType
+        >::template calculation_type<Point, Box>
+{};
+
+
+template <typename CalculationType>
+struct comparable_type<pythagoras_point_box<CalculationType> >
+{
+    typedef comparable::pythagoras_point_box<CalculationType> type;
+};
+
+
+template <typename CalculationType>
+struct get_comparable<pythagoras_point_box<CalculationType> >
+{
+    typedef comparable::pythagoras_point_box<CalculationType> comparable_type;
+public :
+    static inline comparable_type
+    apply(pythagoras_point_box<CalculationType> const& )
+    {
+        return comparable_type();
+    }
+};
+
+
+template <typename CalculationType, typename Point, typename Box>
+struct result_from_distance<pythagoras_point_box<CalculationType>, Point, Box>
+{
+private :
+    typedef typename return_type
+        <
+            pythagoras_point_box<CalculationType>, Point, Box
+        >::type return_type;
+public :
+    template <typename T>
+    static inline return_type
+    apply(pythagoras_point_box<CalculationType> const& , T const& value)
+    {
+        return return_type(value);
+    }
+};
+
+
+// Specializations for comparable::pythagoras_point_box
+template <typename CalculationType>
+struct tag<comparable::pythagoras_point_box<CalculationType> >
+{
+    typedef strategy_tag_distance_point_box type;
+};
+
+
+template <typename CalculationType, typename Point, typename Box>
+struct return_type
+    <
+        comparable::pythagoras_point_box<CalculationType>, Point, Box
+    > : comparable::pythagoras_point_box
+        <
+            CalculationType
+        >::template calculation_type<Point, Box>
+{};
+
+
+
+
+template <typename CalculationType>
+struct comparable_type<comparable::pythagoras_point_box<CalculationType> >
+{
+    typedef comparable::pythagoras_point_box<CalculationType> type;
+};
+
+
+template <typename CalculationType>
+struct get_comparable<comparable::pythagoras_point_box<CalculationType> >
+{
+    typedef comparable::pythagoras_point_box<CalculationType> comparable_type;
+public :
+    static inline comparable_type apply(comparable_type const& )
+    {
+        return comparable_type();
+    }
+};
+
+
+template <typename CalculationType, typename Point, typename Box>
+struct result_from_distance
+    <
+        comparable::pythagoras_point_box<CalculationType>, Point, Box
+    >
+{
+private :
+    typedef typename return_type
+        <
+            comparable::pythagoras_point_box<CalculationType>, Point, Box
+        >::type return_type;
+public :
+    template <typename T>
+    static inline return_type
+    apply(comparable::pythagoras_point_box<CalculationType> const& ,
+          T const& value)
+    {
+        return_type const v = value;
+        return v * v;
+    }
+};
+
+
+template <typename Point, typename BoxPoint>
+struct default_strategy
+    <
+        point_tag, box_tag, Point, BoxPoint, cartesian_tag, cartesian_tag
+    >
+{
+    typedef pythagoras_point_box<> type;
+};
+
+template <typename BoxPoint, typename Point>
+struct default_strategy
+    <
+        box_tag, point_tag, BoxPoint, Point, cartesian_tag, cartesian_tag
+    >
+{
+    typedef typename default_strategy
+        <
+            point_tag, box_tag, Point, BoxPoint, cartesian_tag, cartesian_tag
+        >::type type;
+};
+
+
+} // namespace services
+#endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+
+}} // namespace strategy::distance
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGIES_CARTESIAN_DISTANCE_PYTHAGORAS_POINT_BOX_HPP
diff --git a/include/boost/geometry/strategies/cartesian/point_in_box.hpp b/include/boost/geometry/strategies/cartesian/point_in_box.hpp
index 275f7550e..79f094113 100644
--- a/include/boost/geometry/strategies/cartesian/point_in_box.hpp
+++ b/include/boost/geometry/strategies/cartesian/point_in_box.hpp
@@ -21,9 +21,9 @@
 #include <boost/geometry/strategies/within.hpp>
 
 
-namespace boost { namespace geometry { namespace strategy 
+namespace boost { namespace geometry { namespace strategy
 {
-    
+
 namespace within
 {
 
@@ -60,14 +60,14 @@ struct relate_point_box_loop
 {
     static inline bool apply(Point const& point, Box const& box)
     {
-        if (! SubStrategy::apply(get<Dimension>(point), 
-                    get<min_corner, Dimension>(box), 
+        if (! SubStrategy::apply(get<Dimension>(point),
+                    get<min_corner, Dimension>(box),
                     get<max_corner, Dimension>(box))
             )
         {
             return false;
         }
-        
+
         return relate_point_box_loop
             <
                 SubStrategy,
@@ -102,12 +102,12 @@ template
 >
 struct point_in_box
 {
-    static inline bool apply(Point const& point, Box const& box) 
+    static inline bool apply(Point const& point, Box const& box)
     {
         return relate_point_box_loop
             <
                 SubStrategy,
-                Point, Box, 
+                Point, Box,
                 0, dimension<Point>::type::value
             >::apply(point, box);
     }
@@ -126,13 +126,13 @@ namespace within { namespace services
 template <typename Point, typename Box>
 struct default_strategy
     <
-        point_tag, box_tag, 
-        point_tag, areal_tag, 
-        cartesian_tag, cartesian_tag, 
+        point_tag, box_tag,
+        point_tag, areal_tag,
+        cartesian_tag, cartesian_tag,
         Point, Box
     >
 {
-    typedef within::point_in_box<Point, Box> type; 
+    typedef within::point_in_box<Point, Box> type;
 };
 
 
@@ -146,9 +146,9 @@ namespace covered_by { namespace services
 template <typename Point, typename Box>
 struct default_strategy
     <
-        point_tag, box_tag, 
-        point_tag, areal_tag, 
-        cartesian_tag, cartesian_tag, 
+        point_tag, box_tag,
+        point_tag, areal_tag,
+        cartesian_tag, cartesian_tag,
         Point, Box
     >
 {
diff --git a/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp b/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
index 967090c50..ed2cedcb6 100644
--- a/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
+++ b/include/boost/geometry/strategies/cartesian/side_by_triangle.hpp
@@ -47,6 +47,30 @@ public :
     // Types can be all three different. Therefore it is
     // not implemented (anymore) as "segment"
 
+    template <typename coordinate_type, typename promoted_type, typename P1, typename P2, typename P>
+    static inline promoted_type side_value(P1 const& p1, P2 const& p2, P const& p)
+    {
+        coordinate_type const x = get<0>(p);
+        coordinate_type const y = get<1>(p);
+
+        coordinate_type const sx1 = get<0>(p1);
+        coordinate_type const sy1 = get<1>(p1);
+        coordinate_type const sx2 = get<0>(p2);
+        coordinate_type const sy2 = get<1>(p2);
+
+        promoted_type const dx = sx2 - sx1;
+        promoted_type const dy = sy2 - sy1;
+        promoted_type const dpx = x - sx1;
+        promoted_type const dpy = y - sy1;
+
+        return geometry::detail::determinant<promoted_type>
+                (
+                    dx, dy,
+                    dpx, dpy
+                );
+
+    }
+
     template <typename P1, typename P2, typename P>
     static inline int apply(P1 const& p1, P2 const& p2, P const& p)
     {
@@ -65,13 +89,38 @@ public :
                 CalculationType
             >::type coordinate_type;
 
-        coordinate_type const x = get<0>(p);
-        coordinate_type const y = get<1>(p);
+        // Promote float->double, small int->int
+        typedef typename select_most_precise
+            <
+                coordinate_type,
+                double
+            >::type promoted_type;
 
-        coordinate_type const sx1 = get<0>(p1);
-        coordinate_type const sy1 = get<1>(p1);
-        coordinate_type const sx2 = get<0>(p2);
-        coordinate_type const sy2 = get<1>(p2);
+        promoted_type const s = side_value<coordinate_type, promoted_type>(p1, p2, p);
+        promoted_type const zero = promoted_type();
+
+        return math::equals(s, zero) ? 0
+            : s > zero ? 1
+            : -1;
+    }
+
+    template <typename P1, typename P2, typename P, typename T>
+    static inline int apply_with_epsilon(P1 const& p1, P2 const& p2, P const& p, T const& epsilon)
+    {
+        typedef typename boost::mpl::if_c
+            <
+                boost::is_void<CalculationType>::type::value,
+                typename select_most_precise
+                    <
+                        typename select_most_precise
+                            <
+                                typename coordinate_type<P1>::type,
+                                typename coordinate_type<P2>::type
+                            >::type,
+                        typename coordinate_type<P>::type
+                    >::type,
+                CalculationType
+            >::type coordinate_type;
 
         // Promote float->double, small int->int
         typedef typename select_most_precise
@@ -80,21 +129,11 @@ public :
                 double
             >::type promoted_type;
 
-        promoted_type const dx = sx2 - sx1;
-        promoted_type const dy = sy2 - sy1;
-        promoted_type const dpx = x - sx1;
-        promoted_type const dpy = y - sy1;
-
-        promoted_type const s 
-            = geometry::detail::determinant<promoted_type>
-                (
-                    dx, dy, 
-                    dpx, dpy
-                );
-
+        promoted_type const s = side_value<coordinate_type, promoted_type>(p1, p2, p);
         promoted_type const zero = promoted_type();
-        return math::equals(s, zero) ? 0 
-            : s > zero ? 1 
+
+        return math::abs(s - zero) < epsilon ? 0
+            : s > zero ? 1
             : -1;
     }
 };
diff --git a/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp b/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
index b31f0caa4..80c21423e 100644
--- a/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
+++ b/include/boost/geometry/strategies/concepts/convex_hull_concept.hpp
@@ -46,11 +46,11 @@ class ConvexHullStrategy
     {
         static void apply()
         {
-            Strategy const* str;
+            Strategy const* str = 0;
 
-            state_type* st;
-            geometry_type* sp;
-            std::vector<point_type> *v;
+            state_type* st = 0;
+            geometry_type* sp = 0;
+            std::vector<point_type> *v = 0;
 
             // 4) must implement a method apply, iterating over a range
             str->apply(*sp, *st);
diff --git a/include/boost/geometry/strategies/concepts/distance_concept.hpp b/include/boost/geometry/strategies/concepts/distance_concept.hpp
index 5d8cfb690..a0cbbd21e 100644
--- a/include/boost/geometry/strategies/concepts/distance_concept.hpp
+++ b/include/boost/geometry/strategies/concepts/distance_concept.hpp
@@ -18,6 +18,7 @@
 #include <iterator>
 
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/util/parameter_type_of.hpp>
 
@@ -93,9 +94,8 @@ private :
                     ptype1, ptype2
                 >::apply(*str, 1.0);
 
-            boost::ignore_unused_variable_warning(str);
-            boost::ignore_unused_variable_warning(c);
-            boost::ignore_unused_variable_warning(r);
+            boost::ignore_unused<tag>();
+            boost::ignore_unused(str, c, r);
         }
     };
 
@@ -135,16 +135,9 @@ private :
                     ApplyMethod, 1
                 >::type sptype;
 
-            // 1) must define meta-function return_type
+            // must define meta-function return_type
             typedef typename strategy::distance::services::return_type<Strategy, ptype, sptype>::type rtype;
 
-            // 2) must define underlying point-distance-strategy
-            typedef typename strategy::distance::services::strategy_point_point<Strategy>::type stype;
-            BOOST_CONCEPT_ASSERT
-                (
-                    (concept::PointDistanceStrategy<stype, Point, PointOfSegment>)
-                );
-
 
             Strategy *str = 0;
             ptype *p = 0;
diff --git a/include/boost/geometry/strategies/concepts/simplify_concept.hpp b/include/boost/geometry/strategies/concepts/simplify_concept.hpp
index e1506e884..d7f596cfe 100644
--- a/include/boost/geometry/strategies/concepts/simplify_concept.hpp
+++ b/include/boost/geometry/strategies/concepts/simplify_concept.hpp
@@ -18,6 +18,7 @@
 #include <iterator>
 
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/strategies/concepts/distance_concept.hpp>
@@ -75,7 +76,8 @@ private :
             //    - floating point value
             str->apply(*v1, std::back_inserter(*v2), 1.0);
 
-            boost::ignore_unused_variable_warning(str);
+            boost::ignore_unused<parameter_types, base_index>();
+            boost::ignore_unused(str);
         }
     };
 
diff --git a/include/boost/geometry/strategies/concepts/within_concept.hpp b/include/boost/geometry/strategies/concepts/within_concept.hpp
index a9684b98e..878640371 100644
--- a/include/boost/geometry/strategies/concepts/within_concept.hpp
+++ b/include/boost/geometry/strategies/concepts/within_concept.hpp
@@ -143,7 +143,7 @@ class WithinStrategyPointBox
                 (
                     (boost::is_same
                         <
-                            bool, 
+                            bool,
                             typename boost::function_types::result_type<ApplyMethod>::type
                         >::type::value),
                     WRONG_RETURN_TYPE
@@ -207,7 +207,7 @@ class WithinStrategyBoxBox
                 (
                     (boost::is_same
                         <
-                            bool, 
+                            bool,
                             typename boost::function_types::result_type<ApplyMethod>::type
                         >::type::value),
                     WRONG_RETURN_TYPE
@@ -237,8 +237,8 @@ public :
 };
 
 // So now: boost::geometry::concept::within
-namespace within 
-{ 
+namespace within
+{
 
 #ifndef DOXYGEN_NO_DISPATCH
 namespace dispatch
diff --git a/include/boost/geometry/strategies/default_comparable_distance_result.hpp b/include/boost/geometry/strategies/default_comparable_distance_result.hpp
new file mode 100644
index 000000000..601bdbd6a
--- /dev/null
+++ b/include/boost/geometry/strategies/default_comparable_distance_result.hpp
@@ -0,0 +1,58 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_DEFAULT_COMPARABLE_DISTANCE_RESULT_HPP
+#define BOOST_GEOMETRY_STRATEGIES_DEFAULT_COMPARABLE_DISTANCE_RESULT_HPP
+
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/strategies/distance.hpp>
+
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
+
+namespace boost { namespace geometry
+{
+
+/*!
+\brief Meta-function defining return type of comparable_distance function
+\ingroup distance
+\note The strategy defines the return-type (so this situation is different
+    from length, where distance is sqr/sqrt, but length always squared)
+ */
+template <typename Geometry1, typename Geometry2 = Geometry1>
+struct default_comparable_distance_result
+{
+    typedef typename strategy::distance::services::return_type
+        <
+            typename strategy::distance::services::comparable_type
+                <
+                    typename detail::distance::default_strategy
+                        <
+                            Geometry1, Geometry2
+                        >::type
+                >::type,
+            typename point_type<Geometry1>::type,
+            typename point_type<Geometry2>::type
+        >::type type;
+};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_STRATEGIES_DEFAULT_COMPARABLE_DISTANCE_RESULT_HPP
diff --git a/include/boost/geometry/strategies/default_distance_result.hpp b/include/boost/geometry/strategies/default_distance_result.hpp
index 74ce495d3..92b629f6f 100644
--- a/include/boost/geometry/strategies/default_distance_result.hpp
+++ b/include/boost/geometry/strategies/default_distance_result.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -19,6 +24,7 @@
 #include <boost/geometry/core/point_type.hpp>
 #include <boost/geometry/strategies/distance.hpp>
 
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
 
 namespace boost { namespace geometry
 {
@@ -34,11 +40,9 @@ struct default_distance_result
 {
     typedef typename strategy::distance::services::return_type
         <
-            typename strategy::distance::services::default_strategy
+            typename detail::distance::default_strategy
                 <
-                    point_tag,
-                    typename point_type<Geometry1>::type,
-                    typename point_type<Geometry2>::type
+                    Geometry1, Geometry2
                 >::type,
             typename point_type<Geometry1>::type,
             typename point_type<Geometry2>::type
diff --git a/include/boost/geometry/strategies/default_strategy.hpp b/include/boost/geometry/strategies/default_strategy.hpp
new file mode 100644
index 000000000..6d05970b4
--- /dev/null
+++ b/include/boost/geometry/strategies/default_strategy.hpp
@@ -0,0 +1,34 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_DEFAULT_STRATEGY_HPP
+#define BOOST_GEOMETRY_STRATEGIES_DEFAULT_STRATEGY_HPP
+
+
+namespace boost { namespace geometry
+{
+
+// This is a strategy placeholder type, which is passed by the algorithm free
+// functions to the multi-stage resolving process. It's resolved into an actual
+// strategy type during the resolve_strategy stage, possibly depending on the
+// input geometry type(s). This typically happens after the resolve_variant
+// stage, as it needs to be based on concrete geometry types - as opposed to
+// variant geometry types.
+
+struct default_strategy {};
+
+}} // namespace boost::geometry
+
+
+
+#endif // BOOST_GEOMETRY_STRATEGIES_DEFAULT_STRATEGY_HPP
diff --git a/include/boost/geometry/strategies/distance.hpp b/include/boost/geometry/strategies/distance.hpp
index 4179f8250..98ccb8202 100644
--- a/include/boost/geometry/strategies/distance.hpp
+++ b/include/boost/geometry/strategies/distance.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -61,8 +66,6 @@ template <typename Strategy, typename P1, typename P2>
 struct result_from_distance {};
 
 
-// For point-segment only:
-template <typename Strategy> struct strategy_point_point {};
 
 
 // Default strategy
@@ -72,7 +75,8 @@ template <typename Strategy> struct strategy_point_point {};
     \brief Traits class binding a default strategy for distance
         to one (or possibly two) coordinate system(s)
     \ingroup distance
-    \tparam GeometryTag tag (point/segment) for which this strategy is the default
+    \tparam GeometryTag1 tag (point/segment/box) for which this strategy is the default
+    \tparam GeometryTag2 tag (point/segment/box) for which this strategy is the default
     \tparam Point1 first point-type
     \tparam Point2 second point-type
     \tparam CsTag1 tag of coordinate system of first point type
@@ -80,7 +84,8 @@ template <typename Strategy> struct strategy_point_point {};
 */
 template
 <
-    typename GeometryTag,
+    typename GeometryTag1,
+    typename GeometryTag2,
     typename Point1,
     typename Point2 = Point1,
     typename CsTag1 = typename cs_tag<Point1>::type,
diff --git a/include/boost/geometry/strategies/distance_comparable_to_regular.hpp b/include/boost/geometry/strategies/distance_comparable_to_regular.hpp
new file mode 100644
index 000000000..88f51eb15
--- /dev/null
+++ b/include/boost/geometry/strategies/distance_comparable_to_regular.hpp
@@ -0,0 +1,53 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_STRATEGIES_DISTANCE_COMPARABLE_TO_REGULAR_HPP
+#define BOOST_GEOMETRY_STRATEGIES_DISTANCE_COMPARABLE_TO_REGULAR_HPP
+
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/core/cs.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace distance
+{
+
+
+
+#ifndef DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+namespace services
+{
+
+
+template
+<
+    typename ComparableStrategy,
+    typename Strategy,
+    typename Geometry1,
+    typename Geometry2,
+    typename CsTag1 = typename cs_tag<Geometry1>::type,
+    typename CsTag2 = typename cs_tag<Geometry2>::type
+>
+struct comparable_to_regular
+    : geometry::not_implemented<CsTag1, CsTag2>
+{};
+
+
+} // namespace services
+#endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
+
+
+}} // namespace strategy::distance
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_STRATEGIES_DISTANCE_COMPARABLE_TO_REGULAR_HPP
diff --git a/include/boost/geometry/strategies/intersection.hpp b/include/boost/geometry/strategies/intersection.hpp
index 243f5b561..ef1b676fd 100644
--- a/include/boost/geometry/strategies/intersection.hpp
+++ b/include/boost/geometry/strategies/intersection.hpp
@@ -20,38 +20,44 @@
 #include <boost/geometry/strategies/intersection_result.hpp>
 
 #include <boost/geometry/strategies/cartesian/cart_intersect.hpp>
+#include <boost/geometry/policies/robustness/segment_ratio_type.hpp>
 
 
 namespace boost { namespace geometry
 {
 
 
-// The intersection strategy is a "compound strategy",
-// it contains a segment-intersection-strategy
-// and a side-strategy
 /*!
-\tparam CalculationType \tparam_calculation
-*/
+\brief "compound strategy", containing a segment-intersection-strategy
+       and a side-strategy
+ */
 template
 <
     typename Tag,
     typename Geometry1,
     typename Geometry2,
     typename IntersectionPoint,
+    typename RobustPolicy,
     typename CalculationType = void
 >
 struct strategy_intersection
 {
 private :
+    // for development BOOST_STATIC_ASSERT((! boost::is_same<RobustPolicy, void>::type::value));
+
     typedef typename geometry::point_type<Geometry1>::type point1_type;
     typedef typename geometry::point_type<Geometry2>::type point2_type;
     typedef typename model::referring_segment<point1_type const> segment1_type;
     typedef typename model::referring_segment<point2_type const> segment2_type;
 
     typedef segment_intersection_points
+    <
+        IntersectionPoint,
+        typename geometry::segment_ratio_type
         <
-            IntersectionPoint
-        > ip_type;
+            IntersectionPoint, RobustPolicy
+        >::type
+    > ip_type;
 
 public:
     typedef strategy::intersection::relate_cartesian_segments
@@ -60,18 +66,9 @@ public:
                     <
                         policies::relate::segments_intersection_points
                             <
-                                segment1_type,
-                                segment2_type,
-                                ip_type,
-                                CalculationType
+                                ip_type
                             > ,
                         policies::relate::segments_direction
-                            <
-                                segment1_type,
-                                segment2_type,
-                                CalculationType
-                            >,
-                        CalculationType
                     >,
                 CalculationType
             > segment_intersection_strategy_type;
@@ -81,9 +78,12 @@ public:
             Tag,
             CalculationType
         >::type side_strategy_type;
+
+    typedef RobustPolicy rescale_policy_type;
 };
 
-
+// Version for box_box intersection or other detail calls not needing a strategy
+struct strategy_intersection_empty {};
 
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/strategies/intersection_result.hpp b/include/boost/geometry/strategies/intersection_result.hpp
index 15917a9eb..695db79c9 100644
--- a/include/boost/geometry/strategies/intersection_result.hpp
+++ b/include/boost/geometry/strategies/intersection_result.hpp
@@ -16,6 +16,7 @@
 #include <cstddef>
 
 
+
 namespace boost { namespace geometry
 {
 
@@ -153,13 +154,47 @@ struct de9im_segment : public de9im
 #endif
 };
 
+template <typename SegmentRatio>
+struct fraction_type
+{
+    SegmentRatio robust_ra; // TODO this can be renamed now to "ra"
+    SegmentRatio robust_rb;
 
+    bool initialized;
+    inline fraction_type()
+        : initialized(false)
+    {}
 
-template <typename Point>
+    template <typename Info>
+    inline void assign(Info const& info)
+    {
+        initialized = true;
+        robust_ra = info.robust_ra;
+        robust_rb = info.robust_rb;
+    }
+
+    inline void assign(SegmentRatio const& a, SegmentRatio const& b)
+    {
+        initialized = true;
+        robust_ra = a;
+        robust_rb = b;
+    }
+
+};
+
+//
+/*!
+\brief return-type for segment-intersection
+\note Set in intersection_points.hpp, from segment_intersection_info
+*/
+template <typename Point, typename SegmentRatio>
 struct segment_intersection_points
 {
-    std::size_t count;
+    std::size_t count; // The number of intersection points
+
+    // TODO: combine intersections and fractions in one struct
     Point intersections[2];
+    fraction_type<SegmentRatio> fractions[2];
     typedef Point point_type;
 
     segment_intersection_points()
@@ -167,6 +202,18 @@ struct segment_intersection_points
     {}
 };
 
+// All assigned in cart_intersect, passed to intersection_points
+template <typename CoordinateType, typename PromotedType, typename SegmentRatio>
+struct segment_intersection_info
+{
+    typedef PromotedType promoted_type;
+
+    CoordinateType dx_a, dy_a;
+    CoordinateType dx_b, dy_b; // TODO b can be removed
+    SegmentRatio robust_ra;
+    SegmentRatio robust_rb;
+};
+
 
 }} // namespace boost::geometry
 
diff --git a/include/boost/geometry/strategies/side_info.hpp b/include/boost/geometry/strategies/side_info.hpp
index 3c2c1798a..d113eaa8f 100644
--- a/include/boost/geometry/strategies/side_info.hpp
+++ b/include/boost/geometry/strategies/side_info.hpp
@@ -16,8 +16,9 @@
 
 #include <cmath>
 #include <utility>
-#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
-#include <iostream>
+
+#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+#  include <iostream>
 #endif
 
 namespace boost { namespace geometry
@@ -25,8 +26,8 @@ namespace boost { namespace geometry
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
 
 /*!
@@ -145,13 +146,13 @@ public :
         return sides[Which].first == 0 ? 0 : 1;
     }
 
-#ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
+#if defined(BOOST_GEOMETRY_DEBUG_INTERSECTION) || defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
     inline void debug() const
     {
         std::cout << sides[0].first << " "
             << sides[0].second << " "
             << sides[1].first << " "
-            << sides[1].second 
+            << sides[1].second
             << std::endl;
     }
 #endif
@@ -167,7 +168,7 @@ public :
 };
 
 #if defined(_MSC_VER)
-#pragma warning(pop)  
+#pragma warning(pop)
 #endif
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/strategies/spherical/area_huiller.hpp b/include/boost/geometry/strategies/spherical/area_huiller.hpp
index c41d80abc..e55fdb2b0 100644
--- a/include/boost/geometry/strategies/spherical/area_huiller.hpp
+++ b/include/boost/geometry/strategies/spherical/area_huiller.hpp
@@ -128,7 +128,8 @@ public :
 
             // E: spherical excess, using l'Huiller's formula
             // [tg(e / 4)]2   =   tg[s / 2]  tg[(s-a) / 2]  tg[(s-b) / 2]  tg[(s-c) / 2]
-            calculation_type E = four * atan(sqrt(geometry::math::abs(tan(s / two)
+            calculation_type E = four
+                * atan(geometry::math::sqrt(geometry::math::abs(tan(s / two)
                     * tan((s - a) / two)
                     * tan((s - b) / two)
                     * tan((s - c) / two))));
diff --git a/include/boost/geometry/strategies/spherical/distance_cross_track.hpp b/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
index 4185a9479..6ffa4ff7c 100644
--- a/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
+++ b/include/boost/geometry/strategies/spherical/distance_cross_track.hpp
@@ -250,16 +250,6 @@ public :
 };
 
 
-template
-<
-    typename CalculationType,
-    typename Strategy
->
-struct strategy_point_point<cross_track<CalculationType, Strategy> >
-{
-    typedef Strategy type;
-};
-
 
 
 /*
@@ -294,7 +284,7 @@ struct default_strategy
 template <typename Point, typename PointOfSegment, typename Strategy>
 struct default_strategy
     <
-        segment_tag, Point, PointOfSegment,
+        point_tag, segment_tag, Point, PointOfSegment,
         spherical_equatorial_tag, spherical_equatorial_tag,
         Strategy
     >
@@ -307,7 +297,7 @@ struct default_strategy
                     boost::is_void<Strategy>,
                     typename default_strategy
                         <
-                            point_tag, Point, PointOfSegment,
+                            point_tag, point_tag, Point, PointOfSegment,
                             spherical_equatorial_tag, spherical_equatorial_tag
                         >::type,
                     Strategy
@@ -316,6 +306,22 @@ struct default_strategy
 };
 
 
+template <typename PointOfSegment, typename Point, typename Strategy>
+struct default_strategy
+    <
+        segment_tag, point_tag, PointOfSegment, Point,
+        spherical_equatorial_tag, spherical_equatorial_tag,
+        Strategy
+    >
+{
+    typedef typename default_strategy
+        <
+            point_tag, segment_tag, Point, PointOfSegment,
+            spherical_equatorial_tag, spherical_equatorial_tag,
+            Strategy
+        >::type type;
+};
+
 
 } // namespace services
 #endif // DOXYGEN_NO_STRATEGY_SPECIALIZATIONS
diff --git a/include/boost/geometry/strategies/spherical/distance_haversine.hpp b/include/boost/geometry/strategies/spherical/distance_haversine.hpp
index 60ccfdbd6..8db29c515 100644
--- a/include/boost/geometry/strategies/spherical/distance_haversine.hpp
+++ b/include/boost/geometry/strategies/spherical/distance_haversine.hpp
@@ -14,6 +14,7 @@
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/radian_access.hpp>
 
+#include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/select_calculation_type.hpp>
 #include <boost/geometry/util/promote_floating_point.hpp>
 
@@ -111,7 +112,7 @@ A mathematically equivalent formula, which is less subject
     to rounding error for short distances is:
     d=2*asin(sqrt((sin((lat1-lat2) / 2))^2
     + cos(lat1)*cos(lat2)*(sin((lon1-lon2) / 2))^2))
-    
+
 
 \qbk{
 [heading See also]
@@ -156,7 +157,7 @@ public :
     {
         typedef typename calculation_type<Point1, Point2>::type calculation_type;
         calculation_type const a = comparable_type::apply(p1, p2);
-        calculation_type const c = calculation_type(2.0) * asin(sqrt(a));
+        calculation_type const c = calculation_type(2.0) * asin(math::sqrt(a));
         return m_radius * c;
     }
 
@@ -276,10 +277,14 @@ public :
 };
 
 
-// Register it as the default for point-types 
+// Register it as the default for point-types
 // in a spherical equatorial coordinate system
 template <typename Point1, typename Point2>
-struct default_strategy<point_tag, Point1, Point2, spherical_equatorial_tag, spherical_equatorial_tag>
+struct default_strategy
+    <
+        point_tag, point_tag, Point1, Point2,
+        spherical_equatorial_tag, spherical_equatorial_tag
+    >
 {
     typedef strategy::distance::haversine<typename select_coordinate_type<Point1, Point2>::type> type;
 };
diff --git a/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp b/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
index b7cf279d5..818bd4c34 100644
--- a/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
+++ b/include/boost/geometry/strategies/spherical/side_by_cross_track.hpp
@@ -11,6 +11,7 @@
 
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/access.hpp>
@@ -82,6 +83,8 @@ public :
                 CalculationType
             >::type coordinate_type;
 
+        boost::ignore_unused<coordinate_type>();
+
         double d1 = 0.001; // m_strategy.apply(sp1, p);
         double crs_AD = detail::course(p1, p);
         double crs_AB = detail::course(p1, p2);
diff --git a/include/boost/geometry/strategies/spherical/ssf.hpp b/include/boost/geometry/strategies/spherical/ssf.hpp
index ab7c67559..41562950f 100644
--- a/include/boost/geometry/strategies/spherical/ssf.hpp
+++ b/include/boost/geometry/strategies/spherical/ssf.hpp
@@ -88,13 +88,13 @@ public :
 
         // (Third point is converted directly)
         ct const cos_delta = cos(delta);
-        
+
         // Apply the "Spherical Side Formula" as presented on my blog
-        ct const dist 
-            = (c1y * c2z - c1z * c2y) * cos_delta * cos(lambda) 
+        ct const dist
+            = (c1y * c2z - c1z * c2y) * cos_delta * cos(lambda)
             + (c1z * c2x - c1x * c2z) * cos_delta * sin(lambda)
             + (c1x * c2y - c1y * c2x) * sin(delta);
-        
+
         ct zero = ct();
         return dist > zero ? 1
             : dist < zero ? -1
diff --git a/include/boost/geometry/strategies/strategies.hpp b/include/boost/geometry/strategies/strategies.hpp
index 3aa9ab00f..a90045978 100644
--- a/include/boost/geometry/strategies/strategies.hpp
+++ b/include/boost/geometry/strategies/strategies.hpp
@@ -4,6 +4,9 @@
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
 
@@ -11,6 +14,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_STRATEGIES_STRATEGIES_HPP
 #define BOOST_GEOMETRY_STRATEGIES_STRATEGIES_HPP
 
@@ -18,6 +23,7 @@
 #include <boost/geometry/strategies/tags.hpp>
 
 #include <boost/geometry/strategies/area.hpp>
+#include <boost/geometry/strategies/buffer.hpp>
 #include <boost/geometry/strategies/centroid.hpp>
 #include <boost/geometry/strategies/compare.hpp>
 #include <boost/geometry/strategies/convex_hull.hpp>
@@ -29,14 +35,23 @@
 
 #include <boost/geometry/strategies/cartesian/area_surveyor.hpp>
 #include <boost/geometry/strategies/cartesian/box_in_box.hpp>
+#include <boost/geometry/strategies/cartesian/buffer_end_flat.hpp>
+#include <boost/geometry/strategies/cartesian/buffer_end_round.hpp>
+#include <boost/geometry/strategies/cartesian/buffer_join_miter.hpp>
+#include <boost/geometry/strategies/cartesian/buffer_join_round.hpp>
+#include <boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp>
+#include <boost/geometry/strategies/cartesian/centroid_average.hpp>
 #include <boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp>
 #include <boost/geometry/strategies/cartesian/centroid_weighted_length.hpp>
 #include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
+#include <boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp>
+#include <boost/geometry/strategies/cartesian/distance_pythagoras_box_box.hpp>
 #include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
 #include <boost/geometry/strategies/cartesian/point_in_poly_franklin.hpp>
 #include <boost/geometry/strategies/cartesian/point_in_poly_crossings_multiply.hpp>
 #include <boost/geometry/strategies/cartesian/side_by_triangle.hpp>
+#include <boost/geometry/strategies/cartesian/distance_comparable_to_regular.hpp>
 
 #include <boost/geometry/strategies/spherical/area_huiller.hpp>
 #include <boost/geometry/strategies/spherical/distance_haversine.hpp>
@@ -44,11 +59,17 @@
 #include <boost/geometry/strategies/spherical/compare_circular.hpp>
 #include <boost/geometry/strategies/spherical/ssf.hpp>
 
+#include <boost/geometry/strategies/agnostic/buffer_distance_symmetric.hpp>
+#include <boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp>
+#include <boost/geometry/strategies/agnostic/buffer_end_skip.hpp>
 #include <boost/geometry/strategies/agnostic/hull_graham_andrew.hpp>
 #include <boost/geometry/strategies/agnostic/point_in_box_by_side.hpp>
+#include <boost/geometry/strategies/agnostic/point_in_point.hpp>
 #include <boost/geometry/strategies/agnostic/point_in_poly_winding.hpp>
 #include <boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp>
 
+#include <boost/geometry/strategies/agnostic/relate.hpp>
+
 #include <boost/geometry/strategies/strategy_transform.hpp>
 
 #include <boost/geometry/strategies/transform/matrix_transformers.hpp>
diff --git a/include/boost/geometry/strategies/strategy_transform.hpp b/include/boost/geometry/strategies/strategy_transform.hpp
index 2b75d202e..9d3b1d910 100644
--- a/include/boost/geometry/strategies/strategy_transform.hpp
+++ b/include/boost/geometry/strategies/strategy_transform.hpp
@@ -165,7 +165,7 @@ namespace detail
         // http://www.vias.org/comp_geometry/math_coord_convert_3d.htm
         // https://moodle.polymtl.ca/file.php/1183/Autres_Documents/Derivation_for_Spherical_Co-ordinates.pdf
         // http://en.citizendium.org/wiki/Spherical_polar_coordinates
-        
+
         // Phi = first, theta is second, r is third, see documentation on cs::spherical
 
         // (calculations are splitted to implement ttmath)
@@ -179,7 +179,7 @@ namespace detail
         set<1>(p, r_sin_theta * sin(phi));
         set<2>(p, r_cos_theta);
     }
-    
+
     /// Helper function for conversion, lambda/delta (lon lat) are in radians
     template <typename P, typename T, typename R>
     inline void spherical_equatorial_to_cartesian(T lambda, T delta, R r, P& p)
@@ -188,7 +188,7 @@ namespace detail
 
         // http://mathworld.wolfram.com/GreatCircle.html
         // http://www.spenvis.oma.be/help/background/coortran/coortran.html WRONG
-        
+
         T r_cos_delta = r;
         T r_sin_delta = r;
         r_cos_delta *= cos(delta);
@@ -198,7 +198,7 @@ namespace detail
         set<1>(p, r_cos_delta * sin(lambda));
         set<2>(p, r_sin_delta);
     }
-    
+
 
     /// Helper function for conversion
     template <typename P, typename T>
@@ -224,7 +224,7 @@ namespace detail
         set_from_radian<1>(p, acos(z));
         return true;
     }
-    
+
     template <typename P, typename T>
     inline bool cartesian_to_spherical_equatorial2(T x, T y, T z, P& p)
     {
@@ -234,7 +234,7 @@ namespace detail
         set_from_radian<1>(p, asin(z));
         return true;
     }
-    
+
 
     template <typename P, typename T>
     inline bool cartesian_to_spherical3(T x, T y, T z, P& p)
@@ -242,7 +242,7 @@ namespace detail
         assert_dimension<P, 3>();
 
         // http://en.wikipedia.org/wiki/List_of_canonical_coordinate_transformations#From_Cartesian_coordinates
-        T const r = sqrt(x * x + y * y + z * z);
+        T const r = math::sqrt(x * x + y * y + z * z);
         set<2>(p, r);
         set_from_radian<0>(p, atan2(y, x));
         if (r > 0.0)
@@ -259,7 +259,7 @@ namespace detail
         assert_dimension<P, 3>();
 
         // http://en.wikipedia.org/wiki/List_of_canonical_coordinate_transformations#From_Cartesian_coordinates
-        T const r = sqrt(x * x + y * y + z * z);
+        T const r = math::sqrt(x * x + y * y + z * z);
         set<2>(p, r);
         set_from_radian<0>(p, atan2(y, x));
         if (r > 0.0)
diff --git a/include/boost/geometry/strategies/tags.hpp b/include/boost/geometry/strategies/tags.hpp
index 39f2f2303..7589c2107 100644
--- a/include/boost/geometry/strategies/tags.hpp
+++ b/include/boost/geometry/strategies/tags.hpp
@@ -34,6 +34,8 @@ namespace strategy
 
 struct strategy_tag_distance_point_point {};
 struct strategy_tag_distance_point_segment {};
+struct strategy_tag_distance_point_box {};
+struct strategy_tag_distance_box_box {};
 
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/strategies/transform/map_transformer.hpp b/include/boost/geometry/strategies/transform/map_transformer.hpp
index baf721658..1109e814b 100644
--- a/include/boost/geometry/strategies/transform/map_transformer.hpp
+++ b/include/boost/geometry/strategies/transform/map_transformer.hpp
@@ -24,8 +24,8 @@ namespace boost { namespace geometry
 
 // Silence warning C4127: conditional expression is constant
 #if defined(_MSC_VER)
-#pragma warning(push)  
-#pragma warning(disable : 4127)  
+#pragma warning(push)
+#pragma warning(disable : 4127)
 #endif
 
 namespace strategy { namespace transform
@@ -162,7 +162,7 @@ private :
 }} // namespace strategy::transform
 
 #if defined(_MSC_VER)
-#pragma warning(pop)  
+#pragma warning(pop)
 #endif
 
 }} // namespace boost::geometry
diff --git a/include/boost/geometry/util/calculation_type.hpp b/include/boost/geometry/util/calculation_type.hpp
index aef58909e..2ac0de87d 100644
--- a/include/boost/geometry/util/calculation_type.hpp
+++ b/include/boost/geometry/util/calculation_type.hpp
@@ -34,7 +34,7 @@ struct default_integral
     typedef boost::long_long_type type;
 #else
     typedef int type;
-#endif    
+#endif
 };
 
 /*!
@@ -65,7 +65,7 @@ struct calculation_type
                 DefaultIntegralCalculationType
             >::type::value
         ));
-    
+
 
     typedef typename boost::mpl::if_
         <
@@ -153,12 +153,12 @@ struct ternary
         <
             typename select_most_precise
                 <
-                    typename coordinate_type<Geometry1>::type, 
+                    typename coordinate_type<Geometry1>::type,
                     typename select_coordinate_type
                         <
                             Geometry2,
                             Geometry3
-                        >::type 
+                        >::type
                 >::type,
             CalculationType,
             DefaultFloatingPointCalculationType,
diff --git a/include/boost/geometry/util/combine_if.hpp b/include/boost/geometry/util/combine_if.hpp
new file mode 100644
index 000000000..6d8d932a1
--- /dev/null
+++ b/include/boost/geometry/util/combine_if.hpp
@@ -0,0 +1,78 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_UTIL_COMBINE_IF_HPP
+#define BOOST_GEOMETRY_UTIL_COMBINE_IF_HPP
+
+#include <boost/mpl/fold.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/bind.hpp>
+#include <boost/mpl/set.hpp>
+#include <boost/mpl/insert.hpp>
+#include <boost/mpl/placeholders.hpp>
+
+#include <boost/type_traits.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace util
+{
+
+
+/*!
+    \brief Meta-function to generate all the combination of pairs of types
+        from a given sequence Sequence except those that does not satisfy the
+        predicate Pred
+    \ingroup utility
+    \par Example
+    \code
+        typedef mpl::vector<mpl::int_<0>, mpl::int_<1> > types;
+        typedef combine_if<types, types, always<true_> >::type combinations;
+        typedef mpl::vector<
+            pair<mpl::int_<1>, mpl::int_<1> >,
+            pair<mpl::int_<1>, mpl::int_<0> >,
+            pair<mpl::int_<0>, mpl::int_<1> >,
+            pair<mpl::int_<0>, mpl::int_<0> >        
+        > result_types;
+        
+        BOOST_MPL_ASSERT(( mpl::equal<combinations, result_types> ));
+    \endcode
+*/
+template <typename Sequence1, typename Sequence2, typename Pred>
+struct combine_if
+{
+    struct combine
+    {
+        template <typename Result, typename T>
+        struct apply
+        {
+            typedef typename mpl::fold<Sequence2, Result,
+                mpl::if_
+                <
+                    mpl::bind<typename mpl::lambda<Pred>::type, T, mpl::_2>,
+                    mpl::insert<mpl::_1, mpl::pair<T, mpl::_2> >,
+                    mpl::_1
+                >
+            >::type type;
+        };
+    };
+
+    typedef typename mpl::fold<Sequence1, mpl::set0<>, combine>::type type;
+};
+
+
+} // namespace util
+
+}} // namespace boost::geometry
+
+#endif // BOOST_GEOMETRY_UTIL_COMBINE_IF_HPP
diff --git a/include/boost/geometry/util/compress_variant.hpp b/include/boost/geometry/util/compress_variant.hpp
new file mode 100644
index 000000000..514771298
--- /dev/null
+++ b/include/boost/geometry/util/compress_variant.hpp
@@ -0,0 +1,98 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_UTIL_COMPRESS_VARIANT_HPP
+#define BOOST_GEOMETRY_UTIL_COMPRESS_VARIANT_HPP
+
+
+#include <boost/mpl/equal_to.hpp>
+#include <boost/mpl/fold.hpp>
+#include <boost/mpl/front.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/insert.hpp>
+#include <boost/mpl/int.hpp>
+#include <boost/mpl/set.hpp>
+#include <boost/mpl/size.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+namespace detail
+{
+
+template <typename Variant>
+struct unique_types:
+    mpl::fold<
+        typename mpl::reverse_fold<
+            typename Variant::types,
+            mpl::set<>,
+            mpl::insert<
+                mpl::placeholders::_1,
+                mpl::placeholders::_2
+            >
+        >::type,
+        mpl::vector<>,
+        mpl::push_back<mpl::placeholders::_1, mpl::placeholders::_2>
+    >
+{};
+
+template <typename Types>
+struct variant_or_single:
+    mpl::if_<
+        mpl::equal_to<
+            mpl::size<Types>,
+            mpl::int_<1>
+        >,
+        typename mpl::front<Types>::type,
+        typename make_variant_over<Types>::type
+    >
+{};
+
+} // namespace detail
+
+
+/*!
+    \brief Meta-function that takes a boost::variant type and tries to minimize
+        it by doing the following:
+        - if there's any duplicate types, remove them
+        - if the result is a variant of one type, turn it into just that type
+    \ingroup utility
+    \par Example
+    \code
+        typedef variant<int, float, int, long> variant_type;
+        typedef compress_variant<variant_type>::type compressed;
+        typedef mpl::vector<int, float, long> result_types;
+        BOOST_MPL_ASSERT(( mpl::equal<compressed::types, result_types> ));
+
+        tpyedef variant<int, int, int> one_type_variant_type;
+        typedef compress_variant<one_type_variant_type>::type single_type;
+        BOOST_MPL_ASSERT(( boost::equals<single_type, int> ));
+    \endcode
+*/
+
+template <typename Variant>
+struct compress_variant:
+    detail::variant_or_single<
+        typename detail::unique_types<Variant>::type
+    >
+{};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_UTIL_COMPRESS_VARIANT_HPP
diff --git a/include/boost/geometry/util/math.hpp b/include/boost/geometry/util/math.hpp
index 5829f9cbd..89f4578c0 100644
--- a/include/boost/geometry/util/math.hpp
+++ b/include/boost/geometry/util/math.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -17,7 +22,10 @@
 #include <cmath>
 #include <limits>
 
+#include <boost/type_traits/is_fundamental.hpp>
+
 #include <boost/math/constants/constants.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 #include <boost/geometry/util/select_most_precise.hpp>
 
@@ -85,9 +93,72 @@ struct smaller<Type, true>
 };
 
 
-template <typename Type, bool IsFloatingPoint> 
+template <typename Type, bool IsFloatingPoint>
 struct equals_with_epsilon : public equals<Type, IsFloatingPoint> {};
 
+template
+<
+    typename T,
+    bool IsFundemantal = boost::is_fundamental<T>::value /* false */
+>
+struct square_root
+{
+    typedef T return_type;
+
+    static inline T apply(T const& value)
+    {
+        // for non-fundamental number types assume that sqrt is
+        // defined either:
+        // 1) at T's scope, or
+        // 2) at global scope, or
+        // 3) in namespace std
+        using ::sqrt;
+        using std::sqrt;
+
+        return sqrt(value);
+    }
+};
+
+template <>
+struct square_root<float, true>
+{
+    typedef float return_type;
+
+    static inline float apply(float const& value)
+    {
+        // for float use std::sqrt
+        return std::sqrt(value);
+    }
+};
+
+template <>
+struct square_root<long double, true>
+{
+    typedef long double return_type;
+
+    static inline long double apply(long double const& value)
+    {
+        // for long double use std::sqrt
+        return std::sqrt(value);
+    }
+};
+
+template <typename T>
+struct square_root<T, true>
+{
+    typedef double return_type;
+
+    static inline double apply(T const& value)
+    {
+        // for all other fundamental number types use also std::sqrt
+        //
+        // Note: in C++98 the only other possibility is double;
+        //       in C++11 there are also overloads for integral types;
+        //       this specialization works for those as well.
+        return std::sqrt(boost::numeric_cast<double>(value));
+    }
+};
+
 
 /*!
 \brief Short construct to enable partial specialization for PI, currently not possible in Math.
@@ -111,6 +182,29 @@ struct relaxed_epsilon
     }
 };
 
+// ItoF ItoI FtoF
+template <typename Result, typename Source,
+          bool ResultIsInteger = std::numeric_limits<Result>::is_integer,
+          bool SourceIsInteger = std::numeric_limits<Source>::is_integer>
+struct round
+{
+    static inline Result apply(Source const& v)
+    {
+        return boost::numeric_cast<Result>(v);
+    }
+};
+
+// FtoI
+template <typename Result, typename Source>
+struct round<Result, Source, true, false>
+{
+    static inline Result apply(Source const& v)
+    {
+        return v < 0
+             ? boost::numeric_cast<Result>(ceil(v - 0.5f))
+             : boost::numeric_cast<Result>(floor(v + 0.5f));        
+    }
+};
 
 } // namespace detail
 #endif
@@ -158,7 +252,7 @@ inline bool equals_with_epsilon(T1 const& a, T2 const& b)
     typedef typename select_most_precise<T1, T2>::type select_type;
     return detail::equals_with_epsilon
         <
-            select_type, 
+            select_type,
             boost::is_floating_point<select_type>::type::value
         >::apply(a, b);
 }
@@ -216,6 +310,22 @@ inline T sqr(T const& value)
     return value * value;
 }
 
+/*!
+\brief Short utility to return the square root
+\ingroup utility
+\param value Value to calculate the square root from
+\return The square root value
+*/
+template <typename T>
+inline typename detail::square_root<T>::return_type
+sqrt(T const& value)
+{
+    return detail::square_root
+        <
+            T, boost::is_fundamental<T>::value
+        >::apply(value);
+}
+
 /*!
 \brief Short utility to workaround gcc/clang problem that abs is converting to integer
        and that older versions of MSVC does not support abs of long long...
@@ -233,12 +343,25 @@ inline T abs(T const& value)
 \ingroup utility
 */
 template <typename T>
-static inline int sign(T const& value) 
+static inline int sign(T const& value)
 {
     T const zero = T();
     return value > zero ? 1 : value < zero ? -1 : 0;
 }
 
+/*!
+\brief Short utility to calculate the rounded value of a number.
+\ingroup utility
+\note If the source T is NOT an integral type and Result is an integral type
+      the value is rounded towards the closest integral value. Otherwise it's
+      just casted.
+*/
+template <typename Result, typename T>
+inline Result round(T const& v)
+{
+    // NOTE: boost::round() could be used instead but it throws in some situations
+    return detail::round<Result, T>::apply(v);
+}
 
 } // namespace math
 
diff --git a/include/boost/geometry/util/parameter_type_of.hpp b/include/boost/geometry/util/parameter_type_of.hpp
index b8872d52b..3ed09ab9b 100644
--- a/include/boost/geometry/util/parameter_type_of.hpp
+++ b/include/boost/geometry/util/parameter_type_of.hpp
@@ -25,7 +25,7 @@
 
 
 namespace boost { namespace geometry
-{ 
+{
 
 
 /*!
@@ -46,7 +46,7 @@ struct parameter_type_of
             boost::mpl::int_<1>,
             boost::mpl::int_<0>
         >::type base_index_type;
-        
+
     typedef typename boost::mpl::if_c
         <
             Index == 0,
diff --git a/include/boost/geometry/util/range.hpp b/include/boost/geometry/util/range.hpp
new file mode 100644
index 000000000..986aba660
--- /dev/null
+++ b/include/boost/geometry/util/range.hpp
@@ -0,0 +1,110 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_UTIL_RANGE_HPP
+#define BOOST_GEOMETRY_UTIL_RANGE_HPP
+
+#include <boost/concept_check.hpp>
+#include <boost/range/concepts.hpp>
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/empty.hpp>
+#include <boost/range/size.hpp>
+
+namespace boost { namespace geometry { namespace range {
+
+// NOTE: For SinglePassRanges at could iterate over all elements until the i-th element is met.
+
+/*!
+\brief Short utility to conveniently return an element of a RandomAccessRange.
+\ingroup utility
+*/
+template <typename RandomAccessRange>
+inline typename boost::range_value<RandomAccessRange const>::type const&
+at(RandomAccessRange const& rng,
+   typename boost::range_size<RandomAccessRange const>::type i)
+{
+    BOOST_RANGE_CONCEPT_ASSERT(( boost::RandomAccessRangeConcept<RandomAccessRange const> ));
+    BOOST_ASSERT(i < boost::size(rng));
+    return *(boost::begin(rng) + i);
+}
+
+/*!
+\brief Short utility to conveniently return an element of a RandomAccessRange.
+\ingroup utility
+*/
+template <typename RandomAccessRange>
+inline typename boost::range_value<RandomAccessRange>::type &
+at(RandomAccessRange & rng,
+   typename boost::range_size<RandomAccessRange>::type i)
+{
+    BOOST_RANGE_CONCEPT_ASSERT(( boost::RandomAccessRangeConcept<RandomAccessRange> ));
+    BOOST_ASSERT(i < boost::size(rng));
+    return *(boost::begin(rng) + i);
+}
+
+/*!
+\brief Short utility to conveniently return the front element of a Range.
+\ingroup utility
+*/
+template <typename Range>
+inline typename boost::range_value<Range>::type const&
+front(Range const& rng)
+{
+    BOOST_ASSERT(!boost::empty(rng));
+    return *boost::begin(rng);
+}
+
+/*!
+\brief Short utility to conveniently return the front element of a Range.
+\ingroup utility
+*/
+template <typename Range>
+inline typename boost::range_value<Range>::type &
+front(Range & rng)
+{
+    BOOST_ASSERT(!boost::empty(rng));
+    return *boost::begin(rng);
+}
+
+// NOTE: For SinglePassRanges back() could iterate over all elements until the last element is met.
+
+/*!
+\brief Short utility to conveniently return the back element of a BidirectionalRange.
+\ingroup utility
+*/
+template <typename BidirectionalRange>
+inline typename boost::range_value<BidirectionalRange>::type const&
+back(BidirectionalRange const& rng)
+{
+    BOOST_RANGE_CONCEPT_ASSERT(( boost::BidirectionalRangeConcept<BidirectionalRange const> ));
+    BOOST_ASSERT(!boost::empty(rng));
+    return *(--boost::end(rng));
+}
+
+/*!
+\brief Short utility to conveniently return the back element of a BidirectionalRange.
+\ingroup utility
+*/
+template <typename BidirectionalRange>
+inline typename boost::range_value<BidirectionalRange>::type &
+back(BidirectionalRange & rng)
+{
+    BOOST_RANGE_CONCEPT_ASSERT(( boost::BidirectionalRangeConcept<BidirectionalRange> ));
+    BOOST_ASSERT(!boost::empty(rng));
+    return *(--boost::end(rng));
+}
+
+}}} // namespace boost::geometry::range
+
+#endif // BOOST_GEOMETRY_UTIL_RANGE_HPP
diff --git a/include/boost/geometry/util/rational.hpp b/include/boost/geometry/util/rational.hpp
index b397532bc..805c85eb4 100644
--- a/include/boost/geometry/util/rational.hpp
+++ b/include/boost/geometry/util/rational.hpp
@@ -21,11 +21,11 @@
 #include <boost/geometry/util/select_most_precise.hpp>
 
 
-namespace boost{ namespace geometry 
-{ 
+namespace boost{ namespace geometry
+{
 
 
-// Specialize for Boost.Geometry's coordinate cast 
+// Specialize for Boost.Geometry's coordinate cast
 // (from string to coordinate type)
 namespace detail
 {
@@ -70,7 +70,7 @@ struct coordinate_cast<rational<T> >
             }
             split_parts(source, p, before, after, negate, len);
 
-            return negate 
+            return negate
                 ? -rational<T>(before, after)
                 : rational<T>(before, after)
                 ;
@@ -85,7 +85,7 @@ struct coordinate_cast<rational<T> >
             den *= 10;
         }
 
-        return negate 
+        return negate
             ? -rational<T>(before) - rational<T>(after, den)
             : rational<T>(before) + rational<T>(after, den)
             ;
@@ -115,19 +115,19 @@ struct select_most_precise<boost::rational<T>, double>
 
 
 // Specializes boost::rational to boost::numeric::bounds
-namespace boost { namespace numeric 
+namespace boost { namespace numeric
 {
 
 template<class T>
 struct bounds<rational<T> >
 {
-    static inline rational<T> lowest() 
-    { 
-        return rational<T>(bounds<T>::lowest(), 1); 
+    static inline rational<T> lowest()
+    {
+        return rational<T>(bounds<T>::lowest(), 1);
     }
-    static inline rational<T> highest() 
-    { 
-        return rational<T>(bounds<T>::highest(), 1); 
+    static inline rational<T> highest()
+    {
+        return rational<T>(bounds<T>::highest(), 1);
     }
 };
 
diff --git a/include/boost/geometry/util/transform_variant.hpp b/include/boost/geometry/util/transform_variant.hpp
new file mode 100644
index 000000000..9e4a7aa15
--- /dev/null
+++ b/include/boost/geometry/util/transform_variant.hpp
@@ -0,0 +1,79 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_UTIL_TRANSFORM_VARIANT_HPP
+#define BOOST_GEOMETRY_UTIL_TRANSFORM_VARIANT_HPP
+
+
+#include <boost/mpl/transform.hpp>
+#include <boost/variant/variant_fwd.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+/*!
+    \brief Meta-function that takes a Sequence type, an MPL lambda
+        expression and an optional Inserter and returns a variant type over
+        the same types as the initial variant type, each transformed using
+        the lambda expression.
+    \ingroup utility
+    \par Example
+    \code
+        typedef mpl::vector<int, float, long> types;
+        typedef transform_variant<types, add_pointer<_> > transformed;
+        typedef variant<int*, float*, long*> result;
+        BOOST_MPL_ASSERT(( equal<result, transformed> ));
+    \endcode
+*/
+template <typename Sequence, typename Op, typename In = boost::mpl::na>
+struct transform_variant:
+    make_variant_over<
+        typename mpl::transform<
+            Sequence,
+            Op,
+            In
+        >::type
+    >
+{};
+
+
+/*!
+    \brief Meta-function that takes a boost::variant type and an MPL lambda
+        expression and returns a variant type over the same types as the
+        initial variant type, each transformed using the lambda expression.
+    \ingroup utility
+    \par Example
+    \code
+        typedef variant<int, float, long> variant_type;
+        typedef transform_variant<variant_type, add_pointer<_> > transformed;
+        typedef variant<int*, float*, long*> result;
+        BOOST_MPL_ASSERT(( equal<result, transformed> ));
+    \endcode
+*/
+template <BOOST_VARIANT_ENUM_PARAMS(typename T), typename Op>
+struct transform_variant<variant<BOOST_VARIANT_ENUM_PARAMS(T)>, Op, boost::mpl::na> :
+    make_variant_over<
+        typename mpl::transform<
+            typename variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+            Op
+        >::type
+    >
+{};
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_UTIL_TRANSFORM_VARIANT_HPP
diff --git a/include/boost/geometry/views/box_view.hpp b/include/boost/geometry/views/box_view.hpp
index 26608b086..3f448efe8 100644
--- a/include/boost/geometry/views/box_view.hpp
+++ b/include/boost/geometry/views/box_view.hpp
@@ -43,29 +43,29 @@ namespace boost { namespace geometry
 \qbk{[include reference/views/box_view.qbk]}
 */
 template <typename Box, bool Clockwise = true>
-struct box_view 
+struct box_view
     : public detail::points_view
         <
-            typename geometry::point_type<Box>::type, 
+            typename geometry::point_type<Box>::type,
             5
         >
 {
     typedef typename geometry::point_type<Box>::type point_type;
-    
+
     /// Constructor accepting the box to adapt
     explicit box_view(Box const& box)
         : detail::points_view<point_type, 5>(copy_policy(box))
     {}
-    
-private :    
-    
+
+private :
+
     class copy_policy
     {
     public :
         inline copy_policy(Box const& box)
             : m_box(box)
         {}
-        
+
         inline void apply(point_type* points) const
         {
             detail::assign_box_corners_oriented<!Clockwise>(m_box, points);
diff --git a/include/boost/geometry/views/closeable_view.hpp b/include/boost/geometry/views/closeable_view.hpp
index 882de1ae6..1f1eb2720 100644
--- a/include/boost/geometry/views/closeable_view.hpp
+++ b/include/boost/geometry/views/closeable_view.hpp
@@ -30,7 +30,7 @@ namespace boost { namespace geometry
 
 // Silence warning C4512: assignment operator could not be generated
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4512)
 #endif
 
@@ -67,7 +67,7 @@ private :
 /*!
 \brief View on a range, either closing it or leaving it as it is
 \details The closeable_view is used internally by the library to handle all rings,
-    either closed or open, the same way. The default method is closed, all 
+    either closed or open, the same way. The default method is closed, all
     algorithms process rings as if they are closed. Therefore, if they are opened,
     a view is created which closes them.
     The closeable_view might be used by library users, but its main purpose is
diff --git a/include/boost/geometry/views/detail/indexed_point_view.hpp b/include/boost/geometry/views/detail/indexed_point_view.hpp
new file mode 100644
index 000000000..88b13ec5c
--- /dev/null
+++ b/include/boost/geometry/views/detail/indexed_point_view.hpp
@@ -0,0 +1,112 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_VIEWS_DETAIL_INDEXED_POINT_VIEW_HPP
+#define BOOST_GEOMETRY_VIEWS_DETAIL_INDEXED_POINT_VIEW_HPP
+
+#include <cstddef>
+
+#include <boost/geometry/core/access.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+#include <boost/geometry/core/coordinate_system.hpp>
+#include <boost/geometry/core/coordinate_dimension.hpp>
+#include <boost/geometry/util/math.hpp>
+
+namespace boost { namespace geometry
+{
+
+namespace detail
+{
+
+template <typename Geometry, std::size_t Index>
+class indexed_point_view
+{
+    indexed_point_view & operator=(indexed_point_view const&);
+
+public:
+    typedef typename geometry::point_type<Geometry>::type point_type;
+    typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
+
+    indexed_point_view(Geometry & geometry)
+        : m_geometry(geometry)
+    {}
+
+    template <std::size_t Dimension>
+    inline coordinate_type get() const
+    {
+        return geometry::get<Index, Dimension>(m_geometry);
+    }
+
+    template <std::size_t Dimension>
+    inline void set(coordinate_type const& value)
+    {
+        geometry::set<Index, Dimension>(m_geometry, value);
+    }
+
+private:
+    Geometry & m_geometry;
+};
+
+}
+
+#ifndef DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+namespace traits
+{
+
+template <typename Geometry, std::size_t Index>
+struct tag< detail::indexed_point_view<Geometry, Index> >
+{
+    typedef point_tag type;
+};
+
+template <typename Geometry, std::size_t Index>
+struct coordinate_type< detail::indexed_point_view<Geometry, Index> >
+{
+    typedef typename geometry::coordinate_type<Geometry>::type type;
+};
+
+template <typename Geometry, std::size_t Index>
+struct coordinate_system< detail::indexed_point_view<Geometry, Index> >
+{
+    typedef typename geometry::coordinate_system<Geometry>::type type;
+};
+
+template <typename Geometry, std::size_t Index>
+struct dimension< detail::indexed_point_view<Geometry, Index> >
+    : geometry::dimension<Geometry>
+{};
+
+template<typename Geometry, std::size_t Index, std::size_t Dimension>
+struct access< detail::indexed_point_view<Geometry, Index>, Dimension >
+{
+    typedef typename geometry::coordinate_type<Geometry>::type coordinate_type;
+
+    static inline coordinate_type get(
+        detail::indexed_point_view<Geometry, Index> const& p)
+    {
+        return p.template get<Dimension>();
+    }
+
+    static inline void set(
+        detail::indexed_point_view<Geometry, Index> & p,
+        coordinate_type const& value)
+    {
+        p.template set<Dimension>(value);
+    }
+};
+
+} // namespace traits
+#endif // DOXYGEN_NO_TRAITS_SPECIALIZATIONS
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_VIEWS_DETAIL_INDEXED_POINT_VIEW_HPP
diff --git a/include/boost/geometry/views/detail/normalized_view.hpp b/include/boost/geometry/views/detail/normalized_view.hpp
new file mode 100644
index 000000000..d50ffe48c
--- /dev/null
+++ b/include/boost/geometry/views/detail/normalized_view.hpp
@@ -0,0 +1,116 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_VIEWS_DETAIL_NORMALIZED_VIEW_HPP
+#define BOOST_GEOMETRY_VIEWS_DETAIL_NORMALIZED_VIEW_HPP
+
+
+#include <boost/range/begin.hpp>
+#include <boost/range/end.hpp>
+#include <boost/range/iterator.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/geometry/views/detail/range_type.hpp>
+#include <boost/geometry/views/reversible_view.hpp>
+#include <boost/geometry/views/closeable_view.hpp>
+
+namespace boost { namespace geometry {
+
+
+#ifndef DOXYGEN_NO_DETAIL
+
+namespace detail {
+
+template <typename Geometry>
+struct normalized_view
+{
+    static const bool is_const = boost::is_const<Geometry>::value;
+
+    //typedef typename ring_type<Geometry>::type ring_type;
+
+    typedef typename detail::range_type<Geometry>::type range_type;
+
+    typedef typename
+        boost::mpl::if_c
+            <
+                is_const,
+                range_type const,
+                range_type
+            >::type range;
+
+    typedef typename
+        reversible_view
+            <
+                range,
+                order_as_direction
+                    <
+                        geometry::point_order<Geometry>::value
+                    >::value
+            >::type reversible_type;
+
+    typedef typename
+        boost::mpl::if_c
+            <
+                is_const,
+                reversible_type const,
+                reversible_type
+            >::type reversible;
+
+    typedef typename
+        closeable_view
+            <
+                reversible,
+                geometry::closure<Geometry>::value
+            >::type closeable_type;
+
+    typedef typename
+        boost::mpl::if_c
+            <
+                is_const,
+                closeable_type const,
+                closeable_type
+            >::type closeable;
+    
+    explicit inline normalized_view(range & r)
+        : m_reversible(r)
+        , m_closeable(m_reversible)
+    {}
+
+    typedef typename boost::range_iterator<closeable>::type iterator;
+    typedef typename boost::range_const_iterator<closeable>::type const_iterator;
+
+    inline const_iterator begin() const { return boost::begin(m_closeable); }
+    inline const_iterator end() const { return boost::end(m_closeable); }
+
+    inline iterator begin() { return boost::begin(m_closeable); }
+    inline iterator end() { return boost::end(m_closeable); }
+
+private:
+    reversible_type m_reversible;
+    closeable_type m_closeable;
+};
+
+} // namespace detail
+
+#endif // DOXYGEN_NO_DETAIL
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_VIEWS_DETAIL_NORMALIZED_VIEW_HPP
diff --git a/include/boost/geometry/views/detail/points_view.hpp b/include/boost/geometry/views/detail/points_view.hpp
index 91fbc41c1..3f6fdc609 100644
--- a/include/boost/geometry/views/detail/points_view.hpp
+++ b/include/boost/geometry/views/detail/points_view.hpp
@@ -47,21 +47,21 @@ class points_view
         // Constructor: Begin iterator
         inline points_iterator(Point const* p)
             : m_points(p)
-            , m_index(0) 
+            , m_index(0)
         {}
 
         // Constructor: End iterator
         inline points_iterator(Point const* p, bool)
             : m_points(p)
-            , m_index(MaxSize) 
+            , m_index(MaxSize)
         {}
 
         // Constructor: default (for Range Concept checking).
         inline points_iterator()
             : m_points(NULL)
-            , m_index(MaxSize) 
+            , m_index(MaxSize)
         {}
-        
+
         typedef std::ptrdiff_t difference_type;
 
     private:
@@ -73,7 +73,7 @@ class points_view
             {
                 return m_points[m_index];
             }
-            
+
             // If it index larger (or smaller) return first point
             // (assuming initialized)
             return m_points[0];
@@ -98,7 +98,7 @@ class points_view
         {
             return other.m_index - this->m_index;
         }
-        
+
         inline void advance(difference_type n)
         {
             m_index += n;
@@ -127,8 +127,8 @@ protected :
     {
        copy.apply(m_points);
     }
-    
-private :    
+
+private :
     // Copy points here - box might define them otherwise
     Point m_points[MaxSize];
 };
diff --git a/include/boost/geometry/views/detail/range_type.hpp b/include/boost/geometry/views/detail/range_type.hpp
index a40670cf9..fff634c37 100644
--- a/include/boost/geometry/views/detail/range_type.hpp
+++ b/include/boost/geometry/views/detail/range_type.hpp
@@ -16,7 +16,7 @@
 
 
 #include <boost/mpl/assert.hpp>
-#include <boost/type_traits.hpp>
+#include <boost/range/value_type.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/core/tag.hpp>
@@ -33,7 +33,8 @@ namespace dispatch
 {
 
 
-template <typename GeometryTag, typename Geometry>
+template <typename Geometry,
+          typename Tag = typename tag<Geometry>::type>
 struct range_type
 {
     BOOST_MPL_ASSERT_MSG
@@ -45,31 +46,59 @@ struct range_type
 
 
 template <typename Geometry>
-struct range_type<ring_tag, Geometry>
-{
-    typedef Geometry type;
-};
-
-template <typename Geometry>
-struct range_type<linestring_tag, Geometry>
+struct range_type<Geometry, ring_tag>
 {
     typedef Geometry type;
 };
 
 
 template <typename Geometry>
-struct range_type<polygon_tag, Geometry>
+struct range_type<Geometry, linestring_tag>
+{
+    typedef Geometry type;
+};
+
+
+template <typename Geometry>
+struct range_type<Geometry, polygon_tag>
 {
     typedef typename ring_type<Geometry>::type type;
 };
 
+
 template <typename Geometry>
-struct range_type<box_tag, Geometry>
+struct range_type<Geometry, box_tag>
 {
     typedef box_view<Geometry> type;
 };
 
 
+// multi-point acts itself as a range
+template <typename Geometry>
+struct range_type<Geometry, multi_point_tag>
+{
+    typedef Geometry type;
+};
+
+
+template <typename Geometry>
+struct range_type<Geometry, multi_linestring_tag>
+{
+    typedef typename boost::range_value<Geometry>::type type;
+};
+
+
+template <typename Geometry>
+struct range_type<Geometry, multi_polygon_tag>
+{
+    // Call its single-version
+    typedef typename dispatch::range_type
+        <
+            typename boost::range_value<Geometry>::type
+        >::type type;
+};
+
+
 } // namespace dispatch
 #endif // DOXYGEN_NO_DISPATCH
 
@@ -93,7 +122,6 @@ struct range_type
 {
     typedef typename dispatch::range_type
         <
-            typename tag<Geometry>::type,
             Geometry
         >::type type;
 };
diff --git a/include/boost/geometry/views/identity_view.hpp b/include/boost/geometry/views/identity_view.hpp
index 5cb9d91f7..8947ebf6f 100644
--- a/include/boost/geometry/views/identity_view.hpp
+++ b/include/boost/geometry/views/identity_view.hpp
@@ -23,7 +23,7 @@ namespace boost { namespace geometry
 
 // Silence warning C4512: assignment operator could not be generated
 #if defined(_MSC_VER)
-#pragma warning(push)  
+#pragma warning(push)
 #pragma warning(disable : 4512)
 #endif
 
diff --git a/include/boost/geometry/views/segment_view.hpp b/include/boost/geometry/views/segment_view.hpp
index 50ff617a8..ce676fc4b 100644
--- a/include/boost/geometry/views/segment_view.hpp
+++ b/include/boost/geometry/views/segment_view.hpp
@@ -28,7 +28,7 @@ namespace boost { namespace geometry
 
 /*!
 \brief Makes a segment behave like a linestring or a range
-\details Adapts a segment to the Boost.Range concept, enabling the user to 
+\details Adapts a segment to the Boost.Range concept, enabling the user to
     iterate the two segment points. The segment_view is registered as a LineString Concept
 \tparam Segment \tparam_geometry{Segment}
 \ingroup views
@@ -45,26 +45,26 @@ template <typename Segment>
 struct segment_view
     : public detail::points_view
         <
-            typename geometry::point_type<Segment>::type, 
+            typename geometry::point_type<Segment>::type,
             2
         >
 {
     typedef typename geometry::point_type<Segment>::type point_type;
-    
+
     /// Constructor accepting the segment to adapt
     explicit segment_view(Segment const& segment)
         : detail::points_view<point_type, 2>(copy_policy(segment))
     {}
-    
-private :    
-    
+
+private :
+
     class copy_policy
     {
     public :
         inline copy_policy(Segment const& segment)
             : m_segment(segment)
         {}
-        
+
         inline void apply(point_type* points) const
         {
             geometry::detail::assign_point_from_index<0>(m_segment, points[0]);
diff --git a/index/Jamfile.v2 b/index/Jamfile.v2
new file mode 100644
index 000000000..3675b7f06
--- /dev/null
+++ b/index/Jamfile.v2
@@ -0,0 +1,18 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+#
+# 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)
+
+project boost-geometry-index
+    :
+    requirements
+        <toolset>msvc:<asynch-exceptions>on
+    ;
+
+build-project test ;
+build-project example ;
diff --git a/index/example/benchmark.cpp b/index/example/benchmark.cpp
index 269ea4533..ba2a1dec9 100644
--- a/index/example/benchmark.cpp
+++ b/index/example/benchmark.cpp
@@ -9,6 +9,7 @@
 
 #include <iostream>
 
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/chrono.hpp>
diff --git a/index/example/benchmark2.cpp b/index/example/benchmark2.cpp
index eedeac1b8..48194cbd8 100644
--- a/index/example/benchmark2.cpp
+++ b/index/example/benchmark2.cpp
@@ -10,6 +10,7 @@
 
 #include <iostream>
 
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/chrono.hpp>
diff --git a/index/example/benchmark3.cpp b/index/example/benchmark3.cpp
index 6898e4eb8..ad1910e45 100644
--- a/index/example/benchmark3.cpp
+++ b/index/example/benchmark3.cpp
@@ -9,6 +9,7 @@
 
 #include <iostream>
 
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/chrono.hpp>
diff --git a/index/example/benchmark_experimental.cpp b/index/example/benchmark_experimental.cpp
index 34b08744f..45248008d 100644
--- a/index/example/benchmark_experimental.cpp
+++ b/index/example/benchmark_experimental.cpp
@@ -15,6 +15,7 @@
 #include <boost/foreach.hpp>
 #include <boost/random.hpp>
 
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/segment.hpp>
@@ -26,8 +27,10 @@ typedef bg::model::point<double, 2, bg::cs::cartesian> P;
 typedef bg::model::box<P> B;
 typedef bg::model::linestring<P> LS;
 typedef bg::model::segment<P> S;
-typedef B V;
 //typedef P V;
+typedef B V;
+//typedef S V;
+//#define SEGMENT_INDEXABLE
 
 template <typename V>
 struct generate_value {};
@@ -38,6 +41,12 @@ struct generate_value<B>
     static inline B apply(float x, float y) { return B(P(x - 0.5f, y - 0.5f), P(x + 0.5f, y + 0.5f)); }
 };
 
+template <>
+struct generate_value<S>
+{
+    static inline S apply(float x, float y) { return S(P(x - 0.5f, y - 0.5f), P(x + 0.5f, y + 0.5f)); }
+};
+
 template <>
 struct generate_value<P>
 {
@@ -278,6 +287,7 @@ int main()
             std::cout << time << " - range type-erased qbegin(B) qend() " << queries_count << " found " << temp << '\n';
         }
 
+#ifndef SEGMENT_INDEXABLE
         {
             clock_t::time_point start = clock_t::now();
             size_t temp = 0;
@@ -304,6 +314,7 @@ int main()
             dur_t time = clock_t::now() - start;
             std::cout << time << " - query(i && !w && !c) " << queries_count << " found " << temp << '\n';
         }
+#endif
 
         result.clear();
 
@@ -376,6 +387,7 @@ int main()
         }
 
 #ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+#ifndef SEGMENT_INDEXABLE
 
         {
             LS ls;
@@ -436,6 +448,7 @@ int main()
             dur_t time = clock_t::now() - start;
             std::cout << time << " - query(path(S, " << path_values_count << ")) " << path_queries_count2 << " found " << temp << '\n';
         }
+#endif
 #endif
         {
             clock_t::time_point start = clock_t::now();
diff --git a/index/example/glut_vis.cpp b/index/example/glut_vis.cpp
index e0e6a00c0..2c5f5740b 100644
--- a/index/example/glut_vis.cpp
+++ b/index/example/glut_vis.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
-// Additional tests
+// OpenGL visualization
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,13 +11,14 @@
 
 #include <boost/foreach.hpp>
 
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
 
 #include <boost/geometry/index/detail/rtree/utilities/gl_draw.hpp>
 #include <boost/geometry/index/detail/rtree/utilities/print.hpp>
@@ -25,29 +26,172 @@
 #include <boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp>
 #include <boost/geometry/index/detail/rtree/utilities/statistics.hpp>
 
+#include <boost/variant.hpp>
+
+#define ENABLE_POINTS_AND_SEGMENTS
+
 namespace bg = boost::geometry;
 namespace bgi = bg::index;
 
+// used types
+
 typedef bg::model::point<float, 2, boost::geometry::cs::cartesian> P;
 typedef bg::model::box<P> B;
-//bgi::rtree<B> t(2, 1);
 typedef bg::model::linestring<P> LS;
 typedef bg::model::segment<P> S;
 typedef bg::model::ring<P> R;
 typedef bg::model::polygon<P> Poly;
 typedef bg::model::multi_polygon<Poly> MPoly;
 
-typedef bgi::rtree<
-    B,
-    bgi::rstar<4, 2>
-> RTree;
-RTree t;
-std::vector<B> vect;
+// containers variant
+
+template <typename V>
+struct containers
+{
+    containers & operator=(containers const& c)
+    {
+        tree = c.tree;
+        values = c.values;
+        result = c.result;
+        return *this;
+    }
+
+    bgi::rtree< V, bgi::rstar<4, 2> > tree;
+    std::vector<V> values;
+    std::vector<V> result;
+};
+
+boost::variant<
+    containers<B>
+#ifdef ENABLE_POINTS_AND_SEGMENTS
+  , containers<P>
+  , containers<S>
+#endif
+> cont;
+
+// visitors
+
+template <typename Pred>
+struct query_v : boost::static_visitor<size_t>
+{
+    Pred m_pred;
+    query_v(Pred const& pred) : m_pred(pred) {}
+
+    template <typename C>
+    size_t operator()(C & c) const
+    {
+        c.result.clear();
+        return c.tree.query(m_pred, std::back_inserter(c.result));
+    }
+};
+template <typename Cont, typename Pred>
+inline size_t query(Cont & cont, Pred const& pred)
+{
+    return boost::apply_visitor(query_v<Pred>(pred), cont);
+}
+
+struct print_result_v : boost::static_visitor<>
+{
+    template <typename C>
+    void operator()(C & c) const
+    {
+        for ( size_t i = 0 ; i < c.result.size() ; ++i )
+        {
+            bgi::detail::utilities::print_indexable(std::cout, c.result[i]);
+            std::cout << '\n';
+        }
+    }
+};
+template <typename Cont>
+inline void print_result(Cont const& cont)
+{
+    boost::apply_visitor(print_result_v(), cont);
+}
+
+struct bounds_v : boost::static_visitor<B>
+{
+    template <typename C>
+    B operator()(C & c) const
+    {
+        return c.tree.bounds();
+    }
+};
+template <typename Cont>
+inline B bounds(Cont const& cont)
+{
+    return boost::apply_visitor(bounds_v(), cont);
+}
+
+struct depth_v : boost::static_visitor<size_t>
+{
+    template <typename C>
+    size_t operator()(C & c) const
+    {
+        return get(c.tree);
+    }
+    template <typename RTree>
+    static size_t get(RTree const& t)
+    {
+        return bgi::detail::rtree::utilities::view<RTree>(t).depth();
+    }
+};
+template <typename Cont>
+inline size_t depth(Cont const& cont)
+{
+    return boost::apply_visitor(depth_v(), cont);
+}
+
+struct draw_tree_v : boost::static_visitor<>
+{
+    template <typename C>
+    void operator()(C & c) const
+    {
+        bgi::detail::rtree::utilities::gl_draw(c.tree);
+    }
+};
+template <typename Cont>
+inline void draw_tree(Cont const& cont)
+{
+    return boost::apply_visitor(draw_tree_v(), cont);
+}
+
+struct draw_result_v : boost::static_visitor<>
+{
+    template <typename C>
+    void operator()(C & c) const
+    {
+        for ( size_t i = 0 ; i < c.result.size() ; ++i )
+        {
+            bgi::detail::utilities::gl_draw_indexable(c.result[i], depth_v::get(c.tree));
+        }
+    }
+};
+template <typename Cont>
+inline void draw_result(Cont const& cont)
+{
+    return boost::apply_visitor(draw_result_v(), cont);
+}
+
+struct print_tree_v : boost::static_visitor<>
+{
+    template <typename C>
+    void operator()(C & c) const
+    {
+        bgi::detail::rtree::utilities::print(std::cout, c.tree);        
+    }
+};
+template <typename Cont>
+inline void print_tree(Cont const& cont)
+{
+    return boost::apply_visitor(print_tree_v(), cont);
+}
+
+// globals used in querying
 
 size_t found_count = 0;
-P search_point;
 size_t count = 5;
-std::vector<B> nearest_boxes;
+
+P search_point;
 B search_box;
 R search_ring;
 Poly search_poly;
@@ -57,38 +201,73 @@ LS search_linestring;
 LS search_path;
 
 enum query_mode_type {
-    qm_knn, qm_c, qm_d, qm_i, qm_o, qm_w, qm_nc, qm_nd, qm_ni, qm_no, qm_nw, qm_all, qm_ri, qm_pi, qm_mpi, qm_si, qm_lsi, qm_path
+    qm_knn, qm_knnb, qm_knns, qm_c, qm_d, qm_i, qm_o, qm_w, qm_nc, qm_nd, qm_ni, qm_no, qm_nw, qm_all, qm_ri, qm_pi, qm_mpi, qm_si, qm_lsi, qm_path
 } query_mode = qm_knn;
 
 bool search_valid = false;
 
+// various queries
+
 void query_knn()
 {
     float x = ( rand() % 1000 ) / 10.0f;
     float y = ( rand() % 1000 ) / 10.0f;
 
-    search_point = P(x, y);
-    nearest_boxes.clear();
-    found_count = t.query(
-        bgi::nearest(search_point, count),
-        std::back_inserter(nearest_boxes)
-        );
+    if ( query_mode == qm_knn )
+    {
+        search_point = P(x, y);
+        found_count = query(cont, bgi::nearest(search_point, count));
+    }
+    else if ( query_mode == qm_knnb )
+    {
+        float w = 2 + ( rand() % 1000 ) / 500.0f;
+        float h = 2 + ( rand() % 1000 ) / 500.0f;
+        search_box = B(P(x - w, y - h), P(x + w, y + h));
+        found_count = query(cont, bgi::nearest(search_box, count));
+    }
+    else if ( query_mode == qm_knns )
+    {
+        int signx = rand() % 2 ? 1 : -1;
+        int signy = rand() % 2 ? 1 : -1;
+        float w = (10 + ( rand() % 1000 ) / 100.0f) * signx;
+        float h = (10 + ( rand() % 1000 ) / 100.0f) * signy;
+        search_segment = S(P(x - w, y - h), P(x + w, y + h));
+        found_count = query(cont, bgi::nearest(search_segment, count));
+    }
+    else
+    {
+        BOOST_ASSERT(false);
+    }
 
     if ( found_count > 0 )
     {
-        std::cout << "search point: ";
-        bgi::detail::utilities::print_indexable(std::cout, search_point);
-        std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
+        if ( query_mode == qm_knn )
         {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
+            std::cout << "search point: ";
+            bgi::detail::utilities::print_indexable(std::cout, search_point);
         }
+        else if ( query_mode == qm_knnb )
+        {
+            std::cout << "search box: ";
+            bgi::detail::utilities::print_indexable(std::cout, search_box);
+        }
+        else if ( query_mode == qm_knns )
+        {
+            std::cout << "search segment: ";
+            bgi::detail::utilities::print_indexable(std::cout, search_segment);
+        }
+        else
+        {
+            BOOST_ASSERT(false);
+        }
+        std::cout << "\nfound: ";
+        print_result(cont);
     }
     else
         std::cout << "nearest not found\n";
 }
 
+#ifndef ENABLE_POINTS_AND_SEGMENTS
 void query_path()
 {
     float x = ( rand() % 1000 ) / 10.0f;
@@ -104,11 +283,7 @@ void query_path()
         search_path[2 * i + 1] = P(x+w, yy);
     }
         
-    nearest_boxes.clear();
-    found_count = t.query(
-        bgi::detail::path<LS>(search_path, count),
-        std::back_inserter(nearest_boxes)
-        );
+    found_count = query(cont, bgi::detail::path<LS>(search_path, count));
 
     if ( found_count > 0 )
     {
@@ -116,15 +291,12 @@ void query_path()
         BOOST_FOREACH(P const& p, search_path)
             bgi::detail::utilities::print_indexable(std::cout, p);
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "values on path not found\n";
 }
+#endif
 
 template <typename Predicate>
 void query()
@@ -137,26 +309,20 @@ void query()
         float h = 10 + ( rand() % 1000 ) / 100.0f;
 
         search_box = B(P(x - w, y - h), P(x + w, y + h));
-        nearest_boxes.clear();
-        found_count = t.query(Predicate(search_box), std::back_inserter(nearest_boxes) );
     }
     else
     {
-        search_box = t.bounds();
-        nearest_boxes.clear();
-        found_count = t.query(Predicate(search_box), std::back_inserter(nearest_boxes) );
+        search_box = bounds(cont);
     }
 
+    found_count = query(cont, Predicate(search_box));
+
     if ( found_count > 0 )
     {
         std::cout << "search box: ";
         bgi::detail::utilities::print_indexable(std::cout, search_box);
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
@@ -189,8 +355,7 @@ void query_ring()
     search_ring.push_back(P(x - w, y - h/2));
     search_ring.push_back(P(x - w, y - h));
         
-    nearest_boxes.clear();
-    found_count = t.query(Predicate(search_ring), std::back_inserter(nearest_boxes) );
+    found_count = query(cont, Predicate(search_ring));
     
     if ( found_count > 0 )
     {
@@ -201,11 +366,7 @@ void query_ring()
             std::cout << ' ';
         }
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
@@ -245,8 +406,7 @@ void query_poly()
     search_poly.inners()[0].push_back(P(x - w/2, y + h/2));
     search_poly.inners()[0].push_back(P(x - w/2, y - h/2));
 
-    nearest_boxes.clear();
-    found_count = t.query(Predicate(search_poly), std::back_inserter(nearest_boxes) );
+    found_count = query(cont, Predicate(search_poly));
 
     if ( found_count > 0 )
     {
@@ -257,11 +417,7 @@ void query_poly()
             std::cout << ' ';
         }
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
@@ -317,9 +473,8 @@ void query_multi_poly()
     search_multi_poly[2].outer().push_back(P(x + 6*w/5, y + 2*h));
     search_multi_poly[2].outer().push_back(P(x + 6*w/5, y + 6*h/5));
 
-    nearest_boxes.clear();
-    found_count = t.query(Predicate(search_multi_poly), std::back_inserter(nearest_boxes) );
-
+    found_count = query(cont, Predicate(search_multi_poly));
+    
     if ( found_count > 0 )
     {
         std::cout << "search multi_poly[0] outer: ";
@@ -329,11 +484,7 @@ void query_multi_poly()
             std::cout << ' ';
         }
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
@@ -354,9 +505,8 @@ void query_segment()
     boost::geometry::set<1, 0>(search_segment, x + w);
     boost::geometry::set<1, 1>(search_segment, y + h);
 
-    nearest_boxes.clear();
-    found_count = t.query(Predicate(search_segment), std::back_inserter(nearest_boxes) );
-
+    found_count = query(cont, Predicate(search_segment));
+    
     if ( found_count > 0 )
     {
         std::cout << "search segment: ";
@@ -364,11 +514,7 @@ void query_segment()
         bgi::detail::utilities::print_indexable(std::cout, P(x+w, y+h));
 
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
@@ -392,9 +538,8 @@ void query_linestring()
         search_linestring.push_back(P(xx, yy));
     }
 
-    nearest_boxes.clear();
-    found_count = t.query(Predicate(search_linestring), std::back_inserter(nearest_boxes) );
-
+    found_count = query(cont, Predicate(search_linestring));
+    
     if ( found_count > 0 )
     {
         std::cout << "search linestring: ";
@@ -404,44 +549,46 @@ void query_linestring()
             std::cout << ' ';
         }
         std::cout << "\nfound: ";
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-        {
-            bgi::detail::utilities::print_indexable(std::cout, nearest_boxes[i]);
-            std::cout << '\n';
-        }
+        print_result(cont);
     }
     else
         std::cout << "boxes not found\n";
 }
 
+// the function running the correct query based on the query_mode
+
 void search()
 {
     namespace d = bgi::detail;
 
-    if ( query_mode == qm_knn )
+    if ( query_mode == qm_knn || query_mode == qm_knnb || query_mode == qm_knns )
         query_knn();
-    else if ( query_mode == qm_c )
-        query< d::spatial_predicate<B, d::covered_by_tag, false> >();
     else if ( query_mode == qm_d )
         query< d::spatial_predicate<B, d::disjoint_tag, false> >();
     else if ( query_mode == qm_i )
         query< d::spatial_predicate<B, d::intersects_tag, false> >();
+    else if ( query_mode == qm_nd )
+        query< d::spatial_predicate<B, d::disjoint_tag, true> >();
+    else if ( query_mode == qm_ni )
+        query< d::spatial_predicate<B, d::intersects_tag, true> >();
+    else if ( query_mode == qm_all )
+        query< d::spatial_predicate<B, d::intersects_tag, false> >();
+#ifdef ENABLE_POINTS_AND_SEGMENTS
+    else
+        std::cout << "query disabled\n";
+#else
+    else if ( query_mode == qm_c )
+        query< d::spatial_predicate<B, d::covered_by_tag, false> >();
     else if ( query_mode == qm_o )
         query< d::spatial_predicate<B, d::overlaps_tag, false> >();
     else if ( query_mode == qm_w )
         query< d::spatial_predicate<B, d::within_tag, false> >();
     else if ( query_mode == qm_nc )
         query< d::spatial_predicate<B, d::covered_by_tag, true> >();
-    else if ( query_mode == qm_nd )
-        query< d::spatial_predicate<B, d::disjoint_tag, true> >();
-    else if ( query_mode == qm_ni )
-        query< d::spatial_predicate<B, d::intersects_tag, true> >();
     else if ( query_mode == qm_no )
         query< d::spatial_predicate<B, d::overlaps_tag, true> >();
     else if ( query_mode == qm_nw )
         query< d::spatial_predicate<B, d::within_tag, true> >();
-    else if ( query_mode == qm_all )
-        query< d::spatial_predicate<B, d::intersects_tag, false> >();
     else if ( query_mode == qm_ri )
         query_ring< d::spatial_predicate<R, d::intersects_tag, false> >();
     else if ( query_mode == qm_pi )
@@ -454,22 +601,34 @@ void search()
         query_linestring< d::spatial_predicate<LS, d::intersects_tag, false> >();
     else if ( query_mode == qm_path )
         query_path();
+#endif
 
     search_valid = true;
 }
 
+// various drawing functions
+
+void draw_point(P const& p)
+{
+    float x = boost::geometry::get<0>(p);
+    float y = boost::geometry::get<1>(p);
+    float z = depth(cont);
+
+    glBegin(GL_QUADS);
+    glVertex3f(x+1, y, z);
+    glVertex3f(x, y+1, z);
+    glVertex3f(x-1, y, z);
+    glVertex3f(x, y-1, z);
+    glEnd();
+}
+
 void draw_knn_area(float min_distance, float max_distance)
 {
     float x = boost::geometry::get<0>(search_point);
     float y = boost::geometry::get<1>(search_point);
-    float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+    float z = depth(cont);
 
-    // search point
-    glBegin(GL_TRIANGLES);
-    glVertex3f(x, y, z);
-    glVertex3f(x + 1, y, z);
-    glVertex3f(x + 1, y + 1, z);
-    glEnd();
+    draw_point(search_point);
 
     // search min circle
 
@@ -494,7 +653,7 @@ void draw_linestring(LS const& ls)
     {
         float x = boost::geometry::get<0>(p);
         float y = boost::geometry::get<1>(p);
-        float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+        float z = depth(cont);
         glVertex3f(x, y, z);
     }
 
@@ -507,7 +666,7 @@ void draw_segment(S const& s)
     float y1 = boost::geometry::get<0, 1>(s);
     float x2 = boost::geometry::get<1, 0>(s);
     float y2 = boost::geometry::get<1, 1>(s);
-    float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+    float z = depth(cont);
 
     glBegin(GL_LINES);
     glVertex3f(x1, y1, z);
@@ -522,7 +681,7 @@ void draw_box(Box const& box)
     float y1 = boost::geometry::get<bg::min_corner, 1>(box);
     float x2 = boost::geometry::get<bg::max_corner, 0>(box);
     float y2 = boost::geometry::get<bg::max_corner, 1>(box);
-    float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+    float z = depth(cont);
 
     // search box
     glBegin(GL_LINE_LOOP);
@@ -536,7 +695,7 @@ void draw_box(Box const& box)
 template <typename Range>
 void draw_ring(Range const& range)
 {
-    float z = bgi::detail::rtree::utilities::view<RTree>(t).depth();
+    float z = depth(cont);
 
     // search box
     glBegin(GL_LINE_LOOP);
@@ -566,18 +725,24 @@ void draw_multi_polygon(MultiPolygon const& multi_polygon)
         draw_polygon(p);
 }
 
+// render the scene -> tree, if searching data available also the query geometry and result
+
 void render_scene(void)
 {
     glClear(GL_COLOR_BUFFER_BIT);
 
-    bgi::detail::rtree::utilities::gl_draw(t);
+    draw_tree(cont);
 
     if ( search_valid )
     {
-        glColor3f(1.0f, 0.5f, 0.0f);
+        glColor3f(1.0f, 0.25f, 0.0f);
 
         if ( query_mode == qm_knn )
             draw_knn_area(0, 0);
+        else if ( query_mode == qm_knnb )
+            draw_box(search_box);
+        else if ( query_mode == qm_knns )
+            draw_segment(search_segment);
         else if ( query_mode == qm_ri )
             draw_ring(search_ring);
         else if ( query_mode == qm_pi )
@@ -593,10 +758,9 @@ void render_scene(void)
         else
             draw_box(search_box);
 
-        for ( size_t i = 0 ; i < nearest_boxes.size() ; ++i )
-            bgi::detail::utilities::gl_draw_indexable(
-                nearest_boxes[i],
-                bgi::detail::rtree::utilities::view<RTree>(t).depth());
+        glColor3f(1.0f, 0.5f, 0.0f);
+
+        draw_result(cont);
     }
 
     glFlush();
@@ -633,49 +797,100 @@ void resize(int w, int h)
     srand(1);
 }
 
+// randomize various indexables
+
+inline void rand_val(B & b)
+{
+    float x = ( rand() % 100 );
+    float y = ( rand() % 100 );
+    float w = ( rand() % 2 ) + 1;
+    float h = ( rand() % 2 ) + 1;
+    b = B(P(x - w, y - h),P(x + w, y + h));
+}
+inline void rand_val(P & p)
+{
+    float x = ( rand() % 100 );
+    float y = ( rand() % 100 );
+    p = P(x, y);
+}
+inline void rand_val(S & s)
+{
+    float x = ( rand() % 100 );
+    float y = ( rand() % 100 );
+    float w = ( rand() % 2 + 1) * (rand() % 2 ? 1.0f : -1.0f);
+    float h = ( rand() % 2 + 1) * (rand() % 2 ? 1.0f : -1.0f);
+    s = S(P(x - w, y - h),P(x + w, y + h));
+}
+
+// more higher-level visitors
+
+struct insert_random_value_v : boost::static_visitor<>
+{
+    template <typename V>
+    void operator()(containers<V> & c) const
+    {
+        V v;
+        rand_val(v);
+        
+        boost::geometry::index::insert(c.tree, v);
+        c.values.push_back(v);
+
+        std::cout << "inserted: ";
+        bgi::detail::utilities::print_indexable(std::cout, v);
+        std::cout << '\n';
+
+        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(c.tree) ? "boxes OK\n" : "WRONG BOXES!\n" );
+        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(c.tree) ? "levels OK\n" : "WRONG LEVELS!\n" );
+        std::cout << "\n";
+    }
+};
+template <typename Cont>
+inline void insert_random_value(Cont & cont)
+{
+    return boost::apply_visitor(insert_random_value_v(), cont);
+}
+
+struct remove_random_value_v : boost::static_visitor<>
+{
+    template <typename V>
+    void operator()(containers<V> & c) const
+    {
+        if ( c.values.empty() )
+            return;
+
+        size_t i = rand() % c.values.size();
+        V v = c.values[i];
+
+        c.tree.remove(v);
+        c.values.erase(c.values.begin() + i);
+
+        std::cout << "removed: ";
+        bgi::detail::utilities::print_indexable(std::cout, v);
+        std::cout << '\n';
+
+        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(c.tree) ? "boxes OK\n" : "WRONG BOXES!\n" );
+        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(c.tree) ? "levels OK\n" : "WRONG LEVELS!\n" );
+        std::cout << "\n";
+    }
+};
+template <typename Cont>
+inline void remove_random_value(Cont & cont)
+{
+    return boost::apply_visitor(remove_random_value_v(), cont);
+}
+
+// handle mouse input
+
 void mouse(int button, int state, int /*x*/, int /*y*/)
 {
     if ( button == GLUT_LEFT_BUTTON && state == GLUT_DOWN )
     {
-        float x = ( rand() % 100 );
-        float y = ( rand() % 100 );
-        float w = ( rand() % 2 ) + 1;
-        float h = ( rand() % 2 ) + 1;
-
-        B b(P(x - w, y - h),P(x + w, y + h));
-
-        boost::geometry::index::insert(t, b);
-        vect.push_back(b);
-
-        std::cout << "inserted: ";
-        bgi::detail::utilities::print_indexable(std::cout, b);
-        std::cout << '\n';
-
-        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" );
-        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" );
-        std::cout << "\n";
-
+        insert_random_value(cont);
         search_valid = false;
     }
     else if ( button == GLUT_RIGHT_BUTTON && state == GLUT_DOWN )
     {
-        if ( vect.empty() )
-            return;
-
-        size_t i = rand() % vect.size();
-        B b = vect[i];
-
-        bgi::remove(t, b);
-        vect.erase(vect.begin() + i);
-
-        std::cout << "removed: ";
-        bgi::detail::utilities::print_indexable(std::cout, b);
-        std::cout << '\n';
-
-        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" );
-        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" );
-        std::cout << "\n";
-
+        remove_random_value(cont);
         search_valid = false;
     }
     else if ( button == GLUT_MIDDLE_BUTTON && state == GLUT_DOWN )
@@ -686,71 +901,117 @@ void mouse(int button, int state, int /*x*/, int /*y*/)
     glutPostRedisplay();
 }
 
+// more higher-level visitors
+
+struct insert_random_values_v : boost::static_visitor<>
+{
+    template <typename V>
+    void operator()(containers<V> & c) const
+    {
+        for ( size_t i = 0 ; i < 35 ; ++i )
+        {
+            V v;
+            rand_val(v);
+
+            c.tree.insert(v);
+            c.values.push_back(v);
+
+            std::cout << "inserted: ";
+            bgi::detail::utilities::print_indexable(std::cout, v);
+            std::cout << '\n';
+        }
+
+        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(c.tree) ? "boxes OK\n" : "WRONG BOXES!\n" );
+        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(c.tree) ? "levels OK\n" : "WRONG LEVELS!\n" );
+        std::cout << "\n";
+    }
+};
+template <typename Cont>
+inline void insert_random_values(Cont & cont)
+{
+    return boost::apply_visitor(insert_random_values_v(), cont);
+}
+
+struct bulk_insert_random_values_v : boost::static_visitor<>
+{
+    template <typename V>
+    void operator()(containers<V> & c) const
+    {
+        c.values.clear();
+
+        for ( size_t i = 0 ; i < 35 ; ++i )
+        {
+            V v;
+            rand_val(v);
+
+            c.values.push_back(v);
+
+            std::cout << "inserted: ";
+            bgi::detail::utilities::print_indexable(std::cout, v);
+            std::cout << '\n';
+        }
+
+        create(c.tree, c.values);
+
+        std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(c.tree) ? "boxes OK\n" : "WRONG BOXES!\n" );
+        std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(c.tree) ? "levels OK\n" : "WRONG LEVELS!\n" );
+        std::cout << "\n";
+    }
+
+    template <typename Tree, typename Values>
+    void create(Tree & tree, Values const& values) const
+    {
+        Tree t(values);
+        tree = boost::move(t);
+    }
+};
+template <typename Cont>
+inline void bulk_insert_random_values(Cont & cont)
+{
+    return boost::apply_visitor(bulk_insert_random_values_v(), cont);
+}
+
+// handle keyboard input
+
 std::string current_line;
 
 void keyboard(unsigned char key, int /*x*/, int /*y*/)
 {
     if ( key == '\r' || key == '\n' )
     {
-        if ( current_line == "t" )
+        if ( current_line == "storeb" )
+        {
+            cont = containers<B>();
+            glutPostRedisplay();
+        }
+#ifdef ENABLE_POINTS_AND_SEGMENTS
+        else if ( current_line == "storep" )
+        {
+            cont = containers<P>();
+            glutPostRedisplay();
+        }
+        else if ( current_line == "stores" )
+        {
+            cont = containers<S>();
+            glutPostRedisplay();
+        }
+#endif
+        else if ( current_line == "t" )
         {
             std::cout << "\n";
-            bgi::detail::rtree::utilities::print(std::cout, t);
+            print_tree(cont);
             std::cout << "\n";
         }
         else if ( current_line == "rand" )
         {
-            for ( size_t i = 0 ; i < 35 ; ++i )
-            {
-                float x = ( rand() % 100 );
-                float y = ( rand() % 100 );
-                float w = ( rand() % 2 ) + 1;
-                float h = ( rand() % 2 ) + 1;
-
-                B b(P(x - w, y - h),P(x + w, y + h));
-
-                boost::geometry::index::insert(t, b);
-                vect.push_back(b);
-
-                std::cout << "inserted: ";
-                bgi::detail::utilities::print_indexable(std::cout, b);
-                std::cout << '\n';
-            }
-
-            std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" );
-            std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" );
-            std::cout << "\n";
-
+            insert_random_values(cont);
             search_valid = false;
 
             glutPostRedisplay();
         }
         else if ( current_line == "bulk" )
         {
-            vect.clear();
-
-            for ( size_t i = 0 ; i < 35 ; ++i )
-            {
-                float x = ( rand() % 100 );
-                float y = ( rand() % 100 );
-                float w = ( rand() % 2 ) + 1;
-                float h = ( rand() % 2 ) + 1;
-
-                B b(P(x - w, y - h),P(x + w, y + h));
-                vect.push_back(b);
-
-                std::cout << "inserted: ";
-                bgi::detail::utilities::print_indexable(std::cout, b);
-                std::cout << '\n';
-            }
-
-            RTree t2(vect);
-            t = boost::move(t2);
-
-            std::cout << ( bgi::detail::rtree::utilities::are_boxes_ok(t) ? "boxes OK\n" : "WRONG BOXES!\n" );
-            std::cout << ( bgi::detail::rtree::utilities::are_levels_ok(t) ? "levels OK\n" : "WRONG LEVELS!\n" );
-            std::cout << "\n";
-
+            bulk_insert_random_values(cont);
             search_valid = false;
 
             glutPostRedisplay();
@@ -759,6 +1020,10 @@ void keyboard(unsigned char key, int /*x*/, int /*y*/)
         {
             if ( current_line == "knn" )
                 query_mode = qm_knn;
+            else if ( current_line == "knnb" )
+                query_mode = qm_knnb;
+            else if ( current_line == "knns" )
+                query_mode = qm_knns;
             else if ( current_line == "c" )
                 query_mode = qm_c;
             else if ( current_line == "d" )
@@ -808,6 +1073,8 @@ void keyboard(unsigned char key, int /*x*/, int /*y*/)
     }
 }
 
+// main function
+
 int main(int argc, char **argv)
 {
     glutInit(&argc, argv);
diff --git a/index/example/random_test.cpp b/index/example/random_test.cpp
index 48a45191c..1c40d1553 100644
--- a/index/example/random_test.cpp
+++ b/index/example/random_test.cpp
@@ -10,6 +10,8 @@
 #include <iostream>
 
 #define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 
 #include <boost/foreach.hpp>
diff --git a/index/example/serialize.cpp b/index/example/serialize.cpp
index 1ce9437b9..11ce08bc0 100644
--- a/index/example/serialize.cpp
+++ b/index/example/serialize.cpp
@@ -11,6 +11,8 @@
 #include <fstream>
 
 #define BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
+
+#include <boost/geometry.hpp>
 #include <boost/geometry/index/rtree.hpp>
 #include <boost/geometry/index/detail/rtree/utilities/statistics.hpp>
 
diff --git a/index/test/Jamfile.v2 b/index/test/Jamfile.v2
index 32ea1e376..c2a192e1c 100644
--- a/index/test/Jamfile.v2
+++ b/index/test/Jamfile.v2
@@ -20,7 +20,7 @@ project boost-geometry-index-test
 test-suite boost-geometry-index-varray
     :
     [ run varray_old.cpp ]
-    [ run varray.cpp ]
+    [ run varray.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     ;
 
 build-project algorithms ;
diff --git a/index/test/rtree/exceptions/Jamfile.v2 b/index/test/rtree/exceptions/Jamfile.v2
index c8b42604c..1728b245b 100644
--- a/index/test/rtree/exceptions/Jamfile.v2
+++ b/index/test/rtree/exceptions/Jamfile.v2
@@ -12,7 +12,12 @@ rule test_all
 
    for local fileb in [ glob *.cpp ]
    {
-      all_rules += [ run $(fileb) ] ;
+      all_rules += [ run $(fileb)
+      :  # additional args
+      :  # test-files
+      :  # requirements
+        <toolset>msvc:<cxxflags>/bigobj
+      ] ;
    }
 
    return $(all_rules) ;
diff --git a/index/test/rtree/generated/Jamfile.v2 b/index/test/rtree/generated/Jamfile.v2
index b3ac64804..f3900741b 100644
--- a/index/test/rtree/generated/Jamfile.v2
+++ b/index/test/rtree/generated/Jamfile.v2
@@ -12,7 +12,12 @@ rule test_all
 
    for local fileb in [ glob *.cpp ]
    {
-      all_rules += [ run $(fileb) ] ;
+      all_rules += [ run $(fileb)
+      :  # additional args
+      :  # test-files
+      :  # requirements
+        <toolset>msvc:<cxxflags>/bigobj
+      ] ;
    }
 
    return $(all_rules) ;
diff --git a/index/test/rtree/generated/rtree_dlin_add_b2d.cpp b/index/test/rtree/generated/rtree_dlin_add_b2d.cpp
index 312a7ba55..adab4cb9c 100644
--- a/index/test/rtree/generated/rtree_dlin_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_add_b3d.cpp b/index/test/rtree/generated/rtree_dlin_add_b3d.cpp
index fbcb002ee..b387eb1ff 100644
--- a/index/test/rtree/generated/rtree_dlin_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_add_p2d.cpp b/index/test/rtree/generated/rtree_dlin_add_p2d.cpp
index 222010ff4..09e1c20e3 100644
--- a/index/test/rtree/generated/rtree_dlin_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_add_p3d.cpp b/index/test/rtree/generated/rtree_dlin_add_p3d.cpp
index 4af7feded..9959dc3f0 100644
--- a/index/test/rtree/generated/rtree_dlin_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_add_s2d.cpp b/index/test/rtree/generated/rtree_dlin_add_s2d.cpp
new file mode 100644
index 000000000..c89e3ddbe
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dlin_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_dlin_mod_b2d.cpp b/index/test/rtree/generated/rtree_dlin_mod_b2d.cpp
index aad24a95e..0b355cb82 100644
--- a/index/test/rtree/generated/rtree_dlin_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_mod_b3d.cpp b/index/test/rtree/generated/rtree_dlin_mod_b3d.cpp
index 3520fcfa5..86a1df0de 100644
--- a/index/test/rtree/generated/rtree_dlin_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_mod_p2d.cpp b/index/test/rtree/generated/rtree_dlin_mod_p2d.cpp
index 56895487b..072b8e243 100644
--- a/index/test/rtree/generated/rtree_dlin_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_mod_p3d.cpp b/index/test/rtree/generated/rtree_dlin_mod_p3d.cpp
index 90e51c399..b8e1d6235 100644
--- a/index/test/rtree/generated/rtree_dlin_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_mod_s2d.cpp b/index/test/rtree/generated/rtree_dlin_mod_s2d.cpp
new file mode 100644
index 000000000..595312c4d
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dlin_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_dlin_que_b2d.cpp b/index/test/rtree/generated/rtree_dlin_que_b2d.cpp
index df167f6c6..8a2ee0e70 100644
--- a/index/test/rtree/generated/rtree_dlin_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_que_b3d.cpp b/index/test/rtree/generated/rtree_dlin_que_b3d.cpp
index ddac379f9..c054f630f 100644
--- a/index/test/rtree/generated/rtree_dlin_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_que_p2d.cpp b/index/test/rtree/generated/rtree_dlin_que_p2d.cpp
index e66c79d9e..22bdb83f4 100644
--- a/index/test/rtree/generated/rtree_dlin_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_que_p3d.cpp b/index/test/rtree/generated/rtree_dlin_que_p3d.cpp
index 5ef00c062..68f901776 100644
--- a/index/test/rtree/generated/rtree_dlin_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dlin_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dlin_que_s2d.cpp b/index/test/rtree/generated/rtree_dlin_que_s2d.cpp
new file mode 100644
index 000000000..41f93c575
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dlin_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::dynamic_linear(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_dqua_add_b2d.cpp b/index/test/rtree/generated/rtree_dqua_add_b2d.cpp
index cd917bcf6..80c16cd1f 100644
--- a/index/test/rtree/generated/rtree_dqua_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_add_b3d.cpp b/index/test/rtree/generated/rtree_dqua_add_b3d.cpp
index af1afdea7..47760e224 100644
--- a/index/test/rtree/generated/rtree_dqua_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_add_p2d.cpp b/index/test/rtree/generated/rtree_dqua_add_p2d.cpp
index ea21920cb..46cc6db24 100644
--- a/index/test/rtree/generated/rtree_dqua_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_add_p3d.cpp b/index/test/rtree/generated/rtree_dqua_add_p3d.cpp
index bfbd66bd0..28ec6586c 100644
--- a/index/test/rtree/generated/rtree_dqua_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_add_s2d.cpp b/index/test/rtree/generated/rtree_dqua_add_s2d.cpp
new file mode 100644
index 000000000..e6009b833
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dqua_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_dqua_mod_b2d.cpp b/index/test/rtree/generated/rtree_dqua_mod_b2d.cpp
index 4462102a0..7de20a5f1 100644
--- a/index/test/rtree/generated/rtree_dqua_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_mod_b3d.cpp b/index/test/rtree/generated/rtree_dqua_mod_b3d.cpp
index e5a21b780..4c2e7c718 100644
--- a/index/test/rtree/generated/rtree_dqua_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_mod_p2d.cpp b/index/test/rtree/generated/rtree_dqua_mod_p2d.cpp
index 1e8112dbb..3cce646e1 100644
--- a/index/test/rtree/generated/rtree_dqua_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_mod_p3d.cpp b/index/test/rtree/generated/rtree_dqua_mod_p3d.cpp
index 75cce976e..c0d782d3d 100644
--- a/index/test/rtree/generated/rtree_dqua_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_mod_s2d.cpp b/index/test/rtree/generated/rtree_dqua_mod_s2d.cpp
new file mode 100644
index 000000000..be0cb0ad9
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dqua_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_dqua_que_b2d.cpp b/index/test/rtree/generated/rtree_dqua_que_b2d.cpp
index 47995d1bb..790e29c4d 100644
--- a/index/test/rtree/generated/rtree_dqua_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_que_b3d.cpp b/index/test/rtree/generated/rtree_dqua_que_b3d.cpp
index 73c89d9ad..3c27c09ea 100644
--- a/index/test/rtree/generated/rtree_dqua_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_que_p2d.cpp b/index/test/rtree/generated/rtree_dqua_que_p2d.cpp
index 4683774f3..8ba91c01e 100644
--- a/index/test/rtree/generated/rtree_dqua_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_que_p3d.cpp b/index/test/rtree/generated/rtree_dqua_que_p3d.cpp
index a5cae4ebb..2fad909f8 100644
--- a/index/test/rtree/generated/rtree_dqua_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_dqua_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_dqua_que_s2d.cpp b/index/test/rtree/generated/rtree_dqua_que_s2d.cpp
new file mode 100644
index 000000000..8d353e622
--- /dev/null
+++ b/index/test/rtree/generated/rtree_dqua_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::dynamic_quadratic(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_drst_add_b2d.cpp b/index/test/rtree/generated/rtree_drst_add_b2d.cpp
index 9093a91ee..358de99d7 100644
--- a/index/test/rtree/generated/rtree_drst_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_add_b3d.cpp b/index/test/rtree/generated/rtree_drst_add_b3d.cpp
index 75cf1db8c..1816462bd 100644
--- a/index/test/rtree/generated/rtree_drst_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_add_p2d.cpp b/index/test/rtree/generated/rtree_drst_add_p2d.cpp
index 7595a41c4..2b2146e07 100644
--- a/index/test/rtree/generated/rtree_drst_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_add_p3d.cpp b/index/test/rtree/generated/rtree_drst_add_p3d.cpp
index 934625270..ecbc1c336 100644
--- a/index/test/rtree/generated/rtree_drst_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_add_s2d.cpp b/index/test/rtree/generated/rtree_drst_add_s2d.cpp
new file mode 100644
index 000000000..fabc1e2e8
--- /dev/null
+++ b/index/test/rtree/generated/rtree_drst_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_drst_mod_b2d.cpp b/index/test/rtree/generated/rtree_drst_mod_b2d.cpp
index f3495061b..df3cfdac2 100644
--- a/index/test/rtree/generated/rtree_drst_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_mod_b3d.cpp b/index/test/rtree/generated/rtree_drst_mod_b3d.cpp
index cf2490353..9f8ea3bef 100644
--- a/index/test/rtree/generated/rtree_drst_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_mod_p2d.cpp b/index/test/rtree/generated/rtree_drst_mod_p2d.cpp
index 886be52cf..0cdd1706d 100644
--- a/index/test/rtree/generated/rtree_drst_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_mod_p3d.cpp b/index/test/rtree/generated/rtree_drst_mod_p3d.cpp
index a597f6691..e15305115 100644
--- a/index/test/rtree/generated/rtree_drst_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_mod_s2d.cpp b/index/test/rtree/generated/rtree_drst_mod_s2d.cpp
new file mode 100644
index 000000000..ca3934411
--- /dev/null
+++ b/index/test/rtree/generated/rtree_drst_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_drst_que_b2d.cpp b/index/test/rtree/generated/rtree_drst_que_b2d.cpp
index 2e46885db..5f1ea2e29 100644
--- a/index/test/rtree/generated/rtree_drst_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_que_b3d.cpp b/index/test/rtree/generated/rtree_drst_que_b3d.cpp
index 3ea5e8f66..61e51a2f1 100644
--- a/index/test/rtree/generated/rtree_drst_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_que_p2d.cpp b/index/test/rtree/generated/rtree_drst_que_p2d.cpp
index bab080776..f9bd1951a 100644
--- a/index/test/rtree/generated/rtree_drst_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_drst_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_que_p3d.cpp b/index/test/rtree/generated/rtree_drst_que_p3d.cpp
index efd0e34ee..b7cfc7f71 100644
--- a/index/test/rtree/generated/rtree_drst_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_drst_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_drst_que_s2d.cpp b/index/test/rtree/generated/rtree_drst_que_s2d.cpp
new file mode 100644
index 000000000..8b402560e
--- /dev/null
+++ b/index/test/rtree/generated/rtree_drst_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::dynamic_rstar(5, 2), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_lin_add_b2d.cpp b/index/test/rtree/generated/rtree_lin_add_b2d.cpp
index 668a3a7c6..3474fc438 100644
--- a/index/test/rtree/generated/rtree_lin_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_add_b3d.cpp b/index/test/rtree/generated/rtree_lin_add_b3d.cpp
index b1c8d1080..d390a866c 100644
--- a/index/test/rtree/generated/rtree_lin_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_add_p2d.cpp b/index/test/rtree/generated/rtree_lin_add_p2d.cpp
index 5a3a4c328..af06e30ec 100644
--- a/index/test/rtree/generated/rtree_lin_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_add_p3d.cpp b/index/test/rtree/generated/rtree_lin_add_p3d.cpp
index dee2c17f3..24fc32feb 100644
--- a/index/test/rtree/generated/rtree_lin_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_add_s2d.cpp b/index/test/rtree/generated/rtree_lin_add_s2d.cpp
new file mode 100644
index 000000000..10419db62
--- /dev/null
+++ b/index/test/rtree/generated/rtree_lin_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_lin_mod_b2d.cpp b/index/test/rtree/generated/rtree_lin_mod_b2d.cpp
index a55700ab3..dc8f48c39 100644
--- a/index/test/rtree/generated/rtree_lin_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_mod_b3d.cpp b/index/test/rtree/generated/rtree_lin_mod_b3d.cpp
index 47cc47866..c00b20ab5 100644
--- a/index/test/rtree/generated/rtree_lin_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_mod_p2d.cpp b/index/test/rtree/generated/rtree_lin_mod_p2d.cpp
index a5ae7e41f..7879a5bf0 100644
--- a/index/test/rtree/generated/rtree_lin_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_mod_p3d.cpp b/index/test/rtree/generated/rtree_lin_mod_p3d.cpp
index 6272a2f87..440dbbd0d 100644
--- a/index/test/rtree/generated/rtree_lin_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_mod_s2d.cpp b/index/test/rtree/generated/rtree_lin_mod_s2d.cpp
new file mode 100644
index 000000000..92c81faf0
--- /dev/null
+++ b/index/test/rtree/generated/rtree_lin_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_lin_que_b2d.cpp b/index/test/rtree/generated/rtree_lin_que_b2d.cpp
index a43437557..19f08a6a8 100644
--- a/index/test/rtree/generated/rtree_lin_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_que_b3d.cpp b/index/test/rtree/generated/rtree_lin_que_b3d.cpp
index dff1647e0..19f2ee5c7 100644
--- a/index/test/rtree/generated/rtree_lin_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_que_p2d.cpp b/index/test/rtree/generated/rtree_lin_que_p2d.cpp
index 305d29ab8..b05ee3f64 100644
--- a/index/test/rtree/generated/rtree_lin_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_lin_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_que_p3d.cpp b/index/test/rtree/generated/rtree_lin_que_p3d.cpp
index 9e948ab1d..726287fdd 100644
--- a/index/test/rtree/generated/rtree_lin_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_lin_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_lin_que_s2d.cpp b/index/test/rtree/generated/rtree_lin_que_s2d.cpp
new file mode 100644
index 000000000..8cfba6bf1
--- /dev/null
+++ b/index/test/rtree/generated/rtree_lin_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::linear<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_qua_add_b2d.cpp b/index/test/rtree/generated/rtree_qua_add_b2d.cpp
index 2623bacae..4601697cd 100644
--- a/index/test/rtree/generated/rtree_qua_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_add_b3d.cpp b/index/test/rtree/generated/rtree_qua_add_b3d.cpp
index 314832fb4..fbcd98103 100644
--- a/index/test/rtree/generated/rtree_qua_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_add_p2d.cpp b/index/test/rtree/generated/rtree_qua_add_p2d.cpp
index 6f19d402a..c7644da8e 100644
--- a/index/test/rtree/generated/rtree_qua_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_add_p3d.cpp b/index/test/rtree/generated/rtree_qua_add_p3d.cpp
index c2f6bc8a5..17d378094 100644
--- a/index/test/rtree/generated/rtree_qua_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_add_s2d.cpp b/index/test/rtree/generated/rtree_qua_add_s2d.cpp
new file mode 100644
index 000000000..456e1039c
--- /dev/null
+++ b/index/test/rtree/generated/rtree_qua_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_qua_mod_b2d.cpp b/index/test/rtree/generated/rtree_qua_mod_b2d.cpp
index c66720405..201c0979b 100644
--- a/index/test/rtree/generated/rtree_qua_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_mod_b3d.cpp b/index/test/rtree/generated/rtree_qua_mod_b3d.cpp
index 0230c9b97..0f96c8160 100644
--- a/index/test/rtree/generated/rtree_qua_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_mod_p2d.cpp b/index/test/rtree/generated/rtree_qua_mod_p2d.cpp
index 4c07b4bb3..5c0710bab 100644
--- a/index/test/rtree/generated/rtree_qua_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_mod_p3d.cpp b/index/test/rtree/generated/rtree_qua_mod_p3d.cpp
index 44779b25e..d3db906e8 100644
--- a/index/test/rtree/generated/rtree_qua_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_mod_s2d.cpp b/index/test/rtree/generated/rtree_qua_mod_s2d.cpp
new file mode 100644
index 000000000..efd0e0d04
--- /dev/null
+++ b/index/test/rtree/generated/rtree_qua_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_qua_que_b2d.cpp b/index/test/rtree/generated/rtree_qua_que_b2d.cpp
index 86753b749..875cbf4f5 100644
--- a/index/test/rtree/generated/rtree_qua_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_que_b3d.cpp b/index/test/rtree/generated/rtree_qua_que_b3d.cpp
index 74dc69945..f29b08831 100644
--- a/index/test/rtree/generated/rtree_qua_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_que_p2d.cpp b/index/test/rtree/generated/rtree_qua_que_p2d.cpp
index fb4660e0e..91fd0cfee 100644
--- a/index/test/rtree/generated/rtree_qua_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_qua_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_que_p3d.cpp b/index/test/rtree/generated/rtree_qua_que_p3d.cpp
index f5806c7f4..15646b04d 100644
--- a/index/test/rtree/generated/rtree_qua_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_qua_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_qua_que_s2d.cpp b/index/test/rtree/generated/rtree_qua_que_s2d.cpp
new file mode 100644
index 000000000..84ba5c6b9
--- /dev/null
+++ b/index/test/rtree/generated/rtree_qua_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::quadratic<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_rst_add_b2d.cpp b/index/test/rtree/generated/rtree_rst_add_b2d.cpp
index 97fb92f47..cdce85839 100644
--- a/index/test/rtree/generated/rtree_rst_add_b2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_add_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_add_b3d.cpp b/index/test/rtree/generated/rtree_rst_add_b3d.cpp
index 7e0171b59..b8d85a034 100644
--- a/index/test/rtree/generated/rtree_rst_add_b3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_add_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_add_p2d.cpp b/index/test/rtree/generated/rtree_rst_add_p2d.cpp
index 6fb31af48..154c5ecd7 100644
--- a/index/test/rtree/generated/rtree_rst_add_p2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_add_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_add_p3d.cpp b/index/test/rtree/generated/rtree_rst_add_p3d.cpp
index b02e09fbc..f072f354d 100644
--- a/index/test/rtree/generated/rtree_rst_add_p3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_add_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_add_s2d.cpp b/index/test/rtree/generated/rtree_rst_add_s2d.cpp
new file mode 100644
index 000000000..ec2df11ca
--- /dev/null
+++ b/index/test/rtree/generated/rtree_rst_add_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::additional<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_rst_mod_b2d.cpp b/index/test/rtree/generated/rtree_rst_mod_b2d.cpp
index 3315296e8..5d0760d36 100644
--- a/index/test/rtree/generated/rtree_rst_mod_b2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_mod_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_mod_b3d.cpp b/index/test/rtree/generated/rtree_rst_mod_b3d.cpp
index 96884543d..8ed1ca8c0 100644
--- a/index/test/rtree/generated/rtree_rst_mod_b3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_mod_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_mod_p2d.cpp b/index/test/rtree/generated/rtree_rst_mod_p2d.cpp
index c0cab5ea4..7040f93f9 100644
--- a/index/test/rtree/generated/rtree_rst_mod_p2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_mod_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_mod_p3d.cpp b/index/test/rtree/generated/rtree_rst_mod_p3d.cpp
index 5ad0fdd79..95014311d 100644
--- a/index/test/rtree/generated/rtree_rst_mod_p3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_mod_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_mod_s2d.cpp b/index/test/rtree/generated/rtree_rst_mod_s2d.cpp
new file mode 100644
index 000000000..10daa8662
--- /dev/null
+++ b/index/test/rtree/generated/rtree_rst_mod_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::modifiers<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/generated/rtree_rst_que_b2d.cpp b/index/test/rtree/generated/rtree_rst_que_b2d.cpp
index 2f16ef275..b7d694b08 100644
--- a/index/test/rtree/generated/rtree_rst_que_b2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_que_b2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_que_b3d.cpp b/index/test/rtree/generated/rtree_rst_que_b3d.cpp
index 1943ccc16..75f89886f 100644
--- a/index/test/rtree/generated/rtree_rst_que_b3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_que_b3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::box< bg::model::point<double, 3, bg::cs::cartesian> > Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_que_p2d.cpp b/index/test/rtree/generated/rtree_rst_que_p2d.cpp
index 492a20832..9345409ba 100644
--- a/index/test/rtree/generated/rtree_rst_que_p2d.cpp
+++ b/index/test/rtree/generated/rtree_rst_que_p2d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 2, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_que_p3d.cpp b/index/test/rtree/generated/rtree_rst_que_p3d.cpp
index 5f152ecc3..51a3f4494 100644
--- a/index/test/rtree/generated/rtree_rst_que_p3d.cpp
+++ b/index/test/rtree/generated/rtree_rst_que_p3d.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -9,9 +9,6 @@
 
 #include <rtree/test_rtree.hpp>
 
-#include <boost/geometry/geometries/point.hpp>
-#include <boost/geometry/geometries/box.hpp>
-
 int test_main(int, char* [])
 {
     typedef bg::model::point<double, 3, bg::cs::cartesian> Indexable;
diff --git a/index/test/rtree/generated/rtree_rst_que_s2d.cpp b/index/test/rtree/generated/rtree_rst_que_s2d.cpp
new file mode 100644
index 000000000..33fb4f52f
--- /dev/null
+++ b/index/test/rtree/generated/rtree_rst_que_s2d.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry Index
+// Unit Test
+
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <rtree/test_rtree.hpp>
+
+int test_main(int, char* [])
+{
+    typedef bg::model::segment< bg::model::point<double, 2, bg::cs::cartesian> > Indexable;
+    testset::queries<Indexable>(bgi::rstar<5, 2>(), std::allocator<int>());
+    return 0;
+}
diff --git a/index/test/rtree/interprocess/Jamfile.v2 b/index/test/rtree/interprocess/Jamfile.v2
index d0643b45f..9e8a05f2a 100644
--- a/index/test/rtree/interprocess/Jamfile.v2
+++ b/index/test/rtree/interprocess/Jamfile.v2
@@ -18,9 +18,11 @@ rule test_all
       :  # requirements
         <toolset>acc:<linkflags>-lrt
         <toolset>acc-pa_risc:<linkflags>-lrt
-        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
         <host-os>hpux,<toolset>gcc:<linkflags>"-Wl,+as,mpas"
+#        <toolset>gcc-mingw:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        <toolset>gcc,<target-os>windows:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32" 
         <host-os>windows,<toolset>clang:<linkflags>"-lole32 -loleaut32 -lpsapi -ladvapi32"
+        <toolset>msvc:<cxxflags>/bigobj
       ] ;
    }
 
diff --git a/index/test/rtree/rtree_test_generator.cpp b/index/test/rtree/rtree_test_generator.cpp
index 4d44fd22e..e1d76ee2f 100644
--- a/index/test/rtree/rtree_test_generator.cpp
+++ b/index/test/rtree/rtree_test_generator.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Rtree tests generator
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,6 +11,7 @@
 #include <vector>
 #include <string>
 #include <boost/foreach.hpp>
+#include <boost/assert.hpp>
 #include <boost/tuple/tuple.hpp>
 
 int main()
@@ -37,6 +38,7 @@ int main()
     std::vector<std::string> indexables;
     indexables.push_back("p");
     indexables.push_back("b");
+    indexables.push_back("s");
 
     typedef std::pair<std::string, std::string> TS;
     std::vector<TS> testsets;
@@ -52,6 +54,12 @@ int main()
             {
                 BOOST_FOREACH(std::string const& d, dimensions)
                 {
+                    // If the I is Segment, generate only for 2d
+                    if ( i == "s" && d != "2" )
+                    {
+                        continue;
+                    }
+
                     BOOST_FOREACH(CT const& c, coordinate_types)   
                     {
                         std::string filename = std::string() +
@@ -63,7 +71,7 @@ int main()
                             "// Boost.Geometry Index\n" <<
                             "// Unit Test\n" <<
                             "\n" <<
-                            "// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.\n" <<
+                            "// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.\n" <<
                             "\n" <<
                             "// Use, modification and distribution is subject to the Boost Software License,\n" <<
                             "// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at\n" <<
@@ -72,14 +80,18 @@ int main()
 
                         f <<
                             "#include <rtree/test_rtree.hpp>\n" <<
-                            "\n" <<
-                            "#include <boost/geometry/geometries/point.hpp>\n" <<
-                            "#include <boost/geometry/geometries/box.hpp>\n" <<
                             "\n";
 
+                        std::string indexable_type;
                         std::string point_type = std::string("bg::model::point<") + boost::get<0>(c) + ", " + d + ", bg::cs::cartesian>";
-                        std::string box_type = std::string("bg::model::box< ") + point_type + " >";
-                        std::string indexable_type = (i == "p" ? point_type : box_type);
+                        if ( i == "p" )
+                            indexable_type = point_type;
+                        else if ( i == "b" )
+                            indexable_type = std::string("bg::model::box< ") + point_type + " >";
+                        else if ( i == "s" )
+                            indexable_type = std::string("bg::model::segment< ") + point_type + " >";
+                        else
+                            BOOST_ASSERT(false);
 
                         f <<
                             "int test_main(int, char* [])\n" <<
diff --git a/index/test/rtree/test_rtree.hpp b/index/test/rtree/test_rtree.hpp
index 0d259ae62..12f5e61a5 100644
--- a/index/test/rtree/test_rtree.hpp
+++ b/index/test/rtree/test_rtree.hpp
@@ -1,7 +1,7 @@
 // Boost.Geometry Index
 // Unit Test
 
-// Copyright (c) 2011-2013 Adam Wulkiewicz, Lodz, Poland.
+// Copyright (c) 2011-2014 Adam Wulkiewicz, Lodz, Poland.
 
 // Use, modification and distribution is subject to the Boost Software License,
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -18,6 +18,10 @@
 
 #include <boost/geometry/index/rtree.hpp>
 
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+
 #include <boost/geometry/index/detail/rtree/utilities/are_levels_ok.hpp>
 #include <boost/geometry/index/detail/rtree/utilities/are_boxes_ok.hpp>
 
@@ -87,6 +91,17 @@ struct value< bg::model::box< bg::model::point<T, 2, C> > >
     }
 };
 
+template <typename T, typename C>
+struct value< bg::model::segment< bg::model::point<T, 2, C> > >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    static S apply(int x, int y)
+    {
+        return S(P(x, y), P(x + 2, y + 3));
+    }
+};
+
 template <typename T, typename C>
 struct value< std::pair<bg::model::point<T, 2, C>, int> >
 {
@@ -110,6 +125,18 @@ struct value< std::pair<bg::model::box< bg::model::point<T, 2, C> >, int> >
     }
 };
 
+template <typename T, typename C>
+struct value< std::pair<bg::model::segment< bg::model::point<T, 2, C> >, int> >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef std::pair<S, int> R;
+    static R apply(int x, int y)
+    {
+        return std::make_pair(S(P(x, y), P(x + 2, y + 3)), x + y * 100);
+    }
+};
+
 template <typename T, typename C>
 struct value< boost::tuple<bg::model::point<T, 2, C>, int, int> >
 {
@@ -133,6 +160,18 @@ struct value< boost::tuple<bg::model::box< bg::model::point<T, 2, C> >, int, int
     }
 };
 
+template <typename T, typename C>
+struct value< boost::tuple<bg::model::segment< bg::model::point<T, 2, C> >, int, int> >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef boost::tuple<S, int, int> R;
+    static R apply(int x, int y)
+    {
+        return boost::make_tuple(S(P(x, y), P(x + 2, y + 3)), x + y * 100, 0);
+    }
+};
+
 template <typename T, typename C>
 struct value< bg::model::point<T, 3, C> >
 {
@@ -225,6 +264,18 @@ struct value< std::tuple<bg::model::box< bg::model::point<T, 2, C> >, int, int>
     }
 };
 
+template <typename T, typename C>
+struct value< std::tuple<bg::model::segment< bg::model::point<T, 2, C> >, int, int> >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef std::tuple<S, int, int> R;
+    static R apply(int x, int y)
+    {
+        return std::make_tuple(S(P(x, y), P(x + 2, y + 3)), x + y * 100, 0);
+    }
+};
+
 template <typename T, typename C>
 struct value< std::tuple<bg::model::point<T, 3, C>, int, int> >
 {
@@ -333,6 +384,20 @@ struct value< boost::shared_ptr<test_object<bg::model::box<bg::model::point<T, 3
     }
 };
 
+template <typename T, typename C>
+struct value< boost::shared_ptr<test_object<bg::model::segment<bg::model::point<T, 2, C> > > > >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef test_object<S> O;
+    typedef boost::shared_ptr<O> R;
+
+    static R apply(int x, int y)
+    {
+        return R(new O(S(P(x, y), P(x + 2, y + 3))));
+    }
+};
+
 } //namespace generate
 
 // counting value
@@ -411,6 +476,15 @@ struct value< counting_value<bg::model::box<bg::model::point<T, 3, C> > > >
     static R apply(int x, int y, int z) { return R(B(P(x, y, z), P(x+2, y+3, z+4))); }
 };
 
+template <typename T, typename C>
+struct value< counting_value<bg::model::segment<bg::model::point<T, 2, C> > > >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef counting_value<S> R;
+    static R apply(int x, int y) { return R(S(P(x, y), P(x+2, y+3))); }
+};
+
 } // namespace generate
 
 // value without default constructor
@@ -490,6 +564,15 @@ struct value< value_no_dctor<bg::model::box<bg::model::point<T, 3, C> > > >
     static R apply(int x, int y, int z) { return R(B(P(x, y, z), P(x+2, y+3, z+4))); }
 };
 
+template <typename T, typename C>
+struct value< value_no_dctor<bg::model::segment<bg::model::point<T, 2, C> > > >
+{
+    typedef bg::model::point<T, 2, C> P;
+    typedef bg::model::segment<P> S;
+    typedef value_no_dctor<S> R;
+    static R apply(int x, int y) { return R(S(P(x, y), P(x+2, y+3))); }
+};
+
 // generate input
 
 template <size_t Dimension>
@@ -774,6 +857,14 @@ struct contains_impl<bg::point_tag>
     {}
 };
 
+template <>
+struct contains_impl<bg::segment_tag>
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+    {}
+};
+
 template <typename Rtree, typename Value, typename Box>
 void contains(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
@@ -784,24 +875,53 @@ void contains(Rtree const& tree, std::vector<Value> const& input, Box const& qbo
     >::apply(tree, input, qbox);
 }
 
+template <typename Tag>
+struct covered_by_impl
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
+    {
+        std::vector<Value> expected_output;
+
+        BOOST_FOREACH(Value const& v, input)
+        {
+            if ( bg::covered_by(
+                    bgi::detail::return_ref_or_bounds(
+                        tree.indexable_get()(v)),
+                    qbox) )
+            {
+                expected_output.push_back(v);
+            }
+        }
+
+        spatial_query(tree, bgi::covered_by(qbox), expected_output);
+
+        /*typedef bg::traits::point_type<Box>::type P;
+        bg::model::ring<P> qring;
+        bg::convert(qbox, qring);
+        spatial_query(tree, bgi::covered_by(qring), expected_output);
+        bg::model::polygon<P> qpoly;
+        bg::convert(qbox, qpoly);
+        spatial_query(tree, bgi::covered_by(qpoly), expected_output);*/
+    }
+};
+
+template <>
+struct covered_by_impl<bg::segment_tag>
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+    {}
+};
+
 template <typename Rtree, typename Value, typename Box>
 void covered_by(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
-    std::vector<Value> expected_output;
-
-    BOOST_FOREACH(Value const& v, input)
-        if ( bg::covered_by(tree.indexable_get()(v), qbox) )
-            expected_output.push_back(v);
-
-    spatial_query(tree, bgi::covered_by(qbox), expected_output);
-
-    /*typedef bg::traits::point_type<Box>::type P;
-    bg::model::ring<P> qring;
-    bg::convert(qbox, qring);
-    spatial_query(tree, bgi::covered_by(qring), expected_output);
-    bg::model::polygon<P> qpoly;
-    bg::convert(qbox, qpoly);
-    spatial_query(tree, bgi::covered_by(qpoly), expected_output);*/
+    covered_by_impl<
+        typename bg::tag<
+            typename Rtree::indexable_type
+        >::type
+    >::apply(tree, input, qbox);
 }
 
 template <typename Tag>
@@ -836,6 +956,14 @@ struct covers_impl<bg::point_tag>
     {}
 };
 
+template <>
+struct covers_impl<bg::segment_tag>
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+    {}
+};
+
 template <typename Rtree, typename Value, typename Box>
 void covers(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
@@ -878,6 +1006,14 @@ struct overlaps_impl<bg::point_tag>
     {}
 };
 
+template <>
+struct overlaps_impl<bg::segment_tag>
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+    {}
+};
+
 template <typename Rtree, typename Value, typename Box>
 void overlaps(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
@@ -921,24 +1057,46 @@ void overlaps(Rtree const& tree, std::vector<Value> const& input, Box const& qbo
 //    >::apply(tree, input, qbox);
 //}
 
+template <typename Tag>
+struct within_impl
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
+    {
+        std::vector<Value> expected_output;
+
+        BOOST_FOREACH(Value const& v, input)
+            if ( bg::within(tree.indexable_get()(v), qbox) )
+                expected_output.push_back(v);
+
+        spatial_query(tree, bgi::within(qbox), expected_output);
+
+        /*typedef bg::traits::point_type<Box>::type P;
+        bg::model::ring<P> qring;
+        bg::convert(qbox, qring);
+        spatial_query(tree, bgi::within(qring), expected_output);
+        bg::model::polygon<P> qpoly;
+        bg::convert(qbox, qpoly);
+        spatial_query(tree, bgi::within(qpoly), expected_output);*/
+    }
+};
+
+template <>
+struct within_impl<bg::segment_tag>
+{
+    template <typename Rtree, typename Value, typename Box>
+    static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+    {}
+};
+
 template <typename Rtree, typename Value, typename Box>
 void within(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
 {
-    std::vector<Value> expected_output;
-
-    BOOST_FOREACH(Value const& v, input)
-        if ( bg::within(tree.indexable_get()(v), qbox) )
-            expected_output.push_back(v);
-
-    spatial_query(tree, bgi::within(qbox), expected_output);
-
-    /*typedef bg::traits::point_type<Box>::type P;
-    bg::model::ring<P> qring;
-    bg::convert(qbox, qring);
-    spatial_query(tree, bgi::within(qring), expected_output);
-    bg::model::polygon<P> qpoly;
-    bg::convert(qbox, qpoly);
-    spatial_query(tree, bgi::within(qpoly), expected_output);*/
+    within_impl<
+        typename bg::tag<
+            typename Rtree::indexable_type
+        >::type
+    >::apply(tree, input, qbox);
 }
 
 // rtree nearest queries
@@ -968,7 +1126,7 @@ struct NearestKTransform
 };
 
 template <typename Rtree, typename Value, typename Point, typename Distance>
-void compare_nearest_outputs(Rtree const& rtree, std::vector<Value> const& output, std::vector<Value> const& expected_output, Point const& pt, Distance greatest_distance)
+inline void compare_nearest_outputs(Rtree const& rtree, std::vector<Value> const& output, std::vector<Value> const& expected_output, Point const& pt, Distance greatest_distance)
 {
     // check output
     bool are_sizes_ok = (expected_output.size() == output.size());
@@ -982,7 +1140,7 @@ void compare_nearest_outputs(Rtree const& rtree, std::vector<Value> const& outpu
 
             if ( find(rtree, expected_output.begin(), expected_output.end(), v) == expected_output.end() )
             {
-                Distance d = bgi::detail::comparable_distance_near(pt, rtree.indexable_get()(v));
+                Distance d = bg::comparable_distance(pt, rtree.indexable_get()(v));
                 BOOST_CHECK(d == greatest_distance);
             }
         }
@@ -990,7 +1148,21 @@ void compare_nearest_outputs(Rtree const& rtree, std::vector<Value> const& outpu
 }
 
 template <typename Rtree, typename Value, typename Point>
-void nearest_query_k(Rtree const& rtree, std::vector<Value> const& input, Point const& pt, unsigned int k)
+inline void check_sorted_by_distance(Rtree const& rtree, std::vector<Value> const& output, Point const& pt)
+{
+    typedef typename bg::default_distance_result<Point, typename Rtree::indexable_type>::type D;
+
+    D prev_dist = 0;
+    BOOST_FOREACH(Value const& v, output)
+    {
+        D d = bg::comparable_distance(pt, rtree.indexable_get()(v));
+        BOOST_CHECK(prev_dist <= d);
+        prev_dist = d;
+    }
+}
+
+template <typename Rtree, typename Value, typename Point>
+inline void nearest_query_k(Rtree const& rtree, std::vector<Value> const& input, Point const& pt, unsigned int k)
 {
     // TODO: Nearest object may not be the same as found by the rtree if distances are equal
     // All objects with the same closest distance should be picked
@@ -1002,7 +1174,7 @@ void nearest_query_k(Rtree const& rtree, std::vector<Value> const& input, Point
     // calculate test output - k closest values pairs
     BOOST_FOREACH(Value const& v, input)
     {
-        D d = bgi::detail::comparable_distance_near(pt, rtree.indexable_get()(v));
+        D d = bg::comparable_distance(pt, rtree.indexable_get()(v));
 
         if ( test_output.size() < k )
             test_output.push_back(std::make_pair(d, v));
@@ -1043,15 +1215,16 @@ void nearest_query_k(Rtree const& rtree, std::vector<Value> const& input, Point
     std::copy(rtree.qbegin(bgi::nearest(pt, k)), rtree.qend(), std::back_inserter(output3));
 
     compare_nearest_outputs(rtree, output3, expected_output, pt, greatest_distance);
+    check_sorted_by_distance(rtree, output3, pt);
 
 #ifdef BOOST_GEOMETRY_INDEX_DETAIL_EXPERIMENTAL
     {
         std::vector<Value> output4;
         std::copy(rtree.qbegin_(bgi::nearest(pt, k)), rtree.qend_(bgi::nearest(pt, k)), std::back_inserter(output4));
-        compare_nearest_outputs(rtree, output4, expected_output, pt, greatest_distance);
+        exactly_the_same_outputs(rtree, output4, output3);
         output4.clear();
         copy_alt(rtree.qbegin_(bgi::nearest(pt, k)), rtree.qend_(), std::back_inserter(output4));
-        compare_nearest_outputs(rtree, output4, expected_output, pt, greatest_distance);
+        exactly_the_same_outputs(rtree, output4, output3);
     }
 #endif
 }
@@ -1586,7 +1759,7 @@ void test_rtree_bounds(Parameters const& parameters, Allocator const& allocator)
     typedef typename Allocator::template rebind<Value>::other A;
     typedef bgi::rtree<Value, Parameters, I, E, A> Tree;
     typedef typename Tree::bounds_type B;
-    typedef typename bg::traits::point_type<B>::type P;
+    //typedef typename bg::traits::point_type<B>::type P;
 
     B b;
     bg::assign_inverse(b);
diff --git a/test/algorithms/Jamfile.v2 b/test/algorithms/Jamfile.v2
index 438c41c2c..6c59837ef 100644
--- a/test/algorithms/Jamfile.v2
+++ b/test/algorithms/Jamfile.v2
@@ -1,8 +1,13 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,34 +21,65 @@ test-suite boost-geometry-algorithms
     [ run buffer.cpp ]
     [ run centroid.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run comparable_distance.cpp ]
-    [ run convex_hull.cpp ]
+    [ run convex_hull.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run correct.cpp ]
     [ run convert.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run covered_by.cpp ]
+    [ run crosses.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run difference.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run disjoint.cpp ]
+    [ run difference_linear_linear.cpp ]
+    [ run difference_pl_pl.cpp ]
+    [ run disjoint.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run disjoint_coverage.cpp ]
     [ run distance.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run envelope.cpp ]
-    [ run equals.cpp ]
+    [ run distance_areal_areal.cpp ]
+    [ run distance_linear_areal.cpp ]
+    [ run distance_linear_linear.cpp ]
+    [ run distance_pointlike_areal.cpp ]
+    [ run distance_pointlike_linear.cpp ]
+    [ run distance_pointlike_pointlike.cpp ]
+    [ run envelope.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run equals.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run expand.cpp ]
     [ run for_each.cpp ]
     [ run intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
-    [ run intersects.cpp ]
+    [ run intersection_linear_linear.cpp ]
+    [ run intersection_pl_pl.cpp ]
+    [ run intersects.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run is_simple.cpp ]
+    [ run is_valid.cpp ]
     [ run length.cpp ]
     [ run make.cpp ]
-    [ run overlaps.cpp ]
+    [ run num_points.cpp ]
+    [ run overlaps.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run perimeter.cpp ]
+    [ run point_on_surface.cpp ]
+    [ run relate_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run relate_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run remove_spikes.cpp ]
     [ run reverse.cpp ]
     [ run simplify.cpp ]
-    [ run touches.cpp ]
+    [ run sym_difference_linear_linear.cpp ]
+    [ run touches.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run transform.cpp ]
     [ run union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
+    [ run union_linear_linear.cpp ]
+    [ run union_pl_pl.cpp ]
     [ run unique.cpp ]
-    [ run within.cpp ]
+    [ run within.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_areal_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_areal.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_linear_linear.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run within_pointlike_xxx.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]    
     ;
 
 build-project overlay 
     ;
+
+build-project buffer
+    ;
     
 build-project detail 
     ;
diff --git a/test/algorithms/append.cpp b/test/algorithms/append.cpp
index 7c7728eeb..2a3d01a86 100644
--- a/test/algorithms/append.cpp
+++ b/test/algorithms/append.cpp
@@ -1,9 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -30,51 +35,113 @@
 #include <test_common/test_point.hpp>
 #include <test_geometries/wrapped_boost_array.hpp>
 
+// includes for multi-geometries
+#include <boost/geometry/multi/core/point_type.hpp>
+#include <boost/geometry/multi/core/tags.hpp>
+#include <boost/geometry/multi/geometries/concepts/check.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+#include <boost/geometry/multi/algorithms/append.hpp>
+#include <boost/geometry/multi/algorithms/clear.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
+
 BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::vector)
 BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::deque)
 
 
-template <typename G>
-void test_geometry(G& geometry, bool check)
+template <bool EnableAll>
+struct do_checks
 {
-    typedef typename bg::point_type<G>::type P;
-
-    bg::append(geometry, bg::make_zero<P>());
-    if (check)
+    template <typename G>
+    static inline void apply(G const& geometry,
+                             std::size_t size1,
+                             std::size_t = 0,
+                             std::size_t = 0)
     {
-        BOOST_CHECK_EQUAL(bg::num_points(geometry), 1u);
+        BOOST_CHECK_EQUAL(bg::num_points(geometry), size1);
     }
+};
 
-    // Append a range
-    std::vector<P> v;
-    v.push_back(bg::make_zero<P>());
-    v.push_back(bg::make_zero<P>());
-    bg::append(geometry, v);
 
-    if (check)
+template<>
+struct do_checks<true>
+{
+    template <typename G>
+    static inline void apply(G const& geometry,
+                             std::size_t size1,
+                             std::size_t size2 = 0,
+                             std::size_t size3 = 0)
     {
-        BOOST_CHECK_EQUAL(bg::num_points(geometry), 3u);
+        do_checks<false>::apply(geometry, size1);
+        BOOST_CHECK_EQUAL(bg::num_points(geometry[0]), size2);
+        BOOST_CHECK_EQUAL(bg::num_points(geometry[1]), size3);
     }
+};
 
-    bg::clear(geometry);
 
-    if (check)
+
+template <bool HasMultiIndex, bool IsVariant>
+struct test_geometry
+{
+    template <typename G>
+    static inline void apply(G& geometry, bool check)
     {
-        BOOST_CHECK_EQUAL(bg::num_points(geometry), 0u);
-    }
+        typedef typename bg::point_type<G>::type P;
+        typedef do_checks<HasMultiIndex && !IsVariant> checks;
+
+        bg::append(geometry, bg::make_zero<P>(), -1, 0);
+        if (check)
+        {
+            checks::apply(geometry, 1u, 1u, 0u);
+        }
+
+        // Append a range
+        std::vector<P> v;
+        v.push_back(bg::make_zero<P>());
+        v.push_back(bg::make_zero<P>());
+        bg::append(geometry, v, -1, 1);
+
+        if (check)
+        {
+            checks::apply(geometry, 3u, 1u, 2u);
+        }
+
+        bg::clear(geometry);
+
+        if (check)
+        {
+            do_checks<false>::apply(geometry, 0u);
+        }
+    }
+};
+
 
-    //P p = boost::range::front(geometry);
-}
 
 template <typename G>
 void test_geometry_and_variant(bool check = true)
 {
     G geometry;
     boost::variant<G> variant_geometry = G();
-    test_geometry(geometry, check);
-    test_geometry(variant_geometry, check);
+    test_geometry<false, false>::apply(geometry, check);
+    test_geometry<false, true>::apply(variant_geometry, check);
 }
 
+
+template <typename MG>
+void test_multigeometry_and_variant(bool check = true)
+{
+    typedef typename boost::range_value<MG>::type G;
+
+    G geometry;
+    MG multigeometry;
+    bg::traits::push_back<MG>::apply(multigeometry, geometry);
+    bg::traits::push_back<MG>::apply(multigeometry, geometry);
+
+    boost::variant<MG> variant_multigeometry = multigeometry;
+    test_geometry<true, false>::apply(multigeometry, check);
+    test_geometry<true, true>::apply(variant_multigeometry, check);
+}
+
+
 template <typename P>
 void test_all()
 {
@@ -84,10 +151,18 @@ void test_all()
     test_geometry_and_variant<bg::model::linestring<P> >();
     test_geometry_and_variant<bg::model::ring<P> >();
     test_geometry_and_variant<bg::model::polygon<P> >();
+    test_geometry_and_variant<bg::model::multi_point<P> >();
+    test_multigeometry_and_variant
+        <
+            bg::model::multi_linestring<bg::model::linestring<P> >
+        >();
+    test_multigeometry_and_variant
+        <
+            bg::model::multi_polygon<bg::model::polygon<P> >
+        >();
 
     test_geometry_and_variant<std::vector<P> >();
     test_geometry_and_variant<std::deque<P> >();
-    //test_geometry_and_variant<std::list<P> >();
 }
 
 int test_main(int, char* [])
diff --git a/test/algorithms/area.cpp b/test/algorithms/area.cpp
index 1d05439f6..8f1d3ce63 100644
--- a/test/algorithms/area.cpp
+++ b/test/algorithms/area.cpp
@@ -96,14 +96,14 @@ void test_spherical(bool polar = false)
     // SQL Server gives: 4537.9654419375
     // PostGIS gives: 4537.9311668307
     // Note: those are Geographic, this test is Spherical
-    BOOST_CHECK_CLOSE(area, 4506.6389, 0.001); 
+    BOOST_CHECK_CLOSE(area, 4506.6389, 0.001);
 
     // Wrangel, more in detail
     bg::read_wkt("POLYGON((-178.568604 71.564148,-178.017548 71.449692,-177.833313 71.3461,-177.502838 71.277466 ,-177.439453 71.226929,-177.620026 71.116638,-177.9389 71.037491,-178.8186 70.979965,-179.274445 70.907761,-180 70.9972,179.678314 70.895538,179.272766 70.888596,178.791016 70.7964,178.617737 71.035538,178.872192 71.217484,179.530273 71.4383 ,-180 71.535843 ,-179.628601 71.577194,-179.305298 71.551361,-179.03421 71.597748,-178.568604 71.564148))", geometry);
     area = bg::area(geometry, spherical_earth);
     // SQL Server gives: 7669.10402181435
     // PostGIS gives: 7669.55565459832
-    BOOST_CHECK_CLOSE(area, 7616.523769, 0.001); 
+    BOOST_CHECK_CLOSE(area, 7616.523769, 0.001);
 
     // Check more at the equator
     /*
@@ -125,7 +125,7 @@ void test_spherical(bool polar = false)
 
     bg::read_wkt("POLYGON((-178.7858 20.7852, 177.4758 21.2333, 179.7436 21.5733, -178.7858 20.7852))", geometry);
     area = bg::area(geometry, spherical_earth);
-    BOOST_CHECK_CLOSE(area, 12987.8682, 0.001); // SQL Server gives: 12944.3970990317 -> -39m^2 
+    BOOST_CHECK_CLOSE(area, 12987.8682, 0.001); // SQL Server gives: 12944.3970990317 -> -39m^2
 
     bg::read_wkt("POLYGON((-178.7858 30.7852, 177.4758 31.2333, 179.7436 31.5733, -178.7858 30.7852))", geometry);
     area = bg::area(geometry, spherical_earth);
diff --git a/test/algorithms/assign.cpp b/test/algorithms/assign.cpp
index 82251db5a..aca34a687 100644
--- a/test/algorithms/assign.cpp
+++ b/test/algorithms/assign.cpp
@@ -4,6 +4,7 @@
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 // Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -21,30 +22,31 @@
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/adapted/c_array.hpp>
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/variant/variant.hpp>
 #include <test_common/test_point.hpp>
 
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
 
 
-template <typename Linestring>
-void check_linestring_2d(Linestring const& line)
+template <typename Geometry>
+void check_geometry(Geometry const& geometry, std::string const& expected)
 {
-    BOOST_CHECK((boost::size(line) == 3));
-    BOOST_CHECK((bg::num_points(line) == 3));
+    std::ostringstream out;
+    out << bg::wkt(geometry);
+    BOOST_CHECK_EQUAL(out.str(), expected);
+}
 
-    typedef typename bg::point_type<Linestring>::type point_type;
-    point_type const& p0 = line[0];
-    BOOST_CHECK(bg::get<0>(p0) == 1);
-    BOOST_CHECK(bg::get<1>(p0) == 2);
+template <typename Geometry, typename Points>
+void check_assign_points(Points const& points, std::string const& /*expected*/)
+{
+    Geometry geometry;
+    bg::assign_points(geometry, points);
+    check_geometry(geometry, "LINESTRING(1 2,3 4,5 6)");
 
-    point_type const& p1 = line[1];
-    BOOST_CHECK(bg::get<0>(p1) == 3);
-    BOOST_CHECK(bg::get<1>(p1) == 4);
-
-    point_type const& p2 = line[2];
-    BOOST_CHECK(bg::get<0>(p2) == 5);
-    BOOST_CHECK(bg::get<1>(p2) == 6);
+    boost::variant<Geometry> v;
+    bg::assign_points(v, points);
 }
 
 template <typename Point>
@@ -54,24 +56,21 @@ void test_assign_linestring_2d()
 
     // Test assignment of plain array (note that this is only possible if adapted c-array is included!)
     const double coors[3][2] = { {1, 2}, {3, 4}, {5, 6} };
-    bg::assign_points(line, coors);
-    check_linestring_2d(line);
+    check_assign_points<bg::model::linestring<Point> >(coors, "LINESTRING(1 2,3 4,5 6)");
 
     // Test assignment of point array
     Point points[3];
     bg::assign_values(points[0], 1, 2);
     bg::assign_values(points[1], 3, 4);
     bg::assign_values(points[2], 5, 6);
-    bg::assign_points(line, points);
-    check_linestring_2d(line);
+    check_assign_points<bg::model::linestring<Point> >(points, "LINESTRING(1 2,3 4,5 6)");
 
     // Test assignment of array with different point-type (tuple adaption should be included)
     boost::tuple<float, float> tuples[3];
     tuples[0] = boost::make_tuple(1, 2);
     tuples[1] = boost::make_tuple(3, 4);
     tuples[2] = boost::make_tuple(5, 6);
-    bg::assign_points(line, tuples);
-    check_linestring_2d(line);
+    check_assign_points<bg::model::linestring<Point> >(tuples, "LINESTRING(1 2,3 4,5 6)");
 }
 
 namespace detail
@@ -113,26 +112,18 @@ void test_assign_box_2d()
     detail::test_assign_box_or_segment_2d<bg::model::box<Point> >();
 }
 
-
 template <typename Point>
 void test_assign_point_3d()
 {
     Point p;
     bg::assign_values(p, 1, 2, 3);
-    BOOST_CHECK(bg::get<0>(p) == 1);
-    BOOST_CHECK(bg::get<1>(p) == 2);
-    BOOST_CHECK(bg::get<2>(p) == 3);
+    check_geometry(p, "POINT(1 2 3)");
 
     bg::assign_value(p, 123);
-    BOOST_CHECK(bg::get<0>(p) == 123);
-    BOOST_CHECK(bg::get<1>(p) == 123);
-    BOOST_CHECK(bg::get<2>(p) == 123);
+    check_geometry(p, "POINT(123 123 123)");
 
     bg::assign_zero(p);
-    BOOST_CHECK(bg::get<0>(p) == 0);
-    BOOST_CHECK(bg::get<1>(p) == 0);
-    BOOST_CHECK(bg::get<2>(p) == 0);
-
+    check_geometry(p, "POINT(0 0 0)");
 }
 
 template <typename P>
@@ -158,7 +149,7 @@ void test_assign_conversion()
     bg::set<bg::min_corner, 1>(b, 2);
     bg::set<bg::max_corner, 0>(b, 3);
     bg::set<bg::max_corner, 1>(b, 4);
-	
+
     ring_type ring;
     bg::assign(ring, b);
 
@@ -169,10 +160,6 @@ void test_assign_conversion()
 
     }
 
-
-    //std::cout << bg::wkt(b) << std::endl;
-    //std::cout << bg::wkt(ring) << std::endl;
-
     typename boost::range_const_iterator<ring_type>::type it = ring.begin();
     BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
     BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
@@ -203,21 +190,86 @@ void test_assign_conversion()
 }
 
 
+template <typename P>
+void test_assign_conversion_variant()
+{
+    typedef bg::model::box<P> box_type;
+    typedef bg::model::ring<P> ring_type;
+    typedef bg::model::polygon<P> polygon_type;
+
+    P p;
+    bg::assign_values(p, 1, 2);
+
+    box_type b;
+    boost::variant<box_type&> variant_b(b);
+    bg::assign(variant_b, p);
+
+    BOOST_CHECK_CLOSE((bg::get<0, 0>(b)), 1.0, 0.001);
+    BOOST_CHECK_CLOSE((bg::get<0, 1>(b)), 2.0, 0.001);
+    BOOST_CHECK_CLOSE((bg::get<1, 0>(b)), 1.0, 0.001);
+    BOOST_CHECK_CLOSE((bg::get<1, 1>(b)), 2.0, 0.001);
+
+
+    bg::set<bg::min_corner, 0>(b, 1);
+    bg::set<bg::min_corner, 1>(b, 2);
+    bg::set<bg::max_corner, 0>(b, 3);
+    bg::set<bg::max_corner, 1>(b, 4);
+
+    ring_type ring;
+    boost::variant<ring_type&> variant_ring(ring);
+    bg::assign(variant_ring, boost::variant<box_type>(b));
+
+    {
+        typedef bg::model::ring<P, false, false> ring_type_ccw;
+        ring_type_ccw ring_ccw;
+        // Should NOT compile (currently): bg::assign(ring_ccw, ring);
+
+    }
+
+    typename boost::range_const_iterator<ring_type>::type it = ring.begin();
+    BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+    BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+    it++;
+    BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+    BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
+    it++;
+    BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
+    BOOST_CHECK_CLOSE(bg::get<1>(*it), 4.0, 0.001);
+    it++;
+    BOOST_CHECK_CLOSE(bg::get<0>(*it), 3.0, 0.001);
+    BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+    it++;
+    BOOST_CHECK_CLOSE(bg::get<0>(*it), 1.0, 0.001);
+    BOOST_CHECK_CLOSE(bg::get<1>(*it), 2.0, 0.001);
+
+    BOOST_CHECK_EQUAL(ring.size(), 5u);
+
+
+    polygon_type polygon;
+    boost::variant<polygon_type&> variant_polygon(polygon);
+
+    bg::assign(variant_polygon, boost::variant<ring_type>(ring));
+    BOOST_CHECK_EQUAL(bg::num_points(polygon), 5u);
+
+    ring_type ring2;
+    boost::variant<ring_type&> variant_ring2(ring2);
+    bg::assign(variant_ring2, boost::variant<polygon_type>(polygon));
+    BOOST_CHECK_EQUAL(bg::num_points(ring2), 5u);
+}
+
+
 template <typename Point>
 void test_assign_point_2d()
 {
     Point p;
     bg::assign_values(p, 1, 2);
-    BOOST_CHECK(bg::get<0>(p) == 1);
-    BOOST_CHECK(bg::get<1>(p) == 2);
+    check_geometry(p, "POINT(1 2)");
 
     bg::assign_value(p, 123);
-    BOOST_CHECK(bg::get<0>(p) == 123);
-    BOOST_CHECK(bg::get<1>(p) == 123);
+    check_geometry(p, "POINT(123 123)");
 
     bg::assign_zero(p);
-    BOOST_CHECK(bg::get<0>(p) == 0);
-    BOOST_CHECK(bg::get<1>(p) == 0);
+    check_geometry(p, "POINT(0 0)");
 }
 
 
@@ -242,6 +294,7 @@ int test_main(int, char* [])
     test_assign_point_2d<bg::model::point<double, 2, bg::cs::cartesian> >();
 
     test_assign_conversion<bg::model::point<double, 2, bg::cs::cartesian> >();
+    test_assign_conversion_variant<bg::model::point<double, 2, bg::cs::cartesian> >();
 
 
     // Segment (currently) cannot handle array's because derived from std::pair
diff --git a/test/algorithms/buffer.cpp b/test/algorithms/buffer.cpp
index f64a25f9d..fc591e630 100644
--- a/test/algorithms/buffer.cpp
+++ b/test/algorithms/buffer.cpp
@@ -13,6 +13,8 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/algorithms/buffer.hpp>
@@ -32,11 +34,16 @@ void test_all()
 
     P p1(0, 0);
     P p2(2, 2);
-    bg::model::box<P> b1(p1, p2);
 
-    bg::model::box<P> b2;
+    typedef bg::model::box<P> box_type;
+
+    box_type b1(p1, p2);
+    box_type b2;
     bg::buffer(b1, b2, coordinate_type(2));
 
+    boost::variant<box_type> v(b1);
+    bg::buffer(v, b2, coordinate_type(2));
+
     // TODO: Check if buffer is correct
     // using bg::equals to compare boxes
     // (TODO: implement that)
diff --git a/test/algorithms/buffer/Jamfile.v2 b/test/algorithms/buffer/Jamfile.v2
new file mode 100644
index 000000000..8b3b129ba
--- /dev/null
+++ b/test/algorithms/buffer/Jamfile.v2
@@ -0,0 +1,24 @@
+# Boost.Geometry (aka GGL, Generic Geometry Library)
+#
+# Copyright (c) 2011-2013 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)
+
+project boost-geometry-algorithms-buffer
+    :
+    requirements
+        <include>.
+    ;
+
+test-suite boost-geometry-algorithms-buffer
+    :
+    [ run point_buffer.cpp ]
+    [ run linestring_buffer.cpp ]
+    [ run polygon_buffer.cpp ]
+    [ run multi_point_buffer.cpp ]
+    [ run multi_linestring_buffer.cpp ]
+    [ run multi_polygon_buffer.cpp ]
+    ;
+
diff --git a/test/algorithms/buffer/aimes_linestring_buffer.cpp b/test/algorithms/buffer/aimes_linestring_buffer.cpp
new file mode 100644
index 000000000..5bc2c8fe3
--- /dev/null
+++ b/test/algorithms/buffer/aimes_linestring_buffer.cpp
@@ -0,0 +1,494 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+#include <test_buffer.hpp>
+
+#include <boost/geometry/algorithms/buffer.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+
+
+// Test cases of the list sent by Aimes on geometry list at 2012 Jul 19.
+// Complete list at: http://boost-geometry.203548.n3.nabble.com/file/n4025063/BufferProblems.txt
+template <typename P>
+void test_aimes()
+{
+    static std::string testcases[] =
+    {
+    "LINESTRING(-3.031075 52.22385,-3.030809 52.223579,-3.030424 52.223207,-3.030212 52.222931,-3.030013 52.222764,-3.029721 52.222584,-3.029469 52.222443,-3.029218 52.222319,-3.028886 52.222187,-3.028859 52.222176,-3.028815 52.222158,-3.028563 52.222016,-3.028462 52.221945,-3.028407 52.221881,-3.028351 52.22179,-3.028301 52.221718,-3.028203 52.221601,-3.028151 52.221552,-3.027982 52.221422,-3.027871 52.221353,-3.027755 52.221293,-3.027573 52.22121,-3.027493 52.221179,-3.027463 52.221165,-3.027147 52.221065,-3.027045 52.221039,-3.026812 52.220989,-3.026691 52.220968,-3.026602 52.220957,-3.026111 52.220898,-3.025715 52.220861,-3.025332 52.220842,-3.025011 52.220845,-3.024587 52.220849,-3.024339 52.220869,-3.024213 52.220881,-3.024103 52.220905,-3.023904 52.220966,-3.023687 52.221027,-3.023575 52.221054,-3.023409 52.221077,-3.023317 52.221072,-3.023259 52.221049,-3.023028 52.220905,-3.022859 52.220819,-3.022799 52.220774,-3.022739 52.220688)",
+    "LINESTRING(-3.056646 52.20421,-3.055298 52.204143,-3.054991 52.204119,-3.053966 52.204125,-3.053793 52.204126)",
+    "LINESTRING(-3.040117 52.307787,-3.040012 52.307874,-3.03999 52.30792,-3.039986 52.307973,-3.040054 52.308123,-3.040092 52.308238,-3.040125 52.308398,-3.040165 52.308558,-3.040194 52.308587,-3.040539 52.30889,-3.040868 52.309147,-3.041196 52.309396,-3.042401 52.310114,-3.042414 52.310121,-3.042758 52.31032,-3.04277 52.310327,-3.042779 52.310353,-3.042771 52.31038,-3.042746 52.310444,-3.042627 52.310704,-3.042601 52.310799,-3.042588 52.310846,-3.042588 52.310941,-3.042596 52.311007,-3.04261 52.311035,-3.04264 52.311099,-3.042646 52.311111,-3.042662 52.311134,-3.042681 52.311161,-3.042708 52.311199,-3.042792 52.311275,-3.042808 52.31129,-3.042908 52.311364,-3.04294 52.311385,-3.042996 52.311423,-3.043232 52.311542,-3.043424 52.311632,-3.043447 52.311641,-3.043452 52.311643,-3.043537 52.311677,-3.043725 52.311728,-3.043876 52.311759,-3.044048 52.311784,-3.044325 52.311813,-3.044963 52.31187,-3.045654 52.311927,-3.046044 52.31196,-3.04609 52.311963,-3.046235 52.311979,-3.046374 52.312015,-3.046477 52.312058,-3.046587 52.312109,-3.046654 52.312147,-3.046771 52.312228,-3.046962 52.312372,-3.047043 52.312443,-3.047089 52.312498,-3.04711 52.312547,-3.047112 52.312586,-3.047113 52.312607,-3.047105 52.312666,-3.047067 52.312722)",
+    "LINESTRING(-3.054162 52.34456,-3.054088 52.344534,-3.054014 52.344508,-3.053926 52.34449,-3.053823 52.344491,-3.053632 52.344493,-3.053368 52.344513,-3.053149 52.344551,-3.053076 52.34457,-3.053033 52.344588,-3.053003 52.344598)",
+    "LINESTRING(-3.032714 52.342934,-3.032658 52.342814,-3.032617 52.342701,-3.032583 52.342606,-3.032554 52.342502,-3.032517 52.342439,-3.032453 52.34233,-3.032374 52.3422,-3.032325 52.342121,-3.032288 52.342056,-3.032252 52.342028)",
+    "LINESTRING(-3.041066 52.338221,-3.040547 52.33801,-3.040399 52.337939,-3.040398 52.337921,-3.040427 52.337894,-3.040456 52.337867,-3.040499 52.337849)",
+    "LINESTRING(-3.044091 52.565713,-3.044077 52.565734,-3.044071 52.565742,-3.044028 52.565796,-3.043992 52.565879,-3.043952 52.565959,-3.043915 52.566,-3.043857 52.56604,-3.043741 52.566113,-3.043492 52.566223,-3.042615 52.566563,-3.042425 52.566646,-3.042294 52.566683,-3.041932 52.566745,-3.041648 52.566791,-3.041445 52.566841,-3.041226 52.566924,-3.041066 52.566992,-3.04089 52.567056,-3.040865 52.56708,-3.040858 52.5671,-3.040879 52.567118,-3.040944 52.567135,-3.041034 52.567137,-3.041288 52.567141,-3.041822 52.567144,-3.042107 52.567134,-3.042245 52.567142,-3.04229 52.56715,-3.042558 52.567247,-3.042736 52.56729,-3.042918 52.567326,-3.043082 52.567338,-3.043388 52.567401,-3.043848 52.567532,-3.043908 52.567568,-3.043923 52.567577,-3.043938 52.567603,-3.04394 52.567657,-3.043941 52.567711,-3.043895 52.56798,-3.043869 52.568115,-3.043868 52.568138,-3.043869 52.568158)",
+    "LINESTRING(-3.039713 52.536795,-3.039808 52.536825,-3.039958 52.536844,-3.040172 52.536885,-3.040322 52.536924,-3.040476 52.536964,-3.04061 52.536989,-3.040678 52.536992,-3.040773 52.536986,-3.040949 52.536958,-3.041148 52.536905,-3.041312 52.536857,-3.041544 52.536777,-3.04173 52.536705,-3.041942 52.536634,-3.042081 52.5366,-3.042204 52.53659,-3.042324 52.536587,-3.042414 52.536591,-3.042491 52.536598,-3.042595 52.536619,-3.042767 52.536683,-3.042916 52.536749,-3.043007 52.536786,-3.043108 52.5368)",
+    "LINESTRING(-3.049078 52.571837,-3.049229 52.571855,-3.04964 52.571857,-3.049841 52.571858,-3.049967 52.571873,-3.05006 52.571903,-3.050094 52.571922,-3.050135 52.57194,-3.050228 52.571958,-3.05033 52.571969,-3.050391 52.571987,-3.050413 52.572027,-3.050421 52.572072,-3.050386 52.572205)",
+    "LINESTRING(-2.983733 52.233609,-2.98371 52.233684,-2.983736 52.233793,-2.98379 52.233906,-2.983869 52.233994,-2.984058 52.234121,-2.984225 52.234228,-2.984382 52.234341,-2.984557 52.234481,-2.984695 52.234575,-2.984716 52.234589,-2.984758 52.234617,-2.984943 52.234694,-2.984978 52.234706,-2.985031 52.234722,-2.98506 52.234731,-2.985343 52.234799,-2.985594 52.234867,-2.985755 52.234917,-2.986071 52.23497,-2.9863 52.235006,-2.986458 52.235044,-2.986602 52.235109,-2.987015 52.23534,-2.987215 52.235464,-2.987423 52.235617,-2.987637 52.235785,-2.987968 52.23602,-2.988192 52.236213,-2.988438 52.236386,-2.988512 52.236449,-2.988579 52.236505,-2.98865 52.236583,-2.98869 52.236656,-2.988721 52.236744,-2.988612 52.236848,-2.988548 52.236932,-2.988497 52.237107,-2.988432 52.237336,-2.988372 52.237567,-2.98833 52.237709,-2.988286 52.23788,-2.988233 52.23807,-2.988249 52.238145,-2.988291 52.238321,-2.988323 52.238505,-2.988379 52.238624,-2.988435 52.238727,-2.988438 52.238732,-2.988466 52.238777,-2.988485 52.238809,-2.988525 52.238854,-2.98858 52.238916,-2.988715 52.239098,-2.988806 52.239204,-2.988865 52.239275,-2.988962 52.239393,-2.989045 52.239474,-2.989244 52.239629,-2.989254 52.239636,-2.989273 52.239649,-2.989508 52.239816,-2.989534 52.239835,-2.989747 52.23998,-2.989769 52.239996,-2.98982 52.240033,-2.989843 52.240055,-2.989949 52.240152,-2.989956 52.240159,-2.99002 52.240248,-2.990074 52.240334,-2.990079 52.24034,-2.990089 52.240357,-2.990106 52.240401,-2.99015 52.240512,-2.990268 52.240793,-2.990336 52.24095,-2.990425 52.241123,-2.990472 52.241198,-2.990617 52.241383,-2.990723 52.241527,-2.990784 52.241601,-2.990811 52.241633,-2.990859 52.241753,-2.990892 52.241854,-2.99094 52.241995,-2.990947 52.242025,-2.990958 52.24207,-2.991023 52.242175,-2.991122 52.242333,-2.991202 52.242485,-2.991276 52.242624,-2.991408 52.242809,-2.991639 52.2431,-2.99172 52.243202,-2.991734 52.243222,-2.991897 52.243461,-2.991944 52.243547,-2.992072 52.243781,-2.992267 52.244138,-2.992431 52.244408,-2.992503 52.244532,-2.992657 52.244802,-2.992761 52.245063,-2.9928 52.245305,-2.992813 52.245622,-2.992822 52.245701,-2.99281 52.245784,-2.992793 52.245867,-2.992771 52.245927,-2.992736 52.245978,-2.992646 52.246076,-2.992573 52.246144,-2.992455 52.246276,-2.992316 52.246468,-2.992432 52.246557,-2.99253 52.246568,-2.992901 52.246565,-2.993581 52.246527,-2.993926 52.246509,-2.994191 52.246514)",
+    "LINESTRING(-3.012501 52.228425,-3.012694 52.22837,-3.012848 52.228308,-3.012946 52.22824,-3.013055 52.228146,-3.013123 52.228048,-3.013182 52.227904,-3.013242 52.227742,-3.013269 52.227632,-3.01327 52.227553,-3.013245 52.227479,-3.013151 52.227332,-3.013072 52.227223,-3.012938 52.227095,-3.012779 52.226936,-3.01271 52.226867,-3.012639 52.226817,-3.012452 52.226743,-3.012278 52.226685,-3.01201 52.226616,-3.011707 52.226519,-3.011541 52.226458,-3.011388 52.22638,-3.011334 52.226352,-3.011111 52.226206,-3.010983 52.226107,-3.010893 52.226012,-3.010832 52.225905,-3.010825 52.225845,-3.010841 52.225687,-3.010858 52.225516,-3.010857 52.225451,-3.010844 52.225405,-3.010747 52.225247,-3.01062 52.225123,-3.010467 52.224893,-3.010372 52.224658)",
+    "LINESTRING(-2.998218 52.230123,-2.998074 52.230203,-2.998066 52.230206,-2.997957 52.230258,-2.997863 52.230302,-2.997049 52.230561,-2.996351 52.230783,-2.995741 52.230976,-2.995552 52.231032)",
+    "LINESTRING(-3.005291 52.231131,-3.005218 52.2312,-3.005076 52.23132,-3.004901 52.231443,-3.004725 52.231551,-3.004586 52.231621,-3.004439 52.231667,-3.004381 52.231685,-3.004236 52.231693,-3.004106 52.231684,-3.003877 52.231653,-3.003705 52.231618,-3.003613 52.231587,-3.003529 52.231549,-3.003019 52.231279,-3.002922 52.231244,-3.002789 52.231196,-3.002657 52.231144,-3.002492 52.231112,-3.002372 52.231091,-3.002239 52.231073,-3.001708 52.231062,-3.001596 52.231053,-3.000959 52.230853,-3.000714 52.230758,-3.00005 52.2305,-2.999016 52.230131,-2.999001 52.230122)",
+    "LINESTRING(-3.031075 52.22385,-3.030809 52.223579,-3.030424 52.223207,-3.030212 52.222931,-3.030013 52.222764,-3.029721 52.222584,-3.029469 52.222443,-3.029218 52.222319,-3.028886 52.222187,-3.028859 52.222176,-3.028815 52.222158,-3.028563 52.222016,-3.028462 52.221945,-3.028407 52.221881,-3.028351 52.22179,-3.028301 52.221718,-3.028203 52.221601,-3.028151 52.221552,-3.027982 52.221422,-3.027871 52.221353,-3.027755 52.221293,-3.027573 52.22121,-3.027493 52.221179,-3.027463 52.221165,-3.027147 52.221065,-3.027045 52.221039,-3.026812 52.220989,-3.026691 52.220968,-3.026602 52.220957,-3.026111 52.220898,-3.025715 52.220861,-3.025332 52.220842,-3.025011 52.220845,-3.024587 52.220849,-3.024339 52.220869,-3.024213 52.220881,-3.024103 52.220905,-3.023904 52.220966,-3.023687 52.221027,-3.023575 52.221054,-3.023409 52.221077,-3.023317 52.221072,-3.023259 52.221049,-3.023028 52.220905,-3.022859 52.220819,-3.022799 52.220774,-3.022739 52.220688)",
+    "LINESTRING(-3.005281 52.202464,-3.005919 52.202654,-3.006134 52.202718,-3.007138 52.202939,-3.007725 52.20309)",
+    "LINESTRING(-3.003371 52.210074,-3.003224 52.21001,-3.003195 52.209997,-3.003094 52.209988,-3.003007 52.209981,-3.002994 52.20998,-3.002952 52.209994,-3.002853 52.210026,-3.002667 52.210068,-3.002566 52.21008,-3.002539 52.210084,-3.002326 52.210102,-3.002318 52.210103,-3.00231 52.210104,-3.002164 52.210134,-3.001964 52.21022,-3.001792 52.210359)",
+    "LINESTRING(-2.968498 52.185726,-2.968594 52.185677,-2.968762 52.185642,-2.968969 52.185608,-2.969272 52.185575,-2.970091 52.185526,-2.970473 52.185443,-2.971035 52.185384,-2.971959 52.185251,-2.972754 52.185111,-2.973037 52.185044,-2.973168 52.185016,-2.973851 52.184803,-2.97401 52.184739,-2.974271 52.184602,-2.974856 52.184364,-2.97488 52.184356,-2.975153 52.184265,-2.975391 52.184212,-2.975741 52.184173,-2.97598 52.184125,-2.976288 52.184004,-2.976831 52.183673,-2.977132 52.183471,-2.977414 52.183259,-2.977612 52.183012,-2.978006 52.182385,-2.978157 52.182251,-2.97863 52.181886)",
+    "LINESTRING(-2.898438 52.177673,-2.897173 52.178057,-2.896867 52.178131,-2.89675 52.178159,-2.896383 52.178233,-2.896087 52.178291,-2.895818 52.178337,-2.895512 52.178384,-2.895118 52.178441,-2.894593 52.178499,-2.894339 52.178519,-2.894317 52.178514,-2.894308 52.178511,-2.894282 52.178504,-2.894217 52.178425,-2.894159 52.178354,-2.894028 52.178134,-2.894001 52.178031,-2.893855 52.177495,-2.893851 52.177478,-2.893683 52.17713,-2.893553 52.176988,-2.893238 52.176731,-2.893127 52.176628,-2.892918 52.176433,-2.892613 52.176056,-2.892122 52.175233,-2.892067 52.175113,-2.891895 52.174561,-2.891781 52.174335,-2.891634 52.174134,-2.891492 52.17394,-2.891344 52.173699,-2.891083 52.173401,-2.89083 52.173169,-2.890577 52.172964,-2.890468 52.172913,-2.890384 52.172882,-2.890276 52.172865,-2.890107 52.17286,-2.890063 52.172851,-2.889975 52.172834,-2.889808 52.17278,-2.889709 52.172725,-2.889451 52.172532,-2.88907 52.172247,-2.888619 52.171957,-2.888574 52.171916)",
+    "LINESTRING(-3.001027 52.270697,-3.001233 52.270714,-3.00157 52.270711,-3.001614 52.270715,-3.001658 52.270719,-3.001746 52.270736,-3.002 52.270828)",
+    "LINESTRING(-3.002514 52.270973,-3.002616 52.270954,-3.00282 52.270916,-3.002878 52.27088,-3.002978 52.270771,-3.003022 52.270752,-3.003066 52.270743,-3.003124 52.270734)",
+    "LINESTRING(-2.944639 52.25447,-2.944459 52.254529,-2.944255 52.254603,-2.944087 52.254655,-2.943732 52.254787,-2.943453 52.25489,-2.943209 52.254982,-2.943098 52.255011,-2.942917 52.255063,-2.94283 52.255093,-2.94258 52.255195,-2.942226 52.255335,-2.942051 52.255401,-2.941816 52.255507,-2.941631 52.255602,-2.941497 52.255668,-2.941335 52.255741,-2.941207 52.2558,-2.941149 52.255815,-2.941074 52.255876,-2.94107 52.255945,-2.941106 52.255995,-2.941153 52.256023,-2.94152 52.25616,-2.941797 52.256259,-2.94205 52.256349,-2.9425 52.256509,-2.942615 52.256533,-2.942714 52.256543,-2.94282 52.256546,-2.943027 52.256522,-2.943226 52.256496,-2.943459 52.256443,-2.943774 52.256373,-2.944095 52.256291,-2.944325 52.256228,-2.944471 52.256187,-2.94475 52.256106,-2.944948 52.256054,-2.945042 52.256035,-2.945176 52.256027,-2.945305 52.256026,-2.94547 52.256032,-2.945731 52.256048,-2.945977 52.256064,-2.94623 52.256087,-2.946353 52.256107,-2.94647 52.256139,-2.946483 52.256142,-2.946595 52.256185,-2.946689 52.256202,-2.946889 52.256233,-2.946994 52.256232)",
+    "LINESTRING(-2.983733 52.233609,-2.98371 52.233684,-2.983736 52.233793,-2.98379 52.233906,-2.983869 52.233994,-2.984058 52.234121,-2.984225 52.234228,-2.984382 52.234341,-2.984557 52.234481,-2.984695 52.234575,-2.984716 52.234589,-2.984758 52.234617,-2.984943 52.234694,-2.984978 52.234706,-2.985031 52.234722,-2.98506 52.234731,-2.985343 52.234799,-2.985594 52.234867,-2.985755 52.234917,-2.986071 52.23497,-2.9863 52.235006,-2.986458 52.235044,-2.986602 52.235109,-2.987015 52.23534,-2.987215 52.235464,-2.987423 52.235617,-2.987637 52.235785,-2.987968 52.23602,-2.988192 52.236213,-2.988438 52.236386,-2.988512 52.236449,-2.988579 52.236505,-2.98865 52.236583,-2.98869 52.236656,-2.988721 52.236744,-2.988612 52.236848,-2.988548 52.236932,-2.988497 52.237107,-2.988432 52.237336,-2.988372 52.237567,-2.98833 52.237709,-2.988286 52.23788,-2.988233 52.23807,-2.988249 52.238145,-2.988291 52.238321,-2.988323 52.238505,-2.988379 52.238624,-2.988435 52.238727,-2.988438 52.238732,-2.988466 52.238777,-2.988485 52.238809,-2.988525 52.238854,-2.98858 52.238916,-2.988715 52.239098,-2.988806 52.239204,-2.988865 52.239275,-2.988962 52.239393,-2.989045 52.239474,-2.989244 52.239629,-2.989254 52.239636,-2.989273 52.239649,-2.989508 52.239816,-2.989534 52.239835,-2.989747 52.23998,-2.989769 52.239996,-2.98982 52.240033,-2.989843 52.240055,-2.989949 52.240152,-2.989956 52.240159,-2.99002 52.240248,-2.990074 52.240334,-2.990079 52.24034,-2.990089 52.240357,-2.990106 52.240401,-2.99015 52.240512,-2.990268 52.240793,-2.990336 52.24095,-2.990425 52.241123,-2.990472 52.241198,-2.990617 52.241383,-2.990723 52.241527,-2.990784 52.241601,-2.990811 52.241633,-2.990859 52.241753,-2.990892 52.241854,-2.99094 52.241995,-2.990947 52.242025,-2.990958 52.24207,-2.991023 52.242175,-2.991122 52.242333,-2.991202 52.242485,-2.991276 52.242624,-2.991408 52.242809,-2.991639 52.2431,-2.99172 52.243202,-2.991734 52.243222,-2.991897 52.243461,-2.991944 52.243547,-2.992072 52.243781,-2.992267 52.244138,-2.992431 52.244408,-2.992503 52.244532,-2.992657 52.244802,-2.992761 52.245063,-2.9928 52.245305,-2.992813 52.245622,-2.992822 52.245701,-2.99281 52.245784,-2.992793 52.245867,-2.992771 52.245927,-2.992736 52.245978,-2.992646 52.246076,-2.992573 52.246144,-2.992455 52.246276,-2.992316 52.246468,-2.992432 52.246557,-2.99253 52.246568,-2.992901 52.246565,-2.993581 52.246527,-2.993926 52.246509,-2.994191 52.246514)",
+    "LINESTRING(-2.96971 52.385285,-2.969713 52.385302,-2.969795 52.385527,-2.969832 52.385568,-2.969956 52.38576,-2.970018 52.385883,-2.970042 52.386056,-2.970042 52.386067,-2.970029 52.386343,-2.970014 52.386442,-2.970008 52.386483,-2.970029 52.386586,-2.970032 52.386601,-2.970046 52.38667,-2.970131 52.386944,-2.970207 52.387072,-2.970265 52.387126,-2.970375 52.387143,-2.970425 52.387133,-2.970477 52.387106,-2.970477 52.38709,-2.970472 52.386848,-2.970485 52.386677,-2.970516 52.386575,-2.970655 52.386395,-2.970876 52.386204,-2.971034 52.386111,-2.971198 52.386032,-2.971267 52.386004,-2.97138 52.385958,-2.971639 52.385807,-2.971826 52.385679,-2.972103 52.385586,-2.97241 52.385483,-2.972753 52.385377,-2.973047 52.385311,-2.973623 52.385203,-2.973844 52.385136,-2.974009 52.385057,-2.974682 52.384692,-2.97509 52.384475,-2.975346 52.384353,-2.975663 52.384199,-2.975822 52.384099,-2.976126 52.383856,-2.976248 52.383782,-2.976406 52.383709,-2.976808 52.383507,-2.97691 52.383452,-2.977112 52.383324,-2.977314 52.383143,-2.977415 52.383034,-2.977529 52.382898,-2.9776 52.382799,-2.977628 52.382736,-2.977656 52.382637,-2.977696 52.382474,-2.977693 52.38234,-2.977622 52.382209,-2.977479 52.382031,-2.977175 52.381694,-2.97694 52.381417,-2.976698 52.381146,-2.976623 52.381043,-2.976554 52.380924,-2.976446 52.380715,-2.976363 52.380584,-2.976241 52.380298,-2.976087 52.379831,-2.976036 52.379608,-2.976069 52.37928,-2.976091 52.378928,-2.976071 52.378613,-2.976035 52.378424,-2.975992 52.378395,-2.975901 52.378223,-2.975842 52.378095,-2.975834 52.37802,-2.975822 52.3779,-2.975776 52.377677,-2.97571 52.377473,-2.975613 52.377281,-2.975564 52.377153,-2.975519 52.376974,-2.975433 52.376805,-2.975342 52.376658,-2.975273 52.376573,-2.97521 52.376501,-2.975142 52.376448,-2.975027 52.376371,-2.975012 52.376362,-2.974887 52.376293,-2.974849 52.376237,-2.974917 52.37617,-2.97468 52.376055,-2.974513 52.375966,-2.974362 52.375877,-2.97431 52.375843,-2.974406 52.375776,-2.974582 52.37576,-2.974724 52.37574,-2.974958 52.375653,-2.975739 52.375344,-2.976395 52.37508,-2.976664 52.374976,-2.97683 52.374762)",
+    "LINESTRING(-2.997814 52.40448,-2.997576 52.404378,-2.997296 52.404275,-2.996941 52.404117,-2.99681 52.404059,-2.996536 52.40394,-2.996318 52.403882,-2.996251 52.403881,-2.995987 52.403877,-2.995775 52.403884,-2.995515 52.403893,-2.994131 52.403964,-2.993583 52.403996,-2.992706 52.404048,-2.991636 52.404103,-2.990507 52.404147,-2.990135 52.404129)",
+    "LINESTRING(-2.982697 52.39662,-2.98267 52.396548,-2.982609 52.396497,-2.982548 52.396461,-2.982336 52.396409,-2.981863 52.396237,-2.981625 52.396145,-2.981339 52.396039,-2.981101 52.395931,-2.980871 52.395818,-2.980433 52.395637,-2.979978 52.395444,-2.979797 52.395343,-2.979337 52.395045,-2.978829 52.394739,-2.978805 52.39471,-2.978742 52.394637,-2.978614 52.39454,-2.978484 52.394484,-2.978426 52.394459,-2.97776 52.394027,-2.977536 52.393867,-2.977492 52.393849,-2.977344 52.393805,-2.975869 52.393539,-2.975558 52.393469,-2.975307 52.393408,-2.975026 52.393312,-2.974937 52.393268,-2.974733 52.393166,-2.974573 52.393071,-2.974432 52.39302,-2.974284 52.392994,-2.97424 52.392995,-2.97399 52.392997,-2.973932 52.393006,-2.973771 52.393035)",
+    "LINESTRING(-2.953194 52.366719,-2.953507 52.366736,-2.95351 52.366736,-2.953908 52.366768,-2.954334 52.366791,-2.954562 52.366786,-2.954729 52.366779,-2.95522 52.366749,-2.955385 52.366757,-2.955502 52.366795,-2.955579 52.366826,-2.955921 52.366996,-2.956027 52.367056,-2.95617 52.367141,-2.956353 52.367269,-2.956449 52.367341,-2.956469 52.367356,-2.956512 52.367399,-2.956659 52.367549,-2.956776 52.367661,-2.956944 52.367788,-2.957149 52.367924,-2.95735 52.368033,-2.95769 52.368188,-2.957898 52.368266,-2.95797 52.368293,-2.958228 52.368394,-2.958339 52.368458,-2.958398 52.368522,-2.958431 52.368627,-2.958477 52.368714,-2.95853 52.368773,-2.958568 52.368816,-2.958702 52.368923,-2.958908 52.369053,-2.959013 52.369151,-2.959058 52.369195,-2.959133 52.369258)",
+    "LINESTRING(-2.966068 52.360895,-2.966222 52.360891,-2.966478 52.360892,-2.966667 52.360885,-2.966835 52.360892,-2.967243 52.360923,-2.967495 52.360948,-2.967636 52.360953,-2.968078 52.360941,-2.968299 52.360944,-2.968545 52.360956,-2.968642 52.36095,-2.968822 52.360921,-2.968959 52.360912,-2.96913 52.360911,-2.969356 52.36086,-2.969479 52.360843,-2.969638 52.360834,-2.969796 52.360838,-2.96996 52.360861,-2.970075 52.360884,-2.970228 52.360942,-2.970326 52.360979,-2.970397 52.361011,-2.970521 52.361026,-2.970653 52.361041,-2.97072 52.361051,-2.97083 52.361056,-2.970936 52.36106,-2.97094 52.361061,-2.971028 52.36107,-2.971061 52.361068,-2.971165 52.361061,-2.971173 52.361062,-2.971229 52.361066,-2.971282 52.361087,-2.97138 52.361148,-2.97159 52.361282,-2.971747 52.361379,-2.971835 52.361427,-2.97189 52.361457,-2.971956 52.361493,-2.972094 52.361559,-2.972336 52.361658,-2.972537 52.361748,-2.972635 52.361815,-2.972698 52.361858,-2.972796 52.361938,-2.972891 52.362013,-2.972933 52.362045,-2.973002 52.36209)",
+    "LINESTRING(-2.9647 52.372689,-2.964835 52.372426,-2.964879 52.372262,-2.964847 52.372112,-2.964788 52.372011,-2.964689 52.371911,-2.964426 52.371713,-2.964038 52.371527,-2.963476 52.371297,-2.962907 52.3711,-2.962814 52.371067,-2.962322 52.3709,-2.961904 52.370745,-2.9619 52.370744,-2.961896 52.370742,-2.961634 52.370672,-2.961628 52.370671,-2.961259 52.370618,-2.961135 52.370605,-2.961085 52.3706,-2.961086 52.370591,-2.961095 52.370497,-2.961096 52.370488,-2.961121 52.370455,-2.96131 52.370209,-2.961519 52.369984,-2.961685 52.369803,-2.96174 52.369743,-2.961792 52.369643,-2.961827 52.369523,-2.961869 52.369469)",
+    "LINESTRING(-2.991736 52.342846,-2.991747 52.342813,-2.991756 52.342764,-2.991745 52.342628,-2.991739 52.342554,-2.991732 52.342531,-2.991722 52.342499,-2.991718 52.342485,-2.991714 52.342478,-2.9917 52.342451,-2.99169 52.342431,-2.991614 52.342342,-2.991594 52.342322,-2.991511 52.342239,-2.991321 52.34207,-2.991234 52.341994,-2.991138 52.341912,-2.99098 52.34178,-2.990834 52.34166,-2.990727 52.341549,-2.990648 52.341466,-2.990603 52.341414,-2.990584 52.341391,-2.990528 52.341311,-2.990484 52.341226,-2.990471 52.341181)",
+    "LINESTRING(-2.981095 52.339053,-2.981289 52.3392,-2.981405 52.339277,-2.981642 52.339412,-2.981862 52.339531,-2.98203 52.339615,-2.982129 52.339653,-2.982253 52.339691,-2.982421 52.33973,-2.982601 52.339756,-2.982838 52.339782,-2.982943 52.339791,-2.983192 52.339812,-2.983421 52.339829,-2.983576 52.339841,-2.983713 52.339838,-2.983942 52.339827,-2.984066 52.339821,-2.984197 52.339814,-2.984359 52.339813,-2.984503 52.339822,-2.984523 52.339825,-2.984641 52.339843,-2.984781 52.339878,-2.984989 52.33993,-2.985142 52.339976,-2.98533 52.340048,-2.98545 52.340101,-2.985793 52.340305,-2.986179 52.340517,-2.987262 52.341021,-2.987502 52.341139,-2.987993 52.341405,-2.98828 52.341552,-2.988419 52.341614,-2.988615 52.341683,-2.988796 52.34174,-2.989201 52.34185,-2.98978 52.342006,-2.989938 52.342049,-2.990297 52.342157,-2.990544 52.342244,-2.99059 52.342263,-2.990618 52.342275,-2.990752 52.342331,-2.990972 52.342441,-2.991182 52.342569,-2.991334 52.34268,-2.991462 52.34278,-2.991575 52.342877)",
+    "LINESTRING(-2.978378 52.326615,-2.97858 52.326744,-2.978935 52.326903,-2.979113 52.326964,-2.98031 52.327377,-2.98094 52.327552,-2.981104 52.3276,-2.981291 52.327676,-2.981642 52.327824,-2.981986 52.327972,-2.982377 52.328139,-2.982546 52.328208,-2.982722 52.328274,-2.982959 52.328344,-2.983549 52.328502,-2.983608 52.328518,-2.983888 52.328588,-2.984434 52.328711,-2.984582 52.328744,-2.985255 52.328894)",
+    "LINESTRING(-2.943084 52.483843,-2.943363 52.483805,-2.943509 52.483777,-2.943656 52.483749,-2.943861 52.483702,-2.946632 52.483131,-2.946734 52.483095,-2.946799 52.483048,-2.946915 52.482932,-2.946924 52.482923,-2.947675 52.481978,-2.947651 52.481577)",
+    "LINESTRING(-2.953071 52.469338,-2.953299 52.469326,-2.953594 52.469323,-2.953639 52.469322,-2.953712 52.469319,-2.953768 52.469307,-2.95379 52.469286,-2.953798 52.469217,-2.953806 52.46915,-2.953821 52.469024,-2.953855 52.468907,-2.953909 52.468773,-2.953968 52.468659,-2.954018 52.468562,-2.954068 52.468403,-2.954076 52.46835)",
+    "LINESTRING(-2.916212 52.483947,-2.91619 52.483345,-2.916182 52.48319,-2.916111 52.48314,-2.915883 52.483029,-2.915722 52.482945,-2.915568 52.482864,-2.915468 52.4828,-2.915327 52.482683,-2.915234 52.482569,-2.915128 52.482414,-2.915013 52.482195,-2.914907 52.48201,-2.914737 52.481759,-2.914614 52.481537,-2.914521 52.481405,-2.914382 52.481233,-2.914305 52.481106,-2.914271 52.481006,-2.914213 52.480799,-2.914163 52.480589,-2.914093 52.480359,-2.914032 52.480197,-2.913985 52.480069,-2.913891 52.479905,-2.913802 52.479758,-2.913734 52.479661,-2.913625 52.479521,-2.913468 52.479309,-2.913381 52.479147,-2.913312 52.478929,-2.913259 52.478706,-2.913218 52.478303,-2.913225 52.478168,-2.913255 52.478098,-2.913311 52.478047,-2.913425 52.477985,-2.913772 52.477823,-2.914284 52.477584,-2.914879 52.477304,-2.915429 52.477045,-2.915857 52.476856,-2.915888 52.476843,-2.916396 52.476614,-2.916883 52.476387,-2.917208 52.476227,-2.917382 52.476128,-2.917702 52.47591,-2.917998 52.475688,-2.918258 52.475444,-2.918358 52.475335,-2.918513 52.475115,-2.918572 52.474971,-2.918603 52.474853,-2.918636 52.474674,-2.918663 52.47453,-2.91872 52.474392,-2.918813 52.474244)",
+    "LINESTRING(-2.919312 52.439208,-2.919221 52.439125,-2.919125 52.43902,-2.919047 52.438938,-2.918999 52.438881,-2.918932 52.438799,-2.918872 52.438731,-2.918806 52.438649,-2.918698 52.438542,-2.918601 52.438445,-2.918499 52.438349,-2.918451 52.438292,-2.918439 52.438256,-2.918376 52.438088,-2.918314 52.437944,-2.918234 52.437751,-2.918185 52.437647,-2.918111 52.437478,-2.918055 52.437349,-2.918005 52.437213,-2.917956 52.437109,-2.917925 52.437023,-2.9179 52.43698,-2.917864 52.436926,-2.917809 52.436844,-2.917742 52.436751,-2.917724 52.436719,-2.917693 52.436644,-2.917668 52.436583,-2.917572 52.436479,-2.91747 52.436365,-2.917331 52.436215,-2.917139 52.436033,-2.917043 52.435915,-2.916953 52.435851,-2.916768 52.435712,-2.916576 52.435559,-2.916332 52.435417,-2.916082 52.435279,-2.915838 52.435151,-2.915684 52.435073,-2.915559 52.43501,-2.915481 52.434949,-2.915403 52.434892,-2.915349 52.434824,-2.9153 52.434756,-2.915258 52.434688,-2.915228 52.434645,-2.915186 52.434572,-2.915155 52.434498,-2.915139 52.434444,-2.915139 52.43442,-2.915138 52.434417,-2.915139 52.434415,-2.91516 52.434369,-2.915165 52.434358,-2.915181 52.434324,-2.915231 52.43426,-2.915311 52.434181,-2.915369 52.434138,-2.915495 52.434062,-2.91564 52.433982,-2.915832 52.433884,-2.916101 52.433748,-2.916287 52.433654,-2.916591 52.43349,-2.916911 52.433308,-2.917317 52.433053,-2.917607 52.432862,-2.918043 52.432589,-2.918319 52.432407,-2.91859 52.432242,-2.918741 52.43214,-2.918915 52.43202,-2.919031 52.431948,-2.919164 52.431846,-2.91935 52.4317,-2.919518 52.431584,-2.919732 52.43141,-2.919836 52.431326,-2.920015 52.431156,-2.920147 52.431018,-2.920192 52.430928,-2.920225 52.430809,-2.920223 52.43068,-2.92019 52.430536,-2.920104 52.430342,-2.920006 52.430149,-2.919897 52.429995,-2.919775 52.429802,-2.91972 52.429727,-2.919612 52.429616,-2.919503 52.429521,-2.919419 52.429431,-2.918939 52.429004,-2.918704 52.42882,-2.918615 52.428748,-2.918495 52.428652,-2.918399 52.428585,-2.918197 52.428464,-2.91803 52.428365,-2.917685 52.428162,-2.917572 52.428098,-2.917458 52.428024,-2.917214 52.427882,-2.917012 52.427772,-2.916822 52.427687,-2.916679 52.427623,-2.916631 52.427591,-2.916617 52.427566,-2.916582 52.427504,-2.91651 52.427356)",
+    "LINESTRING(-2.947531 52.452306,-2.947455 52.452225,-2.947258 52.452046,-2.947076 52.45192,-2.946897 52.451781,-2.946825 52.451714,-2.946704 52.451592,-2.946619 52.451467,-2.946503 52.451249,-2.946459 52.451116,-2.946407 52.450915,-2.946378 52.450667,-2.946375 52.45052,-2.946369 52.450229,-2.946394 52.450034,-2.946421 52.449922,-2.946465 52.44976,-2.946549 52.449573,-2.946633 52.449371,-2.946715 52.449246,-2.947034 52.448702,-2.94729 52.448297,-2.947489 52.447958,-2.94775 52.447531,-2.947921 52.447256,-2.948205 52.446801,-2.948314 52.446631,-2.948518 52.446295,-2.948569 52.446201,-2.948642 52.446042,-2.948715 52.445855,-2.948821 52.445591,-2.948888 52.445408,-2.948953 52.445166,-2.948951 52.445083,-2.948944 52.445001,-2.948888 52.444902,-2.948786 52.444799,-2.948738 52.444734,-2.94869 52.444649,-2.948687 52.444493)",
+    "LINESTRING(-2.984196 52.486523,-2.984457 52.486368,-2.984901 52.486099,-2.985548 52.4857,-2.985908 52.48547,-2.986144 52.485334,-2.986369 52.485187,-2.986479 52.485104,-2.986539 52.485057,-2.986632 52.485021,-2.986663 52.485009,-2.986728 52.485002,-2.986917 52.485008,-2.986978 52.485013,-2.987559 52.485093,-2.987778 52.485123,-2.987914 52.485143,-2.988009 52.485137,-2.988065 52.485122,-2.988137 52.485085,-2.988211 52.485037,-2.988273 52.484995,-2.98831 52.484979)",
+    "LINESTRING(-2.995145 52.490812,-2.995121 52.49082,-2.995106 52.490825,-2.995003 52.490841)",
+    "LINESTRING(-2.987242 52.435163,-2.987322 52.435211,-2.987423 52.435307,-2.98768 52.435622,-2.987945 52.435949,-2.988222 52.436339,-2.988312 52.436495,-2.988352 52.436544,-2.988361 52.436555,-2.988405 52.436579,-2.988465 52.436592,-2.988548 52.436586,-2.988625 52.436547,-2.988673 52.436501,-2.988917 52.436278,-2.989057 52.43615,-2.989383 52.435896,-2.989453 52.435863,-2.989572 52.435828,-2.989748 52.435819,-2.990029 52.435835,-2.990331 52.435876,-2.990701 52.435933,-2.990873 52.435968,-2.990993 52.435992,-2.991047 52.436006,-2.991327 52.436078,-2.992217 52.436386,-2.992457 52.436462,-2.992636 52.436531,-2.992846 52.436578,-2.993009 52.436622,-2.993203 52.436691,-2.993324 52.436736,-2.99351 52.436806,-2.993735 52.436909,-2.993967 52.43702,-2.994208 52.437165,-2.994378 52.437262,-2.994486 52.437308,-2.994589 52.437341,-2.994683 52.43736,-2.994729 52.437357,-2.994784 52.437355,-2.994838 52.437352,-2.994951 52.437331,-2.995025 52.437296,-2.995207 52.437212,-2.995258 52.437194,-2.995512 52.43715,-2.995565 52.437141,-2.995813 52.437096,-2.995912 52.437047,-2.996021 52.436998)",
+    "LINESTRING(-3.029102 52.479538,-3.029049 52.479509,-3.028994 52.479479,-3.028888 52.479419,-3.028646 52.47933,-3.028348 52.479265,-3.028073 52.479214,-3.02755 52.479103,-3.027262 52.47905,-3.027073 52.479053,-3.026789 52.479067,-3.026518 52.47907,-3.026262 52.479053,-3.025955 52.479011,-3.025684 52.47899,-3.025529 52.478978,-3.025097 52.478974,-3.024128 52.47895,-3.023829 52.478945,-3.023721 52.478946,-3.023507 52.478953,-3.023167 52.478975,-3.022985 52.478992,-3.02261 52.479015,-3.021561 52.479059,-3.020843 52.479097,-3.020462 52.47911,-3.020266 52.479114,-3.020121 52.479106,-3.019963 52.47908,-3.019725 52.479036,-3.01932 52.478968,-3.018772 52.478867,-3.018526 52.478829,-3.018251 52.478814,-3.017985 52.478774,-3.017884 52.478751,-3.017605 52.478673,-3.017112 52.478514,-3.016597 52.478347,-3.016245 52.478223,-3.015841 52.478072,-3.015526 52.477969,-3.015358 52.477924,-3.014825 52.477794,-3.014565 52.47771,-3.014336 52.477613,-3.014103 52.4775,-3.013876 52.47739,-3.01364 52.477248,-3.013381 52.4771,-3.013161 52.476988,-3.013064 52.476926)",
+    "LINESTRING(-3.008701 52.44449,-3.008806 52.444489,-3.008871 52.444477,-3.00893 52.444439,-3.008992 52.444367,-3.009041 52.444272,-3.009049 52.444253,-3.009086 52.444167,-3.009098 52.444151,-3.009134 52.444105,-3.009155 52.444079,-3.009207 52.444041,-3.009221 52.444037,-3.009296 52.444019,-3.009444 52.444016,-3.009517 52.444026,-3.009602 52.444065,-3.009694 52.444138,-3.009901 52.444328,-3.010028 52.444423,-3.010179 52.444535,-3.010234 52.444616,-3.010236 52.4447,-3.01023 52.444761,-3.010174 52.444835,-3.009969 52.445065,-3.009889 52.445178,-3.009855 52.445256,-3.009839 52.445333,-3.009853 52.445429,-3.009877 52.445498,-3.010006 52.445802,-3.010081 52.445987,-3.010137 52.446124,-3.010162 52.446161,-3.010229 52.446251,-3.010268 52.446287,-3.010294 52.446311,-3.010299 52.446313,-3.010328 52.446328,-3.010406 52.446368,-3.010632 52.446455,-3.010819 52.446526,-3.011086 52.446642,-3.011376 52.446774,-3.011647 52.446917,-3.011727 52.446963,-3.011901 52.447061,-3.012048 52.447139,-3.012145 52.447179,-3.012182 52.447194,-3.012277 52.447234,-3.01243 52.447287,-3.012658 52.447348,-3.012779 52.447373,-3.012893 52.447397,-3.012977 52.447417,-3.012991 52.447421,-3.013064 52.447438,-3.013156 52.447476,-3.013197 52.447503,-3.013264 52.447547,-3.013364 52.447637,-3.013408 52.447677,-3.013462 52.447734,-3.013562 52.447839,-3.013753 52.448031,-3.013818 52.44808,-3.013951 52.44818,-3.014102 52.448282,-3.014287 52.448381,-3.014469 52.448466,-3.014688 52.44857,-3.014982 52.448692,-3.015141 52.448747,-3.015189 52.448758,-3.015261 52.448775,-3.015477 52.448805,-3.015627 52.448814,-3.015683 52.448818,-3.015766 52.448816,-3.01584 52.448814,-3.015968 52.44881,-3.016098 52.448795,-3.016222 52.44878,-3.016235 52.448779,-3.016315 52.448758,-3.0164 52.448737,-3.016504 52.44871,-3.016553 52.448693,-3.016907 52.44857,-3.01692 52.448565,-3.017298 52.448432,-3.017657 52.448308,-3.018457 52.448028,-3.018735 52.447925,-3.019186 52.447718,-3.019297 52.447667,-3.019504 52.447573,-3.019691 52.447485,-3.020021 52.447306,-3.02034 52.447097,-3.020412 52.447042,-3.020528 52.446951,-3.020585 52.446897,-3.0207 52.446752,-3.02077 52.446625,-3.020854 52.446427,-3.020881 52.446319,-3.02093 52.446112,-3.020953 52.446002,-3.020959 52.445992,-3.02098 52.445958,-3.021035 52.445909,-3.021088 52.445881,-3.021142 52.445861,-3.021244 52.445841,-3.021316 52.445845,-3.021396 52.445857,-3.021469 52.445882,-3.021555 52.445938,-3.021636 52.446023,-3.02173 52.446141,-3.021988 52.446453,-3.022105 52.44658,-3.022157 52.446676,-3.022161 52.446683,-3.022195 52.446757,-3.022211 52.446841,-3.022242 52.447147,-3.022262 52.447328,-3.022289 52.4474,-3.022322 52.447442,-3.02234 52.447465,-3.022449 52.44753,-3.022566 52.447562,-3.022722 52.447581,-3.022849 52.447588,-3.023013 52.447578,-3.023241 52.447549,-3.02373 52.447493,-3.023942 52.447483)",
+    "LINESTRING(-2.888846 52.559077,-2.888526 52.559015,-2.8881 52.558936,-2.887961 52.558894,-2.887797 52.55883,-2.887612 52.558738,-2.887359 52.558609,-2.887079 52.558467,-2.886905 52.558368,-2.886651 52.558193,-2.886535 52.55806,-2.886397 52.55782,-2.886355 52.557709,-2.886353 52.557593,-2.886389 52.557524,-2.886442 52.55749,-2.886469 52.557473,-2.886648 52.557357,-2.886851 52.557271,-2.887098 52.557196,-2.887359 52.557129,-2.887542 52.557082,-2.887792 52.557048,-2.88827 52.557015,-2.888439 52.556996,-2.888542 52.55699,-2.889071 52.556911,-2.889527 52.556827,-2.889674 52.556817,-2.889807 52.556843,-2.890283 52.55701,-2.890685 52.557196,-2.890908 52.557302,-2.891384 52.557487)",
+    "LINESTRING(-3.001325 52.540011,-3.001671 52.540197,-3.002042 52.540409,-3.002262 52.540556,-3.002374 52.540609,-3.002493 52.54064,-3.002832 52.540729,-3.00343 52.540875,-3.00422 52.541066,-3.004733 52.54121,-3.004769 52.541221,-3.004913 52.54127,-3.005031 52.541311,-3.005047 52.541327,-3.005244 52.541459,-3.005596 52.541763,-3.006017 52.542175,-3.006452 52.542614,-3.006565 52.542732,-3.006843 52.542953,-3.006847 52.542957,-3.006998 52.543117,-3.007013 52.54314,-3.007085 52.543249,-3.007161 52.543314,-3.007272 52.54334,-3.007546 52.543391,-3.007698 52.543446,-3.007879 52.543533,-3.007883 52.543536,-3.008032 52.543626,-3.008038 52.54363,-3.008144 52.543722,-3.008188 52.543761,-3.008298 52.543868,-3.008317 52.543886,-3.008438 52.54404,-3.008465 52.544087,-3.008538 52.544214,-3.008612 52.544387,-3.008682 52.544563)",
+    "LINESTRING(-3.011001 52.573086,-3.012121 52.572393,-3.01401 52.571244,-3.014085 52.571198,-3.014816 52.570754,-3.014951 52.570672,-3.015417 52.570455,-3.015886 52.570226,-3.016029 52.570153,-3.016323 52.569987,-3.016482 52.569904,-3.016585 52.569854,-3.016815 52.569735,-3.016974 52.56964,-3.017033 52.569586,-3.017063 52.569502,-3.017065 52.569402,-3.017007 52.569243,-3.016987 52.569186,-3.016885 52.568864,-3.016852 52.568756)",
+    "LINESTRING(-3.015129 52.575841,-3.015019 52.575829,-3.014945 52.575821,-3.014885 52.575812,-3.014782 52.575786,-3.014678 52.57576,-3.014574 52.575734,-3.01447 52.575717,-3.014445 52.575713,-3.014381 52.5757,-3.0142 52.575673,-3.013943 52.575639,-3.013602 52.575603)",
+    "LINESTRING(-3.019494 52.52701,-3.019262 52.527165,-3.01868 52.527548,-3.018282 52.52781,-3.01832 52.527865,-3.018397 52.528008,-3.018519 52.528205,-3.018731 52.528464,-3.018942 52.528642,-3.019077 52.52874,-3.019108 52.528766,-3.019393 52.529033,-3.019454 52.529105,-3.01956 52.529248,-3.019938 52.52977,-3.020112 52.529971,-3.020139 52.530025,-3.020088 52.530084,-3.020002 52.530183,-3.019925 52.530293)",
+    "LINESTRING(-2.740076 52.23265,-2.740031 52.232641,-2.739944 52.232642,-2.739856 52.232643,-2.739753 52.232652,-2.739637 52.23268,-2.739535 52.232734,-2.739506 52.232762,-2.739406 52.232888,-2.739377 52.232906,-2.739333 52.232934,-2.73929 52.232952,-2.739217 52.232961,-2.739071 52.232971,-2.738968 52.232981)",
+    "LINESTRING(-2.74881 52.228926,-2.748782 52.228995,-2.748772 52.229095,-2.748813 52.229324,-2.74882 52.229329,-2.7489 52.22938,-2.748952 52.229431,-2.748997 52.229574,-2.749054 52.229656,-2.74907 52.229679,-2.749201 52.229778)",
+    "LINESTRING(-2.762382 52.225983,-2.7627 52.225925,-2.763153 52.225859,-2.763517 52.225776,-2.763912 52.225686)",
+    "LINESTRING(-2.798257 52.212656,-2.798231 52.212824,-2.798217 52.212861,-2.798145 52.212924,-2.797348 52.213361,-2.79711 52.21347,-2.796976 52.213514,-2.796803 52.213559,-2.796593 52.213602,-2.796416 52.213631,-2.796137 52.213677,-2.795965 52.213701,-2.795794 52.213715,-2.795591 52.213721,-2.79543 52.21372,-2.795302 52.213724,-2.795172 52.213737,-2.795033 52.213758,-2.794911 52.213788,-2.794771 52.213826,-2.794724 52.213839,-2.794536 52.213891,-2.794189 52.213996,-2.793878 52.214113,-2.793834 52.21414,-2.79356 52.214357,-2.793459 52.214421,-2.793285 52.214494,-2.793038 52.214595,-2.792965 52.214613,-2.792921 52.214622,-2.792863 52.214632,-2.792819 52.214632,-2.792731 52.214615,-2.792443 52.214496)",
+    "LINESTRING(-2.770867 52.164475,-2.770805 52.164343,-2.770749 52.164267,-2.770768 52.164207,-2.770905 52.164126,-2.771177 52.16399,-2.771345 52.163895,-2.771531 52.163784,-2.771669 52.163688,-2.77181 52.163566,-2.771884 52.163495,-2.771993 52.163371,-2.7721 52.163235,-2.772176 52.163118,-2.772345 52.163,-2.772474 52.162882,-2.772558 52.162848,-2.772658 52.162837,-2.77279 52.162871,-2.772898 52.163016,-2.773065 52.163285,-2.773134 52.163376,-2.773404 52.163732,-2.773459 52.163818,-2.77355 52.16408)",
+    "LINESTRING(-2.781014 52.154968,-2.780805 52.154691,-2.780461 52.154235,-2.780358 52.154095,-2.780245 52.153973,-2.780063 52.153849,-2.77988 52.153794,-2.779824 52.153785,-2.779736 52.153772,-2.77963 52.153756,-2.779487 52.153738)",
+    "LINESTRING(-2.870687 52.157811,-2.870528 52.157893,-2.870484 52.157902,-2.870124 52.157943,-2.869676 52.157994)",
+    "LINESTRING(-2.791074 52.328059,-2.791045 52.32805,-2.791015 52.328041,-2.790911 52.32797,-2.790554 52.327667,-2.79042 52.327582,-2.790316 52.327516,-2.79031 52.327512,-2.790063 52.327293,-2.789899 52.327132,-2.789749 52.32698,-2.789689 52.326881,-2.789596 52.326639,-2.789536 52.326523,-2.78952 52.326482,-2.789505 52.326442,-2.789473 52.32629,-2.789516 52.326217,-2.789573 52.326154,-2.789629 52.326096,-2.789686 52.326042,-2.789909 52.325879,-2.789968 52.325835,-2.790036 52.325764,-2.790079 52.32571,-2.790135 52.325593,-2.790177 52.325449,-2.790223 52.325296)",
+    "LINESTRING(-2.773759 52.312448,-2.77381 52.312252,-2.773812 52.312017,-2.773804 52.311886,-2.77377 52.311786,-2.773674 52.311637,-2.773624 52.311554,-2.773614 52.311493,-2.773592 52.311322,-2.773565 52.311134,-2.773535 52.311048,-2.773523 52.311013,-2.773473 52.310921,-2.773387 52.310827,-2.773263 52.31071,-2.773185 52.310631,-2.773152 52.310584,-2.773114 52.310494,-2.77309 52.310445,-2.773064 52.310392,-2.773028 52.310346,-2.772976 52.310304,-2.772771 52.310182,-2.77243 52.309952,-2.772317 52.309891,-2.772167 52.309832,-2.771975 52.309775,-2.77168 52.309706,-2.77148 52.309669,-2.77137 52.30967)",
+    "LINESTRING(-2.785431 52.305367,-2.785715 52.305338,-2.785805 52.305312,-2.785869 52.305267,-2.785918 52.305217,-2.785966 52.305127,-2.786009 52.305053,-2.786069 52.304985,-2.786168 52.30492,-2.786481 52.30477,-2.786754 52.30465,-2.786958 52.304563,-2.787363 52.304407,-2.787459 52.304362,-2.787543 52.304308,-2.787585 52.304261,-2.787586 52.304219,-2.787557 52.304173,-2.787526 52.304166,-2.787396 52.304139,-2.786805 52.304046,-2.786647 52.304034,-2.786116 52.304031,-2.785881 52.304033,-2.785573 52.304044,-2.785383 52.304052,-2.785165 52.304042,-2.78493 52.304011,-2.784582 52.303947,-2.784168 52.303884,-2.784024 52.303864,-2.783814 52.303824,-2.783694 52.303791,-2.783578 52.303753,-2.78352 52.303729,-2.783488 52.303712,-2.783434 52.303684,-2.783335 52.303628,-2.783206 52.303549,-2.783037 52.303439,-2.782861 52.303342,-2.782699 52.303257,-2.782395 52.30311,-2.781973 52.302914,-2.781694 52.302819,-2.781396 52.30272,-2.781217 52.302671,-2.780941 52.302616,-2.780775 52.302591,-2.780146 52.3025,-2.779867 52.302464,-2.779539 52.302432,-2.779246 52.302421,-2.778979 52.302411,-2.778679 52.302375,-2.778164 52.302297,-2.7779 52.302263,-2.777551 52.30225,-2.777494 52.302248,-2.776549 52.302209,-2.776271 52.302202,-2.77608 52.302203,-2.775656 52.30226,-2.775393 52.302315,-2.775297 52.302361)",
+    "LINESTRING(-2.768162 52.285915,-2.768448 52.285831,-2.768652 52.285764,-2.768716 52.285764,-2.768724 52.285766,-2.76878 52.28578,-2.768815 52.285808,-2.768911 52.285913,-2.769079 52.286078,-2.769143 52.286115,-2.76922 52.286138,-2.769578 52.286155,-2.769661 52.286164,-2.769734 52.286199,-2.769802 52.286251,-2.769847 52.286303)",
+    "LINESTRING(-2.785332 52.291734,-2.785304 52.291218,-2.785283 52.29103,-2.785269 52.290905)",
+    "LINESTRING(-2.810067 52.296994,-2.810306 52.296809,-2.810486 52.296658,-2.810606 52.296549,-2.810711 52.296415,-2.810832 52.296234,-2.810912 52.296108,-2.810927 52.296089,-2.81152 52.295364,-2.811823 52.29498,-2.812021 52.294804,-2.812244 52.294671,-2.812416 52.294582,-2.812839 52.294371,-2.813389 52.294105,-2.813715 52.293961,-2.814725 52.29352,-2.815498 52.293161,-2.815944 52.292958,-2.816497 52.292709,-2.816911 52.292523,-2.817309 52.292353,-2.817554 52.292232,-2.817807 52.29212,-2.818191 52.291952,-2.818516 52.291758,-2.818674 52.291653,-2.818796 52.291556,-2.819045 52.291358,-2.819169 52.291236,-2.819287 52.291088,-2.819404 52.290933,-2.819521 52.290805,-2.819616 52.290721,-2.819736 52.29064,-2.819933 52.290532,-2.820069 52.290466,-2.820477 52.290285,-2.820695 52.29019,-2.820963 52.290063,-2.821334 52.289891,-2.821566 52.289792,-2.821976 52.289633,-2.822547 52.2894,-2.822746 52.289344,-2.822912 52.289303,-2.823099 52.289258,-2.823253 52.289233,-2.823578 52.289197,-2.823976 52.289155,-2.824248 52.289124,-2.824589 52.289082,-2.824774 52.289047,-2.825019 52.289004,-2.825263 52.288949,-2.825477 52.288862,-2.825763 52.288707,-2.826032 52.288602,-2.826442 52.288464,-2.826752 52.288385,-2.82704 52.288331,-2.827267 52.288288,-2.827426 52.288252,-2.827609 52.28819,-2.827827 52.288111,-2.827996 52.288043,-2.828204 52.287909,-2.828342 52.287776,-2.828584 52.287612,-2.828936 52.287406,-2.829149 52.287291,-2.829567 52.287102,-2.82977 52.287014,-2.830091 52.286903,-2.830346 52.286808,-2.830576 52.286697,-2.830867 52.286455,-2.831063 52.286299,-2.831265 52.286057,-2.831309 52.285924,-2.831315 52.285778,-2.831316 52.285452,-2.831349 52.285112,-2.83138 52.284946,-2.831477 52.28477,-2.831655 52.284461,-2.831747 52.284338,-2.832017 52.284076,-2.832121 52.283978,-2.83233 52.283767,-2.832466 52.283576,-2.832612 52.283282,-2.83271 52.283022,-2.832765 52.282754,-2.832774 52.282516,-2.83276 52.28226,-2.832722 52.282057,-2.832663 52.28172,-2.832668 52.281617,-2.8327 52.281503,-2.832809 52.281175,-2.832862 52.280979,-2.832885 52.280839,-2.832872 52.280765,-2.832837 52.280582,-2.832766 52.280266,-2.832763 52.280223,-2.832772 52.280085,-2.832798 52.279996,-2.832863 52.279778,-2.832882 52.279713,-2.832876 52.279654,-2.832819 52.279514,-2.832641 52.279207,-2.832576 52.279063,-2.832564 52.279002,-2.832572 52.278926,-2.832579 52.278835)",
+    "LINESTRING(-2.8096 52.313156,-2.809812 52.312762,-2.809934 52.312592,-2.810033 52.312491,-2.810125 52.312411,-2.81044 52.312106,-2.810489 52.312065,-2.810617 52.311959,-2.810653 52.31193,-2.810848 52.311783,-2.810927 52.311736,-2.811041 52.311684,-2.811097 52.311676,-2.811322 52.311644,-2.811699 52.311638,-2.811945 52.311586,-2.812366 52.311228,-2.812591 52.311079,-2.812836 52.310968,-2.81304 52.310901,-2.813225 52.310872,-2.813313 52.31088,-2.813416 52.310888,-2.813783 52.311141,-2.813911 52.311216,-2.814051 52.311194,-2.814099 52.311176,-2.814195 52.31114,-2.814227 52.311087,-2.814246 52.311025,-2.814254 52.310972,-2.814214 52.310739,-2.814205 52.31068,-2.81411 52.31053,-2.813621 52.310087,-2.813172 52.309559,-2.813157 52.309541,-2.813064 52.309299,-2.813077 52.309132,-2.813233 52.30893,-2.81437 52.308113,-2.814622 52.307931,-2.815506 52.307296,-2.815512 52.307292,-2.81569 52.307207,-2.81587 52.307147,-2.816298 52.307036,-2.816653 52.306942,-2.816811 52.306893,-2.817057 52.3068,-2.817143 52.30675,-2.817279 52.30664,-2.817435 52.306508,-2.817543 52.306409,-2.817628 52.306361,-2.8179 52.306176,-2.818153 52.306013,-2.818347 52.305877,-2.81847 52.305738,-2.818656 52.305494,-2.818772 52.305448)",
+    "LINESTRING(-2.84966 52.261773,-2.849607 52.261747,-2.849544 52.261684,-2.849539 52.261679,-2.849462 52.26156,-2.849356 52.261536,-2.849261 52.261527,-2.849154 52.261515)",
+    "LINESTRING(-2.871409 52.253843,-2.87124 52.25344,-2.871087 52.253117,-2.871026 52.252974,-2.870964 52.252804,-2.870824 52.2524,-2.870797 52.252328,-2.870748 52.252157,-2.870679 52.251973,-2.870634 52.251891,-2.870588 52.251822,-2.870409 52.2517,-2.870132 52.251533,-2.869956 52.251435,-2.869871 52.251388,-2.869749 52.251338,-2.869334 52.251179,-2.868741 52.250899,-2.868417 52.250783,-2.868236 52.250729,-2.868045 52.250672,-2.866816 52.250353)",
+    "LINESTRING(-2.866721 52.282142,-2.866766 52.282095,-2.866835 52.282034,-2.866896 52.281948,-2.866942 52.281807,-2.866984 52.281567,-2.866991 52.281348,-2.867006 52.281279,-2.867061 52.281207,-2.867135 52.281129,-2.867236 52.281049,-2.867331 52.280989,-2.867449 52.280938,-2.867612 52.280873,-2.868169 52.280722,-2.868635 52.280548,-2.868836 52.280505,-2.868971 52.2805,-2.869074 52.280499,-2.869279 52.280507,-2.869416 52.2805,-2.869557 52.280482,-2.869675 52.280445,-2.869778 52.280377,-2.869861 52.280285,-2.869898 52.280191,-2.869895 52.280142,-2.869892 52.280068,-2.869854 52.279936,-2.869807 52.279858,-2.869681 52.279711,-2.869446 52.279519,-2.869358 52.279459,-2.869315 52.279431,-2.869233 52.279397,-2.869029 52.279331,-2.868575 52.279258,-2.8683 52.279184,-2.868182 52.279139,-2.867982 52.279053,-2.867644 52.278872,-2.867516 52.278822,-2.867511 52.27882,-2.867427 52.278795,-2.867315 52.278778,-2.867175 52.278764,-2.867006 52.27877,-2.866844 52.278795,-2.866732 52.278819,-2.866155 52.278948,-2.865845 52.279016,-2.865695 52.279031,-2.865584 52.279027,-2.865529 52.279025,-2.865376 52.279001,-2.865206 52.278966,-2.865049 52.278909,-2.864961 52.278851,-2.864926 52.278799,-2.864926 52.278784,-2.864925 52.278747,-2.864945 52.278685,-2.864986 52.278636,-2.865202 52.278483,-2.865357 52.278359,-2.865431 52.278293,-2.865515 52.278218,-2.865547 52.278181,-2.865644 52.278066,-2.865765 52.277915,-2.865774 52.277902,-2.865846 52.277793,-2.865912 52.277678,-2.86599 52.277542,-2.86609 52.277401,-2.866137 52.277336,-2.86626 52.2772,-2.866323 52.277128,-2.866543 52.276946,-2.866747 52.276785,-2.866852 52.276704,-2.866996 52.276593,-2.867047 52.27655,-2.867079 52.276496,-2.867102 52.27644,-2.86713 52.276372,-2.86713 52.276355,-2.867129 52.276333,-2.867129 52.276317,-2.867122 52.276257,-2.867119 52.276239,-2.867111 52.276195,-2.867043 52.276054,-2.867001 52.275938,-2.866955 52.275829,-2.866893 52.275746,-2.866827 52.275671,-2.866762 52.275632,-2.866691 52.275578,-2.866513 52.275507,-2.866306 52.275444,-2.86601 52.275385,-2.865752 52.275365,-2.865458 52.275371,-2.86523 52.275395,-2.865015 52.275435,-2.864873 52.275467,-2.864636 52.275542,-2.864401 52.275629,-2.864239 52.275701,-2.863556 52.276004,-2.863334 52.276119,-2.863074 52.276293,-2.863031 52.276303,-2.862937 52.276294,-2.862877 52.276262,-2.862847 52.276227,-2.862827 52.276156,-2.862827 52.276075,-2.862831 52.276051,-2.86284 52.275998,-2.862844 52.275975,-2.862864 52.275936,-2.862937 52.275793,-2.86301 52.275653,-2.863091 52.275495,-2.863188 52.275311,-2.863291 52.275136,-2.863322 52.275083,-2.863481 52.274831,-2.863709 52.274511,-2.863937 52.274198,-2.863983 52.274135,-2.864108 52.273941,-2.864208 52.27378,-2.864262 52.273664,-2.864344 52.273524,-2.864377 52.273449,-2.864455 52.273267,-2.864541 52.273114,-2.864604 52.272967,-2.86466 52.272888,-2.864761 52.272799,-2.864874 52.272701,-2.865244 52.272223,-2.865303 52.272127,-2.865359 52.272017,-2.86538 52.271943,-2.865378 52.271853,-2.865358 52.271782,-2.865321 52.271713,-2.865314 52.2717,-2.865286 52.271658,-2.865212 52.271578,-2.865112 52.271488,-2.864864 52.271324,-2.864508 52.271098,-2.864143 52.270876,-2.863871 52.270713,-2.86357 52.270537,-2.863198 52.270336,-2.862901 52.270192,-2.862665 52.270082,-2.862462 52.269977,-2.862355 52.269914,-2.862143 52.269791,-2.861777 52.269578,-2.861671 52.269522,-2.861598 52.269466,-2.861568 52.269412,-2.861557 52.269298,-2.861551 52.269222)",
+    "LINESTRING(-2.870042 52.273476,-2.870124 52.273451,-2.870412 52.273356,-2.870614 52.273316,-2.870828 52.273282,-2.871244 52.27326,-2.871744 52.273239,-2.872129 52.273221,-2.87277 52.273192,-2.87302 52.273178,-2.873339 52.273154,-2.873444 52.273149,-2.873634 52.27313,-2.873663 52.27312,-2.873692 52.273102,-2.873773 52.273038,-2.873892 52.272891,-2.873901 52.272881,-2.873987 52.272815,-2.87408 52.272782,-2.874156 52.272771,-2.874329 52.272746,-2.874551 52.272709,-2.874662 52.272677,-2.874758 52.272637,-2.874892 52.272595,-2.874999 52.272543,-2.875313 52.27243,-2.875555 52.27235,-2.875835 52.272267,-2.876071 52.272199,-2.876178 52.272148,-2.876381 52.272039,-2.876555 52.271924,-2.876722 52.271792,-2.876875 52.271663,-2.87701 52.271536,-2.877145 52.271414,-2.877244 52.271326,-2.877368 52.271244,-2.877559 52.271134,-2.877754 52.271029,-2.877916 52.27095,-2.878073 52.270895,-2.878135 52.270884,-2.878202 52.270885,-2.878258 52.270903,-2.8783 52.27094,-2.878464 52.271092,-2.878685 52.271279,-2.878926 52.271466,-2.879012 52.271546,-2.879085 52.271657,-2.879158 52.271791,-2.879168 52.271856,-2.879157 52.272034,-2.879174 52.272151,-2.879231 52.272368,-2.879301 52.272639,-2.879357 52.272808,-2.879362 52.272916,-2.879353 52.273034,-2.87934 52.273124,-2.879347 52.273212,-2.879365 52.273387,-2.87935 52.2735,-2.879281 52.273704,-2.879202 52.273859,-2.87915 52.273902,-2.879067 52.274004,-2.879003 52.274159,-2.878877 52.27432,-2.878794 52.274425,-2.87864 52.274567)",
+    "LINESTRING(-2.866721 52.282142,-2.866546 52.282289,-2.866394 52.282429,-2.866309 52.282508,-2.86607 52.282714,-2.865899 52.282839,-2.865598 52.283033,-2.865402 52.283143,-2.865272 52.283216,-2.864748 52.28343,-2.864323 52.283589,-2.86384 52.283766,-2.863651 52.28385,-2.863464 52.283952,-2.863198 52.284137,-2.86295 52.284316,-2.862834 52.284492)",
+    "LINESTRING(-2.845194 52.369086,-2.845265 52.369109,-2.845329 52.369154,-2.845454 52.369264,-2.845608 52.369421,-2.845968 52.369803,-2.846306 52.370142,-2.846346 52.370182,-2.846352 52.370188,-2.847293 52.371183,-2.847719 52.371643,-2.847908 52.371843,-2.849636 52.373671)",
+    "LINESTRING(-2.772262 52.351621,-2.772146 52.351676,-2.772073 52.351712,-2.771812 52.351912,-2.771522 52.35213,-2.771022 52.352546,-2.770992 52.352572,-2.770365 52.353117,-2.770282 52.353181,-2.770046 52.353362,-2.769878 52.353489,-2.769556 52.353646,-2.769406 52.353699,-2.76872 52.353919,-2.768529 52.353947,-2.768192 52.353949,-2.767383 52.353892,-2.76723 52.353883,-2.766907 52.353874,-2.766437 52.353888,-2.766083 52.353923,-2.765772 52.353968,-2.765589 52.354014,-2.765519 52.354032,-2.765474 52.354043,-2.765296 52.354115,-2.765148 52.354231,-2.76491 52.3544,-2.764838 52.354448,-2.764679 52.354533,-2.764424 52.354632,-2.764211 52.354685,-2.763933 52.354741,-2.763889 52.35475,-2.763596 52.354806,-2.763321 52.354844,-2.763259 52.354853,-2.763235 52.354852,-2.763095 52.35485,-2.763014 52.354846,-2.762868 52.354839,-2.762565 52.35481,-2.762292 52.354785,-2.762104 52.354779,-2.761605 52.354788,-2.761516 52.354793,-2.761476 52.354795,-2.761285 52.354806,-2.761247 52.354808,-2.760687 52.354846,-2.760029 52.354864,-2.760015 52.354865,-2.759721 52.354886,-2.759369 52.354926,-2.759053 52.354955,-2.758903 52.354953,-2.758735 52.35493,-2.758489 52.354875,-2.758337 52.354841,-2.758063 52.354778,-2.757839 52.354704,-2.757629 52.354657,-2.757158 52.35459,-2.756717 52.354517,-2.756277 52.354423,-2.755841 52.354312,-2.755313 52.354172,-2.754894 52.354049,-2.754619 52.353955,-2.754135 52.353786,-2.753547 52.353566,-2.753298 52.353465,-2.752793 52.353258,-2.752668 52.353175,-2.752563 52.353066,-2.752496 52.352931,-2.752453 52.352791,-2.752438 52.352626,-2.752416 52.352374,-2.752377 52.352138,-2.752361 52.35204,-2.752337 52.351869)",
+    "LINESTRING(-2.773655 52.354022,-2.773551 52.353995,-2.773507 52.353978,-2.773209 52.353728,-2.773149 52.353665,-2.773117 52.353504,-2.773065 52.353162,-2.773034 52.352965,-2.772972 52.35274,-2.772923 52.352611,-2.772886 52.352534,-2.772743 52.352239,-2.772652 52.352068,-2.772561 52.351925,-2.772486 52.351836,-2.772411 52.351764,-2.772262 52.351621)",
+    "LINESTRING(-2.753656 52.360846,-2.753728 52.360934,-2.75384 52.360962,-2.753998 52.360946,-2.754437 52.360861,-2.754844 52.360793,-2.755044 52.36079,-2.755406 52.360811,-2.755894 52.360855,-2.756264 52.360871,-2.756746 52.360857,-2.757133 52.360818,-2.757461 52.360766,-2.757826 52.360684,-2.758227 52.360567,-2.758449 52.360533,-2.758593 52.36053,-2.758726 52.360542,-2.758943 52.360557,-2.759457 52.36057,-2.759816 52.360576,-2.760312 52.360553,-2.761192 52.360483,-2.761344 52.360478,-2.761509 52.360472,-2.761826 52.360457,-2.762371 52.360427,-2.762703 52.360414,-2.762894 52.360411,-2.763043 52.360388,-2.763479 52.360312,-2.763729 52.360296,-2.76429 52.36028,-2.764477 52.36026,-2.764917 52.360214,-2.765116 52.360202,-2.765425 52.360215,-2.765639 52.360213,-2.765865 52.360194,-2.76605 52.360171,-2.766263 52.36013,-2.766457 52.360088,-2.76694 52.359981,-2.76706 52.359964,-2.767268 52.359952,-2.768163 52.359913,-2.768729 52.359888,-2.769041 52.359891,-2.769305 52.359905,-2.769823 52.359945,-2.770114 52.35996,-2.770396 52.35995,-2.770967 52.359901,-2.771202 52.359881,-2.77151 52.359843,-2.771908 52.359735,-2.772174 52.359668,-2.772387 52.35964,-2.77246 52.35963,-2.772868 52.359611,-2.773179 52.359572,-2.773429 52.359575,-2.773575 52.359585,-2.773773 52.359599,-2.773949 52.359605,-2.773984 52.359603,-2.774069 52.359597,-2.774254 52.359562,-2.774815 52.359409,-2.775031 52.359354,-2.775245 52.35932,-2.775579 52.359291,-2.775698 52.35927,-2.775772 52.359256,-2.775799 52.359252,-2.776123 52.359169,-2.776302 52.359162,-2.776435 52.359179,-2.776568 52.359227,-2.776772 52.35931,-2.776943 52.359359,-2.777208 52.359402,-2.777429 52.359408,-2.777672 52.359372,-2.778029 52.359313,-2.778447 52.35922,-2.77871 52.359146,-2.779052 52.359031,-2.77954 52.358873,-2.779776 52.358807,-2.780075 52.358754,-2.780289 52.358728,-2.780606 52.358709,-2.781231 52.358698,-2.781563 52.358681,-2.781774 52.358689,-2.7818 52.358693,-2.782251 52.35876,-2.782572 52.358786,-2.782757 52.358799,-2.782907 52.358797,-2.783039 52.358776,-2.783141 52.358741,-2.783219 52.358672,-2.783336 52.358477,-2.783339 52.358472,-2.783396 52.358373,-2.783511 52.358242,-2.78358 52.35819,-2.78379 52.358072,-2.784078 52.357953,-2.784352 52.357823,-2.784454 52.357751,-2.784543 52.357628,-2.784625 52.357492,-2.784723 52.357393,-2.784828 52.357338,-2.785047 52.357268,-2.785404 52.357212,-2.785891 52.357142,-2.78619 52.357119,-2.786454 52.357117,-2.786613 52.357129,-2.786808 52.357178,-2.787204 52.357335,-2.787725 52.357596,-2.787844 52.357651,-2.787959 52.357686,-2.788219 52.357751,-2.788682 52.357899,-2.789149 52.358066,-2.789808 52.358293,-2.790064 52.358316,-2.790349 52.358303,-2.790691 52.358225,-2.790901 52.358168,-2.791044 52.358104,-2.791144 52.358062,-2.791241 52.357942,-2.791255 52.357924,-2.791346 52.357721,-2.791407 52.357521,-2.791455 52.357414,-2.79158 52.357176,-2.791734 52.356947,-2.791818 52.356849,-2.791869 52.35679,-2.791974 52.356735,-2.792074 52.356716,-2.792153 52.356721,-2.792292 52.356756,-2.79254 52.356832,-2.792669 52.356851,-2.79276 52.356852,-2.792863 52.356848,-2.792998 52.356827,-2.793086 52.356814,-2.793267 52.356791,-2.793417 52.356786,-2.793567 52.356803,-2.793967 52.356842,-2.794114 52.35685,-2.794284 52.356833,-2.794483 52.356768,-2.794772 52.356662,-2.794939 52.356645,-2.795065 52.356662,-2.795174 52.356692,-2.795346 52.356779,-2.795737 52.356976,-2.795915 52.357054,-2.796172 52.357158,-2.79635 52.357236,-2.796486 52.3573,-2.796602 52.357365,-2.796807 52.357481,-2.796919 52.357523,-2.797055 52.357551,-2.797169 52.357565,-2.797284 52.357564,-2.797442 52.357556,-2.797624 52.357529,-2.7978 52.357496,-2.797975 52.357444,-2.798129 52.357373,-2.79824 52.357318,-2.798353 52.357231,-2.798466 52.357144,-2.798585 52.357059,-2.798716 52.356999,-2.79874 52.356991,-2.798815 52.356966,-2.798918 52.35696,-2.799035 52.35697,-2.799433 52.357046,-2.799616 52.357068,-2.799801 52.357071,-2.799918 52.357055,-2.80017 52.357009,-2.800416 52.356975,-2.800521 52.35694,-2.800654 52.356844)",
+    "LINESTRING(-2.818355 52.347202,-2.818399 52.347293,-2.818443 52.347384,-2.818512 52.347477,-2.818663 52.3476,-2.818888 52.347728,-2.819106 52.347835,-2.819235 52.347893,-2.819377 52.347931,-2.819537 52.347956,-2.819804 52.347997,-2.820024 52.348028,-2.820145 52.348056,-2.820331 52.348128,-2.820539 52.348206,-2.82071 52.348258,-2.820909 52.348302,-2.820981 52.348318,-2.821029 52.348352,-2.821031 52.348388,-2.821011 52.348437,-2.820967 52.34846,-2.820826 52.348507,-2.820756 52.348526,-2.82037 52.348612,-2.820269 52.348639,-2.820204 52.34866,-2.819667 52.348853,-2.819451 52.34892,-2.819269 52.348968,-2.819144 52.349017,-2.818939 52.349106,-2.81881 52.349162,-2.818689 52.349193,-2.818372 52.349238,-2.818072 52.349298,-2.817924 52.34933,-2.817707 52.349379,-2.817626 52.349417,-2.817488 52.34949,-2.817383 52.349555,-2.817306 52.349621,-2.817254 52.349654,-2.817208 52.349686,-2.817105 52.34975,-2.817061 52.349773,-2.816975 52.349802,-2.816725 52.349885,-2.816603 52.349932,-2.816494 52.349974,-2.816223 52.350076,-2.816136 52.350122,-2.815942 52.350213,-2.815839 52.350255,-2.815772 52.350275,-2.815636 52.35032,-2.815461 52.350359,-2.815168 52.350407,-2.815007 52.350429,-2.814702 52.35048,-2.814474 52.350521,-2.814312 52.35054,-2.813958 52.350566,-2.813574 52.350584,-2.813074 52.350598,-2.812936 52.350596)",
+    "LINESTRING(-2.817427 52.368525,-2.817397 52.368498,-2.817317 52.368426,-2.817133 52.368212,-2.816979 52.368059,-2.816899 52.367997,-2.816833 52.367974,-2.816774 52.367967,-2.816692 52.367984,-2.816435 52.368082,-2.816345 52.368116,-2.816226 52.368194,-2.816155 52.368223,-2.816103 52.368243,-2.816033 52.368271,-2.816012 52.368352,-2.816011 52.368378,-2.816065 52.368732,-2.816082 52.368876,-2.8161 52.369074,-2.816104 52.369262,-2.816104 52.369271)",
+    "LINESTRING(-2.765419 52.340898,-2.765378 52.342352,-2.765365 52.342451,-2.764943 52.342966,-2.764864 52.343063,-2.764849 52.343129,-2.765031 52.343412,-2.765042 52.343442,-2.765041 52.343497,-2.764983 52.343558,-2.76489 52.343578,-2.764778 52.343581,-2.764724 52.343578,-2.764486 52.343576,-2.764254 52.34357,-2.764096 52.343593,-2.763938 52.343628,-2.763737 52.343721,-2.763547 52.343811,-2.763396 52.343864,-2.763203 52.343899,-2.763004 52.343974,-2.762803 52.344067,-2.762672 52.344127,-2.762663 52.344128,-2.762564 52.344139,-2.762487 52.344123,-2.762484 52.344121,-2.762422 52.344075,-2.762287 52.343936,-2.761979 52.343615,-2.761814 52.343418,-2.761739 52.343311,-2.761583 52.342988,-2.761496 52.342809,-2.761405 52.342665,-2.76136 52.342621,-2.76133 52.342585,-2.761239 52.342546)",
+    "LINESTRING(-2.737783 52.341558,-2.737981 52.341618,-2.738154 52.341638,-2.738366 52.341621,-2.738571 52.341608,-2.738747 52.341607,-2.738976 52.341633,-2.739153 52.341677,-2.739309 52.341678,-2.739566 52.341635,-2.73983 52.341584,-2.740346 52.341505,-2.740486 52.341483,-2.740723 52.341448,-2.740952 52.341432,-2.741154 52.341443,-2.741561 52.341497,-2.741619 52.341505,-2.741772 52.341515,-2.741874 52.341495,-2.741986 52.341474,-2.742249 52.341397,-2.742395 52.341374,-2.742703 52.341356,-2.742976 52.341335,-2.743242 52.341282,-2.743443 52.341211,-2.743662 52.341118,-2.743995 52.341022,-2.744255 52.340947,-2.744517 52.340827,-2.744621 52.340743,-2.744632 52.340675,-2.744546 52.340604,-2.744345 52.340529,-2.744095 52.340491,-2.743921 52.340447,-2.743828 52.340356,-2.743807 52.340312,-2.743809 52.340236,-2.743912 52.340074,-2.744027 52.339961,-2.744239 52.339814,-2.744414 52.339725,-2.744788 52.339635,-2.745551 52.339441,-2.745769 52.339357,-2.745918 52.339264,-2.746016 52.339167,-2.746142 52.33899,-2.746219 52.338838,-2.746281 52.338717)",
+    "LINESTRING(-2.791074 52.328059,-2.791045 52.32805,-2.791015 52.328041,-2.790911 52.32797,-2.790554 52.327667,-2.79042 52.327582,-2.790316 52.327516,-2.79031 52.327512,-2.790063 52.327293,-2.789899 52.327132,-2.789749 52.32698,-2.789689 52.326881,-2.789596 52.326639,-2.789536 52.326523,-2.78952 52.326482,-2.789505 52.326442,-2.789473 52.32629,-2.789516 52.326217,-2.789573 52.326154,-2.789629 52.326096,-2.789686 52.326042,-2.789909 52.325879,-2.789968 52.325835,-2.790036 52.325764,-2.790079 52.32571,-2.790135 52.325593,-2.790177 52.325449,-2.790223 52.325296)",
+    "LINESTRING(-2.876391 52.35697,-2.876449 52.357044,-2.876479 52.357079,-2.876525 52.357196,-2.876726 52.357707,-2.876727 52.357743,-2.876669 52.357797,-2.87664 52.357815,-2.876509 52.357861,-2.876421 52.35788)",
+    "LINESTRING(-2.85556 52.396517,-2.855534 52.396022,-2.855521 52.395526,-2.855513 52.395292,-2.855499 52.395243,-2.855499 52.395241,-2.855441 52.395187,-2.855286 52.395049,-2.855032 52.394824,-2.85445 52.394312,-2.853884 52.393808,-2.853774 52.393713,-2.853653 52.393622,-2.853425 52.393464,-2.853104 52.393254,-2.852847 52.393086,-2.852393 52.392779,-2.852311 52.392723,-2.8519 52.392452,-2.851752 52.392358,-2.851734 52.392346,-2.851695 52.392304,-2.851677 52.392247,-2.851691 52.392204,-2.851704 52.392193,-2.851712 52.392185,-2.851729 52.39217,-2.851751 52.392161,-2.851795 52.392143,-2.853022 52.391795,-2.853067 52.391781,-2.853157 52.391754,-2.853208 52.391727,-2.853232 52.391698,-2.853238 52.391659,-2.853226 52.391609,-2.853207 52.391558,-2.852786 52.390888,-2.852564 52.390535,-2.852295 52.390097,-2.851979 52.389588,-2.85188 52.389439,-2.851585 52.389,-2.851343 52.388633,-2.851011 52.388114,-2.850987 52.388076,-2.850866 52.38789,-2.850855 52.387881,-2.85083 52.387861,-2.850792 52.387854,-2.850735 52.387864,-2.850576 52.387911,-2.850467 52.387949,-2.85043 52.387961,-2.850363 52.387983,-2.850303 52.388025,-2.850294 52.388032,-2.850198 52.3881,-2.850123 52.388144,-2.850047 52.388176,-2.849561 52.38835,-2.849105 52.388508,-2.84873 52.388639,-2.848151 52.388841,-2.848126 52.38885,-2.848093 52.388861,-2.848036 52.388869,-2.847961 52.388866,-2.847881 52.388852,-2.8478 52.388826,-2.847373 52.388665,-2.846573 52.388365,-2.845732 52.388047,-2.845134 52.387819,-2.844629 52.387632,-2.844577 52.387619,-2.844511 52.387615,-2.844423 52.387617,-2.844304 52.387625,-2.844172 52.387633,-2.844031 52.38765,-2.843693 52.387697,-2.843032 52.387787,-2.842679 52.387842,-2.842089 52.387939,-2.841699 52.388,-2.841066 52.388111,-2.840644 52.388189,-2.840601 52.388197,-2.840249 52.388268,-2.840205 52.388278,-2.839876 52.388349,-2.839457 52.388438,-2.839302 52.388471,-2.839156 52.388507,-2.839064 52.388525,-2.838993 52.388536,-2.838901 52.388548,-2.83878 52.388561,-2.838608 52.388572,-2.838373 52.388602,-2.837898 52.38866,-2.837343 52.388751,-2.83692 52.388814,-2.836688 52.388836,-2.836525 52.388853,-2.836407 52.38886,-2.836264 52.388869,-2.836097 52.388875,-2.835884 52.388887,-2.835807 52.388894,-2.835725 52.388908,-2.835593 52.388929,-2.835501 52.388944,-2.835384 52.388961,-2.835305 52.388972,-2.835256 52.388979,-2.835115 52.388998,-2.834892 52.389042,-2.834639 52.38909,-2.834337 52.389144,-2.834152 52.389174,-2.834038 52.38919,-2.833914 52.389202,-2.833758 52.38921,-2.833503 52.389214,-2.833378 52.389219,-2.833226 52.389232,-2.832982 52.389261,-2.832221 52.389361,-2.831966 52.389395,-2.831785 52.389419,-2.831648 52.389439,-2.831467 52.389466,-2.83136 52.389482,-2.831282 52.389492,-2.831212 52.389498,-2.83115 52.389501,-2.831069 52.389498,-2.831008 52.389485,-2.830965 52.389454,-2.830933 52.389431,-2.830912 52.389387,-2.830918 52.389326,-2.830943 52.389246,-2.83098 52.389159,-2.831 52.389088,-2.83101 52.389013,-2.831014 52.38894,-2.831011 52.388855,-2.831001 52.388759,-2.830979 52.388633,-2.830951 52.388515,-2.830863 52.388224,-2.830836 52.388137,-2.830805 52.387982,-2.830787 52.387894,-2.830775 52.387745,-2.830763 52.387601,-2.830759 52.38756,-2.830742 52.387533,-2.830712 52.387509,-2.830673 52.387493,-2.830608 52.387477,-2.830474 52.387467,-2.829886 52.387431,-2.829247 52.387393,-2.828714 52.387362,-2.828589 52.387356,-2.828479 52.387342,-2.828398 52.387328,-2.828291 52.387296,-2.828268 52.387285,-2.828239 52.387272,-2.828188 52.387234,-2.828129 52.3872,-2.828118 52.387197,-2.828062 52.387177,-2.827989 52.387162,-2.827887 52.387148,-2.827766 52.387134,-2.827541 52.387099,-2.827199 52.387048,-2.826926 52.387011,-2.826678 52.386979,-2.826484 52.386962,-2.826128 52.386937,-2.825835 52.386921,-2.825578 52.386909,-2.825252 52.386883,-2.824822 52.386841,-2.82427 52.386796,-2.823937 52.386775,-2.823542 52.386749,-2.823387 52.386739,-2.823187 52.38673,-2.822928 52.386723,-2.822737 52.386725,-2.822636 52.386727,-2.822504 52.386737,-2.82239 52.386753,-2.822291 52.386764,-2.822187 52.386771,-2.822071 52.38677,-2.821698 52.386754,-2.821006 52.386716,-2.820424 52.386678,-2.820017 52.386642,-2.819853 52.386632,-2.819682 52.386628,-2.819589 52.386628,-2.819231 52.386643,-2.818809 52.386659,-2.818609 52.386667,-2.818181 52.386684,-2.817766 52.386708,-2.817455 52.386728,-2.817396 52.386731,-2.817365 52.386732,-2.817012 52.386745,-2.816911 52.386753,-2.816895 52.386757,-2.816813 52.38678,-2.81671 52.386814)",
+    "LINESTRING(-2.749888 52.382861,-2.751339 52.382845,-2.751707 52.382817,-2.751819 52.382778,-2.75187 52.38276,-2.75201 52.382642,-2.752104 52.382552,-2.752124 52.382532,-2.752165 52.382507,-2.752235 52.382465,-2.75224 52.382462,-2.752326 52.382443,-2.75249 52.38246,-2.752823 52.382513,-2.753021 52.38252,-2.753173 52.382509,-2.753231 52.382491,-2.75326 52.382473,-2.753274 52.382455,-2.753361 52.382337,-2.753447 52.38222,-2.753542 52.382158)",
+    "LINESTRING(-2.849636 52.373671,-2.849509 52.373732,-2.849432 52.373769,-2.849363 52.373797,-2.848991 52.373928,-2.848774 52.374004,-2.848314 52.374154,-2.848093 52.374223,-2.847627 52.37434,-2.847196 52.374451,-2.846893 52.374547,-2.846484 52.374688,-2.846072 52.374839,-2.845713 52.374983,-2.845325 52.375139,-2.844837 52.375341,-2.844717 52.375383,-2.844507 52.375452,-2.843824 52.375678,-2.843494 52.375781,-2.8433 52.375826,-2.843033 52.375873,-2.842747 52.37592,-2.842341 52.375982,-2.84211 52.376015,-2.841836 52.376063,-2.841536 52.376121,-2.841258 52.37618,-2.841027 52.376233,-2.840883 52.376266,-2.840791 52.376285,-2.840711 52.376296,-2.840647 52.376305,-2.840597 52.376303,-2.840554 52.376288,-2.840532 52.376278,-2.840492 52.376261,-2.840432 52.376221,-2.840385 52.376186,-2.840337 52.376165,-2.84028 52.376149,-2.840223 52.376136,-2.840149 52.376134,-2.840088 52.376141,-2.840085 52.376141,-2.839997 52.376156,-2.839849 52.376181,-2.839693 52.376196,-2.839501 52.376215,-2.839384 52.376221,-2.839316 52.376223,-2.839233 52.376212,-2.839133 52.376189,-2.838954 52.376148,-2.838297 52.375973,-2.837891 52.375872,-2.837768 52.375854,-2.837658 52.375844,-2.837547 52.375842,-2.83745 52.375842,-2.837346 52.375848,-2.83726 52.37586,-2.837161 52.375877,-2.837075 52.375903,-2.837011 52.375921,-2.836956 52.375931,-2.836916 52.37593,-2.836866 52.375921,-2.83682 52.375905,-2.83677 52.375886,-2.836633 52.375832,-2.836527 52.375789,-2.836448 52.37576,-2.836297 52.37572,-2.835957 52.375646,-2.835684 52.375592,-2.835382 52.375539,-2.835101 52.375498,-2.835051 52.375491,-2.834666 52.375443,-2.834309 52.375408,-2.834102 52.37539,-2.833896 52.375379,-2.833767 52.375379,-2.833655 52.375384,-2.833547 52.3754,-2.833465 52.375423,-2.833372 52.375473,-2.83333 52.375504,-2.833298 52.375527,-2.833246 52.375597,-2.833219 52.375648,-2.833215 52.375691,-2.83321 52.375722,-2.833227 52.375763,-2.833265 52.375818,-2.833342 52.375935,-2.833401 52.376015,-2.833472 52.376113,-2.833505 52.376174,-2.833506 52.376229,-2.8335 52.376258,-2.833497 52.376272,-2.833459 52.376299,-2.833439 52.376303,-2.833401 52.37631,-2.833357 52.376309,-2.833354 52.376308,-2.833312 52.376295,-2.833241 52.376231,-2.833152 52.376155,-2.833073 52.376082,-2.833008 52.376025,-2.832937 52.375973,-2.832878 52.375929,-2.8328 52.375893,-2.832717 52.375865,-2.832619 52.375831,-2.832523 52.3758,-2.832414 52.375772,-2.832111 52.375704,-2.831984 52.37568,-2.831765 52.375635,-2.831397 52.375571,-2.831087 52.375529,-2.830752 52.375481,-2.830563 52.375455,-2.830471 52.375449,-2.830324 52.375441,-2.830123 52.375437,-2.829918 52.375431,-2.829842 52.375423,-2.829737 52.375408,-2.829284 52.37535,-2.828579 52.375259,-2.827637 52.375138,-2.826761 52.375024,-2.826152 52.374942,-2.825627 52.374876,-2.825152 52.374818,-2.824631 52.374752,-2.82419 52.374692,-2.823612 52.374617,-2.822892 52.374522,-2.822234 52.374436,-2.819541 52.374073)",
+    "LINESTRING(-2.812104 52.378289,-2.812462 52.378218,-2.812687 52.378173,-2.812849 52.37812,-2.812995 52.378065,-2.813084 52.378011,-2.813152 52.377925,-2.813193 52.377827,-2.813234 52.377705,-2.813288 52.377616,-2.813365 52.377529,-2.813436 52.377478,-2.813525 52.377435,-2.813627 52.377399,-2.813696 52.377367,-2.813739 52.377308,-2.813784 52.377238,-2.813816 52.37715,-2.813855 52.376997,-2.813891 52.376849,-2.813926 52.376782,-2.813993 52.37674,-2.814096 52.376715,-2.814202 52.376708,-2.814323 52.3767,-2.814413 52.376688,-2.814475 52.376669,-2.814553 52.376617,-2.814678 52.376511,-2.814971 52.376268,-2.815065 52.376187)",
+    "LINESTRING(-2.829632 52.505566,-2.82985 52.505388,-2.830133 52.505157,-2.83044 52.504943,-2.831098 52.50454)",
+    "LINESTRING(-2.857778 52.498206,-2.857762 52.498348,-2.857727 52.498658,-2.857706 52.499173,-2.85764 52.499648,-2.857575 52.5001)",
+    "LINESTRING(-2.779723 52.462749,-2.779545 52.462676,-2.779526 52.462668,-2.779096 52.462511,-2.778881 52.462447,-2.778792 52.462417,-2.778607 52.462395,-2.778255 52.462332,-2.778078 52.462279,-2.777901 52.462215,-2.777793 52.462162,-2.777596 52.462038,-2.777408 52.461908,-2.777232 52.461832,-2.777084 52.461738,-2.776848 52.461632,-2.776494 52.461485,-2.776347 52.461427,-2.77626 52.461391,-2.776088 52.46132,-2.775911 52.46125,-2.775811 52.461218,-2.775773 52.461202,-2.77556 52.461128,-2.775442 52.461087,-2.775236 52.461023,-2.775099 52.460989,-2.774987 52.460989)",
+    "LINESTRING(-2.748927 52.460261,-2.748895 52.460247,-2.748855 52.460247,-2.748774 52.460285,-2.748667 52.460342,-2.748423 52.460455,-2.74833 52.460504,-2.74826 52.460539,-2.748165 52.460628,-2.748143 52.460637,-2.747994 52.460698,-2.747658 52.460744,-2.747408 52.460786,-2.747086 52.460816,-2.746861 52.460802,-2.746672 52.46075,-2.746663 52.460748,-2.746633 52.46073,-2.74641 52.460588,-2.746082 52.460374,-2.745724 52.46018,-2.745566 52.4601,-2.745255 52.460006)",
+    "LINESTRING(-2.831391 52.445745,-2.831339 52.445682,-2.831253 52.445621,-2.831039 52.44551,-2.830941 52.44546,-2.830856 52.445417,-2.830585 52.44522,-2.830148 52.444916,-2.829946 52.444785,-2.829823 52.444658,-2.829669 52.444499,-2.829529 52.444301,-2.829337 52.444027,-2.829228 52.443938)",
+    "LINESTRING(-2.862644 52.42015,-2.862666 52.420191,-2.862617 52.420468,-2.86324 52.42065,-2.863646 52.420786,-2.863929 52.42088,-2.864098 52.420923,-2.864238 52.420943,-2.864523 52.421001,-2.864593 52.421023,-2.864624 52.421057,-2.864662 52.421116,-2.864726 52.421363,-2.864872 52.421795,-2.864946 52.422014,-2.865 52.422122,-2.865058 52.422183,-2.865126 52.422208,-2.865203 52.422225)",
+    "LINESTRING(-2.755579 52.587427,-2.755548 52.587419,-2.755514 52.587406,-2.754749 52.587077,-2.754192 52.586858,-2.754158 52.586844,-2.753716 52.586664,-2.753125 52.586419,-2.75309 52.586407,-2.752784 52.586294,-2.751987 52.585975,-2.750903 52.585522,-2.750786 52.585474,-2.750434 52.585337,-2.7502 52.585287,-2.750041 52.585273,-2.749718 52.585276,-2.749452 52.585272,-2.749222 52.585245,-2.749042 52.585194,-2.74897 52.585173,-2.748916 52.585145,-2.748871 52.585093,-2.748724 52.584982,-2.748585 52.584877,-2.748371 52.584716,-2.74821 52.584667,-2.748025 52.584628,-2.747835 52.584588,-2.747546 52.584561)",
+    "LINESTRING(-2.758824 52.566573,-2.758843 52.566612,-2.758884 52.56673,-2.758879 52.566811,-2.75884 52.566919,-2.758784 52.567022,-2.758735 52.567116,-2.758661 52.567189,-2.758503 52.56727,-2.758483 52.567301,-2.758484 52.567328,-2.758515 52.567351,-2.758562 52.567348,-2.75862 52.567336,-2.758687 52.567284,-2.758831 52.567185,-2.759103 52.566989,-2.759359 52.566874,-2.759639 52.566798,-2.759771 52.566778,-2.759893 52.566784,-2.760066 52.566813,-2.760578 52.56694,-2.760622 52.566931,-2.760666 52.566922,-2.760711 52.566913,-2.760755 52.566894,-2.760798 52.566858,-2.760968 52.566699)",
+    "LINESTRING(-2.79983 52.554365,-2.79986 52.554392,-2.799905 52.554428,-2.800233 52.554632,-2.800442 52.554793,-2.800517 52.554837,-2.800636 52.554899,-2.800948 52.555032,-2.801053 52.555094,-2.801172 52.555183,-2.801217 52.555201,-2.801335 52.555209,-2.801512 52.555199,-2.80163 52.555198,-2.801748 52.555197,-2.801866 52.555188,-2.801969 52.555169,-2.802115 52.555132,-2.80235 52.555085,-2.802454 52.555076,-2.802793 52.555073,-2.80294 52.555054,-2.80316 52.554999,-2.803538 52.554912,-2.803829 52.554803,-2.804605 52.554622,-2.805872 52.554267,-2.806038 52.554234,-2.80643 52.554195,-2.806568 52.554212,-2.806931 52.554219,-2.807023 52.554211,-2.807075 52.554198,-2.807114 52.55418,-2.807192 52.554172,-2.807355 52.554181,-2.807566 52.554194,-2.808058 52.554246,-2.80856 52.554279,-2.808708 52.554287)",
+    "LINESTRING(-2.838002 52.589989,-2.838081 52.590031,-2.838235 52.590053,-2.838557 52.590099,-2.838864 52.590158,-2.83901 52.590208,-2.839129 52.590255,-2.839262 52.590309,-2.839384 52.590391,-2.839451 52.590444,-2.839562 52.590509,-2.839657 52.590536,-2.839789 52.590543,-2.839919 52.590545,-2.840044 52.590556,-2.840131 52.59058,-2.840177 52.590626,-2.840219 52.590711,-2.84025 52.590812,-2.840451 52.591463,-2.840611 52.591889,-2.840709 52.592094,-2.840819 52.592311,-2.841156 52.592947,-2.841231 52.593054,-2.841378 52.59321,-2.841452 52.593274)",
+    "LINESTRING(-2.888846 52.559077,-2.888526 52.559015,-2.8881 52.558936,-2.887961 52.558894,-2.887797 52.55883,-2.887612 52.558738,-2.887359 52.558609,-2.887079 52.558467,-2.886905 52.558368,-2.886651 52.558193,-2.886535 52.55806,-2.886397 52.55782,-2.886355 52.557709,-2.886353 52.557593,-2.886389 52.557524,-2.886442 52.55749,-2.886469 52.557473,-2.886648 52.557357,-2.886851 52.557271,-2.887098 52.557196,-2.887359 52.557129,-2.887542 52.557082,-2.887792 52.557048,-2.88827 52.557015,-2.888439 52.556996,-2.888542 52.55699,-2.889071 52.556911,-2.889527 52.556827,-2.889674 52.556817,-2.889807 52.556843,-2.890283 52.55701,-2.890685 52.557196,-2.890908 52.557302,-2.891384 52.557487)",
+    "LINESTRING(-2.829632 52.505566,-2.82985 52.505388,-2.830133 52.505157,-2.83044 52.504943,-2.831098 52.50454)",
+    "LINESTRING(-2.642485 52.161121,-2.642505 52.161137,-2.642515 52.161145,-2.642731 52.16118,-2.642813 52.161197,-2.643002 52.161234,-2.643168 52.161289,-2.643448 52.161364,-2.643565 52.161395)",
+    "LINESTRING(-2.637575 52.233071,-2.637728 52.233077,-2.637808 52.233079,-2.638076 52.233102,-2.638622 52.233136,-2.638791 52.233154,-2.638988 52.233195,-2.639222 52.233274,-2.639415 52.233362,-2.639539 52.233424,-2.63961 52.23345,-2.639721 52.233468,-2.639879 52.233473,-2.639982 52.233465,-2.640052 52.233456,-2.640186 52.233424,-2.640256 52.233391,-2.640318 52.233354,-2.640357 52.233311,-2.640411 52.233211,-2.640523 52.232946,-2.640638 52.232675,-2.64068 52.232612,-2.640723 52.23256,-2.640835 52.232451,-2.640927 52.232405,-2.641263 52.232261,-2.641743 52.23204,-2.642283 52.23178,-2.642565 52.231658,-2.642817 52.231562,-2.643029 52.231484,-2.643329 52.231368,-2.643708 52.231212,-2.64387 52.231162,-2.644195 52.231077,-2.644562 52.230981,-2.644794 52.230902,-2.644881 52.230856,-2.645009 52.230764,-2.645114 52.23066,-2.645264 52.230502,-2.645455 52.230308,-2.645595 52.230207,-2.64568 52.230165,-2.645736 52.230157,-2.645791 52.230153,-2.646069 52.230191,-2.646136 52.230212,-2.64618 52.230262,-2.646227 52.230349,-2.646285 52.230415,-2.646331 52.230442,-2.646375 52.230449,-2.646438 52.230451,-2.64652 52.230443,-2.646687 52.230402,-2.646814 52.230356,-2.646936 52.230288,-2.64703 52.230232,-2.647068 52.230219,-2.647089 52.230219,-2.647115 52.230227,-2.647136 52.230247,-2.647171 52.230303,-2.647317 52.2306,-2.64753 52.23105,-2.647562 52.231115,-2.647752 52.231493,-2.647963 52.231909,-2.648125 52.232278,-2.648195 52.23237,-2.648499 52.232678,-2.648787 52.233036)",
+    "LINESTRING(-2.690171 52.230102,-2.689196 52.230251,-2.689023 52.230279,-2.689 52.230275,-2.688958 52.230234,-2.688885 52.230144,-2.688817 52.230056,-2.688737 52.229961,-2.688654 52.229882,-2.688612 52.229842,-2.688251 52.229564,-2.687704 52.229139,-2.687509 52.228987,-2.687417 52.22891)",
+    "LINESTRING(-2.665954 52.174958,-2.665528 52.175062,-2.664759 52.175273,-2.663968 52.175413,-2.663044 52.175559,-2.662799 52.175583,-2.662155 52.175646,-2.66196 52.175665,-2.661055 52.175805,-2.660705 52.175852,-2.659976 52.175964,-2.659505 52.175989,-2.659009 52.17604,-2.658398 52.176098,-2.657639 52.176165,-2.657347 52.176185,-2.657069 52.176232,-2.656894 52.176251,-2.656646 52.176252,-2.656445 52.176242,-2.655922 52.176208,-2.655463 52.176181)",
+    "LINESTRING(-2.72594 52.149683,-2.72591 52.149665,-2.725895 52.149656,-2.725866 52.149657,-2.725793 52.149675,-2.725546 52.149748,-2.725343 52.149831,-2.725198 52.149903,-2.725159 52.149924,-2.72514 52.149949,-2.725155 52.149967,-2.725184 52.149984)",
+    "LINESTRING(-2.632796 52.240441,-2.63376 52.240018,-2.634053 52.239885,-2.634766 52.239675,-2.634794 52.239667,-2.634963 52.239618,-2.635271 52.239519,-2.635415 52.239464,-2.635737 52.239402,-2.636024 52.239367,-2.636327 52.239342,-2.63676 52.239321,-2.636986 52.23931,-2.637142 52.239302,-2.637321 52.239294,-2.63775 52.239315,-2.637888 52.239316,-2.637972 52.239302,-2.638385 52.239243,-2.638485 52.239241,-2.638748 52.239205,-2.639029 52.239164,-2.639202 52.239131,-2.639375 52.239092,-2.639563 52.239052,-2.639751 52.238986,-2.64009 52.238867,-2.640313 52.238778,-2.640843 52.238542,-2.641227 52.238369,-2.641732 52.238155,-2.64186 52.238089)",
+    "LINESTRING(-2.639628 52.316021,-2.639653 52.315956,-2.639945 52.315567,-2.640282 52.315088,-2.64036 52.314942,-2.640476 52.314813,-2.640679 52.314644,-2.640745 52.314588,-2.640912 52.314469,-2.641118 52.314317,-2.641179 52.314283,-2.641222 52.314259,-2.641342 52.314239,-2.641487 52.314269,-2.642391 52.314469,-2.642953 52.314591,-2.643178 52.314646)",
+    "LINESTRING(-2.665957 52.29218,-2.666931 52.29203,-2.667244 52.291978,-2.667331 52.29194,-2.667506 52.291819,-2.667615 52.291681,-2.667794 52.29147,-2.668031 52.291296,-2.66824 52.291155,-2.668371 52.291076,-2.668653 52.290936,-2.669207 52.290705,-2.669537 52.290575,-2.669953 52.290379,-2.670247 52.29023,-2.670637 52.290046,-2.670942 52.289843,-2.671075 52.289716,-2.671488 52.289099,-2.671632 52.288956,-2.672236 52.288543,-2.672427 52.288412,-2.672747 52.28806,-2.672811 52.287989,-2.672892 52.287933,-2.672999 52.287857,-2.673944 52.287449,-2.674238 52.287319,-2.674307 52.287288,-2.674378 52.287251,-2.674592 52.28714,-2.674977 52.286959,-2.675056 52.286924,-2.675263 52.28683,-2.675265 52.286828,-2.675294 52.286799,-2.675328 52.286766,-2.675371 52.286705,-2.675399 52.286661,-2.675431 52.286611,-2.675543 52.286414,-2.675699 52.286026,-2.675725 52.285828,-2.675767 52.28572,-2.675881 52.285486,-2.676288 52.284918,-2.67647 52.28468,-2.676749 52.284329,-2.677128 52.283814,-2.6772 52.283739,-2.677232 52.283728,-2.677302 52.283711,-2.677379 52.283733,-2.677402 52.283746)",
+    "LINESTRING(-2.672184 52.273394,-2.671954 52.273362,-2.671202 52.27319,-2.670777 52.273124,-2.670389 52.27307,-2.669867 52.272991,-2.669658 52.272944,-2.669554 52.272906,-2.669302 52.2728,-2.669102 52.272753,-2.669026 52.272692,-2.668962 52.272593,-2.668927 52.272465,-2.6689 52.272333,-2.668849 52.272254,-2.668552 52.271936,-2.668499 52.271864,-2.668375 52.271699,-2.668374 52.271697,-2.668306 52.271613,-2.668247 52.271578,-2.667917 52.271501,-2.667817 52.271476,-2.667733 52.271425,-2.667666 52.27137,-2.667582 52.271301,-2.667422 52.271071,-2.667232 52.270769,-2.667053 52.270509,-2.666868 52.270205,-2.666625 52.269824,-2.66648 52.269572,-2.666433 52.26948,-2.666419 52.269388,-2.666404 52.26923,-2.666411 52.269141,-2.666439 52.269054,-2.666486 52.26889,-2.666521 52.268726,-2.666542 52.268474,-2.666572 52.268218,-2.66661 52.267985,-2.666625 52.267873,-2.666709 52.267648,-2.6668 52.267359,-2.666856 52.267185,-2.666864 52.266914,-2.666884 52.266832,-2.666937 52.266732,-2.666994 52.266678,-2.667118 52.266601,-2.667395 52.266464,-2.667439 52.266433)",
+    "LINESTRING(-2.692432 52.276201,-2.692573 52.276122,-2.692668 52.276056,-2.69298 52.275861,-2.693366 52.275692,-2.693791 52.275545,-2.693888 52.27549,-2.693936 52.275445,-2.69398 52.275364,-2.694043 52.275154,-2.694096 52.27492,-2.69415 52.274558,-2.694205 52.274431,-2.694414 52.273995,-2.694706 52.273077,-2.694727 52.273025,-2.694777 52.272924,-2.694852 52.272846,-2.694945 52.272757,-2.695188 52.272611,-2.695378 52.272511,-2.695563 52.272425,-2.695781 52.272325,-2.69595 52.272254,-2.696126 52.272181,-2.696269 52.272109,-2.69645 52.271997,-2.696741 52.271827,-2.696895 52.271751,-2.697155 52.27167,-2.697364 52.271596,-2.697454 52.27156,-2.697493 52.271543,-2.697549 52.271515,-2.697592 52.271487,-2.69765 52.271451,-2.697679 52.271433,-2.697693 52.271388)",
+    "LINESTRING(-2.71662 52.29899,-2.716103 52.299093,-2.71594 52.299121,-2.715839 52.299122,-2.715711 52.299112,-2.715571 52.299113,-2.715197 52.299153,-2.714666 52.299215,-2.714587 52.299221,-2.714368 52.299293,-2.714006 52.299449,-2.713865 52.299471,-2.713742 52.299458,-2.713671 52.299432,-2.713618 52.299416,-2.713543 52.299414,-2.713271 52.299485,-2.713048 52.299527,-2.712863 52.299542,-2.712736 52.299537,-2.712603 52.299514,-2.712426 52.299461,-2.712134 52.299365,-2.711913 52.299299,-2.711755 52.299265,-2.711653 52.299244,-2.711437 52.299227,-2.711186 52.29922,-2.710958 52.299232,-2.71072 52.299215,-2.710236 52.299199,-2.709901 52.299171,-2.709575 52.299138,-2.709434 52.299134,-2.709285 52.299151,-2.709074 52.299203,-2.708771 52.299229,-2.708419 52.299242,-2.708094 52.299239,-2.707891 52.299202,-2.707749 52.299133,-2.707594 52.299058,-2.707474 52.298978,-2.70734 52.298882,-2.707131 52.298743,-2.706936 52.298636,-2.706577 52.298439,-2.706244 52.298255,-2.706146 52.298212,-2.706107 52.298204)",
+    "LINESTRING(-2.625241 52.364223,-2.625313 52.364079,-2.625396 52.363755,-2.625417 52.363684,-2.625467 52.36353,-2.625566 52.363323,-2.625637 52.363115,-2.625694 52.362997,-2.625737 52.362908,-2.625837 52.362728,-2.626097 52.362394,-2.626226 52.362213,-2.626255 52.362177,-2.626284 52.362105,-2.626297 52.362024,-2.62631 52.361925,-2.626308 52.361772,-2.626276 52.361658,-2.626215 52.36144,-2.626199 52.361341,-2.626197 52.36118,-2.62623 52.361076,-2.626386 52.360856,-2.626497 52.360664,-2.626545 52.360526,-2.626561 52.360396,-2.626552 52.360324,-2.626536 52.360216,-2.62655 52.360062,-2.626547 52.359991,-2.626569 52.359896,-2.626591 52.359799,-2.626651 52.359693,-2.626763 52.359532,-2.626821 52.35939,-2.626881 52.359282,-2.626983 52.358974,-2.626997 52.358931,-2.62704 52.358888,-2.627095 52.358848,-2.627292 52.358805,-2.627482 52.358788,-2.627652 52.358769,-2.627925 52.358743,-2.628089 52.3587,-2.628234 52.358601,-2.6284 52.358454,-2.628643 52.358199,-2.628776 52.358066,-2.628833 52.357997)",
+    "LINESTRING(-2.701915 52.415412,-2.70192 52.415411,-2.701938 52.415405,-2.701956 52.4154,-2.701968 52.415395,-2.701982 52.41539,-2.701996 52.415385,-2.70201 52.41538,-2.702027 52.415375,-2.702051 52.415369,-2.702096 52.415363,-2.702615 52.415426,-2.70304 52.415478,-2.703535 52.415544,-2.703915 52.415593,-2.704146 52.415621,-2.704382 52.415651,-2.704569 52.415674,-2.704741 52.415695,-2.704891 52.415713,-2.705012 52.415727,-2.705118 52.41574,-2.705203 52.415751,-2.705272 52.415759,-2.705334 52.415767,-2.705401 52.415775)",
+    "LINESTRING(-2.707812 52.377531,-2.707872 52.377589,-2.708109 52.377788,-2.708334 52.377977,-2.708556 52.378111,-2.709177 52.378368,-2.70934 52.37842,-2.709472 52.378447,-2.709956 52.378548)",
+    "LINESTRING(-2.620516 52.379118,-2.620457 52.379211,-2.620431 52.379337,-2.62039 52.37952,-2.62036 52.37975,-2.620341 52.379986,-2.620345 52.380114,-2.6204 52.380269,-2.6204 52.380305,-2.620328 52.380386,-2.620246 52.380461,-2.620105 52.380619,-2.620013 52.38068,-2.619911 52.380753,-2.619865 52.380797,-2.619844 52.380845,-2.619698 52.380995,-2.61959 52.381106,-2.61956 52.381171,-2.619543 52.381275,-2.619538 52.381331)",
+    "LINESTRING(-2.707602 52.372668,-2.707795 52.372744,-2.70812 52.372872,-2.70846 52.372996)",
+    "LINESTRING(-2.711811 52.37457,-2.711658 52.374351,-2.711597 52.374317,-2.711513 52.374312,-2.711339 52.374339,-2.710727 52.374445,-2.710437 52.374497,-2.710174 52.374562,-2.709927 52.374623,-2.709397 52.374757)",
+    "LINESTRING(-2.706761 52.37698,-2.706716 52.376953,-2.706627 52.37689,-2.706537 52.37681,-2.706388 52.376667,-2.706314 52.376596,-2.706192 52.376318,-2.706146 52.376153)",
+    "LINESTRING(-2.621756 52.445112,-2.621868 52.444997,-2.621989 52.444842,-2.622251 52.444614,-2.622538 52.444381,-2.622715 52.444245,-2.622746 52.444162,-2.622761 52.444092,-2.622739 52.444014,-2.622645 52.443805,-2.622485 52.443494,-2.622426 52.443401,-2.62237 52.443298,-2.622323 52.443194,-2.622298 52.443091,-2.622292 52.442974,-2.622318 52.442867,-2.622363 52.442789,-2.622434 52.442638,-2.622483 52.442528,-2.622536 52.442409,-2.622539 52.442289,-2.622522 52.442225,-2.622475 52.44213,-2.62243 52.442042,-2.622353 52.441909,-2.622241 52.441739,-2.622058 52.441463,-2.621748 52.441037,-2.621524 52.440713,-2.621368 52.440483,-2.621248 52.440291,-2.621166 52.440152,-2.621086 52.439994,-2.621018 52.439834,-2.62092 52.439574,-2.620759 52.439153,-2.620586 52.438729,-2.620425 52.438338,-2.620138 52.437647)",
+    "LINESTRING(-2.654057 52.461737,-2.654156 52.461723,-2.654248 52.461682,-2.654354 52.461623,-2.654612 52.461392,-2.654764 52.461257,-2.654893 52.461097,-2.655048 52.460894,-2.655062 52.460875,-2.655109 52.460821,-2.655134 52.460792,-2.655226 52.46069,-2.655231 52.460685,-2.655344 52.460581,-2.655418 52.460523,-2.65552 52.460452,-2.655555 52.460434,-2.655627 52.460397,-2.655695 52.460367,-2.655719 52.460356,-2.655819 52.460324,-2.655992 52.460266,-2.656134 52.460217,-2.656205 52.460188,-2.656229 52.460176,-2.656276 52.460152,-2.6564 52.460089,-2.656492 52.46003,-2.656579 52.45996,-2.656722 52.459843,-2.656837 52.459745,-2.657007 52.459598,-2.657009 52.459596,-2.657095 52.459498,-2.657107 52.459484,-2.657153 52.459424,-2.657211 52.459359,-2.657332 52.459224,-2.657388 52.459182,-2.657462 52.459126,-2.65762 52.459015,-2.65783 52.458869,-2.657942 52.458791,-2.658069 52.458703,-2.658316 52.458521,-2.658471 52.45842,-2.658762 52.458249,-2.65919 52.458021,-2.659703 52.457759,-2.659955 52.457606)",
+    "LINESTRING(-2.735941 52.47267,-2.735934 52.472667,-2.735924 52.472661,-2.735852 52.47262,-2.735599 52.47246,-2.73548 52.47237,-2.735464 52.472357,-2.735361 52.472276,-2.735294 52.472218,-2.735262 52.472172,-2.735206 52.472079,-2.735165 52.472022,-2.734934 52.471758,-2.734895 52.471727,-2.734885 52.471718,-2.734835 52.471673,-2.734825 52.471663,-2.734729 52.471589,-2.734697 52.47157,-2.73464 52.471541,-2.734612 52.471531)",
+    "LINESTRING(-2.600202 52.588818,-2.599984 52.588964,-2.599881 52.58905,-2.599775 52.589104,-2.599548 52.589215,-2.599542 52.589219,-2.599052 52.589451,-2.59847 52.589744,-2.598061 52.589933,-2.597517 52.59018,-2.597069 52.590412,-2.596399 52.590737,-2.596005 52.590942,-2.595702 52.591172,-2.595278 52.591479,-2.594971 52.591716,-2.594324 52.592189,-2.594038 52.592401,-2.593483 52.592668,-2.592961 52.592903,-2.592742 52.593009,-2.59245 52.593148,-2.592205 52.593362,-2.591903 52.593647,-2.591599 52.593929,-2.591221 52.594265,-2.590853 52.594544,-2.590349 52.594841,-2.589792 52.595132,-2.589358 52.595346,-2.588695 52.595666,-2.58789 52.596063,-2.587503 52.596248,-2.587206 52.59639,-2.586929 52.596499,-2.58639 52.596768,-2.585825 52.597044,-2.585507 52.597212,-2.585136 52.597431,-2.584636 52.597744,-2.584113 52.598065,-2.583643 52.598353,-2.583338 52.598545,-2.58302 52.598717,-2.582686 52.5989,-2.582504 52.598987,-2.582322 52.599055,-2.582214 52.599083,-2.581887 52.599137,-2.581618 52.599174,-2.581605 52.599185,-2.5816 52.59919,-2.581574 52.599213,-2.581574 52.599231)",
+    "LINESTRING(-2.643908 52.583275,-2.643708 52.583233,-2.643223 52.58317,-2.642576 52.583105,-2.641417 52.582982,-2.64131 52.582971,-2.641297 52.582969,-2.641206 52.582963,-2.641102 52.582947,-2.640998 52.582903,-2.640938 52.582866,-2.640862 52.582804,-2.640729 52.582636,-2.640672 52.582555,-2.640647 52.582507,-2.640625 52.582469,-2.640621 52.58244,-2.640622 52.582385,-2.640636 52.582358,-2.640709 52.582304,-2.640817 52.58222,-2.6409 52.582151,-2.640989 52.582077,-2.641102 52.58199,-2.641183 52.581935,-2.641303 52.581863,-2.641425 52.581798,-2.64147 52.581768,-2.641513 52.581728,-2.641632 52.58163,-2.64178 52.5815,-2.641912 52.581426,-2.642237 52.581273,-2.642484 52.58117,-2.642678 52.581101,-2.642836 52.581071)",
+    "LINESTRING(-2.694135 52.569982,-2.6944 52.570116,-2.694927 52.57055,-2.695022 52.570633,-2.695077 52.570645,-2.695132 52.57064,-2.695204 52.570588,-2.695539 52.570325,-2.695671 52.570243,-2.6957 52.570225,-2.695773 52.570198,-2.695832 52.570188,-2.695906 52.570188,-2.696069 52.570214,-2.696187 52.570213,-2.696305 52.570213,-2.696393 52.570194,-2.696452 52.570185,-2.69654 52.570139,-2.696642 52.570067,-2.696685 52.570013,-2.696742 52.569886,-2.696786 52.569832,-2.696829 52.569796,-2.696932 52.569733,-2.697108 52.569669,-2.697695 52.569485,-2.69793 52.569412,-2.698376 52.569276,-2.698473 52.569256,-2.698576 52.569219,-2.699147 52.568955,-2.699557 52.568755,-2.70001 52.568492,-2.700259 52.568355,-2.700596 52.568219,-2.70091 52.568118,-2.701081 52.568063,-2.701433 52.567971,-2.701933 52.56786,-2.702052 52.567827)",
+    "LINESTRING(-2.735197 52.581367,-2.734933 52.581501,-2.734664 52.581612,-2.734412 52.581716,-2.734155 52.581793,-2.73393 52.581831,-2.733637 52.581899,-2.733549 52.581899)",
+    "LINESTRING(-2.471251 52.186382,-2.471183 52.186377,-2.471137 52.186366,-2.471089 52.18633,-2.471061 52.186262,-2.471046 52.186148,-2.471038 52.186098,-2.470963 52.186025,-2.470884 52.185977,-2.470715 52.185932,-2.470661 52.185913,-2.470461 52.185895,-2.470222 52.185855,-2.470068 52.185818,-2.46998 52.185797,-2.469735 52.185775,-2.469362 52.185764,-2.469308 52.185757,-2.468923 52.185734,-2.468668 52.185713,-2.468601 52.185695,-2.468482 52.185663,-2.468349 52.185615,-2.468213 52.185558,-2.468109 52.185501,-2.467894 52.185386,-2.467456 52.185107,-2.467185 52.184921,-2.467114 52.184875,-2.466823 52.184617,-2.466688 52.184521,-2.466615 52.184469,-2.466488 52.184209,-2.466276 52.183883)",
+    "LINESTRING(-2.471194 52.161747,-2.471208 52.161746,-2.471329 52.161734,-2.471447 52.16172,-2.471514 52.161706,-2.471686 52.16167,-2.471771 52.161669,-2.47189 52.161687)",
+    "LINESTRING(-2.486775 52.192233,-2.486664 52.192166,-2.486034 52.191851,-2.485589 52.191668,-2.485207 52.191477,-2.485187 52.191467,-2.484394 52.191077,-2.484261 52.190967,-2.484201 52.190922,-2.484156 52.190876,-2.484035 52.19073,-2.483971 52.190665,-2.483911 52.190625,-2.48372 52.1905,-2.483666 52.190465,-2.483521 52.19038,-2.483259 52.190129,-2.483087 52.189954,-2.482767 52.189456)",
+    "LINESTRING(-2.506368 52.187521,-2.506339 52.187566,-2.50631 52.187593,-2.506252 52.187611,-2.506223 52.18762,-2.506091 52.187603)",
+    "LINESTRING(-2.505218 52.189211,-2.505069 52.189019,-2.504941 52.188854)",
+    "LINESTRING(-2.50762 52.201419,-2.507724 52.201279,-2.50784 52.201135,-2.507882 52.201,-2.507915 52.200773,-2.50795 52.200666,-2.507951 52.200662,-2.508038 52.200532,-2.508095 52.200451,-2.508153 52.200388,-2.508225 52.200315,-2.508327 52.200234,-2.508414 52.200171,-2.508574 52.20008,-2.509286 52.199681,-2.509563 52.199545,-2.509636 52.199518,-2.509841 52.199449,-2.510023 52.199411,-2.51022 52.199386,-2.51036 52.199374,-2.510693 52.19938,-2.511144 52.199398,-2.511418 52.199391,-2.511575 52.199373,-2.51177 52.199338,-2.512456 52.199218,-2.51266 52.19919,-2.513226 52.199136,-2.513306 52.199118,-2.513362 52.199106,-2.513367 52.199105,-2.5135 52.199064,-2.51351 52.199059,-2.51353 52.199049,-2.513624 52.199006,-2.513725 52.198907)",
+    "LINESTRING(-2.511843 52.190473,-2.511727 52.190563,-2.511672 52.190594,-2.511625 52.1906,-2.511465 52.190619,-2.511392 52.190628,-2.511333 52.190628,-2.5113 52.19062,-2.511274 52.190601,-2.511259 52.190574,-2.511153 52.190269,-2.511032 52.189865,-2.511017 52.189818,-2.511001 52.189775,-2.510972 52.189749,-2.510928 52.189731,-2.510884 52.189713,-2.510825 52.189713,-2.510723 52.189723,-2.510636 52.189744)",
+    "LINESTRING(-2.540195 52.199951,-2.540115 52.199992,-2.539923 52.200124,-2.539792 52.200195,-2.539712 52.200274,-2.539129 52.200421,-2.538881 52.200476,-2.538735 52.200495,-2.538427 52.200514,-2.538121 52.20056,-2.53796 52.200597,-2.537669 52.200706,-2.537523 52.200761,-2.537131 52.201005,-2.53671 52.201286,-2.536448 52.201413,-2.536288 52.201477,-2.536113 52.201522,-2.535953 52.201568,-2.535734 52.201605,-2.535573 52.201633,-2.535295 52.201652,-2.53512 52.201644,-2.535061 52.201635,-2.534944 52.2016,-2.53487 52.201564,-2.534723 52.201475,-2.534162 52.201073,-2.534088 52.201019,-2.533631 52.200707,-2.533528 52.200662,-2.533454 52.200644,-2.533393 52.200645,-2.533258 52.200637,-2.532589 52.200671,-2.532514 52.200672,-2.532447 52.200673,-2.532357 52.200667,-2.532181 52.20065,-2.531512 52.200542,-2.531233 52.200507,-2.531033 52.200494,-2.530901 52.200478,-2.530773 52.200462,-2.529977 52.200263,-2.529738 52.200201,-2.529564 52.200141,-2.529338 52.200039,-2.529245 52.199997,-2.528879 52.199775,-2.528693 52.199663,-2.528521 52.199549,-2.528378 52.199481,-2.528156 52.199402,-2.52758 52.19925,-2.527218 52.199153,-2.526851 52.199047,-2.526484 52.198959,-2.526279 52.198897,-2.525676 52.198692,-2.525427 52.198595,-2.524883 52.198372,-2.524721 52.198328,-2.524545 52.198293)",
+    "LINESTRING(-2.544544 52.17669,-2.544596 52.176676,-2.544688 52.176668,-2.544773 52.176675,-2.54492 52.176689,-2.545117 52.176722,-2.545294 52.176748,-2.545435 52.176759,-2.545625 52.176784,-2.545699 52.176791,-2.545889 52.176809,-2.546085 52.176831,-2.546323 52.176845,-2.546654 52.176873,-2.546825 52.176888,-2.547009 52.17689,-2.54726 52.176893,-2.547529 52.176899,-2.547848 52.176917,-2.548111 52.176923,-2.548264 52.176934,-2.548447 52.176948,-2.548566 52.176945)",
+    "LINESTRING(-2.572267 52.237221,-2.572354 52.23703,-2.572462 52.236915,-2.572642 52.236834,-2.572777 52.236822,-2.573147 52.236798,-2.573256 52.23677,-2.573293 52.236761,-2.573381 52.236734,-2.573672 52.236597,-2.57437 52.23618,-2.574776 52.235936,-2.575348 52.235529,-2.575583 52.235373,-2.575987 52.235117,-2.576503 52.234756,-2.576544 52.234726,-2.576745 52.234593,-2.576895 52.234517,-2.577057 52.234461,-2.577394 52.234363,-2.577633 52.234284,-2.577839 52.234198,-2.577967 52.234153,-2.578536 52.233986,-2.579064 52.233819,-2.579075 52.233815,-2.579399 52.23368,-2.579744 52.233564,-2.580219 52.233415,-2.580847 52.233218)",
+    "LINESTRING(-2.441663 52.321315,-2.441916 52.321358,-2.442019 52.321366,-2.442294 52.321388,-2.44248 52.321436,-2.442685 52.321469,-2.44299 52.321514,-2.443297 52.32154,-2.443602 52.321574,-2.443702 52.321607,-2.443745 52.321669,-2.443789 52.32201,-2.443829 52.322171,-2.443914 52.322332,-2.443995 52.322392,-2.444002 52.322398,-2.444023 52.322413,-2.444032 52.322417,-2.444041 52.322421,-2.4441 52.322447,-2.444476 52.322556,-2.444493 52.32256,-2.444694 52.322611,-2.444935 52.322681,-2.445149 52.322755,-2.445355 52.322852,-2.445631 52.323012,-2.445893 52.323175,-2.446104 52.323281,-2.44629 52.323343,-2.446489 52.323402,-2.446927 52.323534,-2.447081 52.323584,-2.447145 52.323602,-2.447282 52.323637,-2.447384 52.323654,-2.447486 52.323657,-2.447589 52.323648,-2.448131 52.323592,-2.448249 52.323592,-2.44849 52.323599,-2.448762 52.323617)",
+    "LINESTRING(-2.472028 52.316325,-2.472073 52.316386,-2.472207 52.316558,-2.472267 52.316683,-2.472312 52.316764,-2.472327 52.316809,-2.472343 52.316962,-2.472345 52.317132,-2.472304 52.317456,-2.47229 52.317501,-2.472203 52.317683,-2.472045 52.317966,-2.472003 52.318045,-2.47196 52.318159,-2.471917 52.318267,-2.471903 52.318312,-2.471859 52.318375,-2.47183 52.318402,-2.471801 52.318429,-2.471758 52.318447,-2.471654 52.318472)",
+    "LINESTRING(-2.513312 52.310431,-2.513306 52.310371,-2.5133 52.310355,-2.513222 52.310076,-2.513172 52.30988,-2.513115 52.309663,-2.513099 52.309626,-2.513048 52.309509,-2.513032 52.309431,-2.513078 52.309344,-2.513109 52.309326,-2.513184 52.309281,-2.513257 52.309237,-2.513461 52.309147,-2.513605 52.309075,-2.513739 52.309009,-2.513795 52.308971,-2.513839 52.308901,-2.513843 52.308833,-2.513782 52.30868,-2.513738 52.308606,-2.513621 52.308397,-2.513579 52.308322,-2.513493 52.308058,-2.513457 52.307962,-2.513405 52.307867,-2.513197 52.307596,-2.51312 52.30749,-2.512969 52.307256,-2.512865 52.307106,-2.512804 52.307012,-2.512779 52.306933,-2.512773 52.306863,-2.512784 52.306794,-2.5128 52.306747)",
+    "LINESTRING(-2.447545 52.312033,-2.447574 52.312015,-2.447603 52.311997,-2.447748 52.311762,-2.447893 52.311609,-2.447984 52.31151,-2.448009 52.311483,-2.448242 52.311302,-2.448344 52.311221,-2.448708 52.310967,-2.448795 52.310904,-2.449013 52.310652,-2.449042 52.310616,-2.449071 52.310597,-2.449114 52.31057,-2.44929 52.310507,-2.449859 52.310217,-2.449961 52.310154,-2.449975 52.3101,-2.450001 52.309803,-2.450015 52.309686,-2.450058 52.309587,-2.45013 52.309434,-2.450235 52.309256,-2.450453 52.309011,-2.450681 52.308838,-2.450827 52.30873,-2.451118 52.308531,-2.451569 52.308206,-2.451685 52.308114,-2.451712 52.308092,-2.451754 52.308061,-2.4518 52.308009,-2.451846 52.307936,-2.451896 52.307834,-2.451924 52.307764,-2.451926 52.307708,-2.451935 52.307634,-2.451944 52.307557,-2.451928 52.307467,-2.451928 52.307465,-2.451913 52.307395,-2.451838 52.307198,-2.45185 52.307128,-2.451852 52.307116,-2.451856 52.307093,-2.451884 52.307035,-2.451961 52.306947,-2.452048 52.306867,-2.452174 52.306789,-2.452283 52.306727,-2.452473 52.306631,-2.452524 52.306604,-2.452668 52.30651,-2.45271 52.306475,-2.45303 52.306222,-2.453176 52.306123,-2.453239 52.306091)",
+    "LINESTRING(-2.504205 52.303927,-2.504313 52.303921,-2.504708 52.303739,-2.504743 52.303727,-2.504947 52.303657,-2.505136 52.30361,-2.505179 52.303607,-2.505327 52.303594,-2.505721 52.303539,-2.505735 52.303537,-2.506063 52.303488,-2.506494 52.303412,-2.506697 52.303379,-2.506829 52.303359,-2.507095 52.303328,-2.507372 52.303307,-2.507605 52.303302,-2.507775 52.303307,-2.508311 52.303289,-2.508416 52.303304,-2.508705 52.303355,-2.509098 52.303421,-2.509553 52.30349,-2.509639 52.303492,-2.509761 52.303471,-2.509877 52.303422,-2.509979 52.303349,-2.510145 52.303238,-2.510265 52.303178,-2.51049 52.303111,-2.510669 52.303047,-2.510794 52.302988,-2.510973 52.302883,-2.511093 52.302795,-2.511267 52.302679,-2.511436 52.302578,-2.511679 52.302427,-2.511826 52.302358,-2.511969 52.30229,-2.512169 52.302212,-2.512498 52.302075,-2.51274 52.301972,-2.512942 52.3019,-2.513044 52.301864,-2.513083 52.301833,-2.513105 52.301787,-2.513094 52.301723,-2.513033 52.30132,-2.512999 52.301071,-2.512998 52.301062)",
+    "LINESTRING(-2.471692 52.306163,-2.471601 52.306131,-2.471559 52.30611,-2.471471 52.306066,-2.471372 52.306008,-2.471235 52.305918,-2.471124 52.305828,-2.470985 52.3057,-2.470942 52.305644,-2.470888 52.305565,-2.470828 52.305459,-2.470768 52.305348,-2.470707 52.305268,-2.470672 52.30523,-2.470672 52.30523,-2.470671 52.305229,-2.47066 52.305224)",
+    "LINESTRING(-2.460975 52.291103,-2.460895 52.291139,-2.460541 52.291265,-2.46029 52.29135,-2.460273 52.29136,-2.460239 52.29138,-2.460162 52.291444,-2.460092 52.291508,-2.460018 52.291578,-2.459951 52.291614,-2.459858 52.291635,-2.459754 52.291643,-2.459648 52.29164,-2.45952 52.291627,-2.459354 52.291608,-2.459248 52.291608,-2.459195 52.291613,-2.459113 52.291632,-2.458917 52.291709,-2.458094 52.292053,-2.457536 52.29228,-2.45715 52.292444,-2.456959 52.292532,-2.456719 52.292656,-2.455967 52.293047,-2.45559 52.293237,-2.455529 52.293266,-2.455447 52.293284,-2.454891 52.293361,-2.454729 52.293387,-2.454654 52.293412,-2.454636 52.293418,-2.45458 52.293447)",
+    "LINESTRING(-2.527254 52.284957,-2.527217 52.284992,-2.527166 52.285086,-2.527039 52.285303,-2.527002 52.285402,-2.52696 52.285441,-2.526887 52.28558,-2.526854 52.28564,-2.526846 52.285665,-2.526847 52.285695,-2.526855 52.285734,-2.52687 52.285764,-2.526912 52.285807,-2.526946 52.285842,-2.526988 52.285887,-2.527049 52.285949,-2.527079 52.285988,-2.527129 52.286055,-2.527159 52.286105,-2.527186 52.286149,-2.527216 52.286195,-2.52724 52.286247,-2.527259 52.286296,-2.527294 52.286383,-2.527327 52.286465,-2.527392 52.286665,-2.527405 52.286865,-2.527394 52.287169,-2.527378 52.287376,-2.527368 52.287493,-2.527344 52.287666,-2.527326 52.287704,-2.527292 52.287753,-2.527281 52.287816,-2.527302 52.287863,-2.527411 52.287887,-2.527687 52.287883,-2.52791 52.287894,-2.528124 52.287909,-2.528404 52.287941,-2.528654 52.287974,-2.528888 52.288003,-2.529118 52.288033,-2.52948 52.288081,-2.5296 52.288088,-2.5299 52.288117,-2.530232 52.288148,-2.530578 52.288161,-2.530763 52.288171,-2.530984 52.288192,-2.531201 52.2882,-2.531392 52.288201,-2.531518 52.288207,-2.531633 52.288219,-2.531806 52.288224,-2.531985 52.288245,-2.532221 52.288262,-2.532435 52.288288,-2.532926 52.288341,-2.533105 52.288362,-2.533188 52.288389,-2.533259 52.288423,-2.533339 52.288487,-2.533333 52.288518,-2.533328 52.288566,-2.53334 52.288619,-2.533332 52.288664,-2.533289 52.288739,-2.533199 52.288857,-2.533167 52.2889,-2.533148 52.288969,-2.533137 52.289042,-2.533123 52.28912,-2.53308 52.28919,-2.533037 52.289243,-2.532926 52.289358,-2.532822 52.289458,-2.532779 52.289508,-2.532703 52.289579,-2.532616 52.289655,-2.532564 52.28971)",
+    "LINESTRING(-2.448937 52.282899,-2.448852 52.28286,-2.448805 52.282836,-2.447935 52.28238,-2.447175 52.281963,-2.446732 52.28172,-2.446589 52.281628,-2.44658 52.281619,-2.446447 52.281495,-2.446396 52.281389,-2.446387 52.281328,-2.446405 52.281235,-2.446457 52.281182,-2.446507 52.281131,-2.446744 52.281)",
+    "LINESTRING(-2.563133 52.253041,-2.563455 52.252986,-2.563777 52.252876,-2.564579 52.252572,-2.56506 52.25239,-2.565162 52.252371,-2.565269 52.252375,-2.566355 52.252547,-2.566456 52.252563,-2.567209 52.252685,-2.567378 52.252711,-2.567596 52.252732,-2.568538 52.252798,-2.569435 52.252855,-2.569635 52.252857,-2.569726 52.252852,-2.57001 52.252813,-2.570499 52.252757,-2.570648 52.25274,-2.570966 52.25271,-2.57109 52.252714,-2.571365 52.252768,-2.571592 52.252817,-2.57164 52.252824,-2.571675 52.252829,-2.571753 52.25283,-2.571852 52.252811,-2.571865 52.252804,-2.571958 52.252754,-2.572143 52.252652,-2.572291 52.252577,-2.57244 52.252535,-2.572446 52.252534,-2.572473 52.25253,-2.572666 52.252499,-2.57274 52.252496,-2.572809 52.252494,-2.572882 52.252499)",
+    "LINESTRING(-2.548434 52.318773,-2.54837 52.31869,-2.548342 52.318571,-2.54829 52.318243,-2.548328 52.318091,-2.548343 52.317724,-2.548345 52.317578,-2.548348 52.317463,-2.548352 52.317393,-2.548359 52.31729,-2.548367 52.317172,-2.548362 52.317132,-2.548348 52.317089,-2.548335 52.317051,-2.548303 52.317005,-2.548268 52.316968,-2.548228 52.316939,-2.548197 52.316914)",
+    "LINESTRING(-2.5647 52.280694,-2.564611 52.280667,-2.564554 52.280647,-2.564553 52.280646,-2.564466 52.280583,-2.564464 52.280581,-2.564462 52.280579,-2.564382 52.280491,-2.5643 52.280394,-2.5642 52.280285,-2.564089 52.280184,-2.564012 52.280141,-2.563911 52.280103,-2.563849 52.28009,-2.56382 52.280083,-2.563771 52.280073,-2.56375 52.280071,-2.563685 52.280064,-2.56362 52.280057)",
+    "LINESTRING(-2.572267 52.237221,-2.572354 52.23703,-2.572462 52.236915,-2.572642 52.236834,-2.572777 52.236822,-2.573147 52.236798,-2.573256 52.23677,-2.573293 52.236761,-2.573381 52.236734,-2.573672 52.236597,-2.57437 52.23618,-2.574776 52.235936,-2.575348 52.235529,-2.575583 52.235373,-2.575987 52.235117,-2.576503 52.234756,-2.576544 52.234726,-2.576745 52.234593,-2.576895 52.234517,-2.577057 52.234461,-2.577394 52.234363,-2.577633 52.234284,-2.577839 52.234198,-2.577967 52.234153,-2.578536 52.233986,-2.579064 52.233819,-2.579075 52.233815,-2.579399 52.23368,-2.579744 52.233564,-2.580219 52.233415,-2.580847 52.233218)",
+    "LINESTRING(-2.471886 52.410372,-2.472048 52.410396,-2.472451 52.410365,-2.473273 52.4103,-2.473549 52.410281,-2.473782 52.410266,-2.474242 52.410265,-2.474647 52.410255,-2.474666 52.410255,-2.474948 52.410239,-2.475095 52.410224,-2.475192 52.410209,-2.475535 52.410156,-2.476032 52.410086,-2.476313 52.41005,-2.476674 52.410016,-2.476947 52.409988,-2.47713 52.409984,-2.477333 52.409991,-2.477465 52.410011,-2.477505 52.410023,-2.477604 52.410054,-2.477621 52.410059,-2.47776 52.410118,-2.477938 52.410225,-2.47796 52.410242,-2.478004 52.410276,-2.478065 52.410324,-2.478077 52.410336,-2.478164 52.410437,-2.478193 52.410445,-2.478311 52.410454,-2.478707 52.410425,-2.478741 52.410429)",
+    "LINESTRING(-2.466721 52.410894,-2.466809 52.41093,-2.466969 52.411017,-2.467398 52.411283,-2.46767 52.411458,-2.467738 52.411487,-2.467844 52.411521,-2.468032 52.411543,-2.468194 52.411562,-2.468255 52.411569,-2.470843 52.41184,-2.471402 52.411902)",
+    "LINESTRING(-2.554667 52.389753,-2.554543 52.38971,-2.554214 52.389653,-2.55373 52.389577,-2.553436 52.389514,-2.553155 52.389412,-2.552772 52.38929,-2.552624 52.389246,-2.552374 52.389193,-2.552153 52.389131,-2.552101 52.389104,-2.552049 52.389077,-2.552 52.389048)",
+    "LINESTRING(-2.474069 52.386413,-2.474094 52.386471,-2.474115 52.386496,-2.474138 52.386512,-2.474147 52.386518,-2.474168 52.386532,-2.474186 52.386543,-2.474206 52.38655,-2.474224 52.386555,-2.474247 52.386557,-2.474265 52.386558,-2.474356 52.386555)",
+    "LINESTRING(-2.577546 52.379129,-2.577584 52.379095,-2.577739 52.379002,-2.57807 52.378821,-2.579069 52.378298,-2.580057 52.377738,-2.580511 52.377505,-2.580879 52.3773,-2.58191 52.376725,-2.5821 52.376616,-2.582245 52.37653,-2.582368 52.376457,-2.582477 52.376409,-2.582588 52.376376,-2.582702 52.376349,-2.582832 52.37633,-2.583016 52.376318,-2.583245 52.376315,-2.583266 52.376315,-2.583497 52.376348,-2.583633 52.376389,-2.583712 52.376413,-2.583878 52.376449,-2.584109 52.376495,-2.584299 52.376554,-2.584416 52.376593,-2.58449 52.376599,-2.584599 52.376567,-2.584676 52.376514,-2.584728 52.376458,-2.584749 52.376421)",
+    "LINESTRING(-2.459996 52.457962,-2.459215 52.4578,-2.45878 52.457693,-2.458686 52.457664,-2.458619 52.457636,-2.458585 52.457607,-2.458548 52.457468,-2.458519 52.457359,-2.458485 52.457302,-2.458481 52.457242,-2.458492 52.457168,-2.458519 52.457079,-2.458548 52.456995,-2.458598 52.456919,-2.458673 52.456838,-2.458893 52.456647,-2.459155 52.456424,-2.459233 52.456346,-2.459266 52.456298,-2.459277 52.456238,-2.459288 52.456113,-2.459284 52.455913,-2.459288 52.45563,-2.459307 52.45544,-2.459305 52.455367,-2.459301 52.455309,-2.459283 52.455264,-2.459234 52.455202,-2.459169 52.455154,-2.459056 52.455092,-2.458995 52.455039,-2.458933 52.454965,-2.458907 52.454912,-2.458852 52.454721,-2.458775 52.454426,-2.458715 52.454227,-2.458665 52.454112,-2.458609 52.454007,-2.458514 52.453871,-2.458433 52.453774,-2.458356 52.453697,-2.458293 52.45363,-2.458277 52.453587)",
+    "LINESTRING(-2.578602 52.498031,-2.579251 52.498096,-2.579281 52.498114,-2.579311 52.498132,-2.579329 52.498169,-2.579309 52.498265)",
+    "LINESTRING(-2.571655 52.452134,-2.571922 52.452084,-2.572008 52.452068,-2.572449 52.452065,-2.573334 52.452059,-2.573409 52.452073)",
+    "LINESTRING(-2.545333 52.455671,-2.545365 52.455672,-2.545391 52.455671,-2.545479 52.455653,-2.545553 52.455635,-2.545919 52.455507,-2.545995 52.455476,-2.54605 52.455469,-2.546051 52.455469,-2.546107 52.455486,-2.54617 52.455533,-2.546229 52.455605,-2.546334 52.455703,-2.546482 52.455828,-2.54675 52.456016,-2.546824 52.456087,-2.546869 52.456177,-2.546884 52.456377,-2.546897 52.456551,-2.546919 52.456924,-2.546914 52.456973,-2.546866 52.456996,-2.546808 52.456985,-2.546774 52.456978,-2.546585 52.456905,-2.546199 52.456729,-2.546066 52.456697,-2.546052 52.456693,-2.545934 52.456672,-2.545904 52.456667,-2.545727 52.45665,-2.54547 52.456622,-2.544925 52.456606,-2.544903 52.456606,-2.544375 52.456603,-2.544226 52.456608,-2.543741 52.456612,-2.543313 52.456598)",
+    "LINESTRING(-2.47225 52.463886,-2.472365 52.463904,-2.472832 52.463991,-2.472848 52.463994,-2.473175 52.464072,-2.473328 52.464126,-2.473333 52.464128,-2.473338 52.46413,-2.473463 52.464195,-2.473616 52.464322,-2.473678 52.464369,-2.473732 52.464407)",
+    "LINESTRING(-2.457175 52.510534,-2.456312 52.51087,-2.45619 52.510917,-2.456011 52.510988,-2.455861 52.511048,-2.455756 52.51109,-2.455731 52.511109)",
+    "LINESTRING(-2.518319 52.577444,-2.518208 52.577535,-2.518032 52.577597,-2.517232 52.577863,-2.51674 52.578024,-2.516571 52.578088,-2.516489 52.578164,-2.516356 52.578267,-2.5163 52.578304,-2.516133 52.578414,-2.515911 52.578595,-2.515846 52.578648)",
+    "LINESTRING(-2.497517 52.560907,-2.497589 52.560937,-2.497794 52.561027,-2.498074 52.561161,-2.498513 52.561426,-2.49877 52.561577,-2.498981 52.561683,-2.499414 52.561923,-2.499551 52.562023,-2.499692 52.562176,-2.499774 52.562338,-2.499914 52.56263,-2.50008 52.562958,-2.500308 52.563461,-2.500415 52.563697)",
+    "LINESTRING(-2.600202 52.588818,-2.599984 52.588964,-2.599881 52.58905,-2.599775 52.589104,-2.599548 52.589215,-2.599542 52.589219,-2.599052 52.589451,-2.59847 52.589744,-2.598061 52.589933,-2.597517 52.59018,-2.597069 52.590412,-2.596399 52.590737,-2.596005 52.590942,-2.595702 52.591172,-2.595278 52.591479,-2.594971 52.591716,-2.594324 52.592189,-2.594038 52.592401,-2.593483 52.592668,-2.592961 52.592903,-2.592742 52.593009,-2.59245 52.593148,-2.592205 52.593362,-2.591903 52.593647,-2.591599 52.593929,-2.591221 52.594265,-2.590853 52.594544,-2.590349 52.594841,-2.589792 52.595132,-2.589358 52.595346,-2.588695 52.595666,-2.58789 52.596063,-2.587503 52.596248,-2.587206 52.59639,-2.586929 52.596499,-2.58639 52.596768,-2.585825 52.597044,-2.585507 52.597212,-2.585136 52.597431,-2.584636 52.597744,-2.584113 52.598065,-2.583643 52.598353,-2.583338 52.598545,-2.58302 52.598717,-2.582686 52.5989,-2.582504 52.598987,-2.582322 52.599055,-2.582214 52.599083,-2.581887 52.599137,-2.581618 52.599174,-2.581605 52.599185,-2.5816 52.59919,-2.581574 52.599213,-2.581574 52.599231)",
+    "LINESTRING(-2.478365 52.517265,-2.478477 52.517347,-2.478512 52.517372,-2.478895 52.517586,-2.4791 52.517735,-2.479305 52.517896,-2.479507 52.518064,-2.479846 52.518332,-2.480108 52.518545,-2.480699 52.51908,-2.480877 52.519241,-2.480944 52.519297,-2.480997 52.519358,-2.481038 52.519415,-2.48116 52.519651,-2.481163 52.519657,-2.481165 52.519662,-2.4812 52.519808,-2.481269 52.520139,-2.481295 52.520381,-2.481283 52.520579,-2.481261 52.520732,-2.481316 52.520904,-2.481459 52.521127,-2.481552 52.521267,-2.481731 52.521449,-2.481895 52.521618,-2.482215 52.521987,-2.482547 52.522309,-2.483038 52.522747,-2.483544 52.523186,-2.483841 52.523382,-2.484123 52.523534,-2.484448 52.523677,-2.484641 52.523748,-2.485042 52.52389,-2.485233 52.523952,-2.485345 52.523986,-2.485602 52.524068,-2.485927 52.524147,-2.486091 52.524175,-2.486336 52.524205,-2.486547 52.524225,-2.486651 52.524234,-2.486702 52.524243,-2.4868 52.52426,-2.486931 52.524296,-2.487035 52.52434,-2.487168 52.524412,-2.487242 52.524453,-2.487376 52.524546,-2.487449 52.524597,-2.48753 52.524681,-2.4876 52.524761,-2.487704 52.524868,-2.487764 52.524922,-2.487824 52.524976,-2.487943 52.525119,-2.488078 52.525352,-2.488187 52.525735,-2.488216 52.525855,-2.488278 52.526115,-2.488305 52.526239,-2.488385 52.526429,-2.488431 52.5266,-2.488462 52.526735,-2.488512 52.527283,-2.488513 52.527346,-2.488528 52.527418,-2.488559 52.527481,-2.488614 52.527547,-2.488721 52.52762,-2.488857 52.52769,-2.489649 52.528116,-2.490231 52.528454,-2.490491 52.528575,-2.490601 52.528632,-2.490729 52.528709,-2.490812 52.528777,-2.490994 52.528932,-2.491131 52.529129,-2.491132 52.529212,-2.49112 52.529238,-2.491085 52.529304)",
+    "LINESTRING(-2.399788 52.170841,-2.39976 52.170875,-2.399673 52.170957,-2.399615 52.170993,-2.399542 52.171029,-2.399324 52.171111,-2.399207 52.171147,-2.39909 52.171183,-2.398828 52.171238,-2.398687 52.171248,-2.398571 52.171249,-2.398435 52.17124,-2.398415 52.171239,-2.39838 52.171242,-2.398299 52.17125,-2.398201 52.171264,-2.398103 52.171311)",
+    "LINESTRING(-2.39886 52.194121,-2.398902 52.194016,-2.39878 52.19367,-2.398754 52.193547,-2.398799 52.193432,-2.398894 52.193346,-2.398981 52.193289,-2.399046 52.193265,-2.399249 52.193196,-2.399485 52.193106,-2.399774 52.192991,-2.400075 52.192865,-2.400318 52.192747,-2.40067 52.192582,-2.400878 52.192503,-2.401028 52.192446,-2.40112 52.192388,-2.4012 52.192317,-2.401209 52.192289,-2.40121 52.19225,-2.401165 52.192124,-2.40115 52.192061,-2.401261 52.191423,-2.401298 52.191298,-2.4014 52.19114,-2.401526 52.190955,-2.401612 52.190805,-2.401674 52.190626,-2.401736 52.190451,-2.401787 52.190325,-2.401832 52.190182,-2.401888 52.189919)",
+    "LINESTRING(-2.420562 52.189747,-2.420649 52.189755,-2.420904 52.189748,-2.421703 52.189726,-2.421869 52.189701,-2.422065 52.189651,-2.422175 52.18964,-2.422326 52.189643,-2.422433 52.18966,-2.422603 52.189707,-2.422789 52.189736,-2.423127 52.189773,-2.423211 52.189771,-2.423304 52.189737,-2.423401 52.189718,-2.423611 52.189748,-2.423773 52.189749,-2.424169 52.189666,-2.424832 52.189523,-2.424895 52.189492,-2.425031 52.189393,-2.42513 52.189322,-2.425258 52.189185)",
+    "LINESTRING(-2.431553 52.211334,-2.431826 52.211228,-2.432062 52.211176,-2.432725 52.21103,-2.432992 52.210966,-2.433262 52.21089,-2.433621 52.210751,-2.433836 52.210616,-2.434025 52.210455,-2.434143 52.210242,-2.434182 52.210042,-2.434238 52.209873,-2.434312 52.209601,-2.43435 52.209277,-2.434391 52.209007,-2.434394 52.208868)",
+    "LINESTRING(-2.411074 52.184883,-2.410958 52.184882,-2.410934 52.18488,-2.41067 52.184841,-2.410351 52.184785,-2.410136 52.184761,-2.409997 52.18475,-2.409754 52.184755,-2.409291 52.184788,-2.409123 52.1848,-2.40881 52.184786,-2.408474 52.184759,-2.408347 52.184763,-2.407924 52.184807,-2.407374 52.184865,-2.407051 52.184899,-2.406995 52.184894,-2.406965 52.184885,-2.406892 52.184858,-2.406686 52.184751,-2.406636 52.18473,-2.406583 52.184715,-2.406525 52.184707,-2.405576 52.184658,-2.405101 52.184641,-2.404782 52.184628,-2.404481 52.184626,-2.404104 52.184627,-2.403745 52.184639,-2.403416 52.184676,-2.402704 52.184781)",
+    "LINESTRING(-2.411444 52.156441,-2.411417 52.156354,-2.411373 52.156202,-2.411266 52.155878,-2.41114 52.155478,-2.411087 52.155324,-2.41101 52.1551,-2.410884 52.154704,-2.410759 52.154315,-2.41071 52.154107,-2.410674 52.154034,-2.41064 52.153965,-2.410614 52.153891,-2.410553 52.153752,-2.410141 52.153263,-2.40989 52.152986,-2.409609 52.152708,-2.40916 52.152261,-2.409114 52.152257,-2.408964 52.152286,-2.408323 52.152406,-2.408029 52.152462,-2.40781 52.15248,-2.407722 52.152481,-2.40743 52.152473,-2.407093 52.152429,-2.406984 52.152418,-2.406773 52.152362,-2.406536 52.152334,-2.406269 52.152317,-2.406083 52.152324)",
+    "LINESTRING(-2.309246 52.321985,-2.30921 52.322046,-2.309069 52.322272,-2.309024 52.322327,-2.30898 52.322338,-2.30896 52.322343,-2.30885 52.322344,-2.308767 52.322364,-2.308753 52.322369)",
+    "LINESTRING(-2.317414 52.305071,-2.317354 52.305041,-2.317212 52.30497,-2.317056 52.304907,-2.316933 52.304856,-2.316823 52.304778)",
+    "LINESTRING(-2.31162 52.298537,-2.31168 52.298317,-2.311681 52.298306,-2.311717 52.298032,-2.311803 52.297506,-2.311828 52.297403,-2.311885 52.29728,-2.311899 52.297265,-2.311943 52.297213,-2.312097 52.297157,-2.312239 52.297129,-2.312491 52.297101,-2.3128 52.29706,-2.312944 52.297037,-2.313045 52.29702,-2.313186 52.29698,-2.313245 52.296964,-2.313407 52.296912,-2.313418 52.296908,-2.313451 52.296896,-2.313624 52.296829,-2.313666 52.296809,-2.313875 52.296709,-2.314267 52.296499,-2.314505 52.296391,-2.314865 52.29626,-2.315593 52.295989,-2.316099 52.295795,-2.317154 52.295436,-2.317332 52.295378,-2.318137 52.295173,-2.318314 52.29513,-2.319226 52.294921,-2.319938 52.294753,-2.320333 52.29466,-2.320446 52.294633,-2.320696 52.294577,-2.32076 52.294519,-2.32084 52.29447,-2.320946 52.294376,-2.321001 52.294344,-2.321105 52.294315,-2.321169 52.294298,-2.321239 52.294287,-2.321331 52.294279,-2.321476 52.29428,-2.322073 52.294296,-2.322789 52.294317,-2.322742 52.294467,-2.322676 52.294735,-2.322625 52.294996,-2.322596 52.295041,-2.322529 52.295078,-2.322365 52.295129,-2.322313 52.295156,-2.322284 52.295221,-2.322259 52.29536,-2.322265 52.295417)",
+    "LINESTRING(-2.303381 52.282977,-2.303361 52.28292,-2.303334 52.282843,-2.303301 52.282764,-2.303278 52.282705,-2.303027 52.282448,-2.302958 52.282307,-2.302958 52.282251,-2.302958 52.282236)",
+    "LINESTRING(-2.330317 52.266892,-2.330322 52.266946,-2.330326 52.266989,-2.330319 52.267158,-2.330317 52.267329,-2.330291 52.267437,-2.330195 52.267845)",
+    "LINESTRING(-2.325552 52.324293,-2.325676 52.32429,-2.325721 52.324308,-2.325775 52.32433,-2.325834 52.324354,-2.326184 52.324634,-2.326472 52.324866,-2.32673 52.325073,-2.326893 52.325203,-2.327011 52.325296,-2.327231 52.325463)",
+    "LINESTRING(-2.394535 52.321592,-2.394659 52.321506,-2.394904 52.321359,-2.395022 52.321287,-2.395179 52.321211,-2.39532 52.321134,-2.395429 52.321062,-2.39552 52.320986,-2.395648 52.32088,-2.395753 52.320779,-2.395813 52.320708,-2.395856 52.320643,-2.395939 52.3205,-2.396028 52.320348,-2.396095 52.320239,-2.396155 52.320159,-2.396269 52.320018,-2.39646 52.319815,-2.396568 52.319689,-2.396723 52.319489,-2.396904 52.319268,-2.397038 52.31913,-2.397126 52.319043,-2.397219 52.318972,-2.397266 52.318946,-2.397317 52.318896,-2.397368 52.318846,-2.397393 52.318803,-2.397433 52.318728,-2.397467 52.318668,-2.397516 52.318602,-2.39758 52.318536,-2.397689 52.318435,-2.397794 52.318348,-2.397905 52.318255,-2.398077 52.318125,-2.398168 52.31805,-2.398217 52.317987,-2.39824 52.317925,-2.398252 52.317882,-2.398254 52.317838)",
+    "LINESTRING(-2.378569 52.312133,-2.37857 52.312127,-2.378321 52.311753,-2.3781 52.311421)",
+    "LINESTRING(-2.367521 52.286345,-2.367594 52.286291,-2.367984 52.286161,-2.368477 52.286025,-2.368881 52.285927,-2.36908 52.285878,-2.369367 52.285843,-2.369432 52.285834,-2.369552 52.285818,-2.369669 52.285802,-2.369818 52.285757,-2.369894 52.285715,-2.370197 52.285531,-2.370559 52.285294,-2.37092 52.285059,-2.372029 52.284362,-2.372119 52.284306,-2.372218 52.284251,-2.37247 52.284157,-2.372648 52.284069,-2.372718 52.284018,-2.372749 52.283955,-2.372772 52.283858,-2.372733 52.283773,-2.372691 52.283642,-2.372643 52.283484,-2.372621 52.283362,-2.372615 52.283303,-2.372626 52.283207,-2.372652 52.283134,-2.372753 52.282962,-2.372846 52.282879,-2.37293 52.282811,-2.373244 52.282583,-2.37328 52.282551,-2.373543 52.282366,-2.373753 52.282222,-2.374052 52.282024,-2.374299 52.281847,-2.374437 52.281744,-2.374638 52.281589,-2.374835 52.281434,-2.37505 52.281274,-2.37517 52.281179,-2.375292 52.281104,-2.375429 52.281011,-2.375717 52.280825,-2.37583 52.280752,-2.375883 52.280713,-2.375901 52.280687,-2.375908 52.280641,-2.375943 52.280465,-2.375969 52.280312,-2.375983 52.28013,-2.375997 52.280043,-2.376011 52.279916,-2.376028 52.279736,-2.376029 52.279554,-2.376028 52.279374,-2.376055 52.27919,-2.376091 52.279008,-2.37611 52.278827,-2.376143 52.278646,-2.376142 52.278524,-2.376117 52.278402,-2.376085 52.278261,-2.376002 52.278084,-2.375937 52.277952,-2.375879 52.277791,-2.375869 52.277657)",
+    "LINESTRING(-2.356828 52.29325,-2.35674 52.292996,-2.356687 52.292818,-2.356655 52.292763,-2.356609 52.292711,-2.356551 52.292684,-2.35648 52.29268,-2.356456 52.292684,-2.356274 52.292712,-2.356212 52.292719,-2.356141 52.292727,-2.356016 52.292741,-2.355927 52.292741,-2.355848 52.292741,-2.355743 52.292732,-2.355719 52.29273,-2.355703 52.292726,-2.355544 52.292691,-2.355469 52.292682,-2.355305 52.292664,-2.355283 52.292661,-2.355196 52.292648,-2.355177 52.29265,-2.355073 52.292657,-2.354956 52.292666,-2.35483 52.292723,-2.354682 52.292809,-2.354512 52.29291,-2.354314 52.292985,-2.35412 52.293026,-2.354027 52.293038)",
+    "LINESTRING(-2.439742 52.273662,-2.439487 52.27359,-2.439344 52.273597,-2.439059 52.273611,-2.43898 52.273595,-2.43881 52.273451)",
+    "LINESTRING(-2.386295 52.272591,-2.386277 52.272551,-2.386273 52.272507,-2.386273 52.272447,-2.386275 52.272432,-2.386278 52.272384,-2.386279 52.272367,-2.386284 52.272356,-2.386302 52.272316,-2.386322 52.272286,-2.38633 52.272274,-2.386347 52.272262,-2.386366 52.27225,-2.386368 52.272248,-2.386451 52.272216,-2.386781 52.272128,-2.386868 52.272101,-2.386905 52.272065,-2.386904 52.272017,-2.386883 52.271978,-2.386829 52.271926,-2.386761 52.271888,-2.386644 52.271853,-2.386502 52.27183,-2.386391 52.271819,-2.386275 52.271812,-2.386211 52.271794,-2.386207 52.27179,-2.386187 52.271768,-2.386193 52.271714,-2.386224 52.271702,-2.386245 52.271693,-2.386256 52.271689,-2.386336 52.271687,-2.386393 52.271685,-2.386579 52.27167,-2.386619 52.271665,-2.386721 52.271652,-2.386799 52.271643,-2.386816 52.271638,-2.386953 52.271599,-2.387064 52.271552,-2.38708 52.271546,-2.387114 52.271521,-2.387193 52.271465,-2.387434 52.271266,-2.387709 52.271054,-2.387859 52.270946,-2.388003 52.270832,-2.388051 52.270783,-2.388095 52.270737,-2.388136 52.270666,-2.388156 52.27053,-2.388171 52.27044,-2.388222 52.270343,-2.38829 52.270248,-2.388348 52.270213,-2.388433 52.270189,-2.388543 52.270166,-2.388775 52.270123,-2.388964 52.270083,-2.389059 52.270051,-2.38919 52.270002,-2.389295 52.269948,-2.389399 52.269881,-2.389458 52.269828,-2.389488 52.269756,-2.389557 52.269482,-2.389596 52.269274,-2.389609 52.269022,-2.389622 52.268896,-2.389692 52.268518,-2.389749 52.268374,-2.389778 52.268329,-2.389863 52.268272,-2.390046 52.268158,-2.390356 52.267968,-2.390702 52.26776,-2.390886 52.267669,-2.390974 52.267633,-2.391061 52.267605,-2.39112 52.267596,-2.391247 52.267581,-2.39153 52.267568,-2.391603 52.267559,-2.391706 52.267517,-2.391771 52.267474,-2.391774 52.267472,-2.391775 52.267471,-2.391863 52.267381,-2.391962 52.267263,-2.392009 52.267172,-2.39204 52.267074,-2.39206 52.266964,-2.392102 52.266757,-2.392115 52.266694,-2.392193 52.266545,-2.392282 52.266434,-2.39236 52.266357,-2.39245 52.266303,-2.392565 52.266261,-2.392723 52.266231,-2.392901 52.266206,-2.393029 52.266188,-2.393073 52.266175,-2.39316 52.266149,-2.393313 52.26609,-2.393392 52.266044,-2.393453 52.266005,-2.393627 52.265865,-2.393811 52.265725,-2.393847 52.265679,-2.393852 52.265637,-2.393825 52.265578,-2.393745 52.265507,-2.393448 52.265288,-2.393385 52.265244,-2.393161 52.265087,-2.393002 52.264965,-2.392901 52.264891)",
+    "LINESTRING(-2.413413 52.258694,-2.413538 52.259264,-2.41355 52.259313,-2.413676 52.259883,-2.413779 52.260331,-2.413839 52.260595,-2.413895 52.260804,-2.413933 52.261004,-2.413968 52.261134,-2.414015 52.261357,-2.41411 52.26167,-2.414162 52.261798,-2.414221 52.261889,-2.414317 52.261954,-2.414454 52.261996,-2.414872 52.262069,-2.415052 52.26213,-2.415116 52.262207,-2.415148 52.262318,-2.415124 52.262503,-2.415013 52.262875,-2.414913 52.263165,-2.414805 52.263391,-2.414465 52.263742,-2.414041 52.264168,-2.413843 52.264367,-2.413608 52.264517,-2.413418 52.264593,-2.41315 52.264649,-2.412802 52.264738,-2.412492 52.264842,-2.412056 52.265013,-2.411777 52.265105,-2.41154 52.265151,-2.411298 52.265155,-2.411154 52.265137,-2.410854 52.2651,-2.410463 52.265056)",
+    "LINESTRING(-2.422179 52.250591,-2.422229 52.25056,-2.422258 52.250542,-2.422404 52.250506,-2.422448 52.250479,-2.422506 52.250406,-2.422598 52.25024)",
+    "LINESTRING(-2.304096 52.38383,-2.304311 52.383709,-2.304375 52.383673,-2.304741 52.383474)",
+    "LINESTRING(-2.311777 52.355598,-2.311908 52.355533,-2.312027 52.355479,-2.311996 52.355417,-2.311862 52.355242,-2.311751 52.355094,-2.311715 52.35494,-2.311647 52.354695,-2.311602 52.354528,-2.311601 52.354461,-2.3116 52.354326,-2.311555 52.35417,-2.311489 52.354145,-2.311335 52.354178,-2.311181 52.354211,-2.31102 52.354269,-2.310948 52.354295,-2.310895 52.354314,-2.310667 52.354401)",
+    "LINESTRING(-2.310861 52.374127,-2.310797 52.374063,-2.310739 52.374022,-2.310657 52.373964,-2.310579 52.373921)",
+    "LINESTRING(-2.331681 52.351268,-2.331968 52.351174,-2.332394 52.351032,-2.332727 52.350926,-2.333121 52.3508,-2.333336 52.350697,-2.333535 52.350572,-2.333728 52.350421,-2.33399 52.350216,-2.334129 52.350094,-2.334252 52.349977,-2.334333 52.349867,-2.334419 52.349752,-2.334485 52.349592,-2.334495 52.349413,-2.334456 52.349228,-2.334372 52.348983,-2.334323 52.348821,-2.334316 52.348799)",
+    "LINESTRING(-2.328113 52.34744,-2.328381 52.347429,-2.328637 52.347401,-2.328936 52.347357,-2.329147 52.347329,-2.32934 52.347286,-2.32945 52.347264,-2.329714 52.347204,-2.329903 52.347157,-2.330088 52.347111,-2.330303 52.347075,-2.330413 52.347035,-2.330616 52.346951)",
+    "LINESTRING(-2.377692 52.403371,-2.377783 52.403294,-2.377821 52.403256,-2.377923 52.40318,-2.378179 52.402998,-2.378403 52.402832,-2.37892 52.402432,-2.379181 52.40224,-2.379405 52.402124,-2.379934 52.40181,-2.38016 52.401672,-2.380332 52.401507,-2.380498 52.401279,-2.380777 52.400857,-2.380868 52.400761,-2.38108 52.400531,-2.381152 52.400413,-2.381184 52.400297,-2.381217 52.400057,-2.381256 52.399866,-2.381298 52.399733,-2.381373 52.39961,-2.381469 52.399356,-2.381489 52.399177,-2.381495 52.398913,-2.381469 52.398764,-2.381359 52.398634,-2.381155 52.398507,-2.381016 52.398461,-2.380878 52.398423,-2.38062 52.398386,-2.380386 52.398338,-2.380169 52.398274,-2.380085 52.398228,-2.379902 52.398126,-2.379793 52.398048,-2.379716 52.397953,-2.379691 52.397856,-2.379723 52.397749,-2.379781 52.397586,-2.379801 52.39745,-2.379787 52.397334,-2.379669 52.397187,-2.379388 52.396965,-2.37896 52.39669,-2.378453 52.396307,-2.378046 52.395955,-2.377357 52.395277,-2.377302 52.395176,-2.3772 52.394948,-2.377105 52.394613,-2.376996 52.394229,-2.376749 52.393658,-2.376667 52.393464,-2.37645 52.392901,-2.37639 52.392785,-2.375713 52.391955,-2.375234 52.391356,-2.375004 52.391043,-2.374907 52.390855,-2.374914 52.390767,-2.374988 52.390534,-2.375028 52.390408,-2.375047 52.390376,-2.375212 52.390101,-2.375258 52.389951,-2.375276 52.389892,-2.375314 52.389655,-2.375315 52.389636,-2.375321 52.389509,-2.375321 52.389505,-2.375438 52.389241,-2.375754 52.388654,-2.375912 52.388359,-2.375976 52.388178,-2.37602 52.388052,-2.375996 52.387924,-2.375716 52.387478,-2.375151 52.386671,-2.374893 52.386348,-2.374724 52.386148,-2.374601 52.38596,-2.374589 52.385941,-2.374556 52.385827,-2.374571 52.385719,-2.374616 52.385639,-2.374694 52.385554,-2.374796 52.385442,-2.374826 52.38541,-2.375082 52.385237,-2.375492 52.385069,-2.375811 52.384952,-2.376154 52.384779,-2.376547 52.384534,-2.376794 52.384354,-2.377111 52.384089,-2.377263 52.38397,-2.377377 52.38388,-2.377532 52.383758,-2.377707 52.383613)",
+    "LINESTRING(-2.41285 52.381728,-2.41263 52.381673,-2.412534 52.38165,-2.412416 52.381631,-2.412314 52.381609,-2.412146 52.381574,-2.41204 52.381558,-2.411958 52.381553,-2.411908 52.381559,-2.411769 52.381592,-2.411629 52.38164,-2.411416 52.381728,-2.41137 52.381751,-2.411362 52.381755)",
+    "LINESTRING(-2.32153 52.435879,-2.321434 52.435843,-2.321169 52.435748,-2.321029 52.435692,-2.320891 52.435624,-2.320814 52.435544,-2.320789 52.435454,-2.320686 52.43505,-2.320678 52.435016,-2.320697 52.434978,-2.3207 52.434977,-2.320741 52.434964,-2.320807 52.434964,-2.320847 52.434986,-2.320903 52.435022,-2.32098 52.435044,-2.32112 52.435084,-2.321164 52.435095,-2.321305 52.435128,-2.321308 52.435129,-2.321397 52.435165,-2.321537 52.435254,-2.321663 52.435362,-2.321808 52.435503,-2.321811 52.435518,-2.321824 52.43558,-2.321813 52.435716,-2.321777 52.435796,-2.321718 52.435883,-2.321666 52.43593)",
+    "LINESTRING(-2.307716 52.425456,-2.307818 52.425431,-2.307876 52.425407,-2.307913 52.425393,-2.307955 52.425381,-2.307993 52.425377,-2.308035 52.42538,-2.308086 52.425401,-2.308219 52.425445,-2.308331 52.425485,-2.308463 52.425511,-2.308596 52.425534,-2.308714 52.425547,-2.308825 52.425552,-2.309022 52.425546,-2.309125 52.425533,-2.309161 52.425522,-2.309213 52.425506,-2.309219 52.425501,-2.309245 52.425482,-2.309286 52.425452,-2.309447 52.425307,-2.309696 52.425131,-2.309799 52.425067,-2.310109 52.424883,-2.310276 52.424771,-2.310451 52.424658,-2.310519 52.424607,-2.310586 52.424531,-2.310665 52.42442,-2.310708 52.424391)",
+    "LINESTRING(-2.368821 52.479672,-2.368718 52.479668,-2.368563 52.479662,-2.368422 52.479647,-2.368321 52.479625,-2.368055 52.479535,-2.367906 52.479453,-2.367768 52.479353,-2.367678 52.479272)",
+    "LINESTRING(-2.356756 52.456904,-2.3567 52.456817,-2.356403 52.456452,-2.356335 52.456374,-2.356182 52.456224,-2.356001 52.456019,-2.355913 52.455933,-2.355897 52.455925,-2.355889 52.455921,-2.35586 52.455907,-2.355792 52.455906)",
+    "LINESTRING(-2.351301 52.457594,-2.351243 52.457599,-2.351081 52.457613,-2.350831 52.457667,-2.350523 52.457776,-2.350141 52.457939,-2.350024 52.458003)",
+    "LINESTRING(-2.351553 52.453669,-2.351661 52.453639,-2.351911 52.453547,-2.352488 52.453293,-2.352981 52.453076,-2.353348 52.452904,-2.353436 52.452854)",
+    "LINESTRING(-2.358583 52.43464,-2.358485 52.434675,-2.358283 52.434761,-2.358063 52.434905,-2.357924 52.434996,-2.357888 52.435043,-2.357871 52.435063,-2.357815 52.435066,-2.357731 52.435058,-2.357557 52.435069,-2.357033 52.435113,-2.356814 52.43513,-2.356696 52.435121,-2.356544 52.435094,-2.356379 52.435059,-2.356325 52.435055,-2.356269 52.435064,-2.355794 52.435249)",
+    "LINESTRING(-2.36948 52.442856,-2.369591 52.442905,-2.369678 52.442964,-2.369829 52.443057,-2.36992 52.443113,-2.370008 52.443155,-2.370101 52.443184,-2.37022 52.443212)",
+    "LINESTRING(-2.378203 52.420339,-2.377907 52.420588,-2.377812 52.420689,-2.377747 52.420784,-2.377636 52.420949,-2.377438 52.421253,-2.37723 52.421596,-2.377145 52.421741,-2.377032 52.421894,-2.37695 52.421998,-2.37685 52.422099,-2.376733 52.42218,-2.376585 52.422267,-2.376382 52.422369,-2.376173 52.422464,-2.376015 52.422525,-2.375777 52.422613,-2.375539 52.422702,-2.375192 52.422816,-2.374837 52.422933,-2.374674 52.422981,-2.374571 52.423022,-2.374448 52.423075,-2.374379 52.423108,-2.374324 52.423142,-2.374227 52.423211,-2.374132 52.42328,-2.37405 52.423355,-2.373964 52.423444,-2.373799 52.423653,-2.373586 52.423942,-2.373383 52.424274,-2.373231 52.424506,-2.373167 52.424614,-2.373126 52.424671,-2.373096 52.424694,-2.373001 52.424733,-2.372757 52.424811,-2.372453 52.42491,-2.372215 52.424983,-2.371593 52.425148,-2.371186 52.425256,-2.371087 52.425292,-2.370841 52.425377,-2.370665 52.425442,-2.370489 52.425505,-2.370155 52.425593,-2.369952 52.425637,-2.369691 52.425684,-2.369177 52.425766,-2.368982 52.425788,-2.368642 52.425837,-2.368614 52.425842,-2.368611 52.425842,-2.368609 52.425843,-2.368465 52.42587,-2.368347 52.425896,-2.368256 52.425948,-2.368198 52.425992,-2.368112 52.426089,-2.367959 52.42626,-2.367834 52.426413,-2.3677 52.426546,-2.367614 52.426657,-2.36759 52.426744,-2.367598 52.426837,-2.367632 52.426944,-2.367705 52.427086)",
+    "LINESTRING(-2.430145 52.497136,-2.429921 52.496968,-2.42984 52.49691,-2.429772 52.496859,-2.429759 52.496849,-2.429681 52.496802,-2.429674 52.496798,-2.429601 52.49676,-2.429592 52.496755,-2.429577 52.49675,-2.429452 52.496705,-2.429156 52.496622,-2.428936 52.496571,-2.428713 52.496519,-2.428662 52.496509,-2.42838 52.496451,-2.428278 52.49643,-2.427906 52.496362,-2.427796 52.496359,-2.427692 52.496374,-2.427614 52.496413,-2.427594 52.496423,-2.427497 52.496563,-2.427473 52.496604,-2.427424 52.496683,-2.427409 52.496697,-2.427333 52.496767,-2.427313 52.496788,-2.427262 52.496844,-2.427253 52.496852,-2.427253 52.496854,-2.42723 52.496909,-2.427251 52.496965,-2.42727 52.497014,-2.427279 52.497085,-2.427279 52.497097,-2.427274 52.497153,-2.427272 52.497192,-2.427256 52.497239,-2.427248 52.497264,-2.427249 52.497297,-2.427262 52.497316,-2.427274 52.497333,-2.427276 52.497335,-2.427375 52.497409,-2.427536 52.497534,-2.427549 52.497543,-2.427734 52.497685,-2.427863 52.497795,-2.427899 52.49783,-2.427971 52.497897,-2.428166 52.498061,-2.428402 52.498242,-2.428577 52.498372,-2.428759 52.498507,-2.428938 52.498655,-2.429307 52.498971,-2.42952 52.49917,-2.429637 52.499279,-2.429907 52.499533,-2.430107 52.499708,-2.43019 52.499779,-2.430309 52.499887,-2.430347 52.499938,-2.430354 52.499947,-2.430396 52.500005,-2.430403 52.500067,-2.430403 52.50013,-2.430396 52.500164,-2.430395 52.500168,-2.430384 52.500186,-2.430342 52.500254,-2.430222 52.500419,-2.430129 52.500571,-2.430049 52.500741)",
+    "LINESTRING(-2.384219 52.482371,-2.384296 52.482448,-2.384358 52.482546,-2.38439 52.482628,-2.384477 52.482964,-2.38456 52.48325,-2.384633 52.48332,-2.384683 52.483336,-2.385527 52.483375,-2.386516 52.483431,-2.386754 52.483455,-2.386904 52.483491,-2.386908 52.483492,-2.38696 52.48351,-2.387116 52.483564,-2.387205 52.483599,-2.387258 52.48362,-2.387266 52.483624,-2.387373 52.483676,-2.3874 52.483699,-2.387405 52.483732,-2.387404 52.483741,-2.387401 52.483772,-2.387188 52.484013,-2.387151 52.484063,-2.387135 52.484117,-2.387132 52.484128,-2.387132 52.484135,-2.387133 52.484219,-2.387128 52.484283,-2.387116 52.484454,-2.387105 52.484566,-2.387079 52.484639,-2.387041 52.484709,-2.386988 52.484814,-2.386922 52.484945,-2.386917 52.484955,-2.386797 52.485264,-2.386765 52.485391,-2.386753 52.485438,-2.386725 52.485502,-2.386614 52.485766,-2.386546 52.485953,-2.38654 52.485983)",
+    "LINESTRING(-2.409893 52.500854,-2.409695 52.500838,-2.409501 52.500821,-2.409485 52.500817,-2.40946 52.500811,-2.40945 52.500808,-2.409439 52.500768,-2.409456 52.500683,-2.409462 52.500587,-2.409477 52.500532,-2.409451 52.500492,-2.409392 52.500465,-2.409194 52.500421,-2.409173 52.500406,-2.409139 52.500381,-2.409116 52.500337,-2.409098 52.500304,-2.409093 52.500125,-2.40903 52.499999,-2.408956 52.49991,-2.408952 52.499905,-2.408935 52.499891,-2.408772 52.499757,-2.408677 52.499692,-2.408658 52.499679,-2.408632 52.499667,-2.408306 52.499518,-2.408293 52.499507,-2.408247 52.499467,-2.408236 52.499458,-2.408234 52.49945,-2.408202 52.499331,-2.408205 52.499195,-2.408133 52.498988,-2.408037 52.498857,-2.407772 52.49855,-2.407591 52.498335,-2.407348 52.498142,-2.407131 52.497985,-2.407067 52.497943,-2.406992 52.497894,-2.406829 52.497786,-2.406808 52.497772,-2.406522 52.497612,-2.406495 52.497602,-2.406233 52.497495,-2.406027 52.497414,-2.405534 52.497297,-2.405457 52.497278,-2.404824 52.497124,-2.403814 52.496815,-2.40333 52.496679,-2.403133 52.496635,-2.40265 52.496552,-2.401894 52.496427,-2.401568 52.496373,-2.400958 52.496297,-2.40045 52.496245,-2.400184 52.496219,-2.400092 52.496211,-2.400034 52.496193,-2.399953 52.496147,-2.39985 52.496033,-2.399776 52.495956)",
+    "LINESTRING(-2.358014 52.492146,-2.358028 52.492193,-2.358029 52.492234,-2.35786 52.492818,-2.357794 52.493046,-2.357747 52.493245,-2.357732 52.493321)",
+    "LINESTRING(-2.345449 52.467635,-2.345714 52.467635,-2.345802 52.467634,-2.345964 52.467634,-2.346156 52.467651,-2.346421 52.467677,-2.34648 52.467686,-2.346554 52.467713,-2.346687 52.467758,-2.34688 52.467846,-2.347019 52.467912,-2.347165 52.467976,-2.347251 52.468013,-2.347374 52.468089,-2.347533 52.468179,-2.347609 52.468222,-2.347754 52.468317,-2.347802 52.468356,-2.34787 52.468446,-2.347959 52.468599,-2.348004 52.468716,-2.348034 52.468787,-2.348168 52.46894,-2.348276 52.469186,-2.348332 52.469236)",
+    "LINESTRING(-2.304184 52.534293,-2.304229 52.534219,-2.304246 52.53395,-2.304293 52.533323,-2.304343 52.532656,-2.304409 52.531983,-2.304495 52.531339,-2.304623 52.53067,-2.304758 52.530145,-2.304946 52.529717,-2.304941 52.529607)",
+    "LINESTRING(-2.404084 52.529404,-2.404094 52.529399,-2.404103 52.529392,-2.40411 52.529384,-2.404115 52.529376,-2.404118 52.529367,-2.404119 52.529358,-2.404118 52.529349,-2.404115 52.529341,-2.40411 52.529332,-2.404102 52.529325,-2.404093 52.529318,-2.404082 52.529312,-2.40407 52.529307,-2.404057 52.529303,-2.404043 52.529301,-2.404029 52.529299,-2.404014 52.529299,-2.404 52.529301,-2.403986 52.529303,-2.403973 52.529307,-2.403961 52.529312,-2.40395 52.529318,-2.403941 52.529325,-2.403934 52.529333,-2.403929 52.529341,-2.403926 52.52935,-2.403925 52.529359,-2.403926 52.529368,-2.403929 52.529376,-2.403935 52.529385,-2.403942 52.529392,-2.403951 52.529399,-2.403962 52.529405,-2.403974 52.52941,-2.403987 52.529414,-2.404001 52.529416,-2.404015 52.529418,-2.40403 52.529418,-2.404044 52.529416,-2.404058 52.529414,-2.404071 52.52941,-2.404083 52.529405,-2.404084 52.529404)"
+    };
+
+    static double expectations[][4] =
+    {
+    { 3.41515232094025E-07, 3.42522426421965E-07, 6.83030293657794E-07, 6.87058957282716E-07},
+    { 1.02802331980456E-07, 1.03813675877973E-07, 2.05604735015186E-07, 2.09650025340125E-07},
+    { 3.56112451527224E-07, 3.57098969061553E-07, 7.12224860421884E-07, 7.16171342673988E-07},
+    { 4.25305444196056E-08, 4.35412488286602E-08, 8.50612309477583E-08, 8.91039491079937E-08},
+    { 3.69520876120077E-08, 3.79614419898644E-08, 7.39041894348702E-08, 7.79416069462968E-08},
+    { 3.12580681338659E-08, 3.22376649819489E-08, 6.23702476332255E-08, 6.62886350255576E-08},
+    { 2.64535032101776E-07, 2.65503302898651E-07, 5.29010577565714E-07, 5.32883049686461E-07},
+    { 1.26452604831684E-07, 1.27462314480908E-07, 2.52905124398239E-07, 2.56944261423087E-07},
+    { 5.62396706982327E-08, 5.7239461170866E-08, 1.12479426661594E-07, 1.16478773293238E-07},
+    { 7.03945403301987E-07, 7.04847309407342E-07, 1.40789144609244E-06, 1.41149810417573E-06},
+    { 2.05895901217446E-07, 2.06897283305807E-07, 4.11792029808566E-07, 4.15797074992952E-07},
+    { 1.01571146160495E-07, 1.02582319527755E-07, 2.031423207427E-07, 2.07186729994646E-07},
+    { 2.42559636376427E-07, 2.43568607061206E-07, 4.85119102222598E-07, 4.89155340233083E-07},
+    { 3.41515232094025E-07, 3.42522426421965E-07, 6.83030293657794E-07, 6.87058957282716E-07},
+    { 9.08697614931953E-08, 9.1881105390712E-08, 1.81739480353826E-07, 1.85784855943893E-07},
+    { 6.0466163631645E-08, 6.14741111348849E-08, 1.20932355684999E-07, 1.24964373071634E-07},
+    { 4.04659118657946E-07, 4.05667066161186E-07, 8.09318166261619E-07, 8.13350311545946E-07},
+    { 4.80904560618001E-07, 4.81905772176106E-07, 9.61808808597198E-07, 9.65813697462181E-07},
+    { 3.57066625156222E-08, 3.67177221960446E-08, 7.14132681878255E-08, 7.54576063854984E-08},
+    { 2.44433664420285E-08, 2.54509160413363E-08, 4.88867044623476E-08, 5.29170023355618E-08},
+    { 3.61392153536144E-07, 3.62384142249539E-07, 7.22784136542032E-07, 7.26752162449884E-07},
+    { 7.03945403301987E-07, 7.04847309407342E-07, 1.40789144609244E-06, 1.41149810417573E-06},
+    { 7.91276917766481E-07, 7.91866199278957E-07, 1.58255338078561E-06, 1.58491059210064E-06},
+    { 2.80934472129957E-07, 2.81945006008755E-07, 5.61869072157606E-07, 5.65911307148781E-07},
+    { 3.5339049020422E-07, 3.54394444457284E-07, 7.06780582504507E-07, 7.10797138481212E-07},
+    { 2.44327040377357E-07, 2.4533331099974E-07, 4.88653867591893E-07, 4.9267929114194E-07},
+    { 2.6145809783884E-07, 2.62465945866097E-07, 5.22915939882296E-07, 5.26947090406793E-07},
+    { 2.21305654690696E-07, 2.22233921931547E-07, 4.42615530005241E-07, 4.46329210035401E-07},
+    { 7.88202072499189E-08, 7.98287089764926E-08, 1.5764054239753E-07, 1.61674222454167E-07},
+    { 4.08582224054044E-07, 4.09593170047629E-07, 8.17164746536037E-07, 8.21208203660717E-07},
+    { 2.61692591152496E-07, 2.62703764519756E-07, 5.23385125461573E-07, 5.27429577346084E-07},
+    { 2.01361032736713E-07, 2.0236487330294E-07, 4.02722207581974E-07, 4.06737527214318E-07},
+    { 6.18118889406105E-08, 6.28143510539303E-08, 1.23623692616093E-07, 1.27633413171679E-07},
+    { 5.01939382502314E-07, 5.02932437029813E-07, 1.00387870816121E-06, 1.00785118206659E-06},
+    { 6.52623768360172E-07, 6.53615401802199E-07, 1.30525545216642E-06, 1.30922269647726E-06},
+    { 3.24414514807359E-07, 3.25418923807774E-07, 6.48829413307794E-07, 6.52846509296978E-07},
+    { 1.65468009072356E-07, 1.66476610274913E-07, 3.30936202885823E-07, 3.34970451376648E-07},
+    { 5.23240828442795E-09, 6.24356744083343E-09, 1.04648165688559E-08, 1.45094389836231E-08},
+    { 3.62318644420156E-07, 3.63320253882193E-07, 7.24637303051168E-07, 7.28643442471366E-07},
+    { 5.94340193060816E-07, 5.95350627463631E-07, 1.18868054244103E-06, 1.19272210952204E-06},
+    { 7.32884174681203E-07, 7.33866755808776E-07, 1.46576839199497E-06, 1.46969848913159E-06},
+    { 3.02247087802243E-07, 3.0325044519941E-07, 6.04493862965683E-07, 6.08507960464522E-07},
+    { 3.23513106081919E-07, 3.24517259286949E-07, 6.47026212163837E-07, 6.51042981303362E-07},
+    { 2.82636392512359E-07, 2.83643203147221E-07, 5.65272713970444E-07, 5.6930015546186E-07},
+    { 5.57109984811177E-08, 5.67222713243609E-08, 1.11422096438218E-07, 1.15467202022046E-07},
+    { 1.69497056390355E-07, 1.70405499488879E-07, 3.38994169624129E-07, 3.42627942018225E-07},
+    { 4.37937046626757E-08, 4.4801083731727E-08, 8.75873382710779E-08, 9.16166129627527E-08},
+    { 3.69329029581422E-08, 3.79310165499192E-08, 7.38645837827789E-08, 7.78570665715961E-08},
+    { 5.61418005418091E-08, 5.71532154935994E-08, 1.12283629505328E-07, 1.16328905619412E-07},
+    { 2.30063292860905E-07, 2.31069662959271E-07, 4.60126457824117E-07, 4.64152151380404E-07},
+    { 1.53257730062251E-07, 1.54239160110592E-07, 3.06515318015954E-07, 3.10441222950431E-07},
+    { 7.43983150641725E-08, 7.54085220933121E-08, 1.4879661591749E-07, 1.52837202449518E-07},
+    { 3.73331090486317E-08, 3.83436145057203E-08, 7.46662180972635E-08, 7.87081404496348E-08},
+    { 1.35055771011139E-07, 1.36057437316595E-07, 2.70111300437748E-07, 2.74118391985212E-07},
+    { 1.49921490333327E-07, 1.50926723563316E-07, 2.99842824347252E-07, 3.03863657791226E-07},
+    { 5.4672608484907E-07, 5.47715472976051E-07, 1.09345225496327E-06, 1.09740931009128E-06},
+    { 6.82862975054377E-08, 6.92914738920081E-08, 1.3657287922797E-07, 1.40593087394336E-07},
+    { 2.99415603421949E-08, 3.09528473962928E-08, 5.9883106473535E-08, 6.39284820636021E-08},
+    { 1.15991221605327E-06, 1.16091044333189E-06, 2.31982436105227E-06, 2.32381808018545E-06},
+    { 5.37620522322868E-07, 5.38598712296334E-07, 1.07524111570001E-06, 1.07915387559387E-06},
+    { 2.19138769352867E-08, 2.29165522114272E-08, 4.38277680814281E-08, 4.78386539271014E-08},
+    { 2.25320761160219E-07, 2.26330556074572E-07, 4.50641536531293E-07, 4.54680815664688E-07},
+    { 1.01003628572016E-06, 1.01100829397183E-06, 2.02007224459066E-06, 2.02395995074767E-06},
+    { 4.75155772505786E-07, 4.76152848705169E-07, 9.50311530800718E-07, 9.5429980717654E-07},
+    { 1.65787653827465E-07, 1.66797761380622E-07, 3.31575222389802E-07, 3.35615951030377E-07},
+    { 2.30222070740638E-07, 2.31232661462855E-07, 4.60444127270421E-07, 4.64487072804332E-07},
+    { 7.98883817765272E-07, 7.99890472080733E-07, 1.59776760710884E-06, 1.60179418173811E-06},
+    { 1.04933420175257E-07, 1.05940515027214E-07, 2.0986679771795E-07, 2.13895532397146E-07},
+    { 1.77967848458138E-06, 1.78066323996973E-06, 3.55935688389764E-06, 3.56329583439674E-06},
+    { 4.1623603408425E-07, 4.17224313764564E-07, 8.3247203974679E-07, 8.36425286365738E-07},
+    { 9.68960307545785E-08, 9.78908332172068E-08, 1.93792118352576E-07, 1.97771228727106E-07},
+    { 2.7254995416115E-07, 2.73529721539489E-07, 5.45099553050932E-07, 5.49018324136341E-07},
+    { 4.01288005491551E-07, 4.02259715315267E-07, 8.02576039404812E-07, 8.06462495006599E-07},
+    { 1.35055771011139E-07, 1.36057437316595E-07, 2.70111300437748E-07, 2.74118391985212E-07},
+    { 4.29554916081543E-08, 4.39544862729235E-08, 8.59111395357104E-08, 8.99071466164969E-08},
+    { 1.76189836054164E-06, 1.76286511077706E-06, 3.52380727974833E-06, 3.52767503386531E-06},
+    { 1.41602981784672E-07, 1.42607618158763E-07, 2.83206148310455E-07, 2.87224651174256E-07},
+    { 1.15380575493873E-06, 1.15479357987169E-06, 0.000002307610870389, 2.31156330698923E-06},
+    { 1.41356807148441E-07, 1.42356668675347E-07, 2.82713486399189E-07, 2.86713202513056E-07},
+    { 6.45327844495114E-08, 6.55440999253187E-08, 1.29065526266459E-07, 1.33110816591397E-07},
+    { 6.86342787048488E-08, 6.96456083915109E-08, 1.37268628463971E-07, 1.41313861945491E-07},
+    { 1.83265086661777E-07, 1.84274682624164E-07, 3.66530358064665E-07, 3.70568429275409E-07},
+    { 1.43990902756741E-07, 1.44994970696644E-07, 2.87981706037499E-07, 2.91998276225058E-07},
+    { 1.02871865692578E-07, 1.03880751112229E-07, 2.05743802439429E-07, 2.09779301485469E-07},
+    { 1.36728246502571E-07, 1.37673012545747E-07, 2.7345657827027E-07, 2.77235542966991E-07},
+    { 3.10800132297118E-07, 3.11808250330614E-07, 6.21600349859364E-07, 6.25632381456853E-07},
+    { 1.32283005882528E-07, 1.33261437440524E-07, 2.64565414909157E-07, 2.68479169562852E-07},
+    { 3.33188367562798E-07, 3.34195561890738E-07, 6.66376735125596E-07, 6.70405427172227E-07},
+    { 1.90134230138028E-07, 1.91139307048616E-07, 3.80268787125715E-07, 3.8428883897268E-07},
+    { 3.02247087802243E-07, 3.0325044519941E-07, 6.04493862965683E-07, 6.08507960464522E-07},
+    { 6.45327844495114E-08, 6.55440999253187E-08, 1.29065526266459E-07, 1.33110816591397E-07},
+    { 4.02965838475211E-08, 4.13054976888816E-08, 8.05931534841875E-08, 8.46289225364671E-08},
+    { 5.11229515609557E-07, 5.12224545445861E-07, 1.02245836330894E-06, 1.02643905108835E-06},
+    { 1.18189390718726E-07, 1.19196172931879E-07, 2.36378838280871E-07, 2.40405839235791E-07},
+    { 3.81603527443986E-07, 3.82614828708938E-07, 7.63207339105065E-07, 7.67251918887268E-07},
+    { 3.34147500780091E-08, 3.43787576184695E-08, 6.67881465687969E-08, 7.06435514530313E-08},
+    { 3.4107115709503E-07, 3.42081634130409E-07, 6.82142385244333E-07, 6.86184307596704E-07},
+    { 1.58899425173331E-07, 1.59907060037767E-07, 3.17798821924953E-07, 3.21829773497484E-07},
+    { 5.36395234007614E-07, 5.37394143407255E-07, 1.07279079486489E-06, 1.07678548033618E-06},
+    { 3.9406657492691E-07, 3.95064475355866E-07, 7.88133220908094E-07, 7.92124779991354E-07},
+    { 2.77072558674263E-07, 2.78073869708351E-07, 5.54145316300492E-07, 5.58150745177954E-07},
+    { 3.93172285839682E-07, 3.94176680629243E-07, 7.8634455746851E-07, 7.90362207681028E-07},
+    { 2.85718613213248E-07, 2.86716215214256E-07, 5.71436899576838E-07, 5.75428146021295E-07},
+    { 1.26677917933193E-07, 1.27688309703444E-07, 2.5335566533613E-07, 2.57397502423373E-07},
+    { 8.70625598281549E-08, 8.80735200325944E-08, 1.74125048602036E-07, 1.7816884678723E-07},
+    { 9.37471753559294E-08, 9.47451752608686E-08, 1.87494393344423E-07, 1.91486549283582E-07},
+    { 3.30706200202258E-08, 3.40820349720161E-08, 6.61412968838704E-08, 7.01866440522281E-08},
+    { 9.30588299752344E-08, 9.40660100923196E-08, 1.86117645739614E-07, 1.90146408840519E-07},
+    { 3.83720646368602E-08, 3.9382058503179E-08, 7.67441576954297E-08, 8.07838489436108E-08},
+    { 3.12277990133225E-07, 3.13278405883466E-07, 6.2455600868816E-07, 6.28557373261174E-07},
+    { 2.62851173715717E-07, 2.63860243876479E-07, 5.25702404274853E-07, 5.29738812815594E-07},
+    { 6.38404742403509E-08, 6.48505391609433E-08, 1.27680962691556E-07, 1.3172102342196E-07},
+    { 7.73673903609051E-07, 7.74670056102877E-07, 1.54734770774212E-06, 1.55133201928948E-06},
+    { 2.23658261688797E-07, 2.24661988568187E-07, 4.47316281793064E-07, 4.51331573003699E-07},
+    { 3.18664490350784E-07, 3.19664522407948E-07, 6.37329037544987E-07, 6.41328341544067E-07},
+    { 6.28178327133355E-08, 6.38285229115354E-08, 1.25635679637526E-07, 1.29678596749727E-07},
+    { 2.14196546721723E-07, 2.15193523445123E-07, 4.28392880280626E-07, 4.32381142445593E-07},
+    { 2.53436667208007E-08, 2.63544563949836E-08, 5.06872623873278E-08, 5.47306626685895E-08},
+    { 1.79067058070359E-07, 1.80076483502489E-07, 3.58134101929863E-07, 3.62171505230435E-07},
+    { 1.14243619009358E-08, 1.24315846505851E-08, 2.28486385367432E-08, 2.68776432221784E-08},
+    { 1.62669806513804E-08, 1.72783103380425E-08, 3.25339186701967E-08, 3.65793084711186E-08},
+    { 2.55726050113481E-07, 2.56733443393387E-07, 5.11451958118414E-07, 5.15481701768294E-07},
+    { 6.74249776011493E-08, 6.84268144368616E-08, 1.34849770461187E-07, 1.38856961484635E-07},
+    { 6.02680273686929E-07, 6.03684966904439E-07, 1.20536046210873E-06, 1.20937964709356E-06},
+    { 1.45373832083351E-07, 1.46384664390098E-07, 2.90747806275249E-07, 2.94791007604545E-07},
+    { 3.46929951433594E-07, 3.4793785630427E-07, 6.93859675493513E-07, 6.9789133760878E-07},
+    { 2.86301002461187E-07, 2.87301332946299E-07, 5.72601834392117E-07, 5.76603540025644E-07},
+    { 8.92922287221154E-08, 9.02999346408251E-08, 1.78584627974487E-07, 1.82615082167104E-07},
+    { 1.61394524411662E-07, 1.62388303692751E-07, 3.22789020401615E-07, 3.26764009628278E-07},
+    { 3.15667904260408E-07, 3.16657960297562E-07, 6.31335680623124E-07, 6.35296956374987E-07},
+    { 3.65886961617434E-07, 3.66888201597249E-07, 7.31774122186835E-07, 7.35779138949511E-07},
+    { 5.1565010039667E-08, 5.25749044300028E-08, 1.03130020079334E-07, 1.07168872887087E-07},
+    { 2.49045257305625E-07, 2.50053105332881E-07, 4.98090642508942E-07, 5.02122333045918E-07},
+    { 3.89293546732006E-07, 3.90250974646733E-07, 7.78586866090336E-07, 7.82417473033092E-07},
+    { 1.28008643685007E-07, 1.29012775573756E-07, 2.56017258948305E-07, 2.60033857557573E-07},
+    { 3.59406385541661E-07, 3.60415128852765E-07, 7.18812870559304E-07, 7.2284757379748E-07},
+    { 7.04774407722653E-08, 7.14837113946487E-08, 1.40955009442223E-07, 1.44979907190645E-07},
+    { 4.69074876718878E-08, 4.79159325550427E-08, 9.38164674835207E-08, 9.78508154503288E-08},
+    { 3.46929951433594E-07, 3.4793785630427E-07, 6.93859675493513E-07, 6.9789133760878E-07},
+    { 2.52614157147946E-07, 2.5362039934862E-07, 5.05228484826148E-07, 5.09253013092348E-07},
+    { 1.752849669856E-07, 1.76295728238074E-07, 3.50569891338637E-07, 3.54612936348531E-07},
+    { 9.97295472870974E-08, 1.00740251696152E-07, 1.99459023519921E-07, 2.03501656415028E-07},
+    { 1.27083694678731E-08, 1.37173685743619E-08, 2.54168952551481E-08, 2.94525364097353E-08},
+    { 2.88675792603499E-07, 2.89683143250841E-07, 5.77351315200758E-07, 5.81380774633544E-07},
+    { 2.2199529325917E-07, 2.22990578890858E-07, 4.43990884946288E-07, 4.47971643779965E-07},
+    { 3.101136769601E-08, 3.20127782060808E-08, 6.20226217051822E-08, 6.60284200648675E-08},
+    { 6.34119317055593E-08, 6.44227355905969E-08, 1.26823891832828E-07, 1.30867206848961E-07},
+    { 2.27363642579803E-07, 2.28347417419172E-07, 4.54726489351742E-07, 4.5866131870298E-07},
+    { 5.761698673723E-08, 5.86278900982506E-08, 1.15233817155058E-07, 1.19277274279739E-07},
+    { 5.59963240220895E-08, 5.70068436900328E-08, 1.11992690676743E-07, 1.16034897246209E-07},
+    { 1.00404065506154E-07, 1.01413306197173E-07, 2.00808131012309E-07, 2.04845150619803E-07},
+    { 1.51791383018463E-07, 1.52801391095636E-07, 3.03582666560942E-07, 3.07622912032457E-07},
+    { 7.73673903609051E-07, 7.74670056102877E-07, 1.54734770774212E-06, 1.55133201928948E-06},
+    { 6.7849948948151E-07, 6.79496110933542E-07, 1.35699917791499E-06, 1.36098604741619E-06},
+    { 6.46773514745291E-08, 6.56873169191385E-08, 1.29354639000212E-07, 1.33394671308906E-07},
+    { 2.14274791687785E-07, 2.15266346970111E-07, 4.28549661535271E-07, 4.32515697923463E-07},
+    { 1.75431694060535E-07, 1.76439094445868E-07, 3.50863423648207E-07, 3.54893018084113E-07},
+    { 1.54840201105344E-07, 1.55849093630422E-07, 3.09680387999833E-07, 3.13715879940446E-07},
+    { 3.03876547036452E-07, 3.04886683011318E-07, 6.07753179338033E-07, 6.11793765870061E-07},
+    { 2.87581904956369E-07, 2.88585042085288E-07, 5.7516393781043E-07, 5.79176422377259E-07},
+    { 2.4641536811032E-08, 2.56472958426457E-08, 4.92830878329187E-08, 5.33060031671084E-08},
+    { 2.38351063330811E-08, 2.48459812723922E-08, 4.76701984553074E-08, 5.17136911071248E-08},
+    { 5.06429515212403E-07, 5.07291815665667E-07, 1.01285916542793E-06, 1.0163081114456E-06},
+    { 3.16136237188402E-08, 3.26210596313103E-08, 6.32272758593899E-08, 6.72569697712788E-08},
+    { 3.48408235595343E-08, 3.58516203391446E-08, 6.96816471190687E-08, 7.37248200266549E-08},
+    { 7.48174926457068E-08, 7.58264846467682E-08, 1.49634963975132E-07, 1.5367105987707E-07},
+    { 1.93732120123968E-07, 1.94739627090712E-07, 3.87464289985928E-07, 3.9149432495833E-07},
+    { 3.07901757423679E-08, 3.17564925467195E-08, 6.17883486597748E-08, 6.55261729320955E-08},
+    { 4.99771878992306E-07, 5.00766930144891E-07, 9.99543672719483E-07, 1.00352374943213E-06},
+    { 1.17716950853719E-07, 1.18722240927127E-07, 2.35433859074874E-07, 2.39455012263079E-07},
+    { 3.58876590667023E-08, 3.6895563937378E-08, 7.17753749768235E-08, 7.58068807726886E-08},
+    { 4.9829156978376E-07, 4.99225798478165E-07, 9.96582841139571E-07, 1.0003212125298E-06},
+    { 3.75331644875132E-07, 3.76332543794433E-07, 7.50663197379708E-07, 7.54666956481742E-07},
+    { 2.08074482088705E-08, 2.18164970533508E-08, 4.16148893123136E-08, 4.56511770607904E-08},
+    { 2.65227200202389E-08, 2.75340639177557E-08, 5.30454471459052E-08, 5.70908014196903E-08},
+    { 9.48590397342741E-08, 9.57736716600266E-08, 1.89718221577095E-07, 1.93376600066131E-07},
+    { 1.26375994113914E-08, 1.36486946189507E-08, 2.52751917173555E-08, 2.93195441258831E-08},
+    { 1.50946419807951E-07, 1.51955084959354E-07, 3.01892768561629E-07, 3.05927514432369E-07},
+    { 9.22171139450256E-08, 9.32281949417302E-08, 1.84434327366034E-07, 1.88478459506314E-07},
+    { 9.69194388744654E-07, 9.70171512904017E-07, 1.93838912565525E-06, 1.94229757255471E-06},
+    { 5.55253905076825E-08, 5.65363365012672E-08, 1.11050773909938E-07, 1.15094508146285E-07},
+    { 1.13003537194345E-07, 1.13988456007519E-07, 2.26006307002535E-07, 2.29945861462966E-07},
+    { 1.2296865747885E-07, 1.23975510746277E-07, 2.45937201270863E-07, 2.49964827503391E-07},
+    { 4.48469990033118E-08, 4.58578668371956E-08, 8.96939909011962E-08, 9.37375403964325E-08},
+    { 5.0952010610672E-08, 5.19609670845966E-08, 1.01904042537626E-07, 1.05939804484478E-07},
+    { 4.86714952785405E-08, 4.96825975915272E-08, 9.73430047679358E-08, 1.01387534812147E-07},
+    { 7.39467296284602E-08, 7.49580095771307E-08, 1.47893480573202E-07, 1.51938643000449E-07},
+    { 1.0657652893542E-07, 1.07576717311986E-07, 2.13153157346824E-07, 2.17153882431376E-07},
+    { 2.98015478961133E-08, 3.08124867842707E-08, 5.96030602650899E-08, 6.36467447634459E-08},
+    { 4.8263878227317E-07, 4.83640725690293E-07, 9.65278132980529E-07, 9.69288855401373E-07},
+    { 3.14623996189312E-07, 3.15605028333721E-07, 6.29259531592652E-07, 6.33185010201487E-07},
+    { 2.29475041635396E-07, 2.30466028483534E-07, 4.5895009037622E-07, 4.62914151455607E-07},
+    { 4.36916394619402E-07, 4.37877190506697E-07, 8.7382976232675E-07, 8.77673194565887E-07},
+    { 4.38233769273211E-08, 4.4833392109922E-08, 8.76467751709242E-08, 9.16867648470543E-08},
+    { 1.28198685445113E-07, 1.29205858456771E-07, 2.56397569842193E-07, 2.60425942144593E-07},
+    { 1.72098651773922E-07, 1.73105441092503E-07, 3.44197339074981E-07, 3.48224730828406E-07},
+    { 1.79612058559542E-08, 1.79676149514307E-08, 3.5905237893985E-08, 3.59159741947224E-08}
+    };
+
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::linestring<P> linestring;
+    typedef bg::model::polygon<P> polygon;
+
+
+    int const n = sizeof(testcases) / sizeof(testcases[0]);
+    int const ne = sizeof(expectations) / sizeof(expectations[0]);
+    BOOST_ASSERT(n == ne);
+
+#if 0
+    // Create PostGIS query to verify results
+    {
+        std::cout << "with viewy as ( select " << std::endl;
+        for (int i = 0; i < n; i++)
+        {
+            std::cout << (i > 0 ? "," : "") << " ST_GeomFromText('" << testcases[i] << "',0) as p" << i << std::endl;
+        }
+
+        std::cout << ") select 'afm18' as code" << std::endl;
+        for (int i = 0; i < n; i++)
+        {
+            std::cout << ", ST_Area(ST_Buffer(p" << i << ", 0.000018, 'endcap=flat join=miter')) as afm18_" << i << std::endl;
+        }
+        std::cout << " from viewy union all select 'arr18' as code" << std::endl;
+        for (int i = 0; i < n; i++)
+        {
+            std::cout << ", ST_Area(ST_Buffer(p" << i << ", 0.000018, 'endcap=round join=round')) as arr18_" << i << std::endl;
+        }
+        std::cout << " from viewy union all select 'afm36' as code" << std::endl;
+        for (int i = 0; i < n; i++)
+        {
+            std::cout << ", ST_Area(ST_Buffer(p" << i << ", 0.000036, 'endcap=flat join=miter')) as afm36_" << i << std::endl;
+        }
+        std::cout << " from viewy union all select 'arr36' as code" << std::endl;
+        for (int i = 0; i < n; i++)
+        {
+            std::cout << ", ST_Area(ST_Buffer(p" << i << ", 0.000036, 'endcap=round join=round')) as arr36_" << i << std::endl;
+        }
+        std::cout << " from viewy" << std::endl;
+    }
+#endif
+
+    // Aimes tested originally with 0.000018 degrees (around 2 m)
+    int expectation_index = 0;
+    for (int width = 18; width <= 36; width += 18, expectation_index += 2)
+    {
+        double aimes_width = static_cast<double>(width) / 1000000.0;
+        for (int i = 0; i < n; i++)
+        {
+            if (i == 196 // circular with some issue to be investigated
+                || (i == 22 && width == 36) // generates larger miter than PostGIS does
+                || (i == 131 && width == 36) // error in generation
+                )
+            {
+                continue;
+            }
+
+            std::ostringstream name;
+            name << "aimes_" << i << "_" << width;
+            test_one<linestring, buf::join_miter, buf::end_flat, polygon>(name.str(), testcases[i], expectations[i][expectation_index], aimes_width, aimes_width);
+            test_one<linestring, buf::join_round, buf::end_round, polygon>(name.str(), testcases[i], expectations[i][expectation_index + 1], aimes_width, aimes_width);
+        }
+    }
+}
+
+
+int test_main(int, char* [])
+{
+    test_aimes<bg::model::point<double, 2, bg::cs::cartesian> >();
+    return 0;
+}
diff --git a/test/algorithms/buffer/linestring_buffer.cpp b/test/algorithms/buffer/linestring_buffer.cpp
new file mode 100644
index 000000000..2fd633046
--- /dev/null
+++ b/test/algorithms/buffer/linestring_buffer.cpp
@@ -0,0 +1,137 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
+//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
+
+#include <test_buffer.hpp>
+
+#include <boost/geometry/algorithms/buffer.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <test_common/test_point.hpp>
+
+
+static std::string const simplex = "LINESTRING(0 0,4 5)";
+static std::string const straight = "LINESTRING(0 0,4 5,8 10)";
+static std::string const one_bend = "LINESTRING(0 0,4 5,7 4)";
+static std::string const two_bends = "LINESTRING(0 0,4 5,7 4,10 6)";
+static std::string const overlapping = "LINESTRING(0 0,4 5,7 4,10 6, 10 2,2 2)";
+static std::string const curve = "LINESTRING(2 7,3 5,5 4,7 5,8 7)";
+
+static std::string const for_collinear = "LINESTRING(2 0,0 0,0 4,6 4,6 0,4 0)";
+static std::string const for_collinear2 = "LINESTRING(2 1,2 0,0 0,0 4,6 4,6 0,4 0,4 1)";
+
+static std::string const chained2 = "LINESTRING(0 0,1 1,2 2)";
+static std::string const chained3 = "LINESTRING(0 0,1 1,2 2,3 3)";
+static std::string const chained4 = "LINESTRING(0 0,1 1,2 2,3 3,4 4)";
+
+static std::string const reallife1 = "LINESTRING(76396.40464822574 410095.6795147947,76397.85016212701 410095.211865792,76401.30666443033 410095.0466387949,76405.05892643372 410096.1007777959,76409.45103273794 410098.257640797,76412.96309264141 410101.6522238015)";
+
+
+template <typename P>
+void test_all()
+{
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::linestring<P> linestring;
+    typedef bg::model::polygon<P> polygon;
+
+    // Simplex (join-type is not relevant)
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("simplex", simplex, 19.209, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_round, polygon>("simplex", simplex, 26.2733, 1.5, 1.5);
+
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("simplex_asym_neg", simplex, 3.202, +1.5, -1.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("simplex_asym_pos", simplex, 3.202, -1.0, +1.5);
+    // Do not work yet:
+    //    test_one<linestring, buf::join_miter, buf::end_round, polygon>("simplex_asym_neg", simplex, 3.202, +1.5, -1.0);
+    //    test_one<linestring, buf::join_miter, buf::end_round, polygon>("simplex_asym_pos", simplex, 3.202, -1.0, +1.5);
+
+    // Generates a reverse polygon, with a negative area, which will be made empty TODO decide about this
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("simplex_asym_neg_rev", simplex, 0, +1.0, -1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("simplex_asym_pos_rev", simplex, 0, -1.5, +1.0);
+
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("straight", straight, 38.4187, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("straight", straight, 38.4187, 1.5, 1.5);
+
+    // One bend/two bends (tests join-type)
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("one_bend", one_bend, 28.488, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("one_bend", one_bend, 28.696, 1.5, 1.5);
+    test_one<linestring, buf::join_round_by_divide, buf::end_flat, polygon>("one_bend", one_bend, 28.488, 1.5, 1.5);
+
+    test_one<linestring, buf::join_round, buf::end_round, polygon>("one_bend", one_bend, 35.5603, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_round, polygon>("one_bend", one_bend, 35.7601, 1.5, 1.5);
+
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("two_bends", two_bends, 39.235, 1.5, 1.5);
+    test_one<linestring, buf::join_round_by_divide, buf::end_flat, polygon>("two_bends", two_bends, 39.235, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("two_bends", two_bends, 39.513, 1.5, 1.5);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("two_bends_left", two_bends, 20.028, 1.5, 0.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("two_bends_left", two_bends, 20.225, 1.5, 0.0);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("two_bends_right", two_bends, 19.211, 0.0, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("two_bends_right", two_bends, 19.288, 0.0, 1.5);
+
+
+    // Next (and all similar cases) which a offsetted-one-sided buffer has to be fixed. TODO
+    //test_one<linestring, buf::join_miter, buf::end_flat, polygon>("two_bends_neg", two_bends, 99, +1.5, -1.0);
+    //test_one<linestring, buf::join_miter, buf::end_flat, polygon>("two_bends_pos", two_bends, 99, -1.5, +1.0);
+    //test_one<linestring, buf::join_round, buf::end_flat, polygon>("two_bends_neg", two_bends, 99, +1.5, -1.0);
+    //test_one<linestring, buf::join_round, buf::end_flat, polygon>("two_bends_pos", two_bends, 99, -1.5, +1.0);
+
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("overlapping150", overlapping, 65.6786, 1.5, 1.5);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("overlapping150", overlapping, 68.140, 1.5, 1.5);
+
+    // Cases below should still be fixed because of remaining flat-end/inside bug
+
+#if defined(BOOST_GEOMETRY_BUFFER_INCLUDE_FAILING_TESTS)
+    // Different cases with intersection points on flat and (left/right from line itself)
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("overlapping_asym_150_010", overlapping, 48.308, 1.5, 0.25);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("overlapping_asym_150_010", overlapping, 50.770, 1.5, 0.25);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("overlapping_asym_150_075", overlapping, 58.506, 1.5, 0.75);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("overlapping_asym_150_075", overlapping, 60.985, 1.5, 0.75);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("overlapping_asym_150_100", overlapping, 62.514, 1.5, 1.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("overlapping_asym_150_100", overlapping, 64.984, 1.5, 1.0);
+#endif
+
+#if defined(BOOST_GEOMETRY_BUFFER_INCLUDE_FAILING_TESTS)
+    // Having flat end
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("for_collinear", for_collinear, 68.561, 2.0, 2.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("for_collinear", for_collinear, 72, 2.0, 2.0);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("for_collinear2", for_collinear2, 74.387, 2.0, 2.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("for_collinear2", for_collinear2, 78.0, 2.0, 2.0);
+#endif
+
+#if defined(BOOST_GEOMETRY_BUFFER_INCLUDE_FAILING_TESTS)
+    // Having flat end causing self-intersection
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("curve", curve, 54.8448, 5.0, 3.0);
+    test_one<linestring, buf::join_miter, buf::end_flat, polygon>("curve", curve, 55.3875, 5.0, 3.0);
+#endif
+
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("chained2", chained2, 11.3137, 2.5, 1.5);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("chained3", chained3, 16.9706, 2.5, 1.5);
+    test_one<linestring, buf::join_round, buf::end_flat, polygon>("chained4", chained4, 22.6274, 2.5, 1.5);
+
+    //test_one<linestring, buf::join_round, buf::end_flat, polygon>("reallife1", reallife1, 99, 16.5, 6.5);
+}
+
+
+//#define HAVE_TTMATH
+#ifdef HAVE_TTMATH
+#include <ttmath_stub.hpp>
+#endif
+
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+    //test_all<bg::model::point<tt, 2, bg::cs::cartesian> >();
+    return 0;
+}
diff --git a/test/algorithms/buffer/multi_linestring_buffer.cpp b/test/algorithms/buffer/multi_linestring_buffer.cpp
new file mode 100644
index 000000000..57792402a
--- /dev/null
+++ b/test/algorithms/buffer/multi_linestring_buffer.cpp
@@ -0,0 +1,60 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+#include <test_buffer.hpp>
+
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+
+static std::string const simplex = "MULTILINESTRING((0 0,4 5),(5 4,10 0))";
+static std::string const two_bends = "MULTILINESTRING((0 0,4 5,7 4,10 6),(1 5,5 9,8 6))";
+static std::string const turn_inside = "MULTILINESTRING((0 0,4 5,7 4,10 6),(1 5,5 9,8 6),(0 4,-2 6))";
+
+
+template <typename P>
+void test_all()
+{
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::linestring<P> linestring;
+    typedef bg::model::multi_linestring<linestring> multi_linestring_type;
+    typedef bg::model::polygon<P> polygon;
+
+    // Round joins / round ends
+    test_one<multi_linestring_type, buf::join_round, buf::end_round, polygon>("simplex", simplex, 49.0217, 1.5, 1.5);
+    test_one<multi_linestring_type, buf::join_round, buf::end_round, polygon>("two_bends", two_bends, 74.73, 1.5, 1.5);
+    test_one<multi_linestring_type, buf::join_round, buf::end_round, polygon>("turn_inside", turn_inside, 86.3313, 1.5, 1.5);
+    test_one<multi_linestring_type, buf::join_round, buf::end_round, polygon>("two_bends_asym", two_bends, 58.3395, 1.5, 0.75);
+
+    // Round joins / flat ends:
+    test_one<multi_linestring_type, buf::join_round, buf::end_flat, polygon>("simplex", simplex, 38.2623, 1.5, 1.5);
+#if defined(BOOST_GEOMETRY_BUFFER_INCLUDE_FAILING_TESTS)
+    test_one<multi_linestring_type, buf::join_round, buf::end_flat, polygon>("two_bends", two_bends, 64.6217, 1.5, 1.5);
+#endif
+
+    // TODO this should be fixed test_one<multi_linestring_type, buf::join_round, buf::end_flat, polygon>("turn_inside", turn_inside, 99, 1.5, 1.5);
+    test_one<multi_linestring_type, buf::join_round, buf::end_flat, polygon>("two_bends_asym", two_bends, 52.3793, 1.5, 0.75);
+
+    // This one is far from done:
+    // test_one<multi_linestring_type, buf::join_round, polygon>("turn_inside_asym_neg", turn_inside, 99, +1.5, -1.0);
+
+    // Miter / divide joins, various ends
+#if defined(BOOST_GEOMETRY_BUFFER_INCLUDE_FAILING_TESTS)
+    test_one<multi_linestring_type, buf::join_round_by_divide, buf::end_flat, polygon>("two_bends", two_bends, 64.6217, 1.5, 1.5);
+    test_one<multi_linestring_type, buf::join_miter, buf::end_flat, polygon>("two_bends", two_bends, 65.1834, 1.5, 1.5);
+#endif
+    test_one<multi_linestring_type, buf::join_miter, buf::end_round, polygon>("two_bends", two_bends, 75.2917, 1.5, 1.5);
+}
+
+
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+
+    return 0;
+}
diff --git a/test/algorithms/buffer/multi_point_buffer.cpp b/test/algorithms/buffer/multi_point_buffer.cpp
new file mode 100644
index 000000000..43e352fff
--- /dev/null
+++ b/test/algorithms/buffer/multi_point_buffer.cpp
@@ -0,0 +1,202 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+#include <test_buffer.hpp>
+
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+
+static std::string const simplex = "MULTIPOINT((5 5),(7 7))";
+static std::string const three = "MULTIPOINT((5 8),(9 8),(7 11))";
+
+// Generates error (extra polygon on top of rest) at distance 14.0:
+static std::string const multipoint_a = "MULTIPOINT((39 44),(38 37),(41 29),(15 33),(58 39))";
+
+// Just one with holes at distance ~ 15
+static std::string const multipoint_b = "MULTIPOINT((5 56),(98 67),(20 7),(58 60),(10 4),(75 68),(61 68),(75 62),(92 26),(74 6),(67 54),(20 43),(63 30),(45 7))";
+
+
+template <typename P>
+void test_all()
+{
+    //std::cout << typeid(bg::coordinate_type<P>::type).name() << std::endl;
+
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::polygon<P> polygon;
+    typedef bg::model::multi_point<P> multi_point_type;
+
+	double const pi = boost::geometry::math::pi<double>();
+
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("simplex1", simplex, 2.0 * pi, 1.0, 1.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("simplex2", simplex, 22.8372, 2.0, 2.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("simplex3", simplex, 44.5692, 3.0, 3.0);
+
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("three1", three, 3.0 * pi, 1.0, 1.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("three2", three, 36.7592, 2.0, 2.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("three19", three, 33.6914, 1.9, 1.9);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("three21", three, 39.6394, 2.1, 2.1);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("three3", three, 65.533, 3.0, 3.0);
+
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("multipoint_a", multipoint_a, 2049.98, 14.0, 14.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("multipoint_b", multipoint_b, 7109.88, 15.0, 15.0);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("multipoint_b1", multipoint_b, 6911.89, 14.7, 14.7);
+    test_one<multi_point_type, buf::join_miter, buf::end_round, polygon>("multipoint_b2", multipoint_b, 7174.79, 15.1, 15.1);
+}
+
+template 
+<
+    typename GeometryOut, 
+    template<typename, typename> class JoinStrategy,
+    template<typename, typename> class EndStrategy,
+    typename Geometry
+>
+double test_growth(Geometry const& geometry, int n, int d, double distance)
+{
+    namespace bg = boost::geometry;
+
+    typedef typename bg::coordinate_type<Geometry>::type coordinate_type;
+    typedef typename bg::point_type<Geometry>::type point_type;
+
+    typedef typename bg::ring_type<GeometryOut>::type ring_type;
+
+	typedef typename bg::tag<Geometry>::type tag;
+
+    // extern int point_buffer_count;
+    std::ostringstream complete;
+    complete
+        << "point" << "_"
+        << "growth" << "_"
+        << string_from_type<coordinate_type>::name()
+        << "_" << "r"
+        << "_" << n
+        << "_" << d
+         // << "_" << point_buffer_count
+        ;
+
+    //std::cout << complete.str() << std::endl;
+
+    std::ostringstream filename;
+    filename << "buffer_" << complete.str() << ".svg";
+
+    std::ofstream svg(filename.str().c_str());
+
+#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
+    bg::svg_mapper<point_type> mapper(svg, 500, 500);
+
+    {
+        bg::model::box<point_type> box;
+        bg::envelope(geometry, box);
+
+        bg::buffer(box, box, distance * 1.01);
+        mapper.add(box);
+    }
+#endif
+
+    JoinStrategy
+        <
+            point_type,
+            typename bg::point_type<GeometryOut>::type
+        > join_strategy;
+    EndStrategy
+        <
+            point_type,
+            typename bg::point_type<GeometryOut>::type
+        > end_strategy;
+
+    typedef bg::strategy::buffer::distance_symmetric<coordinate_type> distance_strategy_type;
+    distance_strategy_type distance_strategy(distance);
+
+    std::vector<GeometryOut> buffered;
+
+    typedef typename bg::rescale_policy_type<point_type>::type
+        rescale_policy_type;
+    rescale_policy_type rescale_policy
+            = bg::get_rescale_policy<rescale_policy_type>(geometry);
+
+    bg::buffer_inserter<GeometryOut>(geometry, std::back_inserter(buffered),
+                        distance_strategy, 
+                        join_strategy,
+                        end_strategy,
+                        rescale_policy
+#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
+                        , mapper
+#endif
+                                );
+
+    typename bg::default_area_result<GeometryOut>::type area = 0;
+    BOOST_FOREACH(GeometryOut const& polygon, buffered)
+    {
+        area += bg::area(polygon);
+    }
+
+#ifdef BOOST_GEOMETRY_DEBUG_WITH_MAPPER
+    // Map input geometry in green
+    mapper.map(geometry, "opacity:0.5;fill:rgb(0,128,0);stroke:rgb(0,128,0);stroke-width:10");
+
+    BOOST_FOREACH(GeometryOut const& polygon, buffered)
+    {
+        mapper.map(polygon, "opacity:0.4;fill:rgb(255,255,128);stroke:rgb(0,0,0);stroke-width:3");
+    }
+#endif
+
+    return area;
+}
+
+template <typename P>
+void test_growth(int n, int distance_count)
+{
+    srand(int(time(NULL)));
+    //std::cout << typeid(bg::coordinate_type<P>::type).name() << std::endl;
+    boost::timer t;
+
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::polygon<P> polygon;
+    typedef bg::model::multi_point<P> multi_point_type;
+
+    multi_point_type multi_point;
+    for (int i = 0; i < n; i++)
+    {
+        P point(rand() % 100, rand() % 100);
+        multi_point.push_back(point);
+    }
+
+    //std::cout << bg::wkt(multi_point) << std::endl;
+
+    double previous_area = 0;
+    double epsilon = 0.1;
+    double distance = 15.0;
+    for (int d = 0; d < distance_count; d++, distance += epsilon)
+    {
+        double area = test_growth<polygon, buf::join_miter, buf::end_round>(multi_point, n, d, distance);
+        if (area < previous_area)
+        {
+            std::cout << "Error: " << area << " < " << previous_area << std::endl
+                << " n=" << n << " distance=" << distance
+                << bg::wkt(multi_point) << std::endl;
+        }
+        previous_area = area;
+    }
+    std::cout << "n=" << n << " time=" << t.elapsed() << std::endl;
+}
+
+int test_main(int, char* [])
+{
+    //std::cout << std::setprecision(6);
+    //test_all<bg::model::point<float, 2, bg::cs::cartesian> >();
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+
+
+#ifdef BOOST_GEOMETRY_BUFFER_TEST_GROWTH
+    for (int i = 5; i <= 50; i++)
+    {
+        test_growth<bg::model::point<double, 2, bg::cs::cartesian> >(i, 20);
+    }
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/buffer/multi_polygon_buffer.cpp b/test/algorithms/buffer/multi_polygon_buffer.cpp
new file mode 100644
index 000000000..7afd55b82
--- /dev/null
+++ b/test/algorithms/buffer/multi_polygon_buffer.cpp
@@ -0,0 +1,348 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+#include <test_buffer.hpp>
+
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+
+
+static std::string const simplex
+    = "MULTIPOLYGON(((0 1,2 5,5 3,0 1)),((1 1,5 2,5 0,1 1)))";
+
+static std::string const zonethru
+    = "MULTIPOLYGON(((0 0,0 6,5 6,5 4,3 4,3 0,0 0)),((5 0,5 2,7 2,7 6,10 6,10 0,5 0)))";
+
+static std::string const wrapped
+    = "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(2 2,8 2,8 8,2 8,2 2)),((4 4,4 6,6 6,6 4,4 4)))";
+
+static std::string const triangles
+    = "MULTIPOLYGON(((0 4,3 0,-2.5 -1,0 4)),((3 8,5.5 13,8 8,3 8)),((11 4,13.5 -1,8 0,11 4)))";
+
+// From robustness tests
+
+// Case with duplicate points (due to chained boxes) (round)
+static std::string const rt_a
+    = "MULTIPOLYGON(((2 7,2 8,3 8,3 7,2 7)),((5 4,5 5,6 5,6 4,5 4)),((5 8,6 8,6 7,6 6,5 6,5 7,4 7,4 8,5 8)),((3 5,4 5,4 4,3 4,2 4,2 5,3 5)))";
+
+// Case with u-u (miter)
+static std::string const rt_b
+    = "MULTIPOLYGON(((8 4,8 5,9 5,9 4,8 4)),((6 2,6 3,7 3,7 2,6 2)),((8 0,8 1,9 1,9 0,8 0)),((9 7,9 8,10 8,10 7,9 7)))";
+
+// Case with geometry::equals( turn.point(7.0000000000000000, 4.3368086899420177e-019), helper_segment(7.0000000000000000, 0.00000000000000000))) (round)
+static std::string const rt_c
+	= "MULTIPOLYGON(((6 1,6 2,7 2,7 1,6 1)),((8 0,8 1,9 1,9 0,8 0)))";
+
+// Case with round corner on same perpendicular points (round)
+static std::string const rt_d
+	= "MULTIPOLYGON(((2 2,2 3,3 2,2 2)),((2 5,2 6,3 5,2 5)),((2 4,2 5,3 4,2 4)),((3 2,3 3,4 2,3 2)),((4 4,4 5,5 4,4 4)),((5 6,5 5,4 5,4 6,5 7,5 6)),((2 2,3 1,3 0,2 0,2 1,1 1,1 2,2 2)),((1 3,1 2,0 2,1 3)),((1 4,2 4,2 3,1 3,1 4)))";
+
+// Case with missing turning point (miter) and many intersections (round, OK)
+static std::string const rt_e
+	= "MULTIPOLYGON(((0 6,0 7,1 6,0 6)),((3 7,3 8,4 8,4 7,3 7)),((4 6,4 7,5 7,4 6)),((3 6,3 7,4 6,3 6)),((1 9,2 10,2 9,1 9)),((1 9,1 8,0 8,0 9,1 9)),((3 5,3 4,2 4,2 5,2 6,3 5)))";
+
+// Extract of e (miter)
+static std::string const rt_f
+	= "MULTIPOLYGON(((0 6,0 7,1 6,0 6)),((1 9,1 8,0 8,0 9,1 9)))";
+
+// Robustness / turn problem (collinearity with turn after), solved in get_turn-info
+static std::string const rt_g1
+	= "MULTIPOLYGON(((3 8,3 9,4 9,3 8)),((7 5,7 6,8 5,7 5)),((1 8,1 9,2 9,1 8)),((1 6,1 7,2 7,1 6)))";
+
+static std::string const rt_g2
+    = "MULTIPOLYGON(((6 5,7 5,6 4,5 4,5 5,6 5)),((4 2,4 3,5 3,4 2)))";
+
+static std::string const rt_g3
+    = "MULTIPOLYGON(((4 2,5 3,5 2,4 2)),((2 0,3 1,3 0,2 0)))";
+
+
+// IP on match of 3 lines
+static std::string const rt_h
+	= "MULTIPOLYGON(((4 7,4 8,5 7,4 7)),((4 8,5 9,5 8,4 8)),((9 1,10 2,10 1,9 1)),((4 1,4 2,5 2,4 1)),((2 9,2 10,3 10,2 9)),((7 7,8 8,8 7,7 7)),((3 4,4 4,3 3,2 3,2 4,3 4)))";
+
+// r=1.16 (touching)
+static std::string const rt_i
+	= "MULTIPOLYGON(((2 1,2 2,3 2,2 1)),((3 2,3 3,4 3,3 2)))";
+
+// r=1.16 (touching in the middle)
+static std::string const rt_j
+	= "MULTIPOLYGON(((2 4,2 5,3 5,2 4)),((5 3,5 4,6 4,5 3)),((9 4,9 5,10 5,10 4,9 4)),((0 2,0 3,1 3,0 2)))";
+
+// Occupied (but not completely - due to duplicate point there)
+static std::string const rt_k
+	= "MULTIPOLYGON(((3 7,3 8,4 8,3 7)),((0 4,0 5,1 5,0 4)),((3 5,3 6,4 6,4 5,3 5)),((2 6,3 7,3 6,2 6)),((3 2,3 1,2 1,2 2,3 3,3 2)),((0 9,1 10,1 9,1 8,0 8,0 9)))";
+
+// Segment-intersection problem (nearly collinear not reported as collinear), fixed
+static std::string const rt_l
+	= "MULTIPOLYGON(((2 5,2 6,3 5,2 5)),((6 1,6 2,7 1,6 1)))";
+
+// Segment-intersection problem (missed touch because of robustness) (with 4), fixed
+static std::string const rt_m1
+	= "MULTIPOLYGON(((4 2,4 3,5 2,4 2)),((1 2,2 3,2 2,1 2)))";
+
+// Same, with 2
+static std::string const rt_m2
+	= "MULTIPOLYGON(((0 3,1 4,1 3,0 3)),((3 6,4 7,4 6,4 5,3 5,3 6)))";
+
+
+// Segment-intersection problem (disjoint nearly collinear segments were reported as intersecting), fixed.
+static std::string const rt_n
+	= "MULTIPOLYGON(((0 0,1 1,1 0,0 0)),((3 3,4 4,4 3,3 3)))";
+
+// Segment intersection of 3 pieces in one point, plus all intersection points are within the other piece (due to precision)
+static std::string const rt_o1
+    = "MULTIPOLYGON(((8 4,8 5,9 5,8 4)),((9 4,10 5,10 4,9 4)),((6 2,6 3,7 3,6 2)))";
+
+static std::string const rt_o2
+    = "MULTIPOLYGON(((8 4,8 5,9 5,8 4)),((6 5,7 4,6 4,6 5)),((9 4,10 5,10 4,9 4)),((6 2,6 3,7 3,6 2)))";
+
+static std::string const rt_o3
+    = "MULTIPOLYGON(((8 4,8 5,9 5,8 4)),((6.5 5,7.5 4,6.5 4,6.5 5)),((8.5 4,9.5 5,9.5 4,8.5 4)),((6 2,6 3,7 3,6 2)),((10 4,11 5,11 4,10 4)))";
+
+static std::string const rt_o4
+    = "MULTIPOLYGON(((8 4,8 5,9 5,8 4)),((6.5 5,7.5 4,6.5 4,6.5 5)),((8.5 4,9.5 5,9.5 4,8.5 4)),((6 2,6 3,7 3,6 2)),((10 4,11 5,11 4,10 4)),((10 3,11 3,11 2,10 3)))";
+
+// Occupied - intersection
+static std::string const rt_p1
+    = "MULTIPOLYGON(((5 2,5 3,6 3,6 2,5 2)),((8 0,8 1,9 0,8 0)),((8 2,9 3,9 2,8 2)))";
+
+static std::string const rt_p2
+    = "MULTIPOLYGON(((9 3,9 4,10 3,9 3)),((9 4,9 5,10 5,9 4)),((8 6,9 7,9 6,8 6)))";
+
+static std::string const rt_p3
+    = "MULTIPOLYGON(((3 8,3 9,4 9,3 8)),((3 7,3 8,4 8,3 7)),((0 8,0 9,1 8,0 8)))";
+
+// Occupation map: robustness, nearly collinear, both incoming
+static std::string const rt_p4
+    = "MULTIPOLYGON(((8 8,9 9,9 8,8 8)),((5 8,5 9,6 9,5 8)),((6 5,6 6,7 6,6 5)),((4 7,4 8,5 8,4 7)))";
+
+// Occupation map: Two collinear segments intersecting one segment
+static std::string const rt_p5
+    = "MULTIPOLYGON(((3 2,4 3,4 2,3 2)),((2 2,2 3,3 3,3 2,2 2)),((4 3,5 4,5 3,4 3)))";
+
+// Occupied map: only two pieces involved so leave early
+static std::string const rt_p6
+    = "MULTIPOLYGON(((7 3,7 4,8 3,7 3)),((7 6,8 7,8 6,7 6)))";
+
+// Occupation map: needing relaxed_less for map
+static std::string const rt_p7
+    = "MULTIPOLYGON(((6 6,7 7,7 6,6 6)),((3 4,3 5,4 4,3 4)),((2 6,3 7,3 6,2 6)))";
+
+// Occupation map: needing relaxed_less PLUS relaxed_equals for map
+static std::string const rt_p8
+    = "MULTIPOLYGON(((4 7,4 8,5 7,4 7)),((5 3,6 4,6 3,5 3)),((8 5,8 6,9 6,8 5)))";
+
+// Occupation map: needing go back for extra outgoing vectors too
+static std::string const rt_p9
+    = "MULTIPOLYGON(((1 6,1 7,2 6,1 6)),((4 3,4 4,5 3,4 3)),((3 4,2 3,2 4,3 5,3 4)))";
+
+static std::string const rt_p10
+    = "MULTIPOLYGON(((6 6,7 7,7 6,6 6)),((4 6,5 7,5 6,4 6)),((8 8,9 9,9 8,8 8)))";
+
+// Occupation map, multiple back/forward cases and combinations
+static std::string const rt_p11
+    = "MULTIPOLYGON(((0 8,0 9,1 9,1 8,0 8)),((2 8,2 9,3 9,3 8,2 8)),((3 8,4 9,4 8,3 8)),((4 1,4 2,5 2,4 1)))";
+
+// Occupation map - incoming angle, non-zero
+static std::string const rt_p12
+    = "MULTIPOLYGON(((8 4,9 5,9 4,8 4)),((5 5,5 6,6 6,6 5,5 5)),((8 4,8 3,7 3,8 4)))";
+
+// Occupation map - outgoing angle, 1
+static std::string const rt_p13
+    = "MULTIPOLYGON(((5 2,6 3,6 2,5 2)),((3 0,4 1,4 0,3 0)),((3 1,3 2,4 2,4 1,3 1)))";
+
+// Occupation map - touch which was originally in other segment-id
+static std::string const rt_p14
+    = "MULTIPOLYGON(((9 9,10 10,10 9,9 9)),((7 7,8 8,8 7,7 7)),((6 6,6 7,7 7,7 6,6 6)))";
+
+// Occupation map - needing measuring sides from original point and not center point
+static std::string const rt_p15
+    = "MULTIPOLYGON(((5 2,5 3,6 3,6 2,5 2)),((4 1,5 2,5 1,4 1)),((8 5,9 6,9 5,8 5)))";
+
+// Occupation map - needing other approach w.r.t. discarding (collinear) segments
+static std::string const rt_p16
+    = "MULTIPOLYGON(((5 7,5 8,6 7,5 7)),((9 3,9 4,10 3,9 3)),((6 7,7 8,7 7,6 7)))";
+
+// Occupation map - outputting two valid turns (resulting in the wrong choice in the end)
+static std::string const rt_p17
+    = "MULTIPOLYGON(((4 8,5 9,5 8,4 8)),((1 8,2 9,2 8,1 8)),((2 6,3 7,3 6,2 6)))";
+
+// Occupation map - outputting no valid turns (needing to take other turns into account)
+static std::string const rt_p18
+	= "MULTIPOLYGON(((7 6,8 7,8 6,7 6)),((7 3,7 4,8 3,7 3)),((5 4,6 5,6 4,5 4)))";
+
+// Occupation map - showing wrong approach in p17/p18, now new approach with keep_indices
+static std::string const rt_p19
+	= "MULTIPOLYGON(((0 5,1 6,1 5,0 5)),((0 7,0 8,1 7,0 7)),((3 4,3 5,4 4,3 4)))";
+
+// Occupation map: two non-collinear segments non-intersecting, needing relaxed_equal
+static std::string const rt_p20
+	= "MULTIPOLYGON(((2 3,2 4,3 4,3 3,2 3)),((0 5,0 6,1 6,0 5)),((2 7,2 8,3 8,2 7)))";
+
+// Occupation map: turn more right should still be included
+static std::string const rt_p21
+    = "MULTIPOLYGON(((4 2,4 3,5 3,4 2)),((4 1,5 2,5 1,4 1)),((5 2,6 3,6 2,5 2)))";
+
+
+static std::string const rt_p22
+    = "MULTIPOLYGON(((4 8,5 9,5 8,4 8)),((5 9,6 10,6 9,5 9)),((1 7,1 8,2 8,2 7,1 7)),((2 6,3 7,3 6,2 6)))";
+
+
+// Occupation map with a uu-turn
+static std::string const rt_q1
+    = "MULTIPOLYGON(((4 6,4 7,5 7,5 6,4 6)),((1 6,1 7,2 7,2 6,1 6)),((1 9,1 10,2 10,2 9,1 9)))";
+
+// Occupation map with twice a uu-turn
+static std::string const rt_q2
+    = "MULTIPOLYGON(((0 6,0 7,1 6,0 6)),((2 6,2 7,3 6,2 6)),((4 5,3 5,3 6,4 6,5 6,5 5,4 4,4 5)))";
+
+// Robustness issue related to collinear correction (meeting) and selecting the right axis (x/y)
+static std::string const rt_r
+    = "MULTIPOLYGON(((3 1,2 0,1 1,2 2,3 1)),((5 3,4 2,3 2,4 4,5 3)))";
+
+// Robustness - flagged by "meeting"
+static std::string const rt_s1
+    = "MULTIPOLYGON(((4 1,5 2,5 1,4 1)),((5 2,6 3,6 2,5 2)),((7 1,7 2,8 1,7 1)))";
+
+// Robustness - flagged by "disjoint"
+static std::string const rt_s2
+    = "MULTIPOLYGON(((0 0,1 1,1 0,0 0)),((2 4,2 5,3 4,2 4)),((3.5 3.5,4 4,4 3,3 3,3 4,3.5 3.5)))";
+
+// Robustness issue in get_turn_info (touch, collinear, blocking q)
+static std::string const rt_t
+    = "MULTIPOLYGON(((1 3,1 4,2 3,1 3)),((1 4,0 3,0 4,0 5,1 4)))";
+
+
+
+
+template <typename P>
+void test_all()
+{
+    namespace buf = bg::strategy::buffer;
+
+    typedef bg::model::polygon<P> polygon_type;
+    typedef bg::model::multi_polygon<polygon_type> multi_polygon_type;
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("triangles424", triangles, 417.910, 4.24);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("triangles425", triangles, 418.918, 4.25);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("triangles426", triangles, 419.927, 4.26);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("zonethru_10", zonethru, 96.0000, 1.0);
+
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("multi_simplex_05", simplex, 23.7030, 0.5);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("multi_simplex_05", simplex, 24.5965, 0.5);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("multi_simplex_10", simplex, 34.2532, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("multi_simplex_10", simplex, 38.1379, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("multi_simplex_20", simplex, 59.9159, 2.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("multi_simplex_20", simplex, 77.7060, 2.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("multi_simplex_50", simplex, 174.46, 5.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("multi_simplex_50", simplex, 298.797, 5.0);
+
+    // This one does not work:
+    // test_one<multi_polygon_type, buf::join_round_by_divide, buf::end_skip, polygon_type>("multi_simplex_50", simplex, 'd', 174.46, 5.0);
+    
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("zonethru_05", zonethru, 67.4627, 0.5);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("zonethru_05", zonethru, 68.0000, 0.5);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("zonethru_10", zonethru, 93.8508, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("zonethru_10", zonethru, 96.0000, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("zonethru_15", zonethru, 114.584, 1.5);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("zonethru_15", zonethru, 117.000, 1.5);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("wrapped_05", wrapped, 104.570, 0.5);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("wrapped_05", wrapped, 105.000, 0.5);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("wrapped_10", wrapped, 142.281, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("wrapped_10", wrapped, 144.000, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("wrapped_15", wrapped, 167.066, 1.5);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("wrapped_15", wrapped, 169.000, 1.5);
+
+    // TODO: there is still an undetected hole inside rt_a
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_a", rt_a, 34.5381, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_a", rt_a, 36, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_b", rt_b, 31.4186, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_b", rt_b, 34, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_c", rt_c, 14.7093, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_c", rt_c, 16, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_d", rt_d, 18.8726, 0.3);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_d", rt_d, 19.8823, 0.3);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_e", rt_e, 14.1866, 0.3);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_e", rt_e, 15.1198, 0.3);
+    // This does not add anything: test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_f", rt_f, 4.28937, 0.3);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_f", rt_f, 4.60853, 0.3);
+
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_g1", rt_g1, 24.719, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_g1", rt_g1, 30.3137, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_g2", rt_g2, 18.5711, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_g3", rt_g3, 16.5711, 1.0);
+
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_h", rt_h, 47.6012, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_h", rt_h, 61.7058, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_i", rt_i, 10.7528, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_i", rt_i, 13.6569, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_j", rt_j, 28.7309, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_j", rt_j, 35.1421, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_k", rt_k, 42.0092, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_k", rt_k, 48.0563, 1.0);
+    // This does not add anything: test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_l", rt_l, 14.1074, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_l", rt_l, 19.3995, 1.0);
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_m1", rt_m1, 14.1074, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_m1", rt_m1, 19.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_m2", rt_m2, 21.4853, 1.0);
+
+    // This does not add anything: test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_n", rt_n,  14.1074, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_n", rt_n,  18.4853, 1.0);
+
+    test_one<multi_polygon_type, buf::join_round, buf::end_skip, polygon_type>("rt_o1", rt_o1, 17.536, 1.0);
+    //test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_o1", rt_o1, 20.9142, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_o2", rt_o2, 25.7426, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_o3", rt_o3, 28.8247, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_o4", rt_o4, 34.6532, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p1", rt_p1, 24.8211, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p2", rt_p2, 21.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p3", rt_p3, 22.3995, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p4", rt_p4, 33.0563, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p5", rt_p5, 17, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p6", rt_p6, 18.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p7", rt_p7, 26.2279, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p8", rt_p8, 29.0563, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p9", rt_p9, 26.1421, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p10", rt_p10, 23.3995, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p11", rt_p11, 28.7426, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p12", rt_p12, 22.5711, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p13", rt_p13, 19.9142, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p14", rt_p14, 20.8284, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p15", rt_p15, 23.6569, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p16", rt_p16, 23.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p17", rt_p17, 25.3137, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p18", rt_p18, 23.3137, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p19", rt_p19, 25.5637, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p20", rt_p20, 25.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p21", rt_p21, 17.1716, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_p22", rt_p22, 26.5711, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_q1", rt_q1, 27, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_q2", rt_q2, 26.4853, 1.0);
+
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_r", rt_r, 21.0761, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_s1", rt_s1, 20.4853, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_s2", rt_s2, 24.6495, 1.0);
+    test_one<multi_polygon_type, buf::join_miter, buf::end_skip, polygon_type>("rt_t", rt_t, 15.6569, 1.0);
+}
+
+int point_buffer_count;
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+    //test_all<bg::model::point<ttmath_big, 2, bg::cs::cartesian> >();
+    
+    return 0;
+}
+
diff --git a/test/algorithms/buffer/point_buffer.cpp b/test/algorithms/buffer/point_buffer.cpp
new file mode 100644
index 000000000..0165a8c35
--- /dev/null
+++ b/test/algorithms/buffer/point_buffer.cpp
@@ -0,0 +1,49 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+//#define BOOST_GEOMETRY_DEBUG_WITH_MAPPER
+//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
+//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/algorithms/buffer.hpp>
+#include <boost/geometry/core/coordinate_type.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <test_buffer.hpp>
+
+
+static std::string const simplex = "POINT(5 5)";
+
+template <typename P>
+void test_all()
+{
+    namespace buf = bg::strategy::buffer;
+    typedef bg::model::polygon<P> polygon;
+
+	double const pi = boost::geometry::math::pi<double>();
+
+    test_one<P, buf::join_miter, buf::end_round, polygon>("simplex1", simplex, pi, 1.0, 1.0);
+    test_one<P, buf::join_miter, buf::end_round, polygon>("simplex2", simplex, pi * 4.0, 2.0, 2.0);
+    test_one<P, buf::join_miter, buf::end_round, polygon>("simplex3", simplex, pi * 9.0, 3.0, 3.0);
+}
+
+
+int test_main(int, char* [])
+{
+    //std::cout << std::setprecision(6);
+    //test_all<bg::model::point<float, 2, bg::cs::cartesian> >();
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+    return 0;
+}
diff --git a/test/algorithms/buffer/polygon_buffer.cpp b/test/algorithms/buffer/polygon_buffer.cpp
new file mode 100644
index 000000000..29d1517b5
--- /dev/null
+++ b/test/algorithms/buffer/polygon_buffer.cpp
@@ -0,0 +1,363 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2012-2014 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)
+
+
+#include <geometry_test_common.hpp>
+
+#define BOOST_GEOMETRY_TEST_BUFFER_POLYGON
+#include <test_buffer.hpp>
+
+
+
+static std::string const simplex
+    = "POLYGON ((0 0,1 5,6 1,0 0))";
+static std::string const concave_simplex
+    = "POLYGON ((0 0,3 5,3 3,5 3,0 0))";
+static std::string const chained_box
+    = "POLYGON((0 0,0 4,4 4,8 4,12 4,12 0,8 0,4 0,0 0))";
+
+static std::string const donut_simplex
+    = "POLYGON ((0 0,1 9,8 1,0 0),(1 1,4 1,1 4,1 1))";
+static std::string const letter_L
+    = "POLYGON ((0 0,0 4,1 4,1 1,3 1,3 0,0 0))";
+static std::string const indentation
+    = "POLYGON ((0 0,0 5,4 5,4 4,3 3,2 4,2 1,3 2,4 1,4 0,0 0))";
+static std::string const funnelgate
+    = "POLYGON((0 0,0 7,7 7,7 0,5 0,5 1,6 6,1 6,2 1,2 0,0 0))";
+static std::string const gammagate
+    = "POLYGON((0 0,0 6,9 6,9 0,4 0,4 2,7 2,7 4,2 4,2 0,0 0))";
+static std::string const fork_a
+    = "POLYGON((0 0,0 6,9 6,9 0,4 0,4 2,7 2,7 4,6 4,6 5,5 5,5 4,4 4,4 5,3 5,3 4,2 4,2 0,0 0))";
+static std::string const fork_b
+    = "POLYGON((0 0,0 8,14 8,14 0,4 0,4 2,13 2,13 4,12 4,12 7,9 7,9 4,7 4,7 7,4 7,4 4,2 4,2 0,0 0))";
+static std::string const fork_c
+    = "POLYGON((0 0,0 9,12 9,12 0,4 0,4 4,6 4,6 2,8 2,8 4,10 4,10 7,6 7,6 6,2 6,2 0,0 0))";
+
+static std::string const arrow
+    = "POLYGON ((1 0,1 5,0.5 4.5,2 10,3.5 4.5,3 5,3 0,1 0))";
+static std::string const tipped_aitch
+    = "POLYGON ((0 0,0 3,3 3,3 4,0 4,0 7,7 7,7 4,4 4,4 3,7 3,7 0,0 0))";
+static std::string const snake
+    = "POLYGON ((0 0,0 3,3 3,3 4,0 4,0 7,8 7,8 4,6 4,6 3,8 3,8 0,7 0,7 2,5 2"
+                ",5 5,7 5,7 6,1 6,1 5,4 5,4 2,1 2,1 1,6 1,6 0,0 0))";
+static std::string const church
+    = "POLYGON ((0 0,0 3,2.999 3,3 8,3 0,0 0))";
+static std::string const flower
+    = "POLYGON ((1 0,1 10,9 10,9 0,4.99 0,4.99 5.5,4.5 6,5 6.5,5.5 6,5.01 5.5,5.01 0.01,5.25 0.01,5.25 5,6 3,8 5,6 6,8 7,6 9,5 7,4 9,2 7,4 6,2 5,4 3,4.75 5,4.75 0,1 0))";
+
+static std::string const saw
+    = "POLYGON((1 3,1 8,1.5 6,5 8,5.5 6,9 8,9.5 6,13 8,13 3,1 3))";
+
+static std::string const bowl
+    = "POLYGON((1 2,1 7,2 7,3 5,5 4,7 5,8 7,9 7,9 2,1 2))";
+
+// Triangle with segmented sides, closing point at longest side
+static std::string const triangle
+    = "POLYGON((4 5,5 4,4 4,3 4,3 5,3 6,4 5))";
+
+
+static std::string const county1
+    = "POLYGON((-111.700 41.200 ,-111.681388 41.181739 ,-111.682453 41.181506 ,-111.684052 41.180804 ,-111.685295 41.180538 ,-111.686318 41.180776 ,-111.687517 41.181416 ,-111.688982 41.181520 ,-111.690670 41.181523 ,-111.692135 41.181460 ,-111.693646 41.182034 ,-111.695156 41.182204 ,-111.696489 41.182274 ,-111.697775 41.182075 ,-111.698974 41.181539 ,-111.700485 41.182348 ,-111.701374 41.182955 ,-111.700 41.200))";
+
+template <typename P>
+void test_all()
+{
+    namespace buf = bg::strategy::buffer;
+
+    typedef bg::model::polygon<P> polygon_type;
+
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("simplex", simplex, 47.9408, 1.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("simplex", simplex, 52.8733, 1.5);
+
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("concave_simplex", concave_simplex, 14.5616, 0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("concave_simplex", concave_simplex, 16.3861, 0.5);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("chained_box", chained_box, 83.1403, 1.0);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("chained_box", chained_box, 84, 1.0);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("L", letter_L, 13.7314, 0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("L", letter_L, 14.0, 0.5);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("chained_box", chained_box, 84, 1.0);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("chained_box", chained_box, 83.1403, 1.0);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation4", indentation, 25.7741, 0.4);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation4", indentation, 25.5695, 0.4);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation5", indentation, 28.2426, 0.5);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation5", indentation, 27.9953, 0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation6", indentation, 30.6712, 0.6);
+
+    // SQL Server gives 30.34479159164
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation6", indentation, 30.3445, 0.6);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation7", indentation, 33.0958, 0.7);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation7", indentation, 32.6533, 0.7);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation8", indentation, 35.5943, 0.8);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation8", indentation, 35.0164, 0.8);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation12", indentation, 46.3541, 1.2);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation12", indentation, 45.0537, 1.2);
+
+	// TODO: fix, the buffered pieces are currently counterclockwise, that should be reversed
+    //test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation4_neg", indentation, 6.99098413022335, -0.4);
+    //test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation4_neg", indentation, 7.25523322189147, -0.4);
+    //test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation8_neg", indentation, 1.36941992048731, -0.8);
+    //test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation8_neg", indentation, 1.37375487490664, -0.8);
+    //test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("indentation12_neg", indentation, 0, -1.2);
+    //test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("indentation12_neg", indentation, 0, -1.2);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex6", donut_simplex, 53.648, 0.6);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex6", donut_simplex, 52.820, 0.6);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex8", donut_simplex, 61.132, 0.8);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex8", donut_simplex, 59.6713, 0.8);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex10", donut_simplex, 68.670, 1.0);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex10", donut_simplex, 66.387, 1.0);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex12", donut_simplex, 76.605, 1.2);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex12", donut_simplex, 73.3179, 1.2);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex14", donut_simplex, 84.974, 1.4);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex14", donut_simplex, 80.500, 1.4);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex16", donut_simplex, 93.777, 1.6);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex16", donut_simplex, 87.933, 1.6);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("arrow4", arrow, 28.265, 0.4);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("arrow4", arrow, 27.039, 0.4);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("arrow5", arrow, 31.500, 0.5);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("arrow5", arrow, 29.621, 0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("arrow6", arrow, 34.903, 0.6);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("arrow6", arrow, 32.268, 0.6);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("tipped_aitch3", tipped_aitch, 55.36, 0.3);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("tipped_aitch9", tipped_aitch, 77.44, 0.9);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("tipped_aitch13", tipped_aitch, 92.16, 1.3);
+
+    // SQL Server: 55.205415532967 76.6468846383224 90.642916957136
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("tipped_aitch3", tipped_aitch, 55.2053, 0.3);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("tipped_aitch9", tipped_aitch, 76.6457, 0.9);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("tipped_aitch13", tipped_aitch, 90.641, 1.3);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snake4", snake, 64.44, 0.4);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snake5", snake, 72, 0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snake6", snake, 75.44, 0.6);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snake16", snake, 114.24, 1.6);
+
+	test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("funnelgate2", funnelgate, 120.982, 2);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("funnelgate3", funnelgate, 13*13, 3);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("funnelgate4", funnelgate, 15*15, 4);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("gammagate1", gammagate, 88, 1);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("fork_a1", fork_a, 88, 1);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("fork_b1", fork_b, 154, 1);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("fork_c1", fork_c, 152, 1);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("triangle", triangle, 14.6569, 1.0);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("gammagate2", gammagate, 130, 2);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower1", flower, 67.614, 0.1);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower20", flower, 74.894, 0.20);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower25", flower, 78.226, 0.25);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower30", flower, 81.492494146177947, 0.30);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower35", flower, 84.694183819917185, 0.35);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower40", flower, 87.8306529577, 0.40);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower45", flower, 90.901901559536029, 0.45);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower50", flower, 93.907929625415662, 0.50);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower55", flower, 96.848737155342079, 0.55);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("flower60", flower, 99.724324149315279, 0.60);
+
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower10", flower, 67.486, 0.10);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower20", flower, 74.702, 0.20);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower25", flower, 78.071, 0.25);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower30", flower, 81.352, 0.30);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower35", flower, 84.547, 0.35);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower40", flower, 87.665, 0.40);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower45", flower, 90.709, 0.45);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower50", flower, 93.680, 0.50);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower55", flower, 96.580, 0.55);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("flower60", flower, 99.408, 0.60);
+
+    // Saw
+    {
+        // SQL Server:
+// 68.6258859984014 90.2254986930165 112.799509089077 136.392823913949 161.224547934625 187.427508982734
+//215.063576036522 244.167935815974 274.764905445676 306.878264367143 340.530496138041 375.720107548269
+        int const n = 12;
+        double expected_round[n] = 
+            { 
+                 68.6252,  90.222, 112.792, 136.397, 161.230, 187.435,
+                215.073, 244.179, 274.779, 306.894, 340.543, 375.734
+            };
+        double expected_miter[n] = 
+            {
+                70.7706,  98.804, 132.101, 170.661, 214.484, 263.57,
+               317.92,  377.532, 442.408, 512.546, 587.948, 668.613
+            };
+
+        for (int i = 1; i <= n; i++)
+        {
+            std::ostringstream out;
+            out << "saw_" << i;
+            test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>(out.str(), saw, expected_round[i - 1], double(i) / 2.0);
+            test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), saw, expected_miter[i - 1], double(i) / 2.0);
+        }
+    }
+
+    // Bowl
+    {
+        // SQL Server values - see query below.
+//1	43.2425133175081 60.0257800296593 78.3497997564532 98.2145746255142 119.620102487345 142.482792724034
+//2	166.499856911107 191.763334982583 218.446279387336 246.615018368511 276.300134755606 307.518458532186
+
+        int const n = 12;
+        double expected_round[n] = 
+            { 
+                 43.2423,  60.025,  78.3477,  98.2109, 119.614, 142.487,
+                166.505, 191.77, 218.455, 246.625, 276.312, 307.532
+            };
+
+
+        double expected_miter[n] = 
+            {
+                43.4895,  61.014,  80.5726,  102.166, 125.794, 151.374,
+               178.599, 207.443, 237.904, 270.000, 304.0, 340.000
+            };
+
+        for (int i = 1; i <= n; i++)
+        {
+            std::ostringstream out;
+            out << "bowl_" << i;
+            test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>(out.str(), bowl, expected_round[i - 1], double(i) / 2.0);
+            test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), bowl, expected_miter[i - 1], double(i) / 2.0);
+        }
+    }
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("county1", county1, 0.00114092, 0.01);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("county1", county1, 0.00132859, 0.01);
+
+    // Negative buffers making polygons smaller
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("simplex", simplex, 7.04043, -0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("simplex", simplex, 7.04043, -0.5);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("concave_simplex", concave_simplex, 0.777987, -0.5);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("concave_simplex", concave_simplex, 0.724208, -0.5);
+
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex3", donut_simplex, 19.7636, -0.3);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex3", donut_simplex, 19.8861, -0.3);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("donut_simplex6", donut_simplex, 12.8920, -0.6);
+    test_one<polygon_type, buf::join_round, buf::end_skip, polygon_type>("donut_simplex6", donut_simplex, 12.9157, -0.6);
+
+
+    return;
+
+    /*
+    for (int i = 4; i < 30; i++)
+    {
+        {
+            std::ostringstream out;
+            out << "snake_" << i;
+            test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), snake, double(i) / 10.0);
+        }
+        {
+            std::ostringstream out;
+            out << "snake_" << i << "_neg";
+            test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), snake, double(-i) / 10.0);
+        }
+    }
+    */
+
+    /*
+    for (int i = 4; i < 30; i++)
+    {
+        std::ostringstream out;
+        out << "church_" << i;
+        test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), church, double(i) / 10.0);
+    }
+    for (int i = 4; i < 30; i++)
+    {
+        std::ostringstream out;
+        out << "flower_" << i;
+        test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), flower, double(i) / 10.0);
+    }
+    static std::string const snl_8961 =
+        "POLYGON((161081 472784,161061 472769,161007 472740,160996 472746,160998 472777,160999 472782,161005 472888,161012 472889,161019 472891,161032 472895,161038 472883,161081 472784),(161026 472811,161022 472814,161019 472810,161023 472807,161026 472811))";
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snl_8961_10", snl_8961, 10.0);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snl_8961_100", snl_8961, 100.0);
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snl_8961_500", snl_8961, 500.0);
+
+    static std::string const snl_25120 =
+        "POLYGON((225343.489 585110.376,225319.123 585165.731,225323.497 585167.287,225323.134 585167.157,225313.975 585169.208,225321.828 585172,225332.677 585175.83,225367.032 585186.977,225401.64 585196.671,225422.799 585201.029,225429.784 585202.454,225418.859 585195.112,225423.803 585196.13,225425.389 585196.454,225397.027 585165.48,225363.802 585130.372,225354.086 585120.261,225343.489 585110.376))";
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("snl_25120", snl_25120, 1.25);
+    return;
+
+
+    for (int i = 1; i < 10; i++)
+    {
+        std::ostringstream out;
+        out << "snl_7309_" << i;
+        static std::string const snl_7309 =
+            "POLYGON((116042.2 464335.07,116045.9 464325.15,116051.33 464311.53,116056.35 464294.59,116066.41 464264.16,116066.44 464264.09,116060.35 464280.93,116028.89 464268.43,116028.89 464268.44,116024.74 464280.7,116018.91 464296.71,116012.3 464319.59,116004.76 464345.13,115988.36 464389.71,115975.39 464426.35,115965.07 464455.99,115964.81 464458.9,115966.39 464461.02,115976.45 464466.84,115984.12 464470.41,115988.22 464471.33,115991.8 464470.8,115995.9 464467.76,115997.48 464462.73,115999.73 464455.72,116002.11 464448.98,116006.08 464438.53,116010.18 464429.79,116021.96 464392.75,116034 464357.7,116042.2 464335.07))";
+        test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(), snl_7309, i * 10.0);
+    }
+
+    //return;
+    test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>("toolkit1", "POLYGON((173356.986490154 605912.122380707,173358.457939143 605902.891897507,173358.458257372 605902.889901239,173214.162964795 605901.13020255,173214.162746654 605901.132200038,173213.665 605905.69,173212.712441616 605913.799985923,173356.986490154 605912.122380707))",
+            'm', 10.0);
+    for (int i = 1; i < 20; i++)
+    {
+        std::ostringstream out;
+        out << "toolkit2_" << i;
+        test_one<polygon_type, buf::join_miter, buf::end_skip, polygon_type>(out.str(),
+            "POLYGON((120528.56 462115.62,120533.4 462072.1,120533.4 462072.01,120533.39 462071.93,120533.36 462071.86,120533.33 462071.78,120533.28 462071.72,120533.22 462071.66,120533.15 462071.61,120533.08 462071.58,120533 462071.55,120532.92 462071.54,120467.68 462068.66,120468.55 462059.04,120517.39 462062.87,120517.47 462062.87,120517.55 462062.86,120517.62 462062.83,120517.69 462062.79,120517.76 462062.74,120517.81 462062.68,120517.86 462062.62,120517.89 462062.55,120517.92 462062.47,120530.49 461998.63,120530.5 461998.55,120530.49 461998.47,120530.47 461998.39,120530.44 461998.31,120530.4 461998.24,120530.35 461998.18,120530.28 461998.13,120530.21 461998.09,120530.13 461998.06,120482.19 461984.63,120485 461963.14,120528.2 461950.66,120528.28 461950.63,120528.35 461950.59,120528.42 461950.53,120528.47 461950.47,120528.51 461950.4,120528.54 461950.32,120528.56 461950.24,120528.56 461950.15,120528.55 461950.07,120528.53 461949.99,120528.49 461949.92,120528.44 461949.85,120497.49 461915.03,120497.43 461914.98,120497.37 461914.93,120497.3 461914.9,120497.23 461914.88,120497.15 461914.86,120424.61 461910.03,120424.53 461910.03,120424.45 461910.05,120424.37 461910.07,120424.3 461910.11,120424.24 461910.16,120424.18 461910.22,120424.14 461910.29,120424.11 461910.37,120424.09 461910.45,120424.08 461910.53,120424.08 461967.59,120424.08 461967.67,120424.1 461967.75,120424.14 461967.82,120424.18 461967.89,120424.23 461967.95,120424.3 461968,120424.37 461968.04,120424.44 461968.07,120424.52 461968.09,120473.31 461973.83,120469.63 461993.16,120399.48 461986.43,120399.4 461986.43,120399.32 461986.44,120399.25 461986.47,120399.17 461986.5,120399.11 461986.55,120399.05 461986.61,120399.01 461986.67,120398.97 461986.74,120398.95 461986.82,120398.93 461986.9,120394.1 462057.5,120394.1 462057.58,120394.11 462057.66,120394.14 462057.74,120394.18 462057.81,120394.23 462057.87,120394.29 462057.93,120394.35 462057.97,120394.43 462058,120394.5 462058.03,120394.58 462058.03,120458.74 462059.95,120455.16 462072.48,120396.57 462067.68,120396.49 462067.68,120396.4 462067.69,120396.32 462067.72,120396.25 462067.76,120396.18 462067.82,120396.13 462067.88,120396.08 462067.96,120396.05 462068.04,120396.03 462068.12,120392.17 462103.9,120392.16 462103.99,120392.18 462104.07,120392.2 462104.15,120392.24 462104.22,120392.29 462104.29,120392.35 462104.35,120392.42 462104.4,120392.5 462104.43,120392.58 462104.45,120392.66 462104.46,120393.63 462104.46,120393.63 462103.46,120393.22 462103.46,120396.98 462068.71,120455.49 462073.51,120455.57 462073.51,120455.66 462073.49,120455.74 462073.46,120455.81 462073.42,120455.88 462073.37,120455.93 462073.3,120455.98 462073.23,120456.01 462073.15,120459.88 462059.61,120459.89 462059.52,120459.9 462059.44,120459.88 462059.36,120459.86 462059.28,120459.82 462059.21,120459.77 462059.14,120459.72 462059.08,120459.65 462059.04,120459.57 462059,120459.49 462058.98,120459.41 462058.97,120395.13 462057.05,120399.9 461987.48,120469.99 461994.2,120470.07 461994.2,120470.15 461994.19,120470.23 461994.16,120470.3 461994.13,120470.37 461994.08,120470.42 461994.02,120470.47 461993.95,120470.5 461993.88,120470.53 461993.8,120474.4 461973.48,120474.4 461973.4,120474.4 461973.32,120474.38 461973.24,120474.35 461973.16,120474.31 461973.09,120474.25 461973.03,120474.19 461972.98,120474.12 461972.94,120474.04 461972.91,120473.96 461972.9,120425.08 461967.14,120425.08 461911.06,120496.88 461915.85,120527.16 461949.92,120484.4 461962.27,120484.33 461962.3,120484.25 461962.35,120484.19 461962.4,120484.14 461962.46,120484.09 461962.53,120484.06 461962.61,120484.05 461962.69,120481.14 461984.93,120481.14 461985.01,120481.15 461985.09,120481.17 461985.17,120481.2 461985.24,120481.25 461985.31,120481.3 461985.36,120481.36 461985.41,120481.43 461985.45,120481.51 461985.48,120529.42 461998.9,120517.02 462061.84,120468.14 462058,120468.05 462058,120467.97 462058.02,120467.89 462058.05,120467.81 462058.09,120467.75 462058.15,120467.69 462058.22,120467.65 462058.29,120467.62 462058.37,120467.6 462058.46,120466.64 462069.1,120466.63 462069.18,120466.65 462069.26,120466.67 462069.33,120466.71 462069.4,120466.76 462069.47,120466.81 462069.53,120466.88 462069.57,120466.95 462069.61,120467.03 462069.63,120467.11 462069.64,120532.34 462072.52,120527.62 462115.03,120391.73 462106.36,120391.66 462107.36,120528.03 462116.06,120528.12 462116.06,120528.2 462116.04,120528.28 462116.02,120528.35 462115.97,120528.42 462115.92,120528.47 462115.85,120528.51 462115.78,120528.54 462115.7,120528.56 462115.62))",
+                'm', double(i)
+                );
+    }
+    */
+
+
+
+
+}
+
+
+#ifdef HAVE_TTMATH
+#include <ttmath_stub.hpp>
+#endif
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+    //test_all<bg::model::point<tt, 2, bg::cs::cartesian> >();
+    
+    return 0;
+}
+
+
+/*
+BOWL QUERY
+===
+with bowl as
+(
+	select geometry::STGeomFromText('POLYGON((1 2,1 7,2 7,3 5,5 4,7 5,8 7,9 7,9 2,1 2))',0) as q
+)
+select 
+'1-6' as row
+,q.STBuffer(0.5).STArea() as b1
+,q.STBuffer(1.0).STArea() as b2
+,q.STBuffer(1.5).STArea() as b3
+,q.STBuffer(2.0).STArea() as b4
+,q.STBuffer(2.5).STArea() as b5
+,q.STBuffer(3.0).STArea() as b6
+
+from bowl
+union all
+select 
+'7-12'
+,q.STBuffer(3.5).STArea() as b7
+,q.STBuffer(4.0).STArea() as b8
+,q.STBuffer(4.5).STArea() as b9
+,q.STBuffer(5.0).STArea() as b10
+,q.STBuffer(5.5).STArea() as b11
+,q.STBuffer(6.0).STArea() as b12
+from bowl
+	
+
+*/
diff --git a/test/algorithms/buffer/test_buffer.hpp b/test/algorithms/buffer/test_buffer.hpp
new file mode 100644
index 000000000..d469f0712
--- /dev/null
+++ b/test/algorithms/buffer/test_buffer.hpp
@@ -0,0 +1,524 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Unit Test
+
+// Copyright (c) 2010-2012 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)
+
+
+#ifndef BOOST_GEOMETRY_TEST_BUFFER_HPP
+#define BOOST_GEOMETRY_TEST_BUFFER_HPP
+
+
+#include <fstream>
+#include <iomanip>
+
+#include <boost/foreach.hpp>
+#include <geometry_test_common.hpp>
+
+
+#include <boost/geometry/algorithms/envelope.hpp>
+#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry/algorithms/buffer.hpp>
+#include <boost/geometry/algorithms/centroid.hpp>
+#include <boost/geometry/algorithms/union.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/algorithms/intersects.hpp>
+
+#include <boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp>
+
+#include <boost/geometry/strategies/buffer.hpp>
+
+
+
+#include <boost/geometry/io/wkt/wkt.hpp>
+
+
+#if defined(TEST_WITH_SVG)
+
+#include <boost/geometry/io/svg/svg_mapper.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
+
+template <typename Geometry, typename Mapper, typename RescalePolicy>
+void post_map(Geometry const& geometry, Mapper& mapper, RescalePolicy const& rescale_policy)
+{
+    typedef typename bg::point_type<Geometry>::type point_type;
+    typedef bg::detail::overlay::turn_info
+    <
+        point_type,
+        typename bg::segment_ratio_type<point_type, RescalePolicy>::type
+    > turn_info;
+
+    std::vector<turn_info> turns;
+
+    bg::detail::self_get_turn_points::no_interrupt_policy policy;
+    bg::self_turns
+        <
+            bg::detail::overlay::assign_null_policy
+        >(geometry, rescale_policy, turns, policy);
+
+    BOOST_FOREACH(turn_info const& turn, turns)
+    {
+        mapper.map(turn.point, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1", 3);
+    }
+}
+
+template <typename SvgMapper, typename Tag>
+struct svg_visitor
+{
+    class si
+    {
+    private :
+        bg::segment_identifier m_id;
+
+    public :
+        inline si(bg::segment_identifier const& id)
+            : m_id(id)
+        {}
+
+        template <typename Char, typename Traits>
+        inline friend std::basic_ostream<Char, Traits>& operator<<(
+                std::basic_ostream<Char, Traits>& os,
+                si const& s)
+        {
+            os << s.m_id.multi_index << "." << s.m_id.segment_index;
+            return os;
+        }
+    };
+
+
+    SvgMapper& m_mapper;
+
+    svg_visitor(SvgMapper& mapper)
+        : m_mapper(mapper)
+    {}
+
+    template <typename Turns>
+    inline void map_turns(Turns const& turns)
+    {
+        namespace bgdb = boost::geometry::detail::buffer;
+        typedef typename boost::range_value<Turns const>::type turn_type;
+        typedef typename turn_type::point_type point_type;
+        typedef typename turn_type::robust_point_type robust_point_type;
+
+        std::map<robust_point_type, int, bg::less<robust_point_type> > offsets;
+
+        for (typename boost::range_iterator<Turns const>::type it =
+            boost::begin(turns); it != boost::end(turns); ++it)
+        {
+            char color = 'g';
+            std::string fill = "fill:rgb(0,255,0);";
+            switch(it->location)
+            {
+                case bgdb::inside_buffer : fill = "fill:rgb(255,0,0);"; color = 'r'; break;
+                case bgdb::inside_original : fill = "fill:rgb(0,0,255);"; color = 'b'; break;
+            }
+            if (it->blocked())
+            {
+                fill = "fill:rgb(128,128,128);"; color = '-';
+            }
+
+            fill += "fill-opacity:0.7;";
+            std::ostringstream out;
+            out << it->operations[0].piece_index << "/" << it->operations[1].piece_index
+                << " " << si(it->operations[0].seg_id) << "/" << si(it->operations[1].seg_id)
+                << std::endl;
+            out << " " << bg::method_char(it->method)
+                << ":" << bg::operation_char(it->operations[0].operation)
+                << "/" << bg::operation_char(it->operations[1].operation);
+            out << " " << (it->count_within > 0 ? "w" : "")
+                << (it->count_on_multi > 0 ? "m" : "")
+                << (it->count_on_occupied > 0 ? "o" : "")
+                << (it->count_on_offsetted > 0 ? "b" : "") // b: offsetted border
+                << (it->count_on_helper > 0 ? "h" : "")
+                ;
+
+            offsets[it->mapped_robust_point] += 10;
+            int offset = offsets[it->mapped_robust_point];
+
+            m_mapper.map(it->point, fill, 6);
+            m_mapper.text(it->point, out.str(), "fill:rgb(0,0,0);font-family='Arial';font-size:9px;", 5, offset);
+
+            offsets[it->mapped_robust_point] += 25;
+        }
+    }
+
+    template <typename Pieces, typename OffsettedRings>
+    inline void map_pieces(Pieces const& pieces,
+                OffsettedRings const& offsetted_rings,
+                bool do_pieces = true, bool do_indices = true)
+    {
+        typedef typename boost::range_value<Pieces const>::type piece_type;
+        typedef typename boost::range_value<OffsettedRings const>::type ring_type;
+
+        for(typename boost::range_iterator<Pieces const>::type it = boost::begin(pieces);
+            it != boost::end(pieces);
+            ++it)
+        {
+            const piece_type& piece = *it;
+            bg::segment_identifier seg_id = piece.first_seg_id;
+            if (seg_id.segment_index < 0)
+            {
+                continue;
+            }
+
+            ring_type corner;
+
+
+            ring_type const& ring = offsetted_rings[seg_id.multi_index];
+
+            std::copy(boost::begin(ring) + seg_id.segment_index,
+                    boost::begin(ring) + piece.last_segment_index,
+                    std::back_inserter(corner));
+            std::copy(boost::begin(piece.helper_segments),
+                    boost::end(piece.helper_segments),
+                    std::back_inserter(corner));
+
+            if (corner.empty())
+            {
+                continue;
+            }
+
+            if (do_pieces)
+            {
+                std::string style = "opacity:0.3;stroke:rgb(0,0,0);stroke-width:1;";
+                m_mapper.map(corner,
+                    piece.type == bg::strategy::buffer::buffered_segment
+                    ? style + "fill:rgb(255,128,0);"
+                    : style + "fill:rgb(255,0,0);");
+            }
+
+            if (do_indices)
+            {
+
+                // Put starting piece_index / segment_index in centroid
+                typedef typename bg::point_type<ring_type>::type point_type;
+
+                point_type centroid;
+                if (corner.size() > 3)
+                {
+                    bg::centroid(corner, centroid);
+                }
+                else
+                {
+                    centroid = corner.front();
+                }
+                std::ostringstream out;
+                out << piece.index << "/" << piece.first_seg_id.segment_index << ".." << piece.last_segment_index - 1;
+                m_mapper.text(centroid, out.str(), "fill:rgb(255,0,0);font-family='Arial';", 5, 5);
+            }
+        }
+    }
+
+    template <typename TraversedRings>
+    inline void map_traversed_rings(TraversedRings const& traversed_rings)
+    {
+        for(typename boost::range_iterator<TraversedRings const>::type it
+                = boost::begin(traversed_rings); it != boost::end(traversed_rings); ++it)
+        {
+            m_mapper.map(*it, "opacity:0.4;fill:none;stroke:rgb(0,255,0);stroke-width:8");
+        }
+    }
+
+    template <typename OffsettedRings>
+    inline void map_offsetted_rings(OffsettedRings const& offsetted_rings)
+    {
+        for(typename boost::range_iterator<OffsettedRings const>::type it
+                = boost::begin(offsetted_rings); it != boost::end(offsetted_rings); ++it)
+        {
+            if (it->discarded())
+            {
+                m_mapper.map(*it, "opacity:0.4;fill:none;stroke:rgb(255,0,0);stroke-width:8");
+            }
+            else
+            {
+                m_mapper.map(*it, "opacity:0.4;fill:none;stroke:rgb(0,0,255);stroke-width:8");
+            }
+        }
+    }
+
+    template <typename PieceCollection>
+    inline void apply(PieceCollection const& collection)
+    {
+        map_pieces(collection.m_pieces, collection.offsetted_rings);
+        map_turns(collection.m_turns);
+//        map_traversed_rings(collection.traversed_rings);
+//        map_offsetted_rings(collection.offsetted_rings);
+    }
+};
+
+#endif
+
+//-----------------------------------------------------------------------------
+template <template<typename, typename> class JoinStrategy>
+struct JoinTestProperties { };
+
+template<> struct JoinTestProperties<boost::geometry::strategy::buffer::join_round>
+{ 
+    static std::string name() { return "round"; }
+    static double tolerance() { return 0.1; }
+};
+
+template<> struct JoinTestProperties<boost::geometry::strategy::buffer::join_miter>
+{ 
+    static std::string name() { return "miter"; }
+    static double tolerance() { return 0.001; }
+};
+
+template<> struct JoinTestProperties<boost::geometry::strategy::buffer::join_round_by_divide>
+{ 
+    static std::string name() { return "divide"; }
+    static double tolerance() { return 0.1; }
+};
+
+
+//-----------------------------------------------------------------------------
+template <template<typename, typename> class EndStrategy>
+struct EndTestProperties { };
+
+template<> struct EndTestProperties<boost::geometry::strategy::buffer::end_round>
+{ 
+    static std::string name() { return "round"; }
+    static double tolerance() { return 0.1; }
+};
+
+template<> struct EndTestProperties<boost::geometry::strategy::buffer::end_flat>
+{ 
+    static std::string name() { return "flat"; }
+    static double tolerance() { return 0.001; }
+};
+
+template<> struct EndTestProperties<boost::geometry::strategy::buffer::end_skip>
+{ 
+    static std::string name() { return ""; }
+    static double tolerance() { return 0.001; }
+};
+
+template
+<
+    typename GeometryOut,
+    template<typename, typename> class JoinStrategy,
+    template<typename, typename> class EndStrategy,
+    typename Geometry
+>
+void test_buffer(std::string const& caseid, Geometry const& geometry,
+            bool /*check*/, double expected_area,
+            double distance_left, double distance_right)
+{
+    namespace bg = boost::geometry;
+
+    typedef typename bg::coordinate_type<Geometry>::type coordinate_type;
+    typedef typename bg::point_type<Geometry>::type point_type;
+    typedef bg::strategy::buffer::distance_asymmetric<coordinate_type> distance;
+
+    typedef typename bg::ring_type<GeometryOut>::type ring_type;
+
+	typedef typename bg::tag<Geometry>::type tag;
+	// TODO use something different here:
+	std::string type = boost::is_same<tag, bg::polygon_tag>::value ? "poly"
+		: boost::is_same<tag, bg::linestring_tag>::value ? "line"
+		: boost::is_same<tag, bg::point_tag>::value ? "point"
+		: boost::is_same<tag, bg::multi_polygon_tag>::value ? "multipoly"
+		: boost::is_same<tag, bg::multi_linestring_tag>::value ? "multiline"
+		: boost::is_same<tag, bg::multi_point_tag>::value ? "multipoint"
+		: ""
+		;
+
+    typedef typename bg::point_type<GeometryOut>::type output_point_type;
+
+    if (distance_right < -998)
+    {
+        distance_right = distance_left;
+    }
+
+    std::string join_name = JoinTestProperties<JoinStrategy>::name();
+    std::string end_name = EndTestProperties<EndStrategy>::name();
+
+    if (boost::is_same<tag, bg::point_tag>::value 
+        || boost::is_same<tag, bg::multi_point_tag>::value)
+    {
+        join_name.clear();
+    }
+
+    std::ostringstream complete;
+    complete
+        << type << "_"
+        << caseid << "_"
+        << string_from_type<coordinate_type>::name()
+        << "_" << join_name
+        << (end_name.empty() ? "" : "_") << end_name
+        << (distance_left < 0 && distance_right < 0 ? "_deflate" : "")
+         // << "_" << point_buffer_count
+        ;
+
+    //std::cout << complete.str() << std::endl;
+
+    std::ostringstream filename;
+    filename << "buffer_" << complete.str() << ".svg";
+
+#if defined(TEST_WITH_SVG)
+    std::ofstream svg(filename.str().c_str());
+    typedef bg::svg_mapper<point_type> mapper_type;
+    mapper_type mapper(svg, 1000, 1000);
+
+    {
+        bg::model::box<point_type> box;
+        bg::envelope(geometry, box);
+        double d = std::abs(distance_left) + std::abs(distance_right);
+
+        bg::buffer(box, box, d * (join_name == "miter" ? 2.0 : 1.1));
+        mapper.add(box);
+    }
+
+    svg_visitor<mapper_type, tag> visitor(mapper);
+#else
+    bg::detail::buffer::visit_pieces_default_policy visitor;
+#endif
+
+    JoinStrategy
+        <
+            point_type,
+            output_point_type
+        > join_strategy;
+
+    EndStrategy
+        <
+            point_type,
+            output_point_type
+        > end_strategy;
+
+    bg::strategy::buffer::distance_asymmetric
+        <
+            coordinate_type
+        > 
+    distance_strategy(distance_left, distance_right);
+
+    typedef typename bg::point_type<Geometry>::type point_type;
+    typedef typename bg::rescale_policy_type<point_type>::type
+        rescale_policy_type;
+
+    rescale_policy_type rescale_policy
+            = bg::get_rescale_policy<rescale_policy_type>(geometry);
+
+    std::vector<GeometryOut> buffered;
+
+    bg::buffer_inserter<GeometryOut>(geometry, std::back_inserter(buffered),
+                        distance_strategy, 
+                        join_strategy,
+                        end_strategy,
+                        rescale_policy,
+                        visitor);
+
+    typename bg::default_area_result<GeometryOut>::type area = 0;
+    BOOST_FOREACH(GeometryOut const& polygon, buffered)
+    {
+        area += bg::area(polygon);
+    }
+
+    //std::cout << caseid << " " << distance_left << std::endl;
+    //std::cout << "INPUT: " << bg::wkt(geometry) << std::endl;
+    //std::cout << "OUTPUT: " << area << std::endl;
+    //BOOST_FOREACH(GeometryOut const& polygon, buffered)
+    //{
+    //    std::cout << bg::wkt(polygon) << std::endl;
+    //}
+
+
+    if (expected_area > -0.1)
+    {
+        double tol = JoinTestProperties<JoinStrategy>::tolerance() 
+            + EndTestProperties<EndStrategy>::tolerance();
+
+        if (expected_area < 1.0e-5)
+        {
+            tol /= 1.0e6;
+        }
+
+        typename bg::default_area_result<GeometryOut>::type tolerance = tol;
+
+
+        BOOST_CHECK_MESSAGE
+            (
+                bg::math::abs(area - expected_area) < tolerance,
+                complete.str() << " not as expected. " 
+                << std::setprecision(18)
+                << " Expected: "  << expected_area
+                << " Detected: "  << area
+            );
+
+        // Be sure resulting polygon does not contain
+        // self-intersections
+        BOOST_FOREACH(GeometryOut const& polygon, buffered)
+        {
+            BOOST_CHECK_MESSAGE
+                (
+                    ! bg::detail::overlay::has_self_intersections(polygon,
+                            rescale_policy, false),
+                    complete.str() << " output is self-intersecting. "
+                );
+        }
+    }
+
+#if defined(TEST_WITH_SVG)
+    // Map input geometry in green
+    mapper.map(geometry, "opacity:0.5;fill:rgb(0,128,0);stroke:rgb(0,128,0);stroke-width:10");
+
+    BOOST_FOREACH(GeometryOut const& polygon, buffered)
+    {
+        mapper.map(polygon, "opacity:0.4;fill:rgb(255,255,128);stroke:rgb(0,0,0);stroke-width:3");
+        post_map(polygon, mapper, rescale_policy);
+    }
+#endif
+}
+
+
+#ifdef BOOST_GEOMETRY_CHECK_WITH_POSTGIS
+static int counter = 0;
+#endif
+
+template
+<
+    typename Geometry,
+    template<typename, typename> class JoinStrategy,
+    template<typename, typename> class EndStrategy,
+    typename GeometryOut
+>
+void test_one(std::string const& caseid, std::string const& wkt,
+        double expected_area,
+        double distance_left, double distance_right = -999)
+{
+    namespace bg = boost::geometry;
+    Geometry g;
+    bg::read_wkt(wkt, g);
+
+    typedef typename bg::point_type<Geometry>::type point_type;
+
+
+#ifdef BOOST_GEOMETRY_CHECK_WITH_POSTGIS
+    std::cout
+        << (counter > 0 ? "union " : "")
+        << "select " << counter++
+        << ", '" << caseid << "' as caseid"
+        << ", ST_Area(ST_Buffer(ST_GeomFromText('" << wkt << "'), "
+        << distance_left
+        << ", 'endcap=" << end_name << " join=" << join_name << "'))"
+        << ", "  << expected_area
+        << std::endl;
+#endif
+
+    test_buffer<GeometryOut, JoinStrategy, EndStrategy>
+            (caseid, g, false, expected_area,
+            distance_left, distance_right);
+}
+
+
+
+#endif
diff --git a/test/algorithms/centroid.cpp b/test/algorithms/centroid.cpp
index 607eb86c4..f3ef78688 100644
--- a/test/algorithms/centroid.cpp
+++ b/test/algorithms/centroid.cpp
@@ -145,7 +145,10 @@ int test_main(int, char* [])
     test_3d<boost::tuple<ttmath_big, ttmath_big, ttmath_big> >();
 #endif
 
+#ifndef NDEBUG
+    // The test currently fails in release mode. TODO: fix this
     test_large_integers();
+#endif
     test_exceptions<bg::model::d2::point_xy<double> >();
 
     return 0;
diff --git a/test/algorithms/comparable_distance.cpp b/test/algorithms/comparable_distance.cpp
index 294321c4f..7ae30a028 100644
--- a/test/algorithms/comparable_distance.cpp
+++ b/test/algorithms/comparable_distance.cpp
@@ -1,9 +1,15 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -18,17 +24,12 @@
 #include <boost/mpl/if.hpp>
 #include <geometry_test_common.hpp>
 
-#include <boost/geometry/geometry.hpp>
-
-#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/geometries/linestring.hpp>
-
 #include <boost/geometry/algorithms/comparable_distance.hpp>
-#include <boost/geometry/strategies/strategies.hpp>
-
 
 #include <boost/geometry/geometries/geometries.hpp>
-
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
 
 template <typename P>
 void test_distance_result()
@@ -133,9 +134,40 @@ void test_all()
     test_distance_linestring<P>();
 }
 
+template <typename T>
+void test_double_result_from_integer()
+{
+    typedef bg::model::point<T, 2, bg::cs::cartesian> point_type;
+
+    point_type point;
+
+    // Check linestring
+    bg::model::linestring<point_type> linestring;
+    bg::read_wkt("POINT(2 2)", point);
+    bg::read_wkt("LINESTRING(4 1,1 4)", linestring);
+
+    double normal_distance = bg::distance(point, linestring);
+    double comparable_distance = bg::comparable_distance(point, linestring);
+
+    BOOST_CHECK_CLOSE(normal_distance, std::sqrt(0.5), 0.001);
+    BOOST_CHECK_CLOSE(comparable_distance, 0.5, 0.001);
+
+    // Check polygon
+    bg::model::polygon<point_type> polygon;
+    bg::read_wkt("POLYGON((0 0,1 9,8 1,0 0),(1 1,4 1,1 4,1 1))", polygon);
+
+    normal_distance = bg::distance(point, polygon);
+    comparable_distance = bg::comparable_distance(point, polygon);
+
+    BOOST_CHECK_CLOSE(normal_distance, std::sqrt(0.5), 0.001);
+    BOOST_CHECK_CLOSE(comparable_distance, 0.5, 0.001);
+}
+
 int test_main(int, char* [])
 {
-    //test_all<bg::model::d2::point_xy<int> >();
+    test_double_result_from_integer<int>();
+    test_double_result_from_integer<boost::long_long_type>();
+
     test_all<bg::model::d2::point_xy<float> >();
     test_all<bg::model::d2::point_xy<double> >();
 
diff --git a/test/algorithms/convert.cpp b/test/algorithms/convert.cpp
index 90856ff4e..a2758832d 100644
--- a/test/algorithms/convert.cpp
+++ b/test/algorithms/convert.cpp
@@ -26,14 +26,14 @@ void test_mixed_point_types()
     // Box
     test_mixed_identical_result
         <
-            bg::model::box<Point1>, 
+            bg::model::box<Point1>,
             bg::model::box<Point2>
         >
         ("POLYGON((1 2,1 4,3 4,3 2,1 2))");
 
     test_mixed_identical_result
         <
-            bg::model::segment<Point1>, 
+            bg::model::segment<Point1>,
             bg::model::segment<Point2>
         >
         ("LINESTRING(1 1,2 2)");
@@ -41,68 +41,71 @@ void test_mixed_point_types()
     // Linestring
     test_mixed_identical_result
         <
-            bg::model::linestring<Point1>, 
-            bg::model::linestring<Point2> 
+            bg::model::linestring<Point1>,
+            bg::model::linestring<Point2>
         >
         ("LINESTRING(1 1,2 2)");
 
     // Ring
     test_mixed_identical_result
         <
-            bg::model::ring<Point1>, 
-            bg::model::ring<Point2> 
+            bg::model::ring<Point1>,
+            bg::model::ring<Point2>
         >
         ("POLYGON((1 1,2 2,3 0,1 1))");
 
     test_mixed_reversible_result
         <
-            bg::model::ring<Point1, true>, 
-            bg::model::ring<Point2, false> 
+            bg::model::ring<Point1, true>,
+            bg::model::ring<Point2, false>
         >
         (
-            "POLYGON((1 1,2 2,3 0,1 1))", 
+            "POLYGON((1 1,2 2,3 0,1 1))",
             "POLYGON((1 1,3 0,2 2,1 1))"
         );
 
     test_mixed
         <
-            bg::model::ring<Point1, true, true>, 
-            bg::model::ring<Point2, true, false> 
+            bg::model::ring<Point1, true, true>,
+            bg::model::ring<Point2, true, false>
         >
         (
-            "POLYGON((1 1,2 2,3 0,1 1))", 
-            "POLYGON((1 1,2 2,3 0))"
+            "POLYGON((1 1,2 2,3 0,1 1))",
+            "POLYGON((1 1,2 2,3 0))",
+            3
         );
 
     test_mixed
         <
-            bg::model::ring<Point1, true, false>, 
-            bg::model::ring<Point2, true, true> 
+            bg::model::ring<Point1, true, false>,
+            bg::model::ring<Point2, true, true>
         >
         (
-            "POLYGON((1 1,2 2,3 0))", 
-            "POLYGON((1 1,2 2,3 0,1 1))"
+            "POLYGON((1 1,2 2,3 0))",
+            "POLYGON((1 1,2 2,3 0,1 1))",
+            4
         );
 
     // Polygon
     test_mixed_reversible_result
         <
-            bg::model::polygon<Point1, true>, 
-            bg::model::polygon<Point2, false> 
+            bg::model::polygon<Point1, true>,
+            bg::model::polygon<Point2, false>
         >
         (
-            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))", 
+            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))",
             "POLYGON((0 0,5 0,5 5,0 5,0 0),(1 1,2 4,3 2,1 1))"
         );
 
     test_mixed
         <
             bg::model::polygon<Point1>,
-            bg::model::polygon<Point2, false, false> 
+            bg::model::polygon<Point2, false, false>
         >
         (
-            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))", 
-            "POLYGON((0 0,5 0,5 5,0 5),(1 1,2 4,3 2))"
+            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))",
+            "POLYGON((0 0,5 0,5 5,0 5,0 0),(1 1,2 4,3 2,1 1))",
+            7 // WKT is closed, polygon is open
         );
     // (polygon uses ring, so other tests omitted here)
 
@@ -110,134 +113,145 @@ void test_mixed_point_types()
     // ring <-> polygon
     test_mixed_identical_result
         <
-            bg::model::polygon<Point1>, 
-            bg::model::ring<Point2> 
+            bg::model::polygon<Point1>,
+            bg::model::ring<Point2>
         >
         ("POLYGON((1 1,2 2,3 0,1 1))");
 
     test_mixed_reversible_result
         <
-            bg::model::polygon<Point1, true>, 
-            bg::model::ring<Point2, false> 
+            bg::model::polygon<Point1, true>,
+            bg::model::ring<Point2, false>
         >
-        (   
-            "POLYGON((1 1,2 2,3 0,1 1))", 
+        (
+            "POLYGON((1 1,2 2,3 0,1 1))",
             "POLYGON((1 1,3 0,2 2,1 1))"
         );
 
     // Any hole will be omitted going from polygon to ring
     test_mixed
         <
-            bg::model::polygon<Point1>, 
-            bg::model::ring<Point2> 
+            bg::model::polygon<Point1>,
+            bg::model::ring<Point2>
         >
         (
-            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))", 
-            "POLYGON((0 0,0 5,5 5,5 0,0 0))"
+            "POLYGON((0 0,0 5,5 5,5 0,0 0),(1 1,3 2,2 4,1 1))",
+            "POLYGON((0 0,0 5,5 5,5 0,0 0))",
+            5
         );
 
     // point -> box
     test_mixed
         <
-            Point1, 
-            bg::model::box<Point2> 
+            Point1,
+            bg::model::box<Point2>
         >
         (
-            "POINT(0 0)", 
-            "POLYGON((0 0,0 0,0 0,0 0,0 0))"
+            "POINT(0 0)",
+            "POLYGON((0 0,0 0,0 0,0 0,0 0))",
+            4
         );
 
     // segment -> line
     test_mixed
         <
             bg::model::segment<Point1>,
-            bg::model::linestring<Point2> 
+            bg::model::linestring<Point2>
         >
         (
-            "LINESTRING(0 0,1 1)", 
-            "LINESTRING(0 0,1 1)"
+            "LINESTRING(0 0,1 1)",
+            "LINESTRING(0 0,1 1)",
+            2
         );
 
     // box -> ring ( <- is NYI)
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::ring<Point2> 
+            bg::model::box<Point1>,
+            bg::model::ring<Point2>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,0 2,2 2,2 0,0 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,0 2,2 2,2 0,0 0))",
+            5
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::ring<Point2, false> 
+            bg::model::box<Point1>,
+            bg::model::ring<Point2, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,2 0,2 2,0 2,0 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,2 0,2 2,0 2,0 0))",
+            5
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::ring<Point2, true, false> 
+            bg::model::box<Point1>,
+            bg::model::ring<Point2, true, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,0 2,2 2,2 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,0 2,2 2,2 0))",
+            4
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::ring<Point2, false, false> 
+            bg::model::box<Point1>,
+            bg::model::ring<Point2, false, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,2 0,2 2,0 2))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,2 0,2 2,0 2))",
+            4
         );
 
     // box -> polygon ( <- is NYI)
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::polygon<Point2> 
+            bg::model::box<Point1>,
+            bg::model::polygon<Point2>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,0 2,2 2,2 0,0 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,0 2,2 2,2 0,0 0))",
+            5
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::polygon<Point2, false> 
+            bg::model::box<Point1>,
+            bg::model::polygon<Point2, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,2 0,2 2,0 2,0 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,2 0,2 2,0 2,0 0))",
+            5
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::polygon<Point2, true, false> 
+            bg::model::box<Point1>,
+            bg::model::polygon<Point2, true, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,0 2,2 2,2 0))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,0 2,2 2,2 0,0 0))",
+            4 // WKT is closed, polygon is open
         );
 
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::polygon<Point2, false, false> 
+            bg::model::box<Point1>,
+            bg::model::polygon<Point2, false, false>
         >
         (
-            "BOX(0 0,2 2)", 
-            "POLYGON((0 0,2 0,2 2,0 2))"
+            "BOX(0 0,2 2)",
+            "POLYGON((0 0,2 0,2 2,0 2,0 0))",
+            4 // WKT is closed, polygon is open
         );
 }
 
@@ -249,7 +263,7 @@ void test_mixed_point_types_3d()
 
     test_mixed_identical_result
         <
-            bg::model::segment<Point1>, 
+            bg::model::segment<Point1>,
             bg::model::segment<Point2>
         >
         ("LINESTRING(1 2 3,4 5 6)");
@@ -257,8 +271,8 @@ void test_mixed_point_types_3d()
     // Linestring
     test_mixed_identical_result
         <
-            bg::model::linestring<Point1>, 
-            bg::model::linestring<Point2> 
+            bg::model::linestring<Point1>,
+            bg::model::linestring<Point2>
         >
         ("LINESTRING(1 2 3,4 5 6,7 8 9)");
 
@@ -266,11 +280,12 @@ void test_mixed_point_types_3d()
     test_mixed
         <
             bg::model::segment<Point1>,
-            bg::model::linestring<Point2> 
+            bg::model::linestring<Point2>
         >
         (
-            "LINESTRING(1 2 3,4 5 6)", 
-            "LINESTRING(1 2 3,4 5 6)"
+            "LINESTRING(1 2 3,4 5 6)",
+            "LINESTRING(1 2 3,4 5 6)",
+            2
         );
 }
 
diff --git a/test/algorithms/convex_hull.cpp b/test/algorithms/convex_hull.cpp
index f268aa90e..dab96ebd8 100644
--- a/test/algorithms/convex_hull.cpp
+++ b/test/algorithms/convex_hull.cpp
@@ -45,7 +45,7 @@ void test_all()
                 12, 8, 5.245);
 
     test_geometry<bg::model::box<P> >("box(0 0,2 2)", 4, 5, 4);
-    
+
     test_empty_input<bg::model::linestring<P> >();
     test_empty_input<bg::model::ring<P> >();
     test_empty_input<bg::model::polygon<P> >();
diff --git a/test/algorithms/correct.cpp b/test/algorithms/correct.cpp
index b92928659..bd5e7f7bd 100644
--- a/test/algorithms/correct.cpp
+++ b/test/algorithms/correct.cpp
@@ -14,37 +14,18 @@
 
 #include <sstream>
 
-#include <geometry_test_common.hpp>
+#include <algorithms/test_correct.hpp>
 
-#include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/io/dsv/write.hpp>
 
-#include <boost/geometry/io/wkt/read.hpp>
-#include <boost/geometry/io/wkt/write.hpp>
-
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/box.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
 
-template <typename Geometry>
-void test_geometry(std::string const& wkt, std::string const& expected)
-{
-    Geometry geometry;
-
-    bg::read_wkt(wkt, geometry);
-    bg::correct(geometry);
-
-    std::ostringstream out;
-    out << bg::wkt(geometry);
-
-    BOOST_CHECK_EQUAL(out.str(), expected);
-}
-
-
 // Note: 3D/box test cannot be done using WKT because:
 // -> wkt-box does not exist
 // -> so it is converted to a ring
diff --git a/test/algorithms/covered_by.cpp b/test/algorithms/covered_by.cpp
index 32683cbe7..b4a00ea89 100644
--- a/test/algorithms/covered_by.cpp
+++ b/test/algorithms/covered_by.cpp
@@ -1,6 +1,8 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
+
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
 // 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)
@@ -37,6 +39,22 @@ void test_all()
 
     */
 
+    typedef bg::model::segment<P> seg;
+    test_geometry<P, seg>("POINT(1 1)", "LINESTRING(0 0, 2 2)", true);
+    test_geometry<P, seg>("POINT(0 0)", "LINESTRING(0 0, 1 1)", true);
+    test_geometry<P, seg>("POINT(1 0)", "LINESTRING(0 0, 1 1)", false);
+
+    // linestrings
+    typedef bg::model::linestring<P> ls;
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0,1 1,2 2)", true);
+    test_geometry<P, ls>("POINT(3 3)", "LINESTRING(0 0,1 1,2 2)", false);
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0,2 2,3 3)", true);
+
+    // multi_linestrings
+    typedef bg::model::multi_linestring<ls> mls;
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,1 1,2 2),(0 0,0 1))", true);
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,1 1,2 2),(0 0,0 1),(0 0,1 0))", true);
+
     typedef bg::model::box<P> box_type;
 
     test_geometry<P, box_type>("POINT(1 1)", "BOX(0 0,2 2)", true);
@@ -52,22 +70,6 @@ void test_all()
     test_geometry<box_type, box_type>("BOX(1 1,3 3)", "BOX(0 0,3 3)", true);
     test_geometry<box_type, box_type>("BOX(1 2,3 3)", "BOX(0 0,3 3)", true);
     test_geometry<box_type, box_type>("BOX(1 1,4 3)", "BOX(0 0,3 3)", false);
-
-
-    /*
-    test_within_code<P, box_type>("POINT(1 1)", "BOX(0 0,2 2)", 1);
-    test_within_code<P, box_type>("POINT(1 0)", "BOX(0 0,2 2)", 0);
-    test_within_code<P, box_type>("POINT(0 1)", "BOX(0 0,2 2)", 0);
-    test_within_code<P, box_type>("POINT(0 3)", "BOX(0 0,2 2)", -1);
-    test_within_code<P, box_type>("POINT(3 3)", "BOX(0 0,2 2)", -1);
-
-    test_within_code<box_type, box_type>("BOX(1 1,2 2)", "BOX(0 0,3 3)", 1);
-    test_within_code<box_type, box_type>("BOX(0 1,2 2)", "BOX(0 0,3 3)", 0);
-    test_within_code<box_type, box_type>("BOX(1 0,2 2)", "BOX(0 0,3 3)", 0);
-    test_within_code<box_type, box_type>("BOX(1 1,2 3)", "BOX(0 0,3 3)", 0);
-    test_within_code<box_type, box_type>("BOX(1 1,3 2)", "BOX(0 0,3 3)", 0);
-    test_within_code<box_type, box_type>("BOX(1 1,3 4)", "BOX(0 0,3 3)", -1);
-    */
 }
 
 
@@ -90,7 +92,8 @@ void test_mixed_of()
     typedef boost::geometry::model::box<P1> box_type1;
     typedef boost::geometry::model::box<P2> box_type2;
 
-    polygon_type1 poly1, poly2;
+    polygon_type1 poly1;
+    polygon_type2 poly2;
     boost::geometry::read_wkt("POLYGON((0 0,0 5,5 5,5 0,0 0))", poly1);
     boost::geometry::read_wkt("POLYGON((0 0,0 5,5 5,5 0,0 0))", poly2);
 
diff --git a/test/algorithms/crosses.cpp b/test/algorithms/crosses.cpp
new file mode 100644
index 000000000..103791018
--- /dev/null
+++ b/test/algorithms/crosses.cpp
@@ -0,0 +1,97 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_crosses.hpp>
+
+template <typename P>
+void test_pl()
+{
+    /*typedef bg::model::multi_point<P> mpt;
+    typedef bg::model::linestring<P> ls;
+
+    // not implemented yet
+    test_geometry<mpt, ls>("MULTIPOINT(0 0,1 1)", "LINESTRING(0 0,1 0,3 3)", true);
+    test_geometry<mpt, ls>("MULTIPOINT(0 0,1 1)", "LINESTRING(0 0,1 1,3 3)", false);*/
+}
+
+template <typename P>
+void test_pa()
+{
+    /*typedef bg::model::multi_point<P> mpt;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    // not implemented yet
+    test_geometry<mpt, poly>("MULTIPOINT(0 0,6 6)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<mpt, poly>("MULTIPOINT(0 0,1 1)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);*/
+}
+
+template <typename P>
+void test_ll()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,4 4)", "LINESTRING(0 1,2 1,3 1)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2)", "LINESTRING(0 1,2 1)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,4 4)", "LINESTRING(0 1,1 1,2 2,3 2)", false);
+
+    test_geometry<ls, mls>("LINESTRING(0 0,2 2,4 4)", "MULTILINESTRING((0 1,4 1),(0 2,4 2))", true);
+    test_geometry<mls, ls>("MULTILINESTRING((0 1,4 1),(0 2,4 2))", "LINESTRING(0 0,2 2,4 4)", true);
+
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,2 2,4 4),(3 0,3 4))", "MULTILINESTRING((0 1,4 1),(0 2,4 2))", true);
+}
+
+template <typename P>
+void test_la()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+    typedef bg::model::ring<P> ring;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<ls, ring>("LINESTRING(0 0, 10 10)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<ls, poly>("LINESTRING(0 0, 10 10)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<ls, mpoly>("LINESTRING(0 0, 10 10)", "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))", true);
+
+    test_geometry<ls, poly>("LINESTRING(0 0, 10 0)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+    test_geometry<ls, poly>("LINESTRING(1 1, 5 5)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+
+    test_geometry<mls, ring>("MULTILINESTRING((1 1, 5 5),(6 6,7 7))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<mls, poly>("MULTILINESTRING((1 1, 5 5),(6 6,7 7))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);    
+    test_geometry<mls, mpoly>("MULTILINESTRING((1 1, 5 5),(6 6,7 7))", "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))", true);
+}
+
+template <typename P>
+void test_2d()
+{
+    test_pl<P>();
+    test_pa<P>();
+    test_ll<P>();
+    test_la<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_2d<bg::model::d2::point_xy<int> >();
+    test_2d<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_2d<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+   //test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
+
+    return 0;
+}
diff --git a/test/algorithms/detail/get_left_turns.cpp b/test/algorithms/detail/get_left_turns.cpp
new file mode 100644
index 000000000..4efb0df8a
--- /dev/null
+++ b/test/algorithms/detail/get_left_turns.cpp
@@ -0,0 +1,316 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+//
+// Copyright (c) 2012-2014 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)
+
+#include <geometry_test_common.hpp>
+
+#include <boost/algorithm/string/trim.hpp>
+#include <boost/assign/list_of.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/algorithms/detail/get_left_turns.hpp>
+
+#if defined(TEST_WITH_SVG)
+# include <boost/geometry/io/svg/svg_mapper.hpp>
+#endif
+
+namespace bglt = boost::geometry::detail::left_turns;
+
+#if defined(TEST_WITH_SVG)
+template <typename Point>
+inline Point further_than(Point const& p, Point const& origin, int mul, int div)
+{
+    typedef Point vector_type;
+
+    vector_type v = p;
+    bg::subtract_point(v, origin);
+
+    bg::divide_value(v, div);
+    bg::multiply_value(v, mul);
+    Point result = origin;
+    bg::add_point(result, v);
+    return result;
+}
+
+inline std::string get_color(int index)
+{
+    switch (index)
+    {
+        case 0 : return "rgb(0,192,0)";
+        case 1 : return "rgb(0,0,255)";
+        case 2 : return "rgb(255,0,0)";
+        case 3 : return "rgb(255,255,0)";
+    }
+    return "rgb(128,128,128)";
+}
+#endif
+
+
+template <typename Point>
+void test_one(std::string const& caseid,
+                Point const& p,
+                std::vector<bglt::turn_angle_info<Point> > const& angles,
+                std::string const& expected_sorted_indices,
+                std::string const& expected_left_indices)
+{
+    typedef Point vector_type;
+
+    std::vector<bglt::angle_info<Point> > sorted;
+    for (typename std::vector<bglt::turn_angle_info<Point> >::const_iterator it =
+        angles.begin(); it != angles.end(); ++it)
+    {
+        for (int i = 0; i < 2; i++)
+        {
+            bglt::angle_info<Point> info(it->seg_id, i == 0, it->points[i]);
+            sorted.push_back(info);
+        }
+    }
+
+    // Sort on angle
+    std::sort(sorted.begin(), sorted.end(), bglt::angle_less<Point>(p));
+
+    // Block all turns on the right side of any turn
+    bglt::block_turns_on_right_sides(angles, sorted);
+
+    // Check the sorting
+    {
+        std::ostringstream out;
+        out << std::boolalpha;
+        for (typename std::vector<bglt::angle_info<Point> >::const_iterator it =
+            sorted.begin(); it != sorted.end(); ++it)
+        {
+            out << " " << it->seg_id.segment_index
+                << "-" << it->incoming;
+        }
+        std::string detected = boost::trim_copy(out.str());
+        BOOST_CHECK_EQUAL(expected_sorted_indices, detected);
+    }
+
+
+    // Check outgoing lines
+    std::vector<bglt::left_turn> seg_ids;
+    bglt::get_left_turns(sorted, p, seg_ids);
+    {
+        std::ostringstream out;
+        out << std::boolalpha;
+        for (std::vector<bglt::left_turn>::const_iterator it =
+            seg_ids.begin(); it != seg_ids.end(); ++it)
+        {
+            out
+                << " " << it->from.segment_index
+                << "->" << it->to.segment_index
+                ;
+        }
+        std::string detected = boost::trim_copy(out.str());
+        BOOST_CHECK_EQUAL(expected_left_indices, detected);
+    }
+
+#if defined(TEST_WITH_SVG)
+    {
+        std::ostringstream filename;
+        filename << "get_left_turns_" << caseid
+            << "_" << string_from_type<typename bg::coordinate_type<Point>::type>::name()
+            << ".svg";
+
+        std::ofstream svg(filename.str().c_str());
+
+        bg::svg_mapper<Point> mapper(svg, 500, 500);
+        mapper.add(p);
+        for (typename std::vector<bglt::turn_angle_info<Point> >::const_iterator it =
+            angles.begin(); it != angles.end(); ++it)
+        {
+            // Add a point further then it->to_point, just for the mapping
+            for (int i = 0; i < 2; i++)
+            {
+                mapper.add(further_than(it->points[i], p, 12, 10));
+            }
+        }
+
+        int color_index = 0;
+        typedef bg::model::referring_segment<Point const> segment_type;
+        for (typename std::vector<bglt::turn_angle_info<Point> >::const_iterator it =
+            angles.begin(); it != angles.end(); ++it, color_index++)
+        {
+            for (int i = 0; i < 2; i++)
+            {
+                std::string style = "opacity:0.5;stroke-width:1;stroke:rgb(0,0,0);fill:" + get_color(color_index);
+
+                bool const incoming = i == 0;
+                Point const& pf = incoming ? it->points[i] : p;
+                Point const& pt = incoming ? p : it->points[i];
+                vector_type v = pt;
+                bg::subtract_point(v, pf);
+
+                bg::divide_value(v, 10.0);
+
+                // Generate perpendicular vector to right-side
+                vector_type perpendicular;
+                bg::set<0>(perpendicular, bg::get<1>(v));
+                bg::set<1>(perpendicular, -bg::get<0>(v));
+
+                bg::model::ring<Point> ring;
+                ring.push_back(pf);
+                ring.push_back(pt);
+
+                // Extra point at 9/10
+                {
+                    Point pe = pt;
+                    bg::add_point(pe, perpendicular);
+                    ring.push_back(pe);
+                }
+                {
+                    Point pe = pf;
+                    bg::add_point(pe, perpendicular);
+                    ring.push_back(pe);
+                }
+                ring.push_back(pf);
+
+                mapper.map(ring, style);
+
+                segment_type s(pf, pt);
+                mapper.map(s, "opacity:0.9;stroke-width:4;stroke:rgb(0,0,0);");
+            }
+        }
+
+        // Output angles for left-turns
+        for (std::vector<bglt::left_turn>::const_iterator ltit =
+            seg_ids.begin(); ltit != seg_ids.end(); ++ltit)
+        {
+            for (typename std::vector<bglt::angle_info<Point> >::const_iterator sit =
+                sorted.begin(); sit != sorted.end(); ++sit, color_index++)
+            {
+                Point pf, pt;
+                int factor = 0;
+                if (sit->seg_id == ltit->from && sit->incoming)
+                {
+                    pf = sit->point;
+                    pt = p;
+                    factor = -1; // left side
+                }
+                else if (sit->seg_id == ltit->to && ! sit->incoming)
+                {
+                    pf = p;
+                    pt = sit->point;
+                    factor = -1; // left side
+                }
+                if (factor != 0)
+                {
+                    vector_type v = pt;
+                    bg::subtract_point(v, pf);
+                    bg::divide_value(v, 10.0);
+
+                    // Generate perpendicular vector to right-side
+                    vector_type perpendicular;
+                    bg::set<0>(perpendicular, factor * bg::get<1>(v));
+                    bg::set<1>(perpendicular, -factor * bg::get<0>(v));
+
+                    bg::add_point(pf, v);
+                    bg::subtract_point(pt, v);
+
+                    bg::add_point(pf, perpendicular);
+                    bg::add_point(pt, perpendicular);
+
+                    segment_type s(pf, pt);
+                    mapper.map(s, "opacity:0.9;stroke-width:4;stroke:rgb(255,0,0);");
+                }
+            }
+        }
+
+        // Output texts with info about sorted/blocked
+        int index = 0;
+        for (typename std::vector<bglt::angle_info<Point> >::const_iterator it =
+            sorted.begin(); it != sorted.end(); ++it, ++index)
+        {
+            std::ostringstream out;
+            out << std::boolalpha;
+            out << " seg:" << it->seg_id.segment_index
+                << " " << (it->incoming ? "in" : "out")
+                << " idx:" << index
+                << (it->blocked ? " blocked" : "")
+                ;
+            mapper.text(further_than(it->point, p, 11, 10), out.str(), "fill:rgb(0,0,0);font-family='Verdana'");
+        }
+
+        mapper.map(p, "fill:rgb(255,0,0)");
+
+    }
+
+#endif
+
+}
+
+
+template <typename P>
+void test_all()
+{
+    using bglt::turn_angle_info;
+
+    test_one<P>("cross",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(100, 100), bg::make<P>(0, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 0), bg::make<P>(0, 100)))
+            , "1-true 2-true 1-false 2-false"
+            , "2->1"
+        );
+
+    test_one<P>("occupied",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(100, 100), bg::make<P>(0, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 0), bg::make<P>(0, 100)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 3), bg::make<P>(0, 30), bg::make<P>(100, 70)))
+            , "1-true 3-false 2-true 1-false 3-true 2-false"
+            , ""
+        );
+
+    test_one<P>("uu",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(0, 0), bg::make<P>(100, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 100), bg::make<P>(0, 100)))
+            , "2-true 1-false 1-true 2-false"
+            , "2->1 1->2"
+        );
+
+    test_one<P>("uu2",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(0, 0), bg::make<P>(100, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 100), bg::make<P>(0, 100)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 3), bg::make<P>(0, 50), bg::make<P>(100, 50)))
+            , "2-true 3-false 1-false 1-true 3-true 2-false"
+            , "2->3 3->2"
+        );
+
+    test_one<P>("uu3",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(0, 0), bg::make<P>(100, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 100), bg::make<P>(0, 100)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 3), bg::make<P>(50, 0), bg::make<P>(50, 100)))
+            , "3-false 2-true 1-false 3-true 1-true 2-false"
+            , "1->2"
+        );
+
+    test_one<P>("longer",
+        bg::make<P>(50, 50),   // ip
+        boost::assign::list_of
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 1), bg::make<P>(100, 100), bg::make<P>(0, 0)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 2), bg::make<P>(100, 0), bg::make<P>(0, 100)))
+            (turn_angle_info<P>(bg::segment_identifier(0, -1, -1, 3), bg::make<P>(90, 10), bg::make<P>(10, 10)))
+            , "1-true 2-true 3-true 1-false 3-false 2-false"
+            , "3->1"
+        );
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+
+    return 0;
+}
diff --git a/test/algorithms/detail/partition.cpp b/test/algorithms/detail/partition.cpp
index 4bf75529b..90cbe137f 100644
--- a/test/algorithms/detail/partition.cpp
+++ b/test/algorithms/detail/partition.cpp
@@ -89,13 +89,47 @@ struct box_visitor
     }
 };
 
+struct point_in_box_visitor
+{
+    int count;
+    point_in_box_visitor()
+        : count(0)
+    {}
+
+    template <typename Point, typename BoxItem>
+    inline void apply(Point const& point, BoxItem const& box_item)
+    {
+        if (bg::within(point, box_item.box))
+        {
+            count++;
+        }
+    }
+};
+
+struct reversed_point_in_box_visitor
+{
+    int count;
+    reversed_point_in_box_visitor()
+        : count(0)
+    {}
+
+    template <typename BoxItem, typename Point>
+    inline void apply(BoxItem const& box_item, Point const& point)
+    {
+        if (bg::within(point, box_item.box))
+        {
+            count++;
+        }
+    }
+};
+
 
 
 template <typename Box>
 void test_boxes(std::string const& wkt_box_list, double expected_area, int expected_count)
 {
     std::vector<std::string> wkt_boxes;
-    
+
     boost::split(wkt_boxes, wkt_box_list, boost::is_any_of(";"), boost::token_compress_on);
 
     typedef box_item<Box> sample;
@@ -119,7 +153,7 @@ void test_boxes(std::string const& wkt_box_list, double expected_area, int expec
 
 
 
-struct point_item 
+struct point_item
 {
     point_item()
         : id(0)
@@ -156,7 +190,7 @@ struct point_visitor
 {
     int count;
 
-    point_visitor() 
+    point_visitor()
         : count(0)
     {}
 
@@ -179,10 +213,10 @@ void test_points(std::string const& wkt1, std::string const& wkt2, int expected_
     bg::read_wkt(wkt2, mp2);
 
     int id = 1;
-    BOOST_FOREACH(point_item& p, mp1) 
+    BOOST_FOREACH(point_item& p, mp1)
     { p.id = id++; }
     id = 1;
-    BOOST_FOREACH(point_item& p, mp2) 
+    BOOST_FOREACH(point_item& p, mp2)
     { p.id = id++; }
 
     point_visitor visitor;
@@ -203,18 +237,18 @@ void test_all()
 
     test_boxes<box>(
         // 1           2             3               4             5             6             7
-        "box(0 0,1 1); box(0 0,2 2); box(9 9,10 10); box(8 8,9 9); box(4 4,6 6); box(2 4,6 8); box(7 1,8 2)", 
-        5, // Area(Intersection(1,2)) + A(I(5,6)) 
+        "box(0 0,1 1); box(0 0,2 2); box(9 9,10 10); box(8 8,9 9); box(4 4,6 6); box(2 4,6 8); box(7 1,8 2)",
+        5, // Area(Intersection(1,2)) + A(I(5,6))
         3);
 
     test_boxes<box>(
-        "box(0 0,10 10); box(4 4,6 6); box(3 3,7 7)", 
+        "box(0 0,10 10); box(4 4,6 6); box(3 3,7 7)",
             4 + 16 + 4,  // A(I(1,2)) + A(I(1,3)) + A(I(2,3))
             3);
 
     test_boxes<box>(
-        "box(0 2,10 3); box(3 1,4 5); box(7 1,8 5)", 
-            1 + 1,  // A(I(1,2)) + A(I(1,3)) 
+        "box(0 2,10 3); box(3 1,4 5); box(7 1,8 5)",
+            1 + 1,  // A(I(1,2)) + A(I(1,3))
             2);
 
     test_points("multipoint((1 1))", "multipoint((1 1))", 1);
@@ -224,6 +258,7 @@ void test_all()
 
 //------------------- higher volumes
 
+#if defined(TEST_WITH_SVG)
 template <typename SvgMapper>
 struct svg_visitor
 {
@@ -234,7 +269,7 @@ struct svg_visitor
     {}
 
     template <typename Box>
-    inline void apply(Box const& box, int level) 
+    inline void apply(Box const& box, int level)
     {
         /*
         std::string color("rgb(64,64,64)");
@@ -257,8 +292,7 @@ struct svg_visitor
 
     }
 };
-
-
+#endif
 
 
 template <typename Collection>
@@ -320,7 +354,7 @@ void test_many_points(int seed, int size, int count)
     bg::svg_mapper<point_item> mapper(svg, 800, 800);
 
     {
-        point_item p; 
+        point_item p;
         p.x = -1; p.y = -1; mapper.add(p);
         p.x = size + 1; p.y = size + 1; mapper.add(p);
     }
@@ -335,7 +369,9 @@ void test_many_points(int seed, int size, int count)
     point_visitor visitor;
     bg::partition
         <
-            bg::model::box<point_item>, get_point, ovelaps_point,
+            bg::model::box<point_item>,
+            get_point, ovelaps_point,
+            get_point, ovelaps_point,
             box_visitor_type
         >::apply(mp1, mp2, visitor, 2, box_visitor);
 
@@ -384,8 +420,6 @@ void fill_boxes(Collection& collection, int seed, int size, int count)
     }
 }
 
-
-
 void test_many_boxes(int seed, int size, int count)
 {
     typedef bg::model::box<point_item> box_type;
@@ -422,7 +456,7 @@ void test_many_boxes(int seed, int size, int count)
     bg::svg_mapper<point_item> mapper(svg, 800, 800);
 
     {
-        point_item p; 
+        point_item p;
         p.x = -1; p.y = -1; mapper.add(p);
         p.x = size + 1; p.y = size + 1; mapper.add(p);
     }
@@ -432,26 +466,169 @@ void test_many_boxes(int seed, int size, int count)
         mapper.map(item.box, "opacity:0.6;fill:rgb(50,50,210);stroke:rgb(0,0,0);stroke-width:1");
     }
 
-    typedef svg_visitor<bg::svg_mapper<point_item> > partition_visitor_type;
-    partition_visitor_type partition_visitor(mapper);
+    typedef svg_visitor<bg::svg_mapper<point_item> > partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor(mapper);
 
+#else
+    typedef bg::visit_no_policy partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor;
+#endif
 
     box_visitor<box_type> visitor;
     bg::partition
         <
-            box_type, get_box, ovelaps_box,
-            partition_visitor_type
-        >::apply(boxes, visitor, 2, partition_visitor);
+            box_type,
+            get_box, ovelaps_box,
+            get_box, ovelaps_box,
+            partition_box_visitor_type
+        >::apply(boxes, visitor, 2, partition_box_visitor);
 
     BOOST_CHECK_EQUAL(visitor.count, expected_count);
     BOOST_CHECK_CLOSE(visitor.area, expected_area, 0.001);
+}
 
+void test_two_collections(int seed1, int seed2, int size, int count)
+{
+    typedef bg::model::box<point_item> box_type;
+    std::vector<box_item<box_type> > boxes1, boxes2;
+
+    fill_boxes(boxes1, seed1, size, count);
+    fill_boxes(boxes2, seed2, size, count);
+
+    // Get expectations in quadratic loop
+    int expected_count = 0;
+    double expected_area = 0.0;
+    BOOST_FOREACH(box_item<box_type> const& item1, boxes1)
+    {
+        BOOST_FOREACH(box_item<box_type> const& item2, boxes2)
+        {
+            if (bg::intersects(item1.box, item2.box))
+            {
+                box_type b;
+                bg::intersection(item1.box, item2.box, b);
+                expected_area += bg::area(b);
+                expected_count++;
+            }
+        }
+    }
+
+
+#if defined(TEST_WITH_SVG)
+    std::ostringstream filename;
+    filename << "partition_boxes_" << seed1 << "_" << seed2 << ".svg";
+    std::ofstream svg(filename.str().c_str());
+
+    bg::svg_mapper<point_item> mapper(svg, 800, 800);
+
+    {
+        point_item p;
+        p.x = -1; p.y = -1; mapper.add(p);
+        p.x = size + 1; p.y = size + 1; mapper.add(p);
+    }
+
+    BOOST_FOREACH(box_item<box_type> const& item, boxes1)
+    {
+        mapper.map(item.box, "opacity:0.6;fill:rgb(50,50,210);stroke:rgb(0,0,0);stroke-width:1");
+    }
+    BOOST_FOREACH(box_item<box_type> const& item, boxes2)
+    {
+        mapper.map(item.box, "opacity:0.6;fill:rgb(0,255,0);stroke:rgb(0,0,0);stroke-width:1");
+    }
+
+    typedef svg_visitor<bg::svg_mapper<point_item> > partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor(mapper);
+#else
+    typedef bg::visit_no_policy partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor;
 #endif
+
+    box_visitor<box_type> visitor;
+    bg::partition
+        <
+            box_type,
+            get_box, ovelaps_box,
+            get_box, ovelaps_box,
+            partition_box_visitor_type
+        >::apply(boxes1, boxes2, visitor, 2, partition_box_visitor);
+
+    BOOST_CHECK_EQUAL(visitor.count, expected_count);
+    BOOST_CHECK_CLOSE(visitor.area, expected_area, 0.001);
 }
 
 
+void test_heterogenuous_collections(int seed1, int seed2, int size, int count)
+{
+    typedef bg::model::box<point_item> box_type;
+    std::vector<point_item> points;
+    std::vector<box_item<box_type> > boxes;
+
+    fill_points(points, seed1, size, count);
+    fill_boxes(boxes, seed2, size, count);
+
+    // Get expectations in quadratic loop
+    int expected_count = 0;
+    BOOST_FOREACH(point_item const& point, points)
+    {
+        BOOST_FOREACH(box_item<box_type> const& box_item, boxes)
+        {
+            if (bg::within(point, box_item.box))
+            {
+                expected_count++;
+            }
+        }
+    }
 
 
+#if defined(TEST_WITH_SVG)
+    std::ostringstream filename;
+    filename << "partition_heterogeneous_" << seed1 << "_" << seed2 << ".svg";
+    std::ofstream svg(filename.str().c_str());
+
+    bg::svg_mapper<point_item> mapper(svg, 800, 800);
+
+    {
+        point_item p;
+        p.x = -1; p.y = -1; mapper.add(p);
+        p.x = size + 1; p.y = size + 1; mapper.add(p);
+    }
+
+    BOOST_FOREACH(point_item const& point, points)
+    {
+        mapper.map(point, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1", 8);
+    }
+    BOOST_FOREACH(box_item<box_type> const& item, boxes)
+    {
+        mapper.map(item.box, "opacity:0.6;fill:rgb(0,255,0);stroke:rgb(0,0,0);stroke-width:1");
+    }
+
+    typedef svg_visitor<bg::svg_mapper<point_item> > partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor(mapper);
+#else
+    typedef bg::visit_no_policy partition_box_visitor_type;
+    partition_box_visitor_type partition_box_visitor;
+#endif
+
+    point_in_box_visitor visitor1;
+    bg::partition
+        <
+            box_type,
+            get_point, ovelaps_point,
+            get_box, ovelaps_box,
+            partition_box_visitor_type
+        >::apply(points, boxes, visitor1, 2, partition_box_visitor);
+
+    reversed_point_in_box_visitor visitor2;
+    bg::partition
+        <
+            box_type,
+            get_box, ovelaps_box,
+            get_point, ovelaps_point,
+            partition_box_visitor_type
+        >::apply(boxes, points, visitor2, 2, partition_box_visitor);
+
+    BOOST_CHECK_EQUAL(visitor1.count, expected_count);
+    BOOST_CHECK_EQUAL(visitor2.count, expected_count);
+}
 
 int test_main( int , char* [] )
 {
@@ -472,5 +649,10 @@ int test_main( int , char* [] )
         test_many_boxes(i, 20, i * 10);
     }
 
+    test_two_collections(12345, 54321, 20, 40);
+    test_two_collections(67890, 98765, 20, 60);
+
+    test_heterogenuous_collections(67890, 98765, 20, 60);
+
     return 0;
 }
diff --git a/test/algorithms/detail/sections/range_by_section.cpp b/test/algorithms/detail/sections/range_by_section.cpp
index e1d1bca1d..fa804f1ff 100644
--- a/test/algorithms/detail/sections/range_by_section.cpp
+++ b/test/algorithms/detail/sections/range_by_section.cpp
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <string>
 
+#define BOOST_GEOMETRY_UNIT_TEST_SECTIONALIZE
 
 #include <geometry_test_common.hpp>
 
diff --git a/test/algorithms/detail/sections/sectionalize.cpp b/test/algorithms/detail/sections/sectionalize.cpp
index 762190704..8cf079db7 100644
--- a/test/algorithms/detail/sections/sectionalize.cpp
+++ b/test/algorithms/detail/sections/sectionalize.cpp
@@ -15,6 +15,7 @@
 #include <iostream>
 #include <string>
 
+#define BOOST_GEOMETRY_UNIT_TEST_SECTIONALIZE
 
 #include <geometry_test_common.hpp>
 
@@ -48,7 +49,7 @@ void test_sectionalize_part()
 
     typedef bg::detail::sectionalize::sectionalize_part
         <
-            Geometry, point_type, sections_type, 1, 10
+            point_type, 1
         > sectionalize_part;
 
     sections_type sections;
@@ -58,22 +59,24 @@ void test_sectionalize_part()
     Geometry geometry;
     geometry.push_back(bg::make<point_type>(1, 1));
 
+    bg::detail::no_rescale_policy rescale_policy;
+
     bg::ring_identifier ring_id;
-    int index = 0;
-    int ndi = 0;
-    sectionalize_part::apply(sections, section, index, ndi, geometry, ring_id);
+    sectionalize_part::apply(sections, geometry, rescale_policy, false, ring_id, 10);
     // There should not yet be anything generated, because it is only ONE point
 
     geometry.push_back(bg::make<point_type>(2, 2));
-    sectionalize_part::apply(sections, section, index, ndi, geometry, ring_id);
+    sectionalize_part::apply(sections, geometry, rescale_policy, false, ring_id, 10);
 
 }
 
 
 template <int DimensionCount, bool Reverse, typename G>
-void test_sectionalize(std::string const caseid, G const& g, std::size_t section_count,
+void test_sectionalize(std::string const& caseid, G const& g, std::size_t section_count,
         std::string const& index_check, std::string const& dir_check)
 {
+    boost::ignore_unused_variable_warning(caseid);
+
     typedef typename bg::point_type<G>::type point;
     typedef bg::model::box<point> box;
     typedef bg::sections<box, DimensionCount> sections;
@@ -313,7 +316,7 @@ void test_large_integers()
 
     bg::sectionalize<false>(int_poly, int_sections);
     bg::sectionalize<false>(double_poly, double_sections);
-    
+
     bool equally_sized = int_sections.size() == double_sections.size();
     BOOST_CHECK(equally_sized);
     if (! equally_sized)
diff --git a/test/algorithms/difference.cpp b/test/algorithms/difference.cpp
index a9ac9b1e0..139c5c147 100644
--- a/test/algorithms/difference.cpp
+++ b/test/algorithms/difference.cpp
@@ -11,6 +11,10 @@
 #include <string>
 #include <iomanip>
 
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// Test which would fail then are disabled automatically
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
+
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/perimeter.hpp>
 
@@ -44,7 +48,7 @@ void test_areal_linear()
     test_one_lp<LineString, LineString, Polygon>("case4", "LINESTRING(1 1,3 2,1 3)", "POLYGON((0 0,0 4,2 4,2 0,0 0))", 1, 3, sqrt(5.0));
 
     test_one_lp<LineString, LineString, Polygon>("case5", "LINESTRING(0 1,3 4)", poly_simplex, 2, 4, 2.0 * sqrt(2.0));
-    test_one_lp<LineString, LineString, Polygon>("case6", "LINESTRING(1 1,10 3)", "POLYGON((2 0,2 4,3 4,3 1,4 1,4 3,5 3,5 1,6 1,6 3,7 3,7 1,8 1,8 3,9 3,9 0,2 0))", 5, 10, 
+    test_one_lp<LineString, LineString, Polygon>("case6", "LINESTRING(1 1,10 3)", "POLYGON((2 0,2 4,3 4,3 1,4 1,4 3,5 3,5 1,6 1,6 3,7 3,7 1,8 1,8 3,9 3,9 0,2 0))", 5, 10,
             // Pieces are 1 x 2/9:
             5.0 * sqrt(1.0 + 4.0/81.0));
 
@@ -70,7 +74,8 @@ void test_areal_linear()
     test_one_lp<LineString, LineString, Polygon>("case19", "LINESTRING(1 2,1 3,0 3)", poly_9, 1, 2, 1.0);
     test_one_lp<LineString, LineString, Polygon>("case20", "LINESTRING(1 2,1 3,2 3)", poly_9, 0, 0, 0.0);
 
-    test_one_lp<LineString, LineString, Polygon>("case21", "LINESTRING(1 2,1 4,4 4,4 1,2 1,2 2)", poly_9, 0, 0, 0.0);
+    // PROPERTIES CHANGED BY switch_to_integer
+    // TODO test_one_lp<LineString, LineString, Polygon>("case21", "LINESTRING(1 2,1 4,4 4,4 1,2 1,2 2)", poly_9, 0, 0, 0.0);
 
     // More collinear (opposite) cases
     test_one_lp<LineString, LineString, Polygon>("case22", "LINESTRING(4 1,4 4,7 4)", poly_9, 1, 2, 3.0);
@@ -135,12 +140,13 @@ void test_all()
         1, 5, 1.0,
         1, 5, 1.0);
 
+    // The too small one might be discarded (depending on point-type / compiler)
+    // We check area only
     test_one<polygon, polygon, polygon>("distance_zero",
         distance_zero[0], distance_zero[1],
-        2, -1, 8.7048386,
-        if_typed<ct, float>(1, 2), // The too small one is discarded for floating point
-        -1, 0.0098387);
-
+        -1, -1, 8.7048386,
+        -1, -1, 0.0098387,
+        0.001);
 
     test_one<polygon, polygon, polygon>("equal_holes_disjoint",
         equal_holes_disjoint[0], equal_holes_disjoint[1],
@@ -232,17 +238,19 @@ void test_all()
         1, 5, 1,
         1, 5, 1);
 
-    test_one<polygon, polygon, polygon>("buffer_mp1", 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    test_one<polygon, polygon, polygon>("buffer_mp1",
         buffer_mp1[0], buffer_mp1[1],
         1, 61, 10.2717,
         1, 61, 10.2717);
+#endif
 
     if (boost::is_same<ct, double>::value)
     {
-        test_one<polygon, polygon, polygon>("buffer_mp2", 
+        test_one<polygon, polygon, polygon>("buffer_mp2",
             buffer_mp2[0], buffer_mp2[1],
             1, 91, 12.09857,
-            1, 156, 24.19787);
+            1, 155, 24.19714);
     }
 
     /*** TODO: self-tangencies for difference
@@ -257,25 +265,43 @@ void test_all()
         1, 0, 13);
     ***/
 
-#ifdef _MSC_VER
-#ifdef TEST_ISOVIST
+    // Isovist - the # output polygons differ per compiler/pointtype, (very) small
+    // rings might be discarded. We check area only
     test_one<polygon, polygon, polygon>("isovist",
         isovist1[0], isovist1[1],
-        if_typed_tt<ct>(4, 2), 0, 0.279121891701124,
-        if_typed_tt<ct>(4, 3), 0, if_typed_tt<ct>(224.889211358929, 223.777),
-        if_typed_tt<ct>(0.001, 0.2));
-
+        -1, -1, 0.279121,
+        -1, -1, 224.8892,
+        0.001);
     // SQL Server gives: 0.279121891701124 and 224.889211358929
     // PostGIS gives:    0.279121991127244 and 224.889205853156
 
-#endif
+    test_one<polygon, polygon, polygon>("geos_1",
+        geos_1[0], geos_1[1],
+        21, -1, 0.31640625,
+         9, -1, 0.01953125);
+    // SQL Server gives: 0.28937764436705 and 0.000786406897532288 with 44/35 rings
+    // PostGIS gives:    0.30859375       and 0.033203125 with 35/35 rings
+
+    test_one<polygon, polygon, polygon>("geos_2",
+        geos_2[0], geos_2[1],
+        1, -1, 138.6923828,
+        1, -1, 211.859375);
+
+    test_one<polygon, polygon, polygon>("geos_3",
+        geos_3[0], geos_3[1],
+        1, -1, 16211128.5,
+        1, -1, 13180420.0);
+
+    test_one<polygon, polygon, polygon>("geos_4",
+        geos_4[0], geos_4[1],
+        1, -1, 971.9163115,
+        1, -1, 1332.4163115);
 
     test_one<polygon, polygon, polygon>("ggl_list_20110306_javier",
         ggl_list_20110306_javier[0], ggl_list_20110306_javier[1],
         1, -1, 71495.3331,
-        2, -1, 8960.49049); 
-#endif
-        
+        2, -1, 8960.49049);
+
     test_one<polygon, polygon, polygon>("ggl_list_20110307_javier",
         ggl_list_20110307_javier[0], ggl_list_20110307_javier[1],
         1, if_typed<ct, float>(14, 13), 16815.6,
@@ -294,13 +320,13 @@ void test_all()
     test_one<polygon, polygon, polygon>("ggl_list_20110820_christophe",
         ggl_list_20110820_christophe[0], ggl_list_20110820_christophe[1],
         1, -1, 2.8570121719168924,
-        1, -1, 64.498061986388564); 
+        1, -1, 64.498061986388564);
 
     test_one<polygon, polygon, polygon>("ggl_list_20120717_volker",
         ggl_list_20120717_volker[0], ggl_list_20120717_volker[1],
         1, 11, 3370866.2295081965,
-        1, 5, 384.2295081964694, 0.01); 
-             
+        1, 5, 384.2295081964694, 0.01);
+
 #ifdef _MSC_VER
     // 2011-07-02
     // Interesting FP-precision case.
@@ -317,14 +343,47 @@ void test_all()
     {
         test_one<polygon, polygon, polygon>("ggl_list_20110627_phillip",
             ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
-                if_typed_tt<ct>(1, 0), -1, 
-                if_typed_tt<ct>(0.0000000000001105367, 0.0), 
+                if_typed_tt<ct>(1, 0), -1,
+                if_typed_tt<ct>(0.0000000000001105367, 0.0),
             1, -1, 3577.40960816756,
             0.01
             );
     }
 #endif
 
+    // Ticket 8310, one should be completely subtracted from the other.
+    test_one<polygon, polygon, polygon>("ticket_8310a",
+        ticket_8310a[0], ticket_8310a[1],
+        1, 10, 10.11562724,
+        0, 0, 0);
+    test_one<polygon, polygon, polygon>("ticket_8310b",
+        ticket_8310b[0], ticket_8310b[1],
+        1, 10, 10.12655608,
+        0, 0, 0);
+    test_one<polygon, polygon, polygon>("ticket_8310c",
+        ticket_8310c[0], ticket_8310c[1],
+        1, 10, 10.03103292,
+        0, 0, 0);
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    test_one<polygon, polygon, polygon>("ticket_9081_15",
+            ticket_9081_15[0], ticket_9081_15[1],
+            1, 10, 0.0334529710902111,
+            0, 0, 0);
+#endif
+
+    test_one<polygon, polygon, polygon>("ticket_9081_314",
+            ticket_9081_314[0], ticket_9081_314[1],
+            2, 12, 0.0451236449624935,
+            0, 0, 0);
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    test_one<polygon, polygon, polygon>("ticket_9563",
+            ticket_9563[0], ticket_9563[1],
+            0, 0, 0,
+            6, 24, 20.096189);
+#endif
+
     // Other combi's
     {
         test_one<polygon, polygon, ring>(
@@ -360,8 +419,6 @@ void test_all()
                 5, 22, 1.1901714, 5, 27, 1.6701714);
     }
 
-
-
     // Multi/box (should be moved to multi)
     {
         /* Tested with SQL Geometry:
@@ -369,8 +426,8 @@ void test_all()
                         'MULTIPOLYGON(((0 1,2 5,5 3,0 1)),((1 1,5 2,5 0,1 1)))',0) as  p,
                   geometry::STGeomFromText(
                         'POLYGON((2 2,2 4,4 4,4 2,2 2))',0) as q)
-                  
-                select 
+
+                select
                     p.STDifference(q).STArea(),p.STDifference(q).STNumGeometries(),p.STDifference(q) as p_min_q,
                     q.STDifference(p).STArea(),q.STDifference(p).STNumGeometries(),q.STDifference(p) as q_min_p,
                     p.STSymDifference(q).STArea(),q.STSymDifference(p) as p_xor_q
@@ -480,8 +537,8 @@ void test_specific()
 
     test_one<polygon, polygon, polygon>("ggl_list_20120717_volker",
         ggl_list_20120717_volker[0], ggl_list_20120717_volker[1],
-        1, 11, 3370866.2295081965,
-        1, 5, 384, 0.01); 
+        1, 11, 3371540,
+        0, 0, 0, 0.001); // output is discarded
 }
 
 
diff --git a/test/algorithms/difference_linear_linear.cpp b/test/algorithms/difference_linear_linear.cpp
new file mode 100644
index 000000000..f46bcddf3
--- /dev/null
+++ b/test/algorithms/difference_linear_linear.cpp
@@ -0,0 +1,1231 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_difference_linear_linear
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_difference_linear_linear.hpp"
+
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/algorithms/difference.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_difference_linestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / LINESTRING DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<L, L, ML> tester;
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 1,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0 2,1 1,2 1,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1),(2 1,3 2))"),
+         "lldf00");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 2,1 1,2 1,3 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 1,3 2)"),
+         from_wkt<ML>("MULTILINESTRING((0 2,1 1),(2 1,3 0))"),
+         "lldf00-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,3 0),(4 0,5 0))"),
+         "lldf01");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf01-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,3 0))"),
+         "lldf01-2");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((4 0,6 0))"),
+         "lldf01-3");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((4 0,6 0))"),
+         "lldf01-4");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf01-5");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0),(5 0,20 0))"),
+         "lldf01-6");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-20 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((-20 0,4 0),(5 0,20 0))"),
+         "lldf01-7");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+         "lldf01-8");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(2 0,4 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf01-9");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+         "lldf01-10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(2 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+         "lldf01-11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,3 0))"),
+         "lldf01-11a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,3 0))"),
+         "lldf01-11b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,6 0))"),
+         "lldf01-12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0)"),
+         from_wkt<L>("LINESTRING(-1 6,0 5,15 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,5 5),(10 5,15 0))"),
+         "lldf02");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0))"),
+         "lldf03");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 5,10 5,15 0))"),
+         "lldf04");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,25 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (20 0,25 1))"),
+         "lldf05");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0))"),
+         "lldf05-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0))"),
+         "lldf06");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,25 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0))"),
+         "lldf07");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0))"),
+         "lldf08");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 1))"),
+         "lldf09");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 1))"),
+         "lldf10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,\
+                                 30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(2 0,3 0),\
+                      (4 0,5 5,10 5,15 0),(30 0,31 1))"),
+         "lldf11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(2 0,3 0),\
+                      (4 0,5 5,10 5,15 0),(30 0,31 0))"),
+         "lldf11-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(3 1,2 0,0 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf12-1");
+
+   tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5,4 0,5 10)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "lldf13");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,2.5 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf14");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(3 5,4 0))"),
+         "lldf15");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0.5 0,1 0,3 2,4 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0.5 0))"),
+         "lldf16");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(4 5,3 2,1 0,0.5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0.5 0))"),
+         "lldf16-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,30 1)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(25 1,30 1))"),
+         "lldf17");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,21 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1,21 0,30 0))"),
+         "lldf18");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19a-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,6 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19c");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19d");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19e");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19f");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19f-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19g");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0))"),
+         "lldf19g-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,35 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(25 0,30 0,30 30,10 30),\
+                       (10 0,10 -10,15 0,20 0),(25 0,35 0))"),
+         "lldf20");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,15 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,15 0),(30 0,30 30,10 30),\
+                       (10 0,10 -10,15 0))"),
+         "lldf20a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0),(20 0,30 0))"),
+         "lldf21"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 2,5 -1,15 2,18 0))"),
+         "lldf21a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<L>("LINESTRING(1 0,4 0,2 1,5 1,4 0,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(8 0,10 0))"),
+         "lldf22"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0,5 1,1 1,1 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,10 0))"),
+         "lldf23"
+         );
+
+    // the following two tests have been discussed with by Adam
+    tester::apply
+        (from_wkt<L>("LINESTRING(1 0,1 1,2 1)"),
+         from_wkt<L>("LINESTRING(2 1,1 1,1 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lldf24"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(1 0,1 1,2 1)"),
+         from_wkt<L>("LINESTRING(1 2,1 1,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1))"),
+         "lldf25"
+         );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( test_difference_linestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / MULTILINESTRING DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<L, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1))"),
+         "lmldf01"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1))"),
+         "lmldf02"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,10 0,20 1))"),
+         "lmldf03"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1))"),
+         "lmldf04"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "lmldf07"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0))"),
+         "lmldf07a"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lmldf07b"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "lmldf08"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0))"),
+         "lmldf09"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,1.5 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(1.5 0,2 0.5,3 0))"),
+         "lmldf10"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf12"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf13"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf14"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf15"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf15a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf16"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmldf16a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "lmldf17"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "lmldf17a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "lmldf18"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "lmldf18a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(20 0,30 0))"),
+         "lmldf18b"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,26 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,25 0),(26 0,30 0))"),
+         "lmldf18c"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,21 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,21 0),(25 0,30 0))"),
+         "lmldf18d"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 5,1 0,9 0,10 5),(0 1,2 0,3 1),\
+                      (0 -2,3 0,4 4),(0 -5,4 0,5 0,6 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10))"),
+         "lmldf19"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,0 0),(10 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         "lmldf20"
+         );
+}
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_difference_multilinestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / LINESTRING DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<ML, L, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 2,4 3)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         "mlldf01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0))"),
+         "mlldf02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<L>("LINESTRING(-1 -1,1 0,101 0,200 -1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "mlldf03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<L>("LINESTRING(0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlldf04"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((-1 0,-1 10),(0 0,20 0),(25 0,30 0))"),
+         from_wkt<L>("LINESTRING(0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,-1 10),(0 0,1 0),(19 0,20 0),(25 0,30 0))"),
+         "mlldf05"
+         );
+}
+
+
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_difference_multilinestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<ML, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         "mlmldf01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0))"),
+         "mlmldf02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,10 0,20 1),\
+                      (1 0,2 0),(5 0,7 0))"),
+         "mlmldf03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0))"),
+         "mlmldf04"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(10 10,15 10),(20 10,30 20))"),
+         "mlmldf05"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,10 0,13 3),(15 5,20 10),\
+                      (10 10,11 10),(12 10,15 10),(20 10,30 20))"),
+         "mlmldf06"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                      (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                      (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0),(-1 -1,0 0),(9 0,11 10),\
+                      (12 10,13 3),(10 20,15 10),(20 10,25 10,30 15))"),
+         "mlmldf06a"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "mlmldf07"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0))"),
+         "mlmldf07a"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "mlmldf07b"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "mlmldf08"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0))"),
+         "mlmldf09"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(1.5 0,2 0.5,3 0))"),
+         "mlmldf10"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,100 1,101 0),\
+                       (0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1,3 0,4 0,5 1,6 1,\
+                       7 0,8 0,9 1,10 1,11 0,12 0,13 1,14 1,15 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1),(2 1,5 1),(6 1,9 1),\
+                       (10 1,13 1),(14 1,100 1,101 0),(0 0,1 0))"),
+         "mlmldf11"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf13"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf15a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmldf16a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "mlmldf17"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "mlmldf17a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "mlmldf18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0))"),
+         "mlmldf18a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,0 0),(10 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         "mlmldf19"
+         );
+}
+
+
+
+
+
+
+#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
+BOOST_AUTO_TEST_CASE( test_difference_ml_ml_degenerate )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE" 
+              << " (DEGENERATE) ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<ML, ML, ML> tester;
+
+    // the following test cases concern linestrings with duplicate
+    // points and possibly linestrings with zero length.
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((5 5,5 5),(0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 10),\
+                      (4 0,4 10),(5 5,5 5))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(20 0,30 0))"),
+         "mlmldf20a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((5 5,5 5),(0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 10,4 10),(5 5,5 5))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(20 0,30 0))"),
+         "mlmldf20aa"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((10 10,10 10),(0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 10,4 10),(5 5,5 5))"),
+         from_wkt<ML>("MULTILINESTRING((10 10,10 10),(0 0,5 0),(20 0,30 0))"),
+         "mlmldf20aaa"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((10 10),(0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 10,4 10),(5 5,5 5))"),
+         from_wkt<ML>("MULTILINESTRING((10 10,10 10),(0 0,5 0),(20 0,30 0))"),
+         "mlmldf20aaaa"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0),(1 1,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0 0))"),
+         "mlmldf21"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0),(2 2,2 2),(1 1,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0 0),(2 2,2 2))"),
+         "mlmldf22"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0),(1 1,1 1),(2 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0 0),(2 2,2 2))"),
+         "mlmldf23"
+         );
+}
+#endif // BOOST_GEOMETRY_TEST_NO_DEGENERATE
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_difference_ml_ml_spikes )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING DIFFERENCE" 
+              << " (WITH SPIKES) ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_difference_of_geometries<ML, ML, ML> tester;
+
+    // the following test cases concern linestrings with spikes
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         "mlmldf-spikes-01"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         "mlmldf-spikes-02"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,2 0,8 0,3 0,7 0,4 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         "mlmldf-spikes-03"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,3 0,2 0,4 0,3 0,5 0,4 0,6 0,\
+                      5 0,7 0,6 0,8 0,7 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         "mlmldf-spikes-04"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),\
+                      (9 1,9 0,9 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(6 0,7 0),(8 0,10 0))"),
+         "mlmldf-spikes-05"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),\
+                      (9 0,9 2,9 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(6 0,7 0),(8 0,10 0))"),
+         "mlmldf-spikes-05a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(9 0,6 0,8 0),\
+                      (11 0,8 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0))"),
+         "mlmldf-spikes-06"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,0 0,-2 0),(11 0,10 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         "mlmldf-spikes-07"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,-2 -2),(11 1,10 0,12 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         "mlmldf-spikes-07a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(11 0,10 0,12 0),\
+                      (7 5,7 0,8 0,6.5 0,8.5 0,8.5 5))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(6 0,6.5 0),(8.5 0,10 0))"),
+         "mlmldf-spikes-08"
+         );
+
+    // now the first geometry has a spike
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(8 0,10 0))"),
+         "mlmldf-spikes-09"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,7 0,4 0,9 0))"),
+         "mlmldf-spikes-09a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(9 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,7 0,5 0),(5 0,9 0))"),
+         "mlmldf-spikes-09b"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(6 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,6 0),(6 0,5 0),(5 0,6 0))"),
+         "mlmldf-spikes-09c"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(8 0,10 0,8 0))"),
+         "mlmldf-spikes-10"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0,4 0),(2 0,9 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0,9 0))"),
+         "mlmldf-spikes-11"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 1,10 0,12 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         "mlmldf-spikes-12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 -1,10 0,12 -2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         "mlmldf-spikes-12a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 0,10 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         "mlmldf-spikes-13"
+         );
+
+    // the following three tests have been discussed with Adam
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 2,1 1,1 2))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         "mlmldf-spikes-14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,1 0,2 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,0 0))"),
+         "mlmldf-spikes-15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,1 1,2 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         "mlmldf-spikes-16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((2 1,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1))"),
+         "mlmldf-spikes-17"
+         );
+
+    // test cases sent by Adam on the mailing list (equal slikes)
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "mlmldf-spikes-18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,0 0,1 1))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "mlmldf-spikes-19"
+         );
+}
diff --git a/test/algorithms/difference_pl_pl.cpp b/test/algorithms/difference_pl_pl.cpp
new file mode 100644
index 000000000..ed3cce984
--- /dev/null
+++ b/test/algorithms/difference_pl_pl.cpp
@@ -0,0 +1,226 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_difference_pointlike_pointlike
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_set_ops_pl_pl.hpp"
+
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>  multi_point_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_difference_point_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** POINT / POINT DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            P, P, MP, bg::overlay_difference
+        > tester;
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 1)"),
+         "ppdf01");
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "ppdf02");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_difference_multipoint_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / POINT DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, P, MP, bg::overlay_difference
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 1)"),
+         "mppdf01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppdf02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 1)"),
+         "mppdf03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppdf04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 1)"),
+         "mppdf05");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppdf06");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppdf07");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppdf08");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_difference_point_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** POINT / MULTIPOINT DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            P, MP, MP, bg::overlay_difference
+        > tester;
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1)"),
+         "pmpdf01");
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1)"),
+         "pmpdf02");
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "pmpdf03");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_difference_multipoint_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / MULTIPOINT DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, MP, MP, bg::overlay_difference
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(2 2,3 3,0 0,0 0,2 2,1 1,1 1,1 0,1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1,4 4)"),
+         from_wkt<MP>("MULTIPOINT(2 2,3 3,0 0,0 0,2 2)"),
+         from_wkt<MP>("MULTIPOINT(4 4)"),
+         "mpmpdf01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpdf02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         "mpmpdf03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpdf04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpdf05");
+}
diff --git a/test/algorithms/disjoint.cpp b/test/algorithms/disjoint.cpp
index 51d12cf64..d765ef952 100644
--- a/test/algorithms/disjoint.cpp
+++ b/test/algorithms/disjoint.cpp
@@ -12,41 +12,18 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <iostream>
-#include <string>
 
+#include <algorithms/test_disjoint.hpp>
 
-#include <geometry_test_common.hpp>
-
-#include <boost/geometry/algorithms/disjoint.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/io/wkt/read.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <test_common/test_point.hpp>
 
-#include <algorithms/test_relate.hpp>
-
-
-template <typename G1, typename G2>
-void test_disjoint(std::string const& id,
-            std::string const& wkt1,
-            std::string const& wkt2, bool expected)
-{
-    G1 g1;
-    bg::read_wkt(wkt1, g1);
-
-    G2 g2;
-    bg::read_wkt(wkt2, g2);
-
-    bool detected = bg::disjoint(g1, g2);
-    BOOST_CHECK_MESSAGE(detected == expected,
-        "disjoint: " << id
-        << " -> Expected: " << expected
-        << " detected: " << detected);
-}
+#include <algorithms/overlay/overlay_cases.hpp>
 
+#include <algorithms/predef_relop.hpp>
 
 
 template <typename P>
@@ -91,6 +68,10 @@ void test_all()
     test_disjoint<ring, ring>("disjoint_simplex_rr", disjoint_simplex[0], disjoint_simplex[1], true);
     test_disjoint<polygon, ring>("disjoint_simplex_pr", disjoint_simplex[0], disjoint_simplex[1], true);
 
+    test_disjoint<polygon, polygon>("ticket_8310a", ticket_8310a[0], ticket_8310a[1], false);
+    test_disjoint<polygon, polygon>("ticket_8310b", ticket_8310b[0], ticket_8310b[1], false);
+    test_disjoint<polygon, polygon>("ticket_8310c", ticket_8310c[0], ticket_8310c[1], false);
+
     // Testing touch
     test_disjoint<polygon, polygon>("touch_simplex_pp", touch_simplex[0], touch_simplex[1], false);
 
@@ -136,12 +117,12 @@ void test_all()
 
 
     // Problem described by Volker/Albert 2012-06-01
-    test_disjoint<polygon, box>("volker_albert_1", 
-        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))", 
+    test_disjoint<polygon, box>("volker_albert_1",
+        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))",
         "BOX(1941 2066, 2055 2166)", false);
 
-    test_disjoint<polygon, box>("volker_albert_2", 
-        "POLYGON((1941 2066,2055 2066,2055 2166,1941 2166))", 
+    test_disjoint<polygon, box>("volker_albert_2",
+        "POLYGON((1941 2066,2055 2066,2055 2166,1941 2166))",
         "BOX(1941 2066, 2055 2166)", false);
 
     // Degenerate linestrings
@@ -159,7 +140,7 @@ void test_all()
 
     // Linestrings making angles normally ignored
     {
-        // These (non-disjoint) cases 
+        // These (non-disjoint) cases
         // correspond to the test "segment_intersection_collinear"
 
         // Collinear ('a')
@@ -184,7 +165,7 @@ void test_all()
         //           |
         //           |
         // a1--------b1----->a2
-        test_disjoint<ls, ls>("case_s", "linestring(0 0,4 0)", "linestring(2 0,2 2)", false); 
+        test_disjoint<ls, ls>("case_s", "linestring(0 0,4 0)", "linestring(2 0,2 2)", false);
 
         // Collinear, but disjoint
         test_disjoint<ls, ls>("c-d", "linestring(2 0,6 0)", "linestring(7 0,8 0)", true);
@@ -193,7 +174,7 @@ void test_all()
         test_disjoint<ls, ls>("c-d", "linestring(2 0,6 0)", "linestring(2 1,6 1)", true);
 
         // Error still there until 1.48 (reported "error", was reported to disjoint, so that's why it did no harm)
-        test_disjoint<ls, ls>("case_recursive_boxes_1", 
+        test_disjoint<ls, ls>("case_recursive_boxes_1",
             "linestring(10 7,10 6)", "linestring(10 10,10 9)", true);
 
     }
diff --git a/test/algorithms/disjoint_coverage.cpp b/test/algorithms/disjoint_coverage.cpp
new file mode 100644
index 000000000..5b5e31363
--- /dev/null
+++ b/test/algorithms/disjoint_coverage.cpp
@@ -0,0 +1,1384 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_disjoint_coverage
+#endif
+
+// unit test to test disjoint for all geometry combinations
+
+#include <iostream>
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+#include <boost/geometry/multi/core/tags.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/write.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/ring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+#include <boost/geometry/algorithms/disjoint.hpp>
+
+#include "from_wkt.hpp"
+
+
+#ifdef HAVE_TTMATH
+#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#endif
+
+namespace bg = ::boost::geometry;
+
+//============================================================================
+
+template <typename Geometry, typename Tag = typename bg::tag<Geometry>::type>
+struct pretty_print_geometry
+{
+    static inline std::ostream& apply(Geometry const& geometry)
+    {
+        std::cout << bg::wkt(geometry);
+        return std::cout;
+    }
+};
+
+template <typename Segment>
+struct pretty_print_geometry<Segment, bg::segment_tag>
+{
+    static inline std::ostream& apply(Segment const& segment)
+    {
+        std::cout << "SEGMENT" << bg::dsv(segment);
+        return std::cout;
+    }
+};
+
+template <typename Ring>
+struct pretty_print_geometry<Ring, bg::ring_tag>
+{
+    static inline std::ostream& apply(Ring const& ring)
+    {
+        std::cout << "RING" << bg::dsv(ring);
+        return std::cout;
+    }
+};
+
+template <typename Box>
+struct pretty_print_geometry<Box, bg::box_tag>
+{
+    static inline std::ostream& apply(Box const& box)
+    {
+        std::cout << "BOX" << bg::dsv(box);
+        return std::cout;
+    }
+};
+
+//============================================================================
+
+struct test_disjoint
+{
+    template <typename Geometry1, typename Geometry2>
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             bool expected_result)
+    {
+        bool result = bg::disjoint(geometry1, geometry2);
+        BOOST_CHECK( result == expected_result );
+
+        result = bg::disjoint(geometry2, geometry1);
+        BOOST_CHECK( result == expected_result );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "G1 - G2: ";
+        pretty_print_geometry<Geometry1>::apply(geometry1) << " - ";
+        pretty_print_geometry<Geometry2>::apply(geometry2) << std::endl;
+        std::cout << std::boolalpha;
+        std::cout << "expected/computed result: "
+                  << expected_result << " / " << result << std::endl;
+        std::cout << std::endl;
+        std::cout << std::noboolalpha;
+#endif
+    }
+};
+
+//============================================================================
+
+// pointlike-pointlike geometries
+template <typename P>
+inline void test_point_point()
+{
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<P>("POINT(0 0)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<P>("POINT(1 1)"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_multipoint()
+{
+    typedef bg::model::multi_point<P> MP;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<MP>("MULTIPOINT(1 1,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_multipoint()
+{
+    typedef bg::model::multi_point<P> MP;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<MP>("MULTIPOINT(1 1,2 2)"),
+                  true);
+}
+
+//============================================================================
+
+// pointlike-linear geometries
+template <typename P>
+inline void test_point_segment()
+{
+    typedef test_disjoint tester;
+    typedef bg::model::segment<P> S;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 0)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_linestring()
+{
+    typedef bg::model::linestring<P> L;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(3 3)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 0)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_multilinestring()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 1)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  true);
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+}
+
+template <typename P>
+inline void test_multipoint_segment()
+{
+    typedef test_disjoint tester;
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::segment<P> S;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 0,1 1)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 2)"),
+                  from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_linestring()
+{
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::linestring<P> L;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 0,1 1)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 0,3 3)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 0,2 0)"),
+                  from_wkt<L>("LINESTRING(0 0,2 2,4 4)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_multilinestring()
+{
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 1,0 2)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  true);
+
+    tester::apply(from_wkt<MP>("POINT(0 0,1 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("POINT(0 1,1 1)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("POINT(0 1,1 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,2 2,4 4),(0 0,2 0,4 0))"),
+                  false);
+}
+
+//============================================================================
+
+// pointlike-areal geometries
+template <typename P>
+inline void test_point_box()
+{
+    typedef test_disjoint tester;
+    typedef bg::model::box<P> B;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(2 2)"),
+                  from_wkt<B>("BOX(0 0,1 0)"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_ring()
+{
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<R>("POLYGON((0 0,1 0,0 1))"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<R>("POLYGON((0 0,1 0,0 1))"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_polygon()
+{
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<PL>("POLYGON((0 0,1 0,0 1))"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<PL>("POLYGON((0 0,1 0,0 1))"),
+                  true);
+}
+
+template <typename P>
+inline void test_point_multipolygon()
+{
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<P>("POINT(0 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,1 0,0 1)),((2 0,3 0,2 1)))"),
+                  false);
+
+    tester::apply(from_wkt<P>("POINT(1 1)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,1 0,0 1)),((2 0,3 0,2 1)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_box()
+{
+    typedef test_disjoint tester;
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::box<P> B;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(3 3,4 4)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_ring()
+{
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<R>("POLYGON((0 0,1 0,0 1))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 0,1 1)"),
+                  from_wkt<R>("POLYGON((0 0,1 0,0 1))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 2)"),
+                  from_wkt<R>("POLYGON((0 0,1 0,0 1))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_polygon()
+{
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<PL>("POLYGON(((0 0,1 0,0 1)))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,2 0)"),
+                  from_wkt<PL>("POLYGON(((0 0,1 0,0 1)))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 0)"),
+                  from_wkt<PL>("POLYGON(((0 0,1 0,0 1)))"),
+                  true);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 3)"),
+                  from_wkt<PL>("POLYGON(((0 0,1 0,0 1)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipoint_multipolygon()
+{
+    typedef bg::model::multi_point<P> MP;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,2 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON((0 0,1 0,0 1)),(2 0,3 0,2 1))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON((0 0,1 0,0 1)),(2 0,3 0,2 1))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON((0 0,1 0,0 1)),(2 0,3 0,2 1))"),
+                  false);
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(1 1,2 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON((0 0,1 0,0 1)),(2 0,3 0,2 1))"),
+                  true);
+}
+
+//============================================================================
+
+// linear-linear geometries
+template <typename P>
+inline void test_segment_segment()
+{
+    typedef bg::model::segment<P> S;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<S>("SEGMENT(0 0,0 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<S>("SEGMENT(2 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<S>("SEGMENT(1 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<S>("SEGMENT(1 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<S>("SEGMENT(1 1,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_segment()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::linestring<P> L;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(0 0,0 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(2 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 1,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_segment()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((2 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,1 1))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 1,2 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_linestring()
+{
+    typedef bg::model::linestring<P> L;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(0 0,0 2)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(2 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 0,3 0)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<L>("LINESTRING(1 1,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_multilinestring()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((2 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,1 1))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<ML>("MULTILINESTRING((1 1,2 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_multilinestring()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<ML>("MULTILINESTRING((0 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<ML>("MULTILINESTRING((2 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,3 0))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<ML>("MULTILINESTRING((1 0,1 1))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<ML>("MULTILINESTRING((1 1,2 2))"),
+                  true);
+}
+
+//============================================================================
+
+// linear-areal geometries
+template <typename P>
+inline void test_segment_box()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::box<P> B;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 1,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(4 4,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 4,4 4)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(4 0,4 4)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 -2,0 -1)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(-2 -2,-2 -1)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(-2 -2,-2 -2)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(-2 0,-2 0)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 -2,0 -2)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    tester::apply(from_wkt<S>("SEGMENT(-2 0,-1 0)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+
+    // segment degenerates to a point
+    tester::apply(from_wkt<S>("SEGMENT(0 0,0 0)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 1,1 1)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,2 2)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 0,2 0)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(0 2,0 2)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,2 2)"),
+                  from_wkt<B>("BOX(0 0,1 1)"),
+                  true);
+}
+
+template <typename P>
+inline void test_segment_ring()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 0,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 1,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_segment_polygon()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 0,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 1,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_segment_multipolygon()
+{
+    typedef bg::model::segment<P> S;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<S>("SEGMENT(0 0,2 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 0,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(1 1,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<S>("SEGMENT(2 2,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_box()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::box<P> B;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 1,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(2 2,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(4 4,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_ring()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 0,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 1,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(2 2,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_polygon()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 0,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 1,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(2 2,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_linestring_multipolygon()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<L>("LINESTRING(0 0,2 0)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 0,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(1 1,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<L>("LINESTRING(2 2,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_box()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    typedef bg::model::box<P> B;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 1,3 3))"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((2 2,3 3))"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((4 4,3 3))"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_ring()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 0,3 3))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 1,3 3))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((2 2,3 3))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_polygon()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 0,3 3))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 1,3 3))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((2 2,3 3))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multilinestring_multipolygon()
+{
+    typedef bg::model::linestring<P> L;
+    typedef bg::model::multi_linestring<L> ML;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 0,3 3))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 1,3 3))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((2 2,3 3))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,0 2)))"),
+                  true);
+}
+
+//============================================================================
+
+// areal-areal geometries
+template <typename P>
+inline void test_box_box()
+{
+    typedef bg::model::box<P> B;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<B>("BOX(2 2,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(1 1,3 3)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(3 3,4 4)"),
+                  from_wkt<B>("BOX(0 0,2 2)"),
+                  true);
+}
+
+template <typename P>
+inline void test_ring_box()
+{
+    typedef bg::model::box<P> B;
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<B>("BOX(2 2,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(1 1,3 3)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(3 3,4 4)"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_polygon_box()
+{
+    typedef bg::model::box<P> B;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<B>("BOX(2 2,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(1 1,3 3)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(3 3,4 4)"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipolygon_box()
+{
+    typedef bg::model::box<P> B;
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+    
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<B>("BOX(2 2,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(1 1,3 3)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<B>("BOX(3 3,4 4)"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_ring_ring()
+{
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<R>("POLYGON((2 2,2 3,3 3,3 2))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((1 1,1 3,3 3,3 1))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((3 3,3 4,4 4,4 3))"),
+                  from_wkt<R>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_polygon_ring()
+{
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<R>("POLYGON((2 2,2 3,3 3,3 2))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((1 1,1 3,3 3,3 1))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((3 3,3 4,4 4,4 3))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipolygon_ring()
+{
+    typedef bg::model::ring<P, false, false> R; // ccw, open
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<R>("POLYGON((2 2,2 3,3 3,3 2))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((1 1,1 3,3 3,3 1))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<R>("POLYGON((3 3,3 4,4 4,4 3))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_polygon_polygon()
+{
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<PL>("POLYGON((2 2,2 3,3 3,3 2))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<PL>("POLYGON((1 1,1 3,3 3,3 1))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  false);
+
+    tester::apply(from_wkt<PL>("POLYGON((3 3,3 4,4 4,4 3))"),
+                  from_wkt<PL>("POLYGON((0 0,2 0,2 2,0 2))"),
+                  true);
+}
+
+template <typename P>
+inline void test_polygon_multipolygon()
+{
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<PL>("POLYGON((2 2,2 3,3 3,3 2))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<PL>("POLYGON((1 1,1 3,3 3,3 1))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<PL>("POLYGON((3 3,3 4,4 4,4 3))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  true);
+}
+
+template <typename P>
+inline void test_multipolygon_multipolygon()
+{
+    typedef bg::model::polygon<P, false, false> PL; // ccw, open
+    typedef bg::model::multi_polygon<PL> MPL;
+
+    typedef test_disjoint tester;
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((2 2,2 3,3 3,3 2)))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((1 1,1 3,3 3,3 1)))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  false);
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((3 3,3 4,4 4,4 3)))"),
+                  from_wkt<MPL>("MULTIPOLYGON(((0 0,2 0,2 2,0 2)))"),
+                  true);
+}
+
+//============================================================================
+
+template <typename CoordinateType>
+inline void test_pointlike_pointlike()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_point_point<point_type>();
+    // not implemented yet
+    //    test_point_multipoint<point_type>();
+
+    //    test_multipoint_multipoint<point_type>();
+}
+
+template <typename CoordinateType>
+inline void test_pointlike_linear()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_point_linestring<point_type>();
+    test_point_multilinestring<point_type>();
+    test_point_segment<point_type>();
+
+    // not implemented yet
+    //    test_multipoint_linestring<point_type>();
+    //    test_multipoint_multilinestring<point_type>();
+    //    test_multipoint_segment<point_type>();
+}
+
+template <typename CoordinateType>
+inline void test_pointlike_areal()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_point_polygon<point_type>();
+    test_point_multipolygon<point_type>();
+    test_point_ring<point_type>();
+    test_point_box<point_type>();
+
+    // not implemented yet
+    //    test_multipoint_polygon<point_type>();
+    //    test_multipoint_multipolygon<point_type>();
+    //    test_multipoint_ring<point_type>();
+    //    test_multipoint_box<point_type>();
+}
+
+template <typename CoordinateType>
+inline void test_linear_linear()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_linestring_linestring<point_type>();
+    test_linestring_multilinestring<point_type>();
+    test_linestring_segment<point_type>();
+
+    test_multilinestring_multilinestring<point_type>();
+    test_multilinestring_segment<point_type>();
+
+    test_segment_segment<point_type>();
+}
+
+template <typename CoordinateType>
+inline void test_linear_areal()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_segment_polygon<point_type>();
+    test_segment_multipolygon<point_type>();
+    test_segment_ring<point_type>();
+    test_segment_box<point_type>();
+
+    test_linestring_polygon<point_type>();
+    test_linestring_multipolygon<point_type>();
+    test_linestring_ring<point_type>();
+    test_linestring_box<point_type>();
+
+    test_multilinestring_polygon<point_type>();
+    test_multilinestring_multipolygon<point_type>();
+    test_multilinestring_ring<point_type>();
+    test_multilinestring_box<point_type>();
+}
+
+template <typename CoordinateType>
+inline void test_areal_areal()
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+
+    test_polygon_polygon<point_type>();
+    test_polygon_multipolygon<point_type>();
+    test_polygon_ring<point_type>();
+    test_polygon_box<point_type>();
+
+    test_multipolygon_multipolygon<point_type>();
+    test_multipolygon_ring<point_type>();
+    test_multipolygon_box<point_type>();
+
+    test_ring_ring<point_type>();
+    test_ring_box<point_type>();
+
+    test_box_box<point_type>();
+}
+
+//============================================================================
+
+BOOST_AUTO_TEST_CASE( test_pointlike_pointlike_all )
+{
+    test_pointlike_pointlike<double>();
+    test_pointlike_pointlike<int>();
+#ifdef HAVE_TTMATH
+    test_pointlike_pointlike<ttmath_big>();
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_pointlike_linear_all )
+{
+    test_pointlike_linear<double>();
+    test_pointlike_linear<int>();
+#ifdef HAVE_TTMATH
+    test_pointlike_linear<ttmath_big>();
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_pointlike_areal_all )
+{
+    test_pointlike_areal<double>();
+    test_pointlike_areal<int>();
+#ifdef HAVE_TTMATH
+    test_pointlike_areal<ttmath_big>();
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_linear_linear_all )
+{
+    test_linear_linear<double>();
+    test_linear_linear<int>();
+#ifdef HAVE_TTMATH
+    test_linear_linear<ttmath_big>();
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_linear_areal_all )
+{
+    test_linear_areal<double>();
+    test_linear_areal<int>();
+#ifdef HAVE_TTMATH
+    test_linear_areal<ttmath_big>();
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_areal_areal_all )
+{
+    test_areal_areal<double>();
+    test_areal_areal<int>();
+#ifdef HAVE_TTMATH
+    test_areal_areal<ttmath_big>();
+#endif
+}
diff --git a/test/algorithms/distance.cpp b/test/algorithms/distance.cpp
index ab7fc5bf6..967f42054 100644
--- a/test/algorithms/distance.cpp
+++ b/test/algorithms/distance.cpp
@@ -1,9 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -12,8 +12,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define TEST_ARRAY
 
+#include <string>
 #include <sstream>
 
 #include <algorithms/test_distance.hpp>
@@ -30,6 +30,14 @@
 #include <test_geometries/custom_segment.hpp>
 #include <test_geometries/wrapped_boost_array.hpp>
 
+// includes for multi-geometries
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+#include <boost/variant/variant.hpp>
+
 BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
 
@@ -64,7 +72,10 @@ void test_distance_point()
     BOOST_CHECK_CLOSE(d, return_type(1.4142135), 0.001);
 
     // Test specifying strategy manually
-    typename services::default_strategy<bg::point_tag, P>::type strategy;
+    typename services::default_strategy
+        <
+            bg::point_tag, bg::point_tag, P
+        >::type strategy;
 
     d = bg::distance(p1, p2, strategy);
     BOOST_CHECK_CLOSE(d, return_type(1.4142135), 0.001);
@@ -85,7 +96,10 @@ void test_distance_point()
     {
         // test comparability
 
-        typedef typename services::default_strategy<bg::point_tag, P>::type strategy_type;
+        typedef typename services::default_strategy
+            <
+                bg::point_tag, bg::point_tag, P
+            >::type strategy_type;
         typedef typename services::comparable_type<strategy_type>::type comparable_strategy_type;
 
         strategy_type strategy;
@@ -100,7 +114,6 @@ template <typename P>
 void test_distance_segment()
 {
     typedef typename bg::default_distance_result<P>::type return_type;
-    typedef typename bg::coordinate_type<P>::type coordinate_type;
 
     P s1; bg::set<0>(s1, 1); bg::set<1>(s1, 1);
     P s2; bg::set<0>(s2, 4); bg::set<1>(s2, 4);
@@ -135,12 +148,18 @@ void test_distance_segment()
 
     // Test specifying strategy manually:
     // 1) point-point-distance
-    typename bg::strategy::distance::services::default_strategy<bg::point_tag, P>::type pp_strategy;
+    typename bg::strategy::distance::services::default_strategy
+        <
+            bg::point_tag, bg::point_tag, P
+        >::type pp_strategy;
     d1 = bg::distance(p1, seg, pp_strategy);
     BOOST_CHECK_CLOSE(d1, return_type(1), 0.001);
 
     // 2) point-segment-distance
-    typename bg::strategy::distance::services::default_strategy<bg::segment_tag, P>::type ps_strategy;
+    typename bg::strategy::distance::services::default_strategy
+        <
+            bg::point_tag, bg::segment_tag, P
+        >::type ps_strategy;
     d1 = bg::distance(p1, seg, ps_strategy);
     BOOST_CHECK_CLOSE(d1, return_type(1), 0.001);
 
@@ -150,6 +169,27 @@ void test_distance_segment()
     BOOST_CHECK_CLOSE(d1, return_type(1), 0.001);
 }
 
+template <typename Point, typename Geometry, typename T>
+void test_distance_linear(std::string const& wkt_point, std::string const& wkt_geometry, T const& expected)
+{
+    Point p;
+    bg::read_wkt(wkt_point, p);
+
+    Geometry g;
+    bg::read_wkt(wkt_geometry, g);
+
+    typedef typename bg::default_distance_result<Point>::type return_type;
+    return_type d = bg::distance(p, g);
+
+    // For point-to-linestring (or point-to-polygon), both a point-strategy and a point-segment-strategy can be specified.
+    // Test this.
+    return_type ds1 = bg::distance(p, g, bg::strategy::distance::pythagoras<>());
+    return_type ds2 = bg::distance(p, g, bg::strategy::distance::projected_point<>());
+
+    BOOST_CHECK_CLOSE(d, return_type(expected), 0.001);
+    BOOST_CHECK_CLOSE(ds1, return_type(expected), 0.001);
+    BOOST_CHECK_CLOSE(ds2, return_type(expected), 0.001);
+}
 
 template <typename P>
 void test_distance_array_as_linestring()
@@ -176,6 +216,105 @@ void test_distance_array_as_linestring()
 }
 
 
+// code moved from the distance unit test in multi/algorithms -- start
+template <typename Geometry1, typename Geometry2>
+void test_distance(std::string const& wkt1, std::string const& wkt2, double expected)
+{
+    Geometry1 g1;
+    Geometry2 g2;
+    bg::read_wkt(wkt1, g1);
+    bg::read_wkt(wkt2, g2);
+    typename bg::default_distance_result<Geometry1, Geometry2>::type d = bg::distance(g1, g2);
+
+    BOOST_CHECK_CLOSE(d, expected, 0.0001);
+}
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+void test_distance(Strategy const& strategy, std::string const& wkt1,
+                   std::string const& wkt2, double expected)
+{
+    Geometry1 g1;
+    Geometry2 g2;
+    bg::read_wkt(wkt1, g1);
+    bg::read_wkt(wkt2, g2);
+    typename bg::default_distance_result<Geometry1, Geometry2>::type d = bg::distance(g1, g2, strategy);
+
+    BOOST_CHECK_CLOSE(d, expected, 0.0001);
+}
+
+
+template <typename P>
+void test_2d()
+{
+    typedef bg::model::multi_point<P> mp;
+    typedef bg::model::multi_linestring<bg::model::linestring<P> > ml;
+    test_distance<P, P>("POINT(0 0)", "POINT(1 1)", sqrt(2.0));
+    test_distance<P, mp>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<mp, P>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp, mp>("MULTIPOINT((1 1),(1 0),(0 2))", "MULTIPOINT((2 2),(2 3))", sqrt(2.0));
+    test_distance<P, ml>("POINT(0 0)", "MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", 1.0);
+    test_distance<ml, P>("MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", "POINT(0 0)", 1.0);
+    test_distance<ml, mp>("MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", "MULTIPOINT((0 0),(1 1))", 0.0);
+
+    // Test with a strategy
+    bg::strategy::distance::pythagoras<> pyth;
+    test_distance<P, P>(pyth, "POINT(0 0)", "POINT(1 1)", sqrt(2.0));
+    test_distance<P, mp>(pyth, "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<mp, P>(pyth, "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+}
+
+
+template <typename P>
+void test_3d()
+{
+    typedef bg::model::multi_point<P> mp;
+    test_distance<P, P>("POINT(0 0 0)", "POINT(1 1 1)", sqrt(3.0));
+    test_distance<P, mp>("POINT(0 0 0)", "MULTIPOINT((1 1 1),(1 0 0),(0 1 2))", 1.0);
+    test_distance<mp, mp>("MULTIPOINT((1 1 1),(1 0 0),(0 0 2))", "MULTIPOINT((2 2 2),(2 3 4))", sqrt(3.0));
+}
+
+
+template <typename P1, typename P2>
+void test_mixed()
+{
+    typedef bg::model::multi_point<P1> mp1;
+    typedef bg::model::multi_point<P2> mp2;
+
+    test_distance<P1, P2>("POINT(0 0)", "POINT(1 1)", sqrt(2.0));
+
+    test_distance<P1, mp1>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P1, mp2>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P2, mp1>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P2, mp2>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+
+    // Test automatic reversal
+    test_distance<mp1, P1>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp1, P2>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp2, P1>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp2, P2>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+
+    // Test multi-multi using different point types for each
+    test_distance<mp1, mp2>("MULTIPOINT((1 1),(1 0),(0 2))", "MULTIPOINT((2 2),(2 3))", sqrt(2.0));
+
+    // Test with a strategy
+    using namespace bg::strategy::distance;
+
+    test_distance<P1, P2>(pythagoras<>(), "POINT(0 0)", "POINT(1 1)", sqrt(2.0));
+
+    test_distance<P1, mp1>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P1, mp2>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P2, mp1>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+    test_distance<P2, mp2>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
+
+    // Most interesting: reversal AND a strategy (note that the stategy must be reversed automatically
+    test_distance<mp1, P1>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp1, P2>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp2, P1>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+    test_distance<mp2, P2>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
+}
+// code moved from the distance unit test in multi/algorithms -- end
+
+
 
 
 template <typename P>
@@ -233,6 +372,7 @@ void test_all()
 
     test_geometry<P, test::wrapped_boost_array<P, 2> >("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));
 
+    test_distance_linear<P, bg::model::linestring<P> >("POINT(3 1)", "LINESTRING(1 1,4 4)", sqrt(2.0));
 }
 
 template <typename P>
@@ -242,10 +382,22 @@ void test_empty_input()
     bg::model::linestring<P> line_empty;
     bg::model::polygon<P> poly_empty;
     bg::model::ring<P> ring_empty;
+    bg::model::multi_point<P> mp_empty;
+    bg::model::multi_linestring<bg::model::linestring<P> > ml_empty;
 
     test_empty_input(p, line_empty);
     test_empty_input(p, poly_empty);
     test_empty_input(p, ring_empty);
+
+    test_empty_input(p, mp_empty);
+    test_empty_input(p, ml_empty);
+    test_empty_input(mp_empty, mp_empty);
+
+    // Test behaviour if one of the inputs is empty
+    bg::model::multi_point<P> mp;
+    mp.push_back(p);
+    test_empty_input(mp_empty, mp);
+    test_empty_input(mp, mp_empty);
 }
 
 void test_large_integers()
@@ -267,7 +419,7 @@ void test_large_integers()
         BOOST_AUTO(idist, bg::distance(ia, ib));
         BOOST_AUTO(ddist, bg::distance(da, db));
 
-        BOOST_CHECK_MESSAGE(std::abs(idist - ddist) < 0.1, 
+        BOOST_CHECK_MESSAGE(std::abs(idist - ddist) < 0.1,
                 "within<a double> different from within<an int>");
     }
     // Point-segment
@@ -286,11 +438,58 @@ void test_large_integers()
         BOOST_AUTO(idist, bg::distance(ia, ib));
         BOOST_AUTO(ddist, bg::distance(da, db));
 
-        BOOST_CHECK_MESSAGE(std::abs(idist - ddist) < 0.1, 
+        BOOST_CHECK_MESSAGE(std::abs(idist - ddist) < 0.1,
                 "within<a double> different from within<an int>");
     }
 }
 
+template <typename T>
+void test_variant()
+{
+    typedef bg::model::point<T, 2, bg::cs::cartesian> point_type;
+    typedef bg::model::segment<point_type> segment_type;
+    typedef bg::model::box<point_type> box_type;
+    typedef boost::variant<point_type, segment_type, box_type> variant_type;
+
+    point_type point;
+    std::string const point_li = "POINT(1 3)";
+    bg::read_wkt(point_li, point);
+
+    segment_type seg;
+    std::string const seg_li = "LINESTRING(1 1,4 4)";
+    bg::read_wkt(seg_li, seg);
+
+    variant_type v1, v2;
+    
+    BOOST_MPL_ASSERT((
+        boost::is_same
+            <
+                typename bg::resolve_variant::result_of::distance<variant_type, variant_type, bg::default_strategy>::type,
+                double
+            >
+    ));
+
+    // Default strategy
+    v1 = point;
+    v2 = point;
+    BOOST_CHECK_CLOSE(bg::distance(v1, v2), bg::distance(point, point), 0.0001);
+    BOOST_CHECK_CLOSE(bg::distance(v1, point), bg::distance(point, point), 0.0001);
+    BOOST_CHECK_CLOSE(bg::distance(point, v2), bg::distance(point, point), 0.0001);
+    v1 = point;
+    v2 = seg;
+    BOOST_CHECK_CLOSE(bg::distance(v1, v2), bg::distance(point, seg), 0.0001);
+    BOOST_CHECK_CLOSE(bg::distance(v1, seg), bg::distance(point, seg), 0.0001);
+    BOOST_CHECK_CLOSE(bg::distance(point, v2), bg::distance(point, seg), 0.0001);
+
+    // User defined strategy
+    v1 = point;
+    v2 = point;
+    bg::strategy::distance::haversine<double> s;
+    //BOOST_CHECK_CLOSE(bg::distance(v1, v2, s), bg::distance(point, point, s), 0.0001);
+    //BOOST_CHECK_CLOSE(bg::distance(v1, point, s), bg::distance(point, point, s), 0.0001);
+    //BOOST_CHECK_CLOSE(bg::distance(point, v2, s), bg::distance(point, point, s), 0.0001);
+}
+
 int test_main(int, char* [])
 {
 #ifdef TEST_ARRAY
@@ -313,5 +512,26 @@ int test_main(int, char* [])
 
     test_empty_input<bg::model::d2::point_xy<int> >();
 
+    // below are the test cases moved here from the distance unit test
+    // in test/multi/algorithms
+    test_2d<boost::tuple<float, float> >();
+    test_2d<bg::model::d2::point_xy<float> >();
+    test_2d<bg::model::d2::point_xy<double> >();
+
+    test_3d<boost::tuple<float, float, float> >();
+    test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
+
+    test_mixed<bg::model::d2::point_xy<float>, bg::model::d2::point_xy<double> >();
+
+#ifdef HAVE_TTMATH
+    test_2d<bg::model::d2::point_xy<ttmath_big> >();
+    test_mixed<bg::model::d2::point_xy<ttmath_big>, bg::model::d2::point_xy<double> >();
+#endif
+
+    test_empty_input<bg::model::d2::point_xy<int> >();
+
+    test_variant<double>();
+    test_variant<int>();
+
     return 0;
 }
diff --git a/test/algorithms/distance_all.cpp b/test/algorithms/distance_all.cpp
new file mode 100644
index 000000000..74a46fffb
--- /dev/null
+++ b/test/algorithms/distance_all.cpp
@@ -0,0 +1,20 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_all
+#endif
+
+#include "distance_pointlike_pointlike.cpp"
+#include "distance_pointlike_linear.cpp"
+#include "distance_pointlike_areal.cpp"
+#include "distance_linear_linear.cpp"
+#include "distance_linear_areal.cpp"
+#include "distance_areal_areal.cpp"
diff --git a/test/algorithms/distance_areal_areal.cpp b/test/algorithms/distance_areal_areal.cpp
new file mode 100644
index 000000000..162793425
--- /dev/null
+++ b/test/algorithms/distance_areal_areal.cpp
@@ -0,0 +1,281 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_areal_areal
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<int,2,bg::cs::cartesian>     int_point_type;
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::polygon<point_type, false>         polygon_type;
+typedef bg::model::multi_polygon<polygon_type>        multi_polygon_type;
+typedef bg::model::box<int_point_type>                int_box_type;
+typedef bg::model::box<point_type>                    box_type;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::projected_point<> point_segment_strategy;
+typedef bg::strategy::distance::pythagoras_box_box<> box_box_strategy;
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_polygon_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "polygon/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<polygon_type, polygon_type> tester;
+
+    tester::apply("polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  "polygon((-5 20,5 20,5 25,-5 25,-5 20))",
+                  10, 100, strategy);
+
+    tester::apply("polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  "polygon((-5 20,-5 5,5 5,5 20,-5 20))",
+                  0, 0, strategy);
+
+    tester::apply("polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  "polygon((-5 20,-5 -20,5 -20,5 20,-5 20))",
+                  0, 0, strategy);
+
+    tester::apply("polygon((-10 -10,10 -10,10 10,-10 10,-10 -10),\
+                   (-5 -5,-5 5,5 5,5 -5,-5 -5))",
+                  "polygon((-1 -1,0 0,-1 0,-1 -1))",
+                  4, 16, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_polygon_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "polygon/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            polygon_type, multi_polygon_type
+        > tester;
+
+    tester::apply("polygon((12 0,14 0,19 0,19.9 -1,12 0))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0.1, 0.01, strategy, true);
+
+    tester::apply("polygon((19 0,19.9 -1,12 0,20.5 0.5,19 0))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipolygon_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipolygon/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_polygon_type, multi_polygon_type
+        > tester;
+
+    tester::apply("multipolygon(((12 0,14 0,14 1,12 0)),\
+                   ((18 0,19 0,19.9 -1,18 0)))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0.1, 0.01, strategy);
+
+    tester::apply("multipolygon(((18 0,19 0,19.9 -1,18 0)),\
+                   ((12 0,14 0,20.5 0.5,12 0)))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_box_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "box/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<int_box_type, int_box_type> int_tester;
+    typedef test_distance_of_geometries<box_type, box_type> tester;
+
+    int_tester::apply("box(5 5,10 10)",
+                      "box(0 0,1 1)",
+                      sqrt(32.0), 32, strategy);
+
+    tester::apply("box(5 5,10 10)",
+                  "box(0 0,1 1)",
+                  sqrt(32.0), 32, strategy);
+
+    tester::apply("box(3 8,13 18)",
+                  "box(0 0,5 5)",
+                  3, 9, strategy);
+
+    tester::apply("box(5 5,10 10)",
+                  "box(0 0,5 5)",
+                  0, 0, strategy);
+
+    tester::apply("box(5 5,10 10)",
+                  "box(0 0,6 6)",
+                  0, 0, strategy);
+
+    tester::apply("box(3 5,13 15)",
+                  "box(0 0,5 5)",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_polygon_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "polygon/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<polygon_type, box_type> tester;
+
+    tester::apply("polygon((10 10,10 5,5 5,5 10,10 10))",
+                  "box(0 0,1 1)",
+                  sqrt(32.0), 32, strategy);
+
+    tester::apply("polygon((10 10,10 5,5 5,5 10,10 10))",
+                  "box(0 0,5 5)",
+                  0, 0, strategy);
+
+    tester::apply("polygon((10 10,10 5,5 5,5 10,10 10))",
+                  "box(0 0,6 6)",
+                  0, 0, strategy);
+
+    tester::apply("polygon((10 10,15 5,10 0,5 5,10 10))",
+                  "box(5 0,7.5 2.5)",
+                  0, 0, strategy);
+
+    tester::apply("polygon((10 10,15 5,10 0,5 5,10 10))",
+                  "box(5 0,6 1)",
+                  sqrt(4.5), 4.5, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipolygon_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipolygon/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<multi_polygon_type, box_type> tester;
+
+    tester::apply("multipolygon(((-10 -10,-10 -9,-9 -9,-9 -10,-10 -10)),\
+                   ((2 2,2 3,3 3,3 2,2 2)))",
+                  "box(0 0,1 1)",
+                  sqrt(2.0), 2, strategy);
+
+    tester::apply("multipolygon(((-10 -10,-10 -9,-9 -9,-9 -10,-10 -10)),\
+                   ((2 2,2 3,3 3,3 2,2 2)))",
+                  "box(0 0,2 2)",
+                  0, 0, strategy);
+
+    tester::apply("multipolygon(((-10 -10,-10 -9,-9 -9,-9 -10,-10 -10)),\
+                   ((2 2,2 3,3 3,3 2,2 2)))",
+                  "box(0 0,2.5 2)",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_areal_areal(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::polygon<Point> polygon_empty;
+    bg::model::multi_polygon<bg::model::polygon<Point> > multipolygon_empty;
+
+    bg::model::polygon<Point> polygon =
+        from_wkt<bg::model::polygon<Point> >("polygon((0 0,1 0,0 1))");
+
+    // 1st geometry is empty
+    test_empty_input(polygon_empty, polygon, strategy);
+    test_empty_input(multipolygon_empty, polygon, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(polygon, polygon_empty, strategy);
+    test_empty_input(polygon, multipolygon_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(polygon_empty, polygon_empty, strategy);
+    test_empty_input(polygon_empty, multipolygon_empty, strategy);
+    test_empty_input(multipolygon_empty, polygon_empty, strategy);
+    test_empty_input(multipolygon_empty, multipolygon_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_polygon_polygon )
+{
+    test_distance_polygon_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_polygon_multipolygon )
+{
+    test_distance_polygon_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipolygon_multipolygon )
+{
+    test_distance_multipolygon_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_box_box )
+{
+    test_distance_box_box(box_box_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_polygon_box )
+{
+    test_distance_polygon_box(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipolygon_box )
+{
+    test_distance_multipolygon_box(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_areal_areal )
+{
+    test_more_empty_input_areal_areal<point_type>(point_segment_strategy());
+}
diff --git a/test/algorithms/distance_linear_areal.cpp b/test/algorithms/distance_linear_areal.cpp
new file mode 100644
index 000000000..79774b0d0
--- /dev/null
+++ b/test/algorithms/distance_linear_areal.cpp
@@ -0,0 +1,797 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_linear_areal
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::point<int,2,bg::cs::cartesian>     int_point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::segment<int_point_type>            int_segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+typedef bg::model::polygon<point_type, false>         polygon_type;
+typedef bg::model::multi_polygon<polygon_type>        multi_polygon_type;
+typedef bg::model::box<point_type>                    box_type;
+typedef bg::model::box<int_point_type>                int_box_type;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::pythagoras<> point_point_strategy;
+typedef bg::strategy::distance::projected_point<> point_segment_strategy;
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "segment/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<segment_type, polygon_type> tester;
+
+    tester::apply("segment(-1 20,1 20)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  10, 100, strategy);
+
+    tester::apply("segment(1 20,2 40)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  10, 100, strategy);
+
+    tester::apply("segment(-1 20,-1 5)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy);
+
+    tester::apply("segment(-1 20,-1 -20)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<linestring_type, polygon_type> tester;
+
+    tester::apply("linestring(-1 20,1 20,1 30)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  10, 100, strategy, true);
+  
+    tester::apply("linestring(-1 20,1 20,1 5)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy, true);
+
+    tester::apply("linestring(-1 20,1 20,1 -20)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multilinestring_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multilinestring/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_linestring_type, polygon_type
+        > tester;
+
+    tester::apply("multilinestring((-100 -100,-90 -90),(-1 20,1 20,1 30))",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  10, 100, strategy, true);
+  
+    tester::apply("multilinestring((-1 20,1 20,1 30),(-1 20,1 20,1 5))",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy, true);
+
+    tester::apply("multilinestring((-1 20,1 20,1 30),(-1 20,1 20,1 -20))",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "segment/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            segment_type, multi_polygon_type
+        > tester;
+
+    tester::apply("segment(-1 20,1 20)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((0 22,-1 30, 2 40,0 22)))",
+                  2, 4, strategy);
+
+    tester::apply("segment(12 0,14 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  2, 4, strategy);
+
+    tester::apply("segment(12 0,20.5 0.5)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy);
+
+    tester::apply("segment(12 0,50 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            linestring_type, multi_polygon_type
+        > tester;
+
+    tester::apply("linestring(-1 20,1 20)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((0 22,-1 30, 2 40,0 22)))",
+                  2, 4, strategy, true);
+    
+    tester::apply("linestring(12 0,14 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  2, 4, strategy, true);
+
+    tester::apply("linestring(12 0,20.5 0.5)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy, true);
+
+    tester::apply("linestring(12 0,50 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multilinestring_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multilinestring/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_linestring_type, multi_polygon_type
+        > tester;
+
+    tester::apply("multilinestring((12 0,14 0),(19 0,19.9 -1))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10)))",
+                  0.1, 0.01, strategy, true);
+
+    tester::apply("multilinestring((19 0,19.9 -1),(12 0,20.5 0.5))",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "2D segment/box distance tests" << std::endl;
+#endif
+    typedef int_box_type B;
+    typedef segment_type S;
+    typedef int_segment_type IS;
+
+    typedef test_distance_of_geometries<B, S> tester;
+    typedef test_distance_of_geometries<B, IS> itester;
+
+    // 1st example by Adam Wulkiewicz
+    tester::apply("BOX(5 51,42 96)",
+                  "SEGMENT(6.6799994 95.260002,35.119999 56.340004)",
+                  0, 0, strategy);
+
+    // 2nd example by Adam Wulkiewicz
+    tester::apply("BOX(51 55,94 100)",
+                  "SEGMENT(92.439995 50.130001,59.959999 80.870003)",
+                  0, 0, strategy);
+
+    // segments that intersect the box
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0.5,0.5 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0.5,1.5 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -1,0.5 2)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 1,1.5 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 0,0 2)",
+                  0, 0, strategy);
+    
+    // segment that has closest point on box boundary
+    tester::apply("box(0 0,1 1)",
+                  "segment(4 0.5,5 0.75)",
+                  3, 9, strategy);
+
+    // segment that has closest point on box corner
+    tester::apply("box(0 0,1 1)",
+                  "segment(4 0,0 4)",
+                  sqrt(2.0), 2, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(-4 0,0 -4)",
+                   sqrt(8.0), 8, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(-8 4,4 -8)",
+                   sqrt(8.0), 8, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-4 0,0 4)",
+                  1.5 * sqrt(2.0), 4.5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-4 0,1 5)",
+                  1.5 * sqrt(2.0), 4.5, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(0 -2,3 1)",
+                   0.5 * sqrt(2.0), 0.5, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(0 -2,2 2)",
+                   0, 0, strategy);
+
+    // horizontal segments
+    itester::apply("box(0 0,1 1)",
+                   "segment(-2 -1,-1 -1)",
+                   sqrt(2.0), 2, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(-1 -1,0 -1)",
+                   1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-0.5 -1,0.5 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -1,0.75 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -1,1.25 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 -1,2 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 -1,3 -1)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -1,2 -1)",
+                  1, 1, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 0,-1 0)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0,0 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-0.5 0,0.5 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0,0.75 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0,1.25 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 0,2 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 0,3 0)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 0,2 0)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 0.5,-1 0.5)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0.5,0 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-0.5 0.5,0.5 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0.5,0.75 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0.5,1.25 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 0.5,2 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 0.5,3 0.5)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 0.5,2 0.5)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 1,-1 1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 1,0 1)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-0.5 1,0.5 1)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 1,0.75 1)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 1,1.25 1)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 1,2 1)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 1,3 1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 1,2 1)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 3,-1 3)",
+                  sqrt(5.0), 5, strategy);
+    itester::apply("box(0 0,1 1)",
+                   "segment(-1 3,0 3)",
+                   2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-0.5 3,0.5 3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 3,0.75 3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 3,1.25 3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 3,2 3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(2 3,3 3)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 3,2 3)",
+                  2, 4, strategy);
+
+    // vertical segments
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -2,-1 -1)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -1,-1 0)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -0.5,-1 0.5)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0.5,-1 0.75)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 0.5,-1 1.25)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 1,-1 2)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 2,-1 3)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -2,-1 2)",
+                  1, 1, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 -2,0 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 -1,0 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 -0.5,0 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 0.5,0 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 0.5,0 1.25)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 1,0 2)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 2,0 3)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 -2,0 2)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -2,0.5 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -1,0.5 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -0.5,0.5 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0.5,0.5 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 0.5,0.5 1.25)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 1,0.5 2)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 2,0.5 3)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -2,0.5 2)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 -2,1 -1)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 -1,1 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 -0.5,1 0.5)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 0.5,1 0.75)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 0.5,1 1.25)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 1,1 2)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 2,1 3)",
+                  1, 1, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 -2,1 2)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 -2,3 -1)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 -1,3 0)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 -0.5,3 0.5)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 0.5,3 0.75)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 0.5,3 1.25)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 1,3 2)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 2,3 3)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 -2,3 2)",
+                  2, 4, strategy);
+
+    // positive slope
+    itester::apply("box(0 0,1 1)",
+                   "segment(-2 -2,-1 -1)",
+                   sqrt(2.0), 2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,0 -0.5)",
+                  0.5, 0.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,0.5 -0.5)",
+                  0.5, 0.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,1 -0.5)",
+                  0.5, 0.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,2 0)",
+                  sqrt(0.2), 0.2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,4 1)",
+                  sqrt(0.2), 0.2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,-1.5 0)",
+                  1.5, 2.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,-1.5 0.5)",
+                  1.5, 2.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,-1.5 1)",
+                  1.5, 2.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,0 2)",
+                  sqrt(0.2), 0.2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,1 4)",
+                  sqrt(0.2), 0.2, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,4 2)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,2 4)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,4 3)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,3 4)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,3 3)",
+                  0, 0, strategy);
+
+    // negative slope
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 -2,-1 -3)",
+                  sqrt(8.0), 8, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-3 -1,0 -4)",
+                  sqrt(8.0), 8, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 0.75,-1.5 0.5)",
+                  1.5, 2.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 1.5,-1.5 0.5)",
+                  1.5, 2.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 2,0.75 1.5)",
+                  0.5, 0.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 2,0.75 1.5)",
+                  0.5, 0.25, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 2,2 0)",
+                  0, 0, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0 3,3 0)",
+                  sqrt(0.5), 0.5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 4,4 -1)",
+                  sqrt(0.5), 0.5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 4,0 3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-2 5,-1 4)",
+                  sqrt(10.0), 10, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(3 -1,4 -4)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(1 2,2 1)",
+                  sqrt(0.5), 0.5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 -2,2 -3)",
+                  2, 4, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -2,0 -3)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -2,0.5 -3.5)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(-1 -2,0.5 -3.5)",
+                  sqrt(5.0), 5, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 3,2.5 2)",
+                  sqrt(2.45), 2.45, strategy);
+    tester::apply("box(0 0,1 1)",
+                  "segment(0.5 1.5,1.5 -1.5)",
+                  0, 0, strategy);
+
+    // test degenerate segment
+    tester::apply("box(0 0,2 2)",
+                  "segment(4 1,4 1)",
+                  2, 4, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<linestring_type, box_type> tester;
+
+    // linestrings that intersect the box
+    tester::apply("linestring(-1 0.5,0.5 0.75)",
+                  "box(0 0,1 1)",
+                  0, 0, strategy);
+    tester::apply("linestring(-1 0.5,1.5 0.75)",
+                  "box(0 0,1 1)",
+                  0, 0, strategy);
+    
+    // linestring that has closest point on box boundary
+    tester::apply("linestring(4 0.5,5 0.75)",
+                  "box(0 0,1 1)",
+                  3, 9, strategy);
+
+    // linestring that has closest point on box corner
+    tester::apply("linestring(4 0,0 4)",
+                  "box(0 0,1 1)",
+                  sqrt(2.0), 2, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multilinestring_box(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multilinestring/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<multi_linestring_type, box_type> tester;
+
+    // multilinestring that intersects the box
+    tester::apply("multilinestring((-1 0.5,0.5 0.75),(4 0.5,5 0.75))",
+                  "box(0 0,1 1)",
+                  0, 0, strategy);
+    
+    // multilinestring that has closest point on box boundary
+    tester::apply("multilinestring((4 0.5,5 0.75))",
+                  "box(0 0,1 1)",
+                  3, 9, strategy);
+
+    // multilinestring that has closest point on box corner
+    tester::apply("multilinestring((5 0,0 5),(4 0,0 4))",
+                  "box(0 0,1 1)",
+                  sqrt(2.0), 2, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_linear_areal(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::linestring<Point> line_empty;
+    bg::model::polygon<Point> polygon_empty;
+    bg::model::multi_linestring<bg::model::linestring<Point> > multiline_empty;
+    bg::model::multi_polygon<bg::model::polygon<Point> > multipolygon_empty;
+
+    bg::model::linestring<Point> line =
+        from_wkt<bg::model::linestring<Point> >("linestring(0 0,1 1)");
+
+    bg::model::polygon<Point> polygon =
+        from_wkt<bg::model::polygon<Point> >("polygon((0 0,1 0,0 1))");
+
+    // 1st geometry is empty
+    test_empty_input(line_empty, polygon, strategy);
+    test_empty_input(multiline_empty, polygon, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(line, polygon_empty, strategy);
+    test_empty_input(line, multipolygon_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(line_empty, polygon_empty, strategy);
+    test_empty_input(line_empty, multipolygon_empty, strategy);
+    test_empty_input(multiline_empty, polygon_empty, strategy);
+    test_empty_input(multiline_empty, multipolygon_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_segment_polygon )
+{
+    test_distance_segment_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_polygon )
+{
+    test_distance_linestring_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multilinestring_polygon )
+{
+    test_distance_multilinestring_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_segment_multipolygon )
+{
+    test_distance_segment_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_multipolygon )
+{
+    test_distance_linestring_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multilinestring_multipolygon )
+{
+    test_distance_multilinestring_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_segment_box )
+{
+    test_distance_segment_box(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_box )
+{
+    test_distance_linestring_box(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multilinestring_box )
+{
+    test_distance_multilinestring_box(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_linear_areal )
+{
+    test_more_empty_input_linear_areal<point_type>(point_segment_strategy());
+}
diff --git a/test/algorithms/distance_linear_linear.cpp b/test/algorithms/distance_linear_linear.cpp
new file mode 100644
index 000000000..4eea09d1c
--- /dev/null
+++ b/test/algorithms/distance_linear_linear.cpp
@@ -0,0 +1,280 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_linear_linear
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::projected_point<> point_segment_strategy;
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_segment(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "segment/segment distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<segment_type, segment_type> tester;
+
+    tester::apply("segment(0 0,10 0)",
+                  "segment(4 2,4 0.5)",
+                  return_type(0.5), return_type(0.25), strategy);
+
+    tester::apply("segment(0 0,10 0)",
+                  "segment(4 2,4 -0.5)",
+                  return_type(0), return_type(0), strategy);
+
+    tester::apply("segment(0 0,10 0)",
+                  "segment(4 2,0 0)",
+                  return_type(0), return_type(0), strategy);
+
+    tester::apply("segment(0 0,10 0)",
+                  "segment(-2 3,1 2)",
+                  return_type(2), return_type(4), strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_linestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "segment/linestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<segment_type, linestring_type> tester;
+
+    tester::apply("segment(-1 -1,-2 -2)",
+                  "linestring(2 1,1 2,4 0)",
+                  sqrt(12.5), 12.5, strategy);
+
+    tester::apply("segment(1 1,2 2)",
+                  "linestring(2 1,1 2,4 0)",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_linestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/linestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            linestring_type, linestring_type
+        > tester;
+
+    // It is not obvious that linestrings with only one point are valid
+    tester::apply("linestring(1 1)", "linestring(2 1)",
+                  1, 1, strategy);
+
+    tester::apply("linestring(1 1,3 1)", "linestring(2 1)",
+                  0, 0, strategy);
+
+    tester::apply("linestring(1 1)", "linestring(0 0,-2 0,2 -2,2 0)",
+                  sqrt(2.0), 2, strategy);
+
+    tester::apply("linestring(1 1,1 1)", "linestring(2 1,2 1)",
+                  1, 1, strategy);
+
+    tester::apply("linestring(1 1,1 1,1 1)", "linestring(2 1,2 1,2 1,2 1)",
+                  1, 1, strategy);
+
+    tester::apply("linestring(1 1,3 1)", "linestring(2 1,2 1)",
+                  0, 0, strategy);
+
+    tester::apply("linestring(1 1,1 1)", "linestring(0 0,-2 0,2 -2,2 0)",
+                  sqrt(2.0), 2, strategy);
+
+    tester::apply("linestring(1 1,3 1)", "linestring(2 1, 4 1)",
+                  0, 0, strategy);
+
+    tester::apply("linestring(1 1,2 2,3 3)", "linestring(2 1,1 2,4 0)",
+                  0, 0, strategy);
+
+    tester::apply("linestring(1 1,2 2,3 3)", "linestring(1 0,2 -1,4 0)",
+                  1, 1, strategy);
+
+    tester::apply("linestring(1 1,2 2,3 3)",
+                  "linestring(1 -10,2 0,2.1 -10,4 0)",
+                  sqrt(2.0), 2, strategy);
+
+    tester::apply("linestring(1 1,2 2,3 3)",
+                  "linestring(1 -10,2 1.9,2.1 -10,4 0)",
+                  sqrt(0.005), 0.005, strategy);
+
+    tester::apply("linestring(1 1,1 2)", "linestring(0 0,-2 0,2 -2,2 0)",
+                  sqrt(2.0), 2, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_segment_multilinestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "segment/multilinestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            segment_type, multi_linestring_type
+        > tester;
+
+    tester::apply("segment(-1 -1,-2 -2)",
+                  "multilinestring((2 1,1 2),(4 0,4 10))",
+                  sqrt(12.5), 12.5, strategy);
+
+    tester::apply("segment(1 1,2 2)",
+                  "multilinestring((2 1,1 2),(4 0,4 10))",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_multilinestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/multilinestring distance tests" << std::endl;
+#endif
+
+    typedef test_distance_of_geometries
+        <
+            linestring_type, multi_linestring_type
+        > tester;
+
+    tester::apply("linestring(1 1,2 2,3 3)",
+                  "multilinestring((2 1,1 2,4 0),(1 -10,2 1.9,2.1 -10,4 0))",
+                  0, 0, strategy, true);
+
+    tester::apply("linestring(1 1,2 2,3 3)",
+                  "multilinestring((1 -10,2 0,2.1 -10,4 0),(1 -10,2 1.9,2.1 -10,4 0))",
+                  sqrt(0.005), 0.005, strategy, true);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multilinestring_multilinestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multilinestring/multilinestring distance tests" << std::endl;
+#endif
+
+    typedef test_distance_of_geometries
+        <
+            multi_linestring_type, multi_linestring_type
+        > tester;
+
+    tester::apply("multilinestring((0 0,0 1,1 1),(10 0,11 1,12 2))",
+                  "multilinestring((0.5 0.5,0.75 0.75),(11 0,11 7))",
+                  0, 0, strategy);
+
+    tester::apply("multilinestring((0 0,0 1,1 1),(10 0,11 1,12 2))",
+                  "multilinestring((0.5 0.5,0.75 0.75),(11 0,11 0.9))",
+                  sqrt(0.005), 0.005, strategy);
+
+    tester::apply("multilinestring((0 0,0 1,1 1),(10 0,11 1,12 2))",
+                  "multilinestring((0.5 0.5,0.75 0.75),(11.1 0,11.1 0.9))",
+                  sqrt(0.02), 0.02, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_linear_linear(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::linestring<Point> line_empty;
+    bg::model::multi_linestring<bg::model::linestring<Point> > multiline_empty;
+
+    bg::model::linestring<Point> line =
+        from_wkt<bg::model::linestring<Point> >("linestring(0 0,1 1)");
+
+    // 1st geometry is empty
+    test_empty_input(line_empty, line, strategy);
+    test_empty_input(multiline_empty, line, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(line, line_empty, strategy);
+    test_empty_input(line, multiline_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(line_empty, line_empty, strategy);
+    test_empty_input(line_empty, multiline_empty, strategy);
+    test_empty_input(multiline_empty, multiline_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_segment_segment )
+{
+    test_distance_segment_segment(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_segment_linestring )
+{
+    test_distance_segment_linestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_linestring )
+{
+    test_distance_linestring_linestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_segment_multilinestring )
+{
+    test_distance_segment_multilinestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_multilinestring )
+{
+    test_distance_linestring_multilinestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multilinestring_multilinestring )
+{
+    test_distance_multilinestring_multilinestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_linear_linear )
+{
+    test_more_empty_input_linear_linear<point_type>(point_segment_strategy());
+}
diff --git a/test/algorithms/distance_pointlike_areal.cpp b/test/algorithms/distance_pointlike_areal.cpp
new file mode 100644
index 000000000..69b805476
--- /dev/null
+++ b/test/algorithms/distance_pointlike_areal.cpp
@@ -0,0 +1,575 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_pointlike_areal
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>            multi_point_type;
+typedef bg::model::point<double,3,bg::cs::cartesian>  point_type_3d;
+typedef bg::model::multi_point<point_type_3d>         multi_point_type_3d;
+typedef bg::model::polygon<point_type, false>         polygon_type;
+typedef bg::model::multi_polygon<polygon_type>        multi_polygon_type;
+typedef bg::model::box<point_type>                    box_type;
+typedef bg::model::box<point_type_3d>                 box_type_3d;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::pythagoras<> point_point_strategy;
+typedef bg::strategy::distance::projected_point<> point_segment_strategy;
+typedef bg::strategy::distance::pythagoras_point_box<> point_box_strategy;
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, polygon_type> tester;
+
+    tester::apply("point(0 -20)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  10, 100, strategy);
+
+    tester::apply("point(12 0)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  2, 4, strategy);
+
+    tester::apply("point(0 0)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy);
+
+    tester::apply("point(0 0)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10),\
+                   (-5 -5,-5 5,5 5,5 -5,-5 -5))",
+                  5, 25, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, multi_polygon_type> tester;
+
+    tester::apply("point(0 -20)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((0 22,-1 30,2 40,0 22)))",
+                  10, 100, strategy);
+
+    tester::apply("point(12 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  2, 4, strategy);
+
+    tester::apply("point(0 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy);
+
+    tester::apply("point(0 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10),\
+                   (-5 -5,-5 5,5 5,5 -5,-5 -5)),\
+                   ((100 0,101 0,101 1,100 1,100 0)))",
+                  5, 25, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_polygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipoint/polygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<multi_point_type, polygon_type> tester;
+
+    tester::apply("multipoint(0 -20,0 -15)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  5, 25, strategy);
+
+    tester::apply("multipoint(16 0,12 0)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  2, 4, strategy);
+
+    tester::apply("multipoint(0 0,5 5,4 4)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10))",
+                  0, 0, strategy);
+
+    tester::apply("multipoint(0 0,2 0)",
+                  "polygon((-10 -10,10 -10,10 10,-10 10,-10 -10),\
+                   (-5 -5,-5 5,5 5,5 -5,-5 -5))",
+                  3, 9, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_multipolygon(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipoint/multipolygon distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_point_type, multi_polygon_type
+        > tester;
+
+    tester::apply("multipoint(0 -20,0 -15)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((0 22,-1 30,2 40,0 22)))",
+                  5, 25, strategy);
+
+    tester::apply("multipoint(16 0,12 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  2, 4, strategy);
+
+    tester::apply("multipoint(0 0,4 4,5 5)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10)),\
+                   ((20 -1,21 2,30 -10,20 -1)))",
+                  0, 0, strategy);
+
+    tester::apply("multipoint(0 0,2 0)",
+                  "multipolygon(((-10 -10,10 -10,10 10,-10 10,-10 -10),\
+                   (-5 -5,-5 5,5 5,5 -5,-5 -5)),\
+                   ((100 0,101 0,101 1,100 1,100 0)))",
+                  3, 9, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_box_2d(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "2D point/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<box_type, point_type> tester;
+
+    // point inside box
+    tester::apply("box(-1 -1,1 1)",
+                  "point(0 0)", 0, 0, strategy);
+
+    // points on box corners
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-1 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(1 1)", 0, 0, strategy);
+
+    // points on box boundary edges
+    tester::apply("box(-1 -1,1 1)",
+                  "point(0 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(0 1)", 0, 0, strategy);
+
+    // points outside box
+    tester::apply("box(-1 -1,1 1)",
+                  "point(0 4)", 3, 9, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(0.5 4)", 3, 9, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-0.5 5)", 4, 16, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(3 0.25)", 2, 4, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-3 -0.25)", 2, 4, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(3 5)", sqrt(20.0), 20, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-5 -4)", 5, 25, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(2 -2)", sqrt(2.0), 2, strategy);
+    tester::apply("box(-1 -1,1 1)",
+                  "point(-3 4)", sqrt(13.0), 13, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_box_different_point_types(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "2D point/box distance tests with different points"
+              << std::endl;
+#endif
+    typedef point_type double_point;
+    typedef box_type double_box;
+    typedef bg::model::point<int,2,bg::cs::cartesian> int_point;
+    typedef bg::model::box<int_point> int_box;
+
+    test_distance_of_geometries
+        <
+            int_point, int_box
+        >::apply("point(0 0)",
+                 "box(1 1, 2 2)",
+                 sqrt(2.0), 2, strategy);
+
+    test_distance_of_geometries
+        <
+            double_point, int_box
+        >::apply("point(0.5 0)",
+                 "box(1 -1,2 1)",
+                 0.5, 0.25, strategy);
+
+    test_distance_of_geometries
+        <
+            double_point, double_box
+        >::apply("point(1.5 0)",
+                 "box(1 -1,2 1)",
+                 0, 0, strategy);
+
+    test_distance_of_geometries
+        <
+            double_point, int_box
+        >::apply("point(1.5 0)",
+                 "box(1 -1,2 1)",
+                 0, 0, strategy);
+
+    test_distance_of_geometries
+        <
+            int_point, double_box
+        >::apply("point(1 0)",
+                 "box(0.5 -1,1.5 1)",
+                 0, 0, strategy);
+
+    test_distance_of_geometries
+        <
+            int_point, double_box
+        >::apply("point(0 0)",
+                 "box(0.5, -1,1.5, 1)",
+                 0.5, 0.25, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_box_3d(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "3D point/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<box_type_3d, point_type_3d> tester;
+
+    // point inside box
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 0 0)", 0, 0, strategy);
+
+    // points on box corners
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 -1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 -1 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 1 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 -1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 -1 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 1 1)", 0, 0, strategy);
+
+    // points on box boundary edges
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -1 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 1 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 1 1)", 0, 0, strategy);
+
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 0 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 0 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 0 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 0 1)", 0, 0, strategy);
+
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 -1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 -1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 1 0)", 0, 0, strategy);
+
+    // point on box faces
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 0 -1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 0 1)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 1 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-1 0 0)", 0, 0, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(1 0 0)", 0, 0, strategy);
+
+    // points outside box -- closer to box corners
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-2 -3 -4)", sqrt(14.0), 14, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-2 -3 3)", 3, 9, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-2 5 -2)", sqrt(18.0), 18, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-2 5 3)", sqrt(21.0), 21, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(4 -6 -3)", sqrt(38.0), 38, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(4 -6 4)", sqrt(43.0), 43, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(4 7 -2)", sqrt(46.0), 46, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(4 7 8)", sqrt(94.0), 94, strategy);
+
+
+    // points closer to box facets
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 0 10)", 9, 81, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 0 -5)", 4, 16, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 7 0)", 6, 36, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -6 0)", 5, 25, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(4 0 0)", 3, 9, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-3 0 0)", 2, 4, strategy);
+
+    // points closer to box edges
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -4 -5)", 5, 25, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 -3 6)", sqrt(29.0), 29, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 2 -7)", sqrt(37.0), 37, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(0 8 7)", sqrt(85.0), 85, strategy);
+
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-4 0 -4)", sqrt(18.0), 18, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-3 0 5)", sqrt(20.0), 20, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(2 0 -6)", sqrt(26.0), 26, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(8 0 6)", sqrt(74.0), 74, strategy);
+
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-5 -5 0)", sqrt(32.0), 32, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(-4 6 0)", sqrt(34.0), 34, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(3 -7 0)", sqrt(40.0), 40, strategy);
+    tester::apply("box(-1 -1 -1,1 1 1)",
+                  "point(9 7 0)", 10, 100, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_box_2d(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "2D multipoint/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<box_type, multi_point_type> tester;
+
+    // at least one point inside the box
+    tester::apply("box(0 0,10 10)",
+                  "multipoint(0 0,-1 -1,20 20)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,10 10)",
+                  "multipoint(1 1,-1 -1,20 20)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0,10 10)",
+                  "multipoint(1 1,2 2,3 3)",
+                  0, 0, strategy);
+
+    // all points outside the box
+    tester::apply("box(0 0,10 10)",
+                  "multipoint(-1 -1,20 20)",
+                  sqrt(2.0), 2, strategy);
+
+    tester::apply("box(0 0,10 10)",
+                  "multipoint(5 13, 50 50)",
+                  3, 9, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_box_3d(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "3D multipoint/box distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            box_type_3d, multi_point_type_3d
+        > tester;
+
+    // at least one point inside the box
+    tester::apply("box(0 0 0,10 10 10)",
+                  "multipoint(0 0 0,-1 -1 -1,20 20 20)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0 0,10 10 10)",
+                  "multipoint(1 1 1,-1 -1 -1,20 20 20)",
+                  0, 0, strategy);
+
+    tester::apply("box(0 0 0,10 10 10)",
+                  "multipoint(1 1 1,2 2 2,3 3 3)",
+                  0, 0, strategy);
+
+    // all points outside the box
+    tester::apply("box(0 0 0,10 10 10)",
+                  "multipoint(-1 -1 -1,20 20 20)",
+                  sqrt(3.0), 3, strategy);
+
+    tester::apply("box(0 0 0,10 10 10)",
+                  "multipoint(5 5 13,50 50 50)",
+                  3, 9, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_pointlike_areal(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::multi_point<Point> multipoint_empty;
+    bg::model::polygon<Point> polygon_empty;
+    bg::model::multi_polygon<bg::model::polygon<Point> > multipolygon_empty;
+
+    Point point = from_wkt<Point>("point(0 0)");
+    bg::model::polygon<Point> polygon =
+        from_wkt<bg::model::polygon<Point> >("polygon((0 0,1 0,0 1))");
+
+    // 1st geometry is empty
+    test_empty_input(multipoint_empty, polygon, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(point, polygon_empty, strategy);
+    test_empty_input(point, multipolygon_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(multipoint_empty, polygon_empty, strategy);
+    test_empty_input(multipoint_empty, multipolygon_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_point_polygon )
+{
+    test_distance_point_polygon(point_point_strategy()); // back-compatibility
+    test_distance_point_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_multipolygon )
+{
+    test_distance_point_multipolygon(point_point_strategy()); // back-compatibility
+    test_distance_point_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_polygon )
+{
+    test_distance_multipoint_polygon(point_point_strategy()); // back-compatibility
+    test_distance_multipoint_polygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_multipolygon )
+{
+    test_distance_multipoint_multipolygon(point_point_strategy()); // back-compatibility
+    test_distance_multipoint_multipolygon(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_box_2d )
+{
+    point_box_strategy pb_strategy;
+
+    test_distance_point_box_2d(pb_strategy);
+    test_distance_point_box_different_point_types(pb_strategy);
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_box_3d )
+{
+    test_distance_point_box_3d(point_box_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_box_2d )
+{
+    test_distance_multipoint_box_2d(point_box_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_box_3d )
+{
+    test_distance_multipoint_box_3d(point_box_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_pointlike_areal )
+{
+    test_more_empty_input_pointlike_areal
+        <
+            point_type
+        >(point_segment_strategy());
+}
diff --git a/test/algorithms/distance_pointlike_linear.cpp b/test/algorithms/distance_pointlike_linear.cpp
new file mode 100644
index 000000000..099465d8e
--- /dev/null
+++ b/test/algorithms/distance_pointlike_linear.cpp
@@ -0,0 +1,264 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_pointlike_linear
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>            multi_point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::pythagoras<> point_point_strategy;
+typedef bg::strategy::distance::projected_point<> point_segment_strategy;
+
+
+//===========================================================================
+
+
+template <typename Strategy>
+void test_distance_point_segment(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/segment distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, segment_type> tester;
+
+    tester::apply("point(0 0)", "segment(2 0,3 0)", 2, 4, strategy);
+    tester::apply("point(2.5 3)", "segment(2 0,3 0)", 3, 9, strategy);
+    tester::apply("point(2 0)", "segment(2 0,3 0)", 0, 0, strategy);
+    tester::apply("point(3 0)", "segment(2 0,3 0)", 0, 0, strategy);
+    tester::apply("point(2.5 0)", "segment(2 0,3 0)", 0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_linestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/linestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, linestring_type> tester;
+
+    tester::apply("point(0 0)", "linestring(2 0)", 2, 4, strategy);
+    tester::apply("point(0 0)", "linestring(2 0,3 0)", 2, 4, strategy);
+    tester::apply("point(2.5 3)", "linestring(2 0,3 0)", 3, 9, strategy);
+    tester::apply("point(2 0)", "linestring(2 0,3 0)", 0, 0, strategy);
+    tester::apply("point(3 0)", "linestring(2 0,3 0)", 0, 0, strategy);
+    tester::apply("point(2.5 0)", "linestring(2 0,3 0)", 0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_multilinestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/multilinestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            point_type, multi_linestring_type
+        > tester;
+
+    tester::apply("point(0 0)",
+                  "multilinestring((-5 0,-3 0),(2 0,3 0))",
+                  2, 4, strategy);
+    tester::apply("point(2.5 3)",
+                  "multilinestring((-5 0,-3 0),(2 0,3 0))",
+                  3, 9, strategy);
+    tester::apply("point(2 0)",
+                  "multilinestring((-5 0,-3 0),(2 0,3 0))",
+                  0, 0, strategy);
+    tester::apply("point(3 0)",
+                  "multilinestring((-5 0,-3 0),(2 0,3 0))",
+                  0, 0, strategy);
+    tester::apply("point(2.5 0)",
+                  "multilinestring((-5 0,-3 0),(2 0,3 0))",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_linestring_multipoint(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "linestring/multipoint distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            linestring_type, multi_point_type
+        > tester;
+
+    tester::apply("linestring(2 0,0 2,100 100)",
+                  "multipoint(0 0,1 0,0 1,1 1)",
+                  0, 0, strategy);
+    tester::apply("linestring(4 0,0 4,100 100)",
+                  "multipoint(0 0,1 0,0 1,1 1)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("linestring(1 1,2 2,100 100)",
+                  "multipoint(0 0,1 0,0 1,1 1)",
+                  0, 0, strategy);
+    tester::apply("linestring(3 3,4 4,100 100)",
+                  "multipoint(0 0,1 0,0 1,1 1)",
+                  sqrt(8.0), 8, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_multilinestring(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipoint/multilinestring distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_point_type, multi_linestring_type
+        > tester;
+
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multilinestring((2 0,0 2),(2 2,3 3))",
+                  0, 0, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multilinestring((3 0,0 3),(4 4,5 5))",
+                  0.5 * sqrt(2.0), 0.5, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multilinestring((4 4,5 5),(1 1,2 2))",
+                  0, 0, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multilinestring((3 3,4 4),(4 4,5 5))",
+                  sqrt(8.0), 8, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_segment(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipoint/segment distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<multi_point_type, segment_type> tester;
+
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "segment(2 0,0 2)",
+                  0, 0, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "segment(4 0,0 4)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "segment(1 1,2 2)",
+                  0, 0, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "segment(3 3,4 4)",
+                  sqrt(8.0), 8, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_pointlike_linear(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::linestring<Point> line_empty;
+    bg::model::multi_point<Point> multipoint_empty;
+    bg::model::multi_linestring<bg::model::linestring<Point> > multiline_empty;
+
+    Point point = from_wkt<Point>("point(0 0)");
+    bg::model::linestring<Point> line =
+        from_wkt<bg::model::linestring<Point> >("linestring(0 0,1 1)");
+
+    // 1st geometry is empty
+    test_empty_input(multipoint_empty, line, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(point, line_empty, strategy);
+    test_empty_input(point, multiline_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(multipoint_empty, line_empty, strategy);
+    test_empty_input(multipoint_empty, multiline_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_point_segment )
+{
+    test_distance_point_segment(point_point_strategy()); // back-compatibility
+    test_distance_point_segment(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_linestring )
+{
+    test_distance_point_linestring(point_point_strategy()); // back-compatibility
+    test_distance_point_linestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_multilinestring )
+{
+    test_distance_point_multilinestring(point_point_strategy()); // back-compatibility
+    test_distance_point_multilinestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_linestring_multipoint )
+{
+    test_distance_linestring_multipoint(point_point_strategy()); // back-compatibility
+    test_distance_linestring_multipoint(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_multilinestring )
+{
+    test_distance_multipoint_multilinestring(point_point_strategy()); // back-compatibility
+    test_distance_multipoint_multilinestring(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_segment )
+{
+    test_distance_multipoint_segment(point_segment_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_pointlike_linear )
+{
+    test_more_empty_input_pointlike_linear
+        <
+            point_type
+        >(point_segment_strategy());
+}
diff --git a/test/algorithms/distance_pointlike_pointlike.cpp b/test/algorithms/distance_pointlike_pointlike.cpp
new file mode 100644
index 000000000..83116ed73
--- /dev/null
+++ b/test/algorithms/distance_pointlike_pointlike.cpp
@@ -0,0 +1,143 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_pointlike_pointlike
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_distance_common.hpp"
+
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>            multi_point_type;
+
+namespace services = bg::strategy::distance::services;
+typedef bg::default_distance_result<point_type>::type return_type;
+
+typedef bg::strategy::distance::pythagoras<> point_point_strategy;
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_point(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/point distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, point_type> tester;
+
+    tester::apply("point(1 1)",
+                  "point(0 0)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("point(1 1)",
+                  "point(1 1)",
+                  0, 0, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_point_multipoint(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "point/multipoint distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries<point_type, multi_point_type> tester;
+
+    tester::apply("point(1 1)",
+                  "multipoint(1 1,2 1,2 2,1 2)",
+                  0, 0, strategy);
+    tester::apply("point(1 1)",
+                  "multipoint(2 2,2 3,3 2,3 3)",
+                  sqrt(2.0), 2, strategy);
+    tester::apply("point(3 0)",
+                  "multipoint(2 2,2 4,4 2,4 4)",
+                  sqrt(5.0), 5, strategy);
+}
+
+//===========================================================================
+
+template <typename Strategy>
+void test_distance_multipoint_multipoint(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "multipoint/multipoint distance tests" << std::endl;
+#endif
+    typedef test_distance_of_geometries
+        <
+            multi_point_type, multi_point_type
+        > tester;
+
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multipoint(1 1,2 1,2 2,1 2)",
+                  0, 0, strategy);
+    tester::apply("multipoint(0 0,1 0,0 1,1 1)",
+                  "multipoint(2 2,2 3,3 2,3 3)",
+                  sqrt(2.0), 2, strategy);
+}
+
+//===========================================================================
+
+template <typename Point, typename Strategy>
+void test_more_empty_input_pointlike_pointlike(Strategy const& strategy)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "testing on empty inputs... " << std::flush;
+#endif
+    bg::model::multi_point<Point> multipoint_empty;
+
+    Point point = from_wkt<Point>("point(0 0)");
+
+    // 1st geometry is empty
+    test_empty_input(multipoint_empty, point, strategy);
+
+    // 2nd geometry is empty
+    test_empty_input(point, multipoint_empty, strategy);
+
+    // both geometries are empty
+    test_empty_input(multipoint_empty, multipoint_empty, strategy);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "done!" << std::endl;
+#endif
+}
+
+//===========================================================================
+
+BOOST_AUTO_TEST_CASE( test_all_point_point )
+{
+    test_distance_point_point(point_point_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_point_multipoint )
+{
+    test_distance_point_multipoint(point_point_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_multipoint_multipoint )
+{
+    test_distance_multipoint_multipoint(point_point_strategy());
+}
+
+BOOST_AUTO_TEST_CASE( test_all_empty_input_pointlike_pointlike )
+{
+    test_more_empty_input_pointlike_pointlike
+        <
+            point_type
+        >(point_point_strategy());
+}
diff --git a/test/algorithms/equals.cpp b/test/algorithms/equals.cpp
index c651b13ee..1ee21ec22 100644
--- a/test/algorithms/equals.cpp
+++ b/test/algorithms/equals.cpp
@@ -1,6 +1,12 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
+
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 // 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)
@@ -10,8 +16,91 @@
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
 
+#include <boost/geometry/multi/core/topological_dimension.hpp>
+#include <boost/geometry/multi/core/point_order.hpp>
+#include <boost/geometry/multi/core/closure.hpp>
+#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
+#include <boost/geometry/multi/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/multi/algorithms/equals.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
 
+namespace bgm = bg::model;
+
+template <typename P>
+void test_segment_segment()
+{
+    typedef bgm::segment<P> seg;
+
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(0 0, 3 3)", true);
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(3 3, 0 0)", true);
+
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(0 0, 1 1)", false);
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(3 3, 2 2)", false);
+
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(1 1, 4 4)", false);
+    test_geometry<seg, seg>("seg2d_1", "LINESTRING(0 0, 3 3)", "LINESTRING(1 0, 2 0)", false);
+}
+
+template <typename P>
+void test_linestring_linestring()
+{
+    typedef bgm::linestring<P> ls;
+
+    test_geometry<ls, ls>("ls2d_1", "LINESTRING(1 1, 3 3)", "LINESTRING(3 3, 1 1)", true);
+    test_geometry<ls, ls>("ls2d_2", "LINESTRING(1 1, 3 3, 2 5)", "LINESTRING(1 1, 2 2, 3 3, 2 5)", true);
+    test_geometry<ls, ls>("ls2d_3", "LINESTRING(1 0, 3 3, 2 5)", "LINESTRING(1 1, 2 2, 3 3, 2 5)", false);
+    test_geometry<ls, ls>("ls2d_4", "LINESTRING(1 0, 3 3, 2 5)", "LINESTRING(1 1, 3 3, 2 5)", false);
+    test_geometry<ls, ls>("ls2d_5", "LINESTRING(0 5,5 5,10 5,10 0,5 0,5 5,5 10,10 10,15 10,15 5,10 5,10 10,10 15)",
+                                    "LINESTRING(0 5,15 5,15 10,5 10,5 0,10 0,10 15)", true);
+    test_geometry<ls, ls>("ls2d_6", "LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,5 0)", "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", true);
+    test_geometry<ls, ls>("ls2d_7", "LINESTRING(0 5,10 5,10 10,5 10,5 0)", "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", true);
+    test_geometry<ls, ls>("ls2d_8", "LINESTRING(0 0,5 0,5 0,6 0)", "LINESTRING(0 0,6 0)", true);
+
+    test_geometry<ls, ls>("ls2d_seg", "LINESTRING(1 1,2 2)", "LINESTRING(1 1,2 2)", true);
+    test_geometry<ls, ls>("ls2d_rev", "LINESTRING(1 1,2 2)", "LINESTRING(2 2,1 1)", true);
+
+    test_geometry<ls, ls>("ls2d_spike", "LINESTRING(0 0,5 0,3 0,6 0)", "LINESTRING(0 0,6 0)", true);
+
+    test_geometry<ls, ls>("ls2d_ring1", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "LINESTRING(5 5,0 5,0 0,5 0,5 5)", true);
+    test_geometry<ls, ls>("ls2d_ring2", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "LINESTRING(5 5,5 0,0 0,0 5,5 5)", true);
+    test_geometry<ls, ls>("ls2d_overl_ring1", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "LINESTRING(5 5,0 5,0 0,5 0,5 5,0 5)", true);
+    test_geometry<ls, ls>("ls2d_overl_ring2", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "LINESTRING(5 5,5 0,0 0,0 5,5 5,5 0)", true);
+}
+
+template <typename P>
+void test_linestring_multilinestring()
+{
+    typedef bgm::linestring<P> ls;
+    typedef bgm::multi_linestring<ls> mls;
+
+    test_geometry<ls, mls>("ls_mls_1", "LINESTRING(0 0,1 0,2 0)", "MULTILINESTRING((0 0,2 0))", true);
+    test_geometry<ls, mls>("ls_mls_1", "LINESTRING(0 0,1 0,2 0)", "MULTILINESTRING((0 0,1 0),(1 0,2 0))", true);
+    test_geometry<ls, mls>("ls_mls_1", "LINESTRING(0 0,2 0,4 0)", "MULTILINESTRING((0 0,2 0),(2 0,3 0),(3 0,4 0))", true);
+    test_geometry<ls, mls>("ls_mls_1", "LINESTRING(0 0,2 0,4 0)", "MULTILINESTRING((0 0,2 0),(2 0,3 0),(2 0,3 0),(3 0,4 0))", true);
+    test_geometry<ls, mls>("ls_mls_1", "LINESTRING(0 0,2 0,4 0)", "MULTILINESTRING((0 0,2 0),(3 0,4 0))", false);
+
+    test_geometry<ls, mls>("ls_mls_spike", "LINESTRING(0 0,2 0,2 2,2 0,4 0)", "MULTILINESTRING((0 0,4 0),(2 2,2 0))", true);
+    test_geometry<ls, mls>("ls_mls_spike", "LINESTRING(0 0,2 0,2 2,2 0,4 0)", "MULTILINESTRING((0 0,4 0),(2 2,2 -1))", false);
+
+    test_geometry<ls, mls>("ls_mls_ring1", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "MULTILINESTRING((5 5,0 5,0 0),(0 0,5 0,5 5))", true);
+    test_geometry<ls, mls>("ls_mls_ring2", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "MULTILINESTRING((5 5,5 0,0 0),(0 0,0 5,5 5))", true);
+    test_geometry<ls, mls>("ls_mls_overl_ring1", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "MULTILINESTRING((5 5,0 5,0 0),(0 0,5 0,5 5,0 5))", true);
+    test_geometry<ls, mls>("ls_mls_overl_ring2", "LINESTRING(0 0,5 0,5 5,0 5,0 0)", "MULTILINESTRING((5 5,5 0,0 0),(0 0,0 5,5 5,5 0))", true);
+}
+
+template <typename P>
+void test_multilinestring_multilinestring()
+{
+    typedef bgm::linestring<P> ls;
+    typedef bgm::multi_linestring<ls> mls;
+
+    test_geometry<mls, mls>("ls_mls_mls",
+                            "MULTILINESTRING((0 5,10 5,10 10,5 10),(5 10,5 0,5 2),(5 2,5 5,0 5))",
+                            "MULTILINESTRING((5 5,0 5),(5 5,5 0),(10 10,10 5,5 5,5 10,10 10))",
+                            true);
+}
 
 template <typename P>
 void test_all()
@@ -19,7 +108,7 @@ void test_all()
     typedef bg::model::box<P> box;
     typedef bg::model::ring<P> ring;
     typedef bg::model::polygon<P> polygon;
-    typedef bg::model::linestring<P> linestring;
+    //typedef bg::model::linestring<P> linestring;
 
     std::string case_p1 = "POLYGON((0 0,0 2,2 2,0 0))";
 
@@ -90,14 +179,14 @@ void test_all()
 
     test_geometry<polygon, box>("boxpoly2", "POLYGON((1 1,1 2,2 2,2 1,1 1))", "BOX(1 1,2 3)", false);
 
-    // linestring/linestring
-    // simplex
-    test_geometry<linestring, linestring>("ls1", "LINESTRING(1 1,2 2)", "LINESTRING(1 1,2 2)", true);
-
-    // REVERSE linestring
-    // Is this equal? To be decided.
-    //test_geometry<linestring, linestring>("ls1", "LINESTRING(1 1,2 2)", "LINESTRING(2 2,1 1)", true);
+    test_geometry<polygon, polygon>("poly_holes_shifted_points",
+        "POLYGON((0 0,0 3,3 3,3 0,0 0),(1 1,2 1,2 2,1 2,1 1))",
+        "POLYGON((0 0,0 3,3 3,3 0,0 0),(2 2,1 2,1 1,2 1,2 2))", true);
 
+    test_segment_segment<P>();
+    test_linestring_linestring<P>();
+    test_linestring_multilinestring<P>();
+    test_multilinestring_multilinestring<P>();
 }
 
 
diff --git a/test/algorithms/for_each.cpp b/test/algorithms/for_each.cpp
index f61397eec..2efe10f2c 100644
--- a/test/algorithms/for_each.cpp
+++ b/test/algorithms/for_each.cpp
@@ -65,7 +65,7 @@ void test_all()
             , "((1, 1), (1, 4)) ((1, 4), (4, 4)) ((4, 4), (4, 1)) ((4, 1), (1, 1)) "
               "((2, 2), (3, 2)) ((3, 2), (3, 3)) ((3, 3), (2, 3)) ((2, 3), (2, 2))"
             , 4 * 3.0 + 4 * 1.0
-            , "POLYGON((10 1,10 4,4 4,4 1,1 1),(2 2,3 2,3 3,2 3,2 2))"
+            , "POLYGON((10 1,10 4,4 4,4 1,1 1,10 1),(2 2,3 2,3 3,2 3,2 2))"
         );
 }
 
diff --git a/test/algorithms/from_wkt.hpp b/test/algorithms/from_wkt.hpp
new file mode 100644
index 000000000..5c78afdea
--- /dev/null
+++ b/test/algorithms/from_wkt.hpp
@@ -0,0 +1,27 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Tests
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_GEOMETRY_TEST_FROM_WKT_HPP
+#define BOOST_GEOMETRY_TEST_FROM_WKT_HPP
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+template <typename Geometry>
+inline Geometry from_wkt(std::string const& wkt)
+{
+    Geometry result;
+    boost::geometry::read_wkt(wkt, result);
+    return result;
+}
+
+#endif // BOOST_GEOMETRY_TEST_FROM_WKT_HPP
diff --git a/test/algorithms/intersection.cpp b/test/algorithms/intersection.cpp
index e176e2356..cefdb8ec9 100644
--- a/test/algorithms/intersection.cpp
+++ b/test/algorithms/intersection.cpp
@@ -15,7 +15,11 @@
 #include <iostream>
 #include <string>
 
-#define TEST_ISOVIST
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// Test which would fail then are disabled automatically
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
+
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/register/linestring.hpp>
@@ -34,19 +38,9 @@
 BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::vector)
 
 
-static std::string pie_2_3_23_0[2] =
-{
-    "POLYGON((2500 2500,2855 3828,2500 3875,2500 2500))",
-    "POLYGON((2500 2500,2791 3586,2499 3625,2208 3586,2500 2500))"
-};
-
 template <typename Polygon>
 void test_areal()
 {
-    test_one<Polygon, Polygon, Polygon>("pie_2_3_23_0",
-        pie_2_3_23_0[0], pie_2_3_23_0[1],
-        1, 4, 163292.679042133, 0.1);
-
     test_one<Polygon, Polygon, Polygon>("simplex_with_empty_1",
         simplex_normal[0], polygon_empty,
         0, 0, 0.0);
@@ -156,39 +150,51 @@ void test_areal()
         crossed[0], crossed[1],
         3, 0, 1.5);
 
+    test_one<Polygon, Polygon, Polygon>("pie_2_3_23_0",
+        pie_2_3_23_0[0], pie_2_3_23_0[1],
+        1, 4, 163292.679042133, 0.1);
+
+
     typedef typename bg::coordinate_type<Polygon>::type ct;
     bool const ccw = bg::point_order<Polygon>::value == bg::counterclockwise;
     bool const open = bg::closure<Polygon>::value == bg::open;
 
 
-#ifdef TEST_ISOVIST
-#ifdef _MSC_VER
     test_one<Polygon, Polygon, Polygon>("isovist",
         isovist1[0], isovist1[1],
-        1, 20, 88.19203,
+        1, 19, 88.19203,
         if_typed_tt<ct>(0.01, 0.1));
 
     // SQL Server gives: 88.1920416352664
     // PostGIS gives:    88.19203677911
 
-#endif
-#endif
+    test_one<Polygon, Polygon, Polygon>("geos_1",
+        geos_1[0], geos_1[1],
+            1, -1, 3461.0214843);
+    test_one<Polygon, Polygon, Polygon>("geos_2",
+        geos_2[0], geos_2[1],
+            0, 0, 0.0);
+    test_one<Polygon, Polygon, Polygon>("geos_3",
+        geos_3[0], geos_3[1],
+            0, -0, 0.0);
+    test_one<Polygon, Polygon, Polygon>("geos_4",
+        geos_4[0], geos_4[1],
+            1, -1, 0.08368849);
 
-    //std::cout << typeid(ct).name() << std::endl;
 
     if (! ccw && open)
     {
         // Pointcount for ttmath/double (both 5) or float (4)
         // double returns 5 (since method append_no_dups_or_spikes)
-        // but not for ccw/open. Those cases has to be adapted once, anyway, 
+        // but not for ccw/open. Those cases has to be adapted once, anyway,
         // because for open always one point too much is generated...
         test_one<Polygon, Polygon, Polygon>("ggl_list_20110306_javier",
             ggl_list_20110306_javier[0], ggl_list_20110306_javier[1],
-            1, if_typed<ct, float>(4, 5), 
-            0.6649875, 
-            if_typed<ct, float>(1.0, 0.01)); 
+            1, if_typed<ct, float>(4, 5),
+            0.6649875,
+            if_typed<ct, float>(1.0, 0.01));
     }
-        
+
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110307_javier",
         ggl_list_20110307_javier[0], ggl_list_20110307_javier[1],
         1, 4, 0.4, 0.01);
@@ -197,34 +203,67 @@ void test_areal()
         ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
         1, if_typed_tt<ct>(6, 5), 11151.6618);
 
-#ifdef _MSC_VER // gcc/linux behaves differently
-    if (! boost::is_same<ct, float>::value)
-    {
-        test_one<Polygon, Polygon, Polygon>("ggl_list_20110716_enrico",
-            ggl_list_20110716_enrico[0], ggl_list_20110716_enrico[1],
-            3, 
-            if_typed<ct, float>(19, 21),
-            35723.8506317139);
-    }
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20110716_enrico",
+        ggl_list_20110716_enrico[0], ggl_list_20110716_enrico[1],
+        3, 16, 35723.8506317139);
+
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20131119_james",
+        ggl_list_20131119_james[0], ggl_list_20131119_james[1],
+        1, 4, 6.6125873045, 0.1);
+
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20140223_shalabuda",
+        ggl_list_20140223_shalabuda[0], ggl_list_20140223_shalabuda[1],
+        1, 4, 3.77106);
+
+#if 0
+    // TODO: fix this testcase, it should give 0 but instead it gives one of the input polygons
+    // Mailed to the Boost.Geometry list on 2014/03/21 by 7415963@gmail.com
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20140321_7415963",
+        ggl_list_20140321_7415963[0], ggl_list_20140321_7415963[1],
+        0, 0, 0, 0.1);
 #endif
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_rt_f", buffer_rt_f[0], buffer_rt_f[1],
                 1, 4,  0.00029437899183903937, 0.01);
+#endif
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_g", buffer_rt_g[0], buffer_rt_g[1],
                 1, 0, 2.914213562373);
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("ticket_8254", ticket_8254[0], ticket_8254[1],
-                1, 4, 3.63593e-08, 0.01);
+                1, 4, 3.6334e-08, 0.01);
+#endif
 
     test_one<Polygon, Polygon, Polygon>("ticket_6958", ticket_6958[0], ticket_6958[1],
                 1, 4, 4.34355e-05, 0.01);
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("ticket_8652", ticket_8652[0], ticket_8652[1],
-                1, 4, 0.0003, 0.00001);
+                1, 4, 0.0003);
+#endif
 
+    test_one<Polygon, Polygon, Polygon>("ticket_8310a", ticket_8310a[0], ticket_8310a[1],
+                1, 5, 0.3843747);
+    test_one<Polygon, Polygon, Polygon>("ticket_8310b", ticket_8310b[0], ticket_8310b[1],
+                1, 5, 0.3734379);
+    test_one<Polygon, Polygon, Polygon>("ticket_8310c", ticket_8310c[0], ticket_8310c[1],
+                1, 5, 0.4689541);
+
+    test_one<Polygon, Polygon, Polygon>("ticket_9081_15",
+                ticket_9081_15[0], ticket_9081_15[1],
+                1, 4, 0.0068895780745301394);
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    test_one<Polygon, Polygon, Polygon>("ticket_9563", ticket_9563[0], ticket_9563[1],
+                1, 8, 129.90381);
+#endif
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_mp1", buffer_mp1[0], buffer_mp1[1],
                 1, 31, 2.271707796);
+#endif
 
     test_one<Polygon, Polygon, Polygon>("buffer_mp2", buffer_mp2[0], buffer_mp2[1],
                 1, 29, 0.457126);
@@ -298,14 +337,13 @@ void test_boxes(std::string const& wkt1, std::string const& wkt2, double expecte
     }
 }
 
-
 template <typename P>
 void test_point_output()
 {
     typedef bg::model::linestring<P> linestring;
     typedef bg::model::polygon<P> polygon;
     typedef bg::model::box<P> box;
-    typedef bg::model::segment<P> segment;
+    //typedef bg::model::segment<P> segment;
 
     test_point_output<polygon, polygon>(simplex_normal[0], simplex_normal[1], 6);
     test_point_output<box, polygon>("box(1 1,6 4)", simplex_normal[0], 4);
@@ -328,7 +366,7 @@ void test_areal_linear()
     test_one_lp<LineString, Polygon, LineString>("case4", "POLYGON((0 0,0 4,2 4,2 0,0 0))", "LINESTRING(1 1,3 2,1 3)", 2, 4, sqrt(5.0));
 
     test_one_lp<LineString, Polygon, LineString>("case5", poly_simplex, "LINESTRING(0 1,3 4)", 1, 2, sqrt(2.0));
-    test_one_lp<LineString, Polygon, LineString>("case6", "POLYGON((2 0,2 4,3 4,3 1,4 1,4 3,5 3,5 1,6 1,6 3,7 3,7 1,8 1,8 3,9 3,9 0,2 0))", "LINESTRING(1 1,10 3)", 4, 8, 
+    test_one_lp<LineString, Polygon, LineString>("case6", "POLYGON((2 0,2 4,3 4,3 1,4 1,4 3,5 3,5 1,6 1,6 3,7 3,7 1,8 1,8 3,9 3,9 0,2 0))", "LINESTRING(1 1,10 3)", 4, 8,
             // Pieces are 1 x 2/9:
             4.0 * sqrt(1.0 + 4.0/81.0));
     test_one_lp<LineString, Polygon, LineString>("case7", poly_simplex, "LINESTRING(1.5 1.5,2.5 2.5)", 1, 2, sqrt(2.0));
@@ -346,12 +384,14 @@ void test_areal_linear()
     test_one_lp<LineString, Polygon, LineString>("case16", poly_9, "LINESTRING(2 2,1 2,1 3,2 3)", 1, 4, 3.0);
 
     std::string const angly = "LINESTRING(2 2,2 1,4 1,4 2,5 2,5 3,4 3,4 4,5 4,3 6,3 5,2 5,2 6,0 4)";
-    test_one_lp<LineString, Polygon, LineString>("case17", "POLYGON((1 1,1 5,4 5,4 1,1 1))", angly, 3, 8, 6.0);
+    // PROPERTIES CHANGED BY switch_to_integer
+    // TODO test_one_lp<LineString, Polygon, LineString>("case17", "POLYGON((1 1,1 5,4 5,4 1,1 1))", angly, 3, 8, 6.0);
     test_one_lp<LineString, Polygon, LineString>("case18", "POLYGON((1 1,1 5,5 5,5 1,1 1))", angly, 2, 12, 10.0 + sqrt(2.0));
     test_one_lp<LineString, Polygon, LineString>("case19", poly_9, "LINESTRING(1 2,1 3,0 3)", 1, 2, 1.0);
     test_one_lp<LineString, Polygon, LineString>("case20", poly_9, "LINESTRING(1 2,1 3,2 3)", 1, 3, 2.0);
 
-    test_one_lp<LineString, Polygon, LineString>("case21", poly_9, "LINESTRING(1 2,1 4,4 4,4 1,2 1,2 2)", 1, 6, 11.0);
+    // PROPERTIES CHANGED BY switch_to_integer
+    // TODO test_one_lp<LineString, Polygon, LineString>("case21", poly_9, "LINESTRING(1 2,1 4,4 4,4 1,2 1,2 2)", 1, 6, 11.0);
 
     // Compile test - arguments in any order:
     test_one<LineString, Polygon, LineString>("simplex", poly_simplex, "LINESTRING(0 2,4 2)", 1, 2, 2.0);
@@ -362,7 +402,6 @@ void test_areal_linear()
 
 }
 
-
 template <typename P>
 void test_all()
 {
@@ -374,24 +413,30 @@ void test_all()
     typedef bg::model::polygon<P, false> polygon_ccw;
     typedef bg::model::polygon<P, true, false> polygon_open;
     typedef bg::model::polygon<P, false, false> polygon_ccw_open;
+    boost::ignore_unused<polygon_ccw, polygon_open, polygon_ccw_open>();
 
     std::string clip = "box(2 2,8 8)";
 
     test_areal_linear<polygon, linestring>();
+#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     test_areal_linear<polygon_open, linestring>();
     test_areal_linear<polygon_ccw, linestring>();
     test_areal_linear<polygon_ccw_open, linestring>();
+#endif
 
     // Test polygons clockwise and counter clockwise
     test_areal<polygon>();
 
+#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     test_areal<polygon_ccw>();
     test_areal<polygon_open>();
     test_areal<polygon_ccw_open>();
-
+#endif
 
     test_areal_clip<polygon, box>();
+#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     test_areal_clip<polygon_ccw, box>();
+#endif
 
 #if defined(TEST_FAIL_DIFFERENT_ORIENTATIONS)
     // Should NOT compile
@@ -519,6 +564,34 @@ void test_rational()
 }
 
 
+template <typename P>
+void test_boxes_per_d(P const& min1, P const& max1, P const& min2, P const& max2, bool expected_result)
+{
+    typedef bg::model::box<P> box;
+    
+    box box_out;
+    bool detected = bg::intersection(box(min1, max1), box(min2, max2), box_out);
+
+    BOOST_CHECK_EQUAL(detected, expected_result);
+    if ( detected && expected_result )
+    {
+        BOOST_CHECK( bg::equals(box_out, box(min2,max1)) );
+    }
+}
+
+template <typename CoordinateType>
+void test_boxes_nd()
+{
+    typedef bg::model::point<CoordinateType, 1, bg::cs::cartesian> p1;
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> p2;
+    typedef bg::model::point<CoordinateType, 3, bg::cs::cartesian> p3;
+
+    test_boxes_per_d(p1(0), p1(5), p1(3), p1(6), true);
+    test_boxes_per_d(p2(0,0), p2(5,5), p2(3,3), p2(6,6), true);
+    test_boxes_per_d(p3(0,0,0), p3(5,5,5), p3(3,3,3), p3(6,6,6), true);
+}
+
+
 int test_main(int, char* [])
 {
     test_all<bg::model::d2::point_xy<double> >();
@@ -535,7 +608,11 @@ int test_main(int, char* [])
 
     test_exception<bg::model::d2::point_xy<double> >();
     test_pointer_version();
+#if ! defined(BOOST_GEOMETRY_RESCALE_TO_ROBUST)
     test_rational<bg::model::d2::point_xy<boost::rational<int> > >();
+#endif
+
+    test_boxes_nd<double>();
 
     return 0;
 }
diff --git a/test/algorithms/intersection_linear_linear.cpp b/test/algorithms/intersection_linear_linear.cpp
new file mode 100644
index 000000000..33891571d
--- /dev/null
+++ b/test/algorithms/intersection_linear_linear.cpp
@@ -0,0 +1,1539 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_intersection_linear_linear
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_intersection_linear_linear.hpp"
+
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/algorithms/intersection.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_linestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / LINESTRING INTERSECTION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<L, L, ML> tester;
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 1,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0 2,1 1,2 1,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1))"),
+         "lli00");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0))"),
+         "lli01");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0))"),
+         "lli01-2");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0))"),
+         "lli01-4");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((4 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(2 0),(4 0,5 0),(6.5 0),(8 0))"),
+#endif
+         "lli01-6");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-20 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((4 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(2 0),(4 0,5 0),(6.5 0),(8 0))"),
+#endif
+         "lli01-7");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0))"),
+         "lli01-8");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lli01-10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(2 0,5 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((2 0))"),
+#endif
+         "lli01-11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0))"),
+         "lli01-11a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0))"),
+         "lli01-11b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,5 0,10 0)"),
+         from_wkt<L>("LINESTRING(2 0,6 0,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 0,5 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,6 0,8 0))"),
+         "lli01-11c");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0,5 0))"),
+         "lli01-12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0)"),
+         from_wkt<L>("LINESTRING(-1 6,0 5,15 5)"),
+         from_wkt<ML>("MULTILINESTRING((5 5,10 5))"),
+         "lli02");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0))"),
+         "lli03");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0))"),
+         "lli04");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,25 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0)(15 0,20 0))"),
+         "lli05");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,30 0))"),
+         "lli05-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,30 0))"),
+         "lli06");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,25 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,25 0,30 0))"),
+         "lli07");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,19 0,30 0))"),
+         "lli08");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,30 0))"),
+         "lli09");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(15 0,30 0))"),
+         "lli10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,\
+                                 30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0),(3 0,4 0),\
+                      (15 0,20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0),(3 0,4 0),\
+                      (15 0,30 0))"),
+         "lli11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0),\
+                      (3 0,4 0),(15 0,30 0))"),
+         "lli11-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,3 1))"),
+         "lli12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(3 1,2 0,0 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((3 1,2 0,0 0))"),
+         "lli12-1");
+
+   tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5,4 0,5 10)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,2 1,3 5,4 0))"),
+         "lli13");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,2.5 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0,2.5 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,2.5 0,3 1))"),
+         "lli14");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,2 1,3 5))"),
+         "lli15");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0.5 0,1 0,3 2,4 5)"),
+         from_wkt<ML>("MULTILINESTRING((0.5 0,1 0,2 1,3 2))"),
+         from_wkt<ML>("MULTILINESTRING((0.5 0,1 0,3 2))"),
+         "lli16");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(4 5,3 2,1 0,0.5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0.5 0,1 0,2 1,3 2))"),
+         from_wkt<ML>("MULTILINESTRING((0.5 0,1 0,3 2))"),
+         "lli16-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,30 1)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 1)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((20 1,25 1))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((2 0),(20 1,25 1))"),
+#endif
+         "lli17");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,21 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((2 0),(20 1),(25 0))"),
+#endif
+         "lli18");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 1)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0))"),
+#endif
+         "lli19");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,4 0,4 1,20 1,5 0,1 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0))"),
+#endif
+         "lli19-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0))"),
+#endif
+         "lli19a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(4 0,4 1,20 1,5 0,1 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0))"),
+#endif
+         "lli19a-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0,5 0))"),
+         "lli19b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,6 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0,5 0))"),
+         "lli19c");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0,3 0))"),
+         "lli19d");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0,3 0))"),
+         "lli19e");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(4 0,5 0))"),
+         "lli19f");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,4 0),(5 0,1 0))"),
+         "lli19f-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,5 0,5 1)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(5 0))"),
+#endif
+         "lli19g");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 1,20 1,5 0,1 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0),(5 0))"),
+#endif
+         "lli19g-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,35 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((20 0,25 0),(10 30,10 0),\
+                      (35 0,40 0),(20 0,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((20 0,25 0),(10 0,10 30),\
+                      (40 0,35 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((10 0),(20 0,25 0),(10 30,10 0),\
+                      (30 20),(35 0,40 0),(20 0,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((10 0),(20 0,25 0),(10 0,10 30),\
+                      (30 20),(40 0,35 0))"),
+#endif
+         "lli20");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,15 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((15 0,30 0),(10 30,10 0),\
+                      (15 0,40 0))"),
+         from_wkt<ML>("MULTILINESTRING((10 0,10 30),(20 0,25 0),(40 0,15 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((10 0),(15 0,30 0),(10 30,10 0),\
+                      (30 20),(15 0,40 0))"),
+         from_wkt<ML>("MULTILINESTRING((10 0),(10 0,10 30),(20 0,25 0),\
+                      (30 20),(40 0,15 0))"),
+#endif
+         "lli20a");
+
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((18 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((4 0),(8.33333333333333333 0),\
+                      (18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((4 0),(8.33333333333333333 0),\
+                      (18 0,20 0))"),
+#endif
+         "lli21"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<L>("LINESTRING(1 0,4 0,2 1,5 1,4 0,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,4 0),(4 0,8 0))"),
+         "lli22"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0,5 1,1 1,1 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,4 0),(4 0,5 0))"),
+         "lli23"
+         );
+
+    // the following two tests have been discussed with by Adam
+    tester::apply
+        (from_wkt<L>("LINESTRING(1 0,1 1,2 1)"),
+         from_wkt<L>("LINESTRING(2 1,1 1,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         "lli24"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(1 0,1 1,2 1)"),
+         from_wkt<L>("LINESTRING(1 2,1 1,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1))"),
+         "lli25"
+         );
+}
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_linestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / MULTILINESTRING INTERSECTION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<L, ML, ML> tester;
+
+    // the inertsection code automatically reverses the order of the
+    // geometries according to the geometry IDs.
+    // all calls below are actually reversed, and internally the
+    // intersection of the linestring with the multi-linestring is
+    // computed.
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "lmli01"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0))"),
+         "lmli02"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,5 0))"),
+         "lmli03"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0))"),
+         "lmli04"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+         "lmli07"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         "lmli07a"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         "lmli07b"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+         "lmli08"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((3 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0),(2 0.5),(3 0,101 0))"),
+#endif
+         "lmli09"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,1.5 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,1.5 0),(3 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0),(2 0.5),(1 0,1.5 0),(3 0,101 0))"),
+#endif
+         "lmli10"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli12"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli13"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli14"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli15"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli15a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli16"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli16a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(25 0))"),
+#endif
+         "lmli17"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(25 0))"),
+#endif
+         "lmli17a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         "lmli18"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,18 0,19 0))"),
+         "lmli18a"
+         );
+}
+
+
+
+
+
+
+#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
+BOOST_AUTO_TEST_CASE( test_intersection_l_ml_degenerate )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / MULTILINESTRING INTERSECTION"
+              << " (DEGENERATE) ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<L, ML, ML> tester;
+
+    // the following test cases concern linestrings with duplicate
+    // points and possibly linestrings with zero length.
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 10,4 10))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),(4 0),\
+                      (5 0,18 0,19 0,20 0))"),
+#endif
+         "lmli20a"
+         );
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 0,4 10,4 10))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),(4 0),\
+                      (5 0,18 0,19 0,20 0))"),
+#endif
+         "lmli20b"
+         );
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (30 0,30 0,30 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),\
+                      (5 0,18 0,19 0,20 0),(30 0))"),
+#endif
+         "lmli20c"
+         );
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (30 0,30 0,31 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),\
+                      (5 0,18 0,19 0,20 0),(30 0))"),
+#endif
+         "lmli20d"
+         );
+}
+#endif // BOOST_GEOMETRY_TEST_NO_DEGENERATE
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / LINESTRING INTERSECTION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<ML, L, ML> tester;
+
+    // the intersection code automatically reverses the order of the
+    // geometries according to the geometry IDs.
+    // all calls below are actually reversed, and internally the
+    // intersection of the linestring with the multi-linestring is
+    // computed.
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 2,4 3)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "mlli01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0))"),
+         "mlli02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<L>("LINESTRING(-1 -1,1 0,101 0,200 -1)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+         "mlli03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<L>("LINESTRING(0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(18 0,2 0),\
+                       (3 0,17 0),(16 0,4 0))"),
+         "mlli04"
+         );
+}
+
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_multilinestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<ML, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "mlmli01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(3 0,4 0))"),
+         "mlmli02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,5 0),(2 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(3 0,5 0))"),
+         "mlmli03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0))"),
+         "mlmli04"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(2 0,4 0),(15 10,20 10))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(15 10,20 10))"),
+         "mlmli05"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                       (10 20,15 10,25 10,30 15))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((0 0,9 0),(13 3,15 5),\
+                      (1 0,7 0),(11 10,12 10),(15 10,20 10))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(0 0,9 0),(13 3,14 4,15 5),\
+                      (11 10,12 10),(15 10,20 10))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0,9 0),(13 3,15 5),(20 10),\
+                      (1 0,7 0),(11 10,12 10),(15 10,20 10))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(0 0,9 0),(13 3,14 4,15 5),\
+                      (11 10,12 10),(15 10,20 10))"),
+#endif
+         "mlmli06"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+         "mlmli07"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,50 0),(20 0,101 0))"),
+         "mlmli07a"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,50 0),(20 0,101 0))"),
+         "mlmli07b"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0),(1 0,101 0))"),
+#endif
+         "mlmli08"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((3 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0),(2 0.5),(3 0,101 0))"),
+#endif
+         "mlmli09"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,1.5 0),(3 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,1.5 0),(2 0.5),(3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0),(1 0,1.5 0),(2 0.5),(3 0,101 0))"),
+#endif
+         "mlmli10"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,100 1,101 0),\
+                       (0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1,3 0,4 0,5 1,6 1,\
+                       7 0,8 0,9 1,10 1,11 0,12 0,13 1,14 1,15 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1),(5 1,6 1),(9 1,10 1),\
+                       (13 1,14 1),(1 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1),(5 1,6 1),(9 1,10 1),\
+                       (13 1,14 1),(3 0,4 0),(7 0,8 0),(11 0,12 0),\
+                       (1 0,101 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1),(5 1,6 1),(9 1,10 1),\
+                       (13 1,14 1),(101 0),(1 0),(1 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0),(1 1,2 1),(5 1,6 1),(9 1,10 1),\
+                       (13 1,14 1),(3 0,4 0),(7 0,8 0),(11 0,12 0),(15 0),\
+                       (1 0,101 0))"),
+#endif
+         "mlmli11"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(2 0,18 0),(3 0,17 0),\
+                      (4 0,16 0))"),
+         "mlmli12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(2 0,18 0),(3 0,17 0),\
+                      (4 0,16 0))"),
+         "mlmli13"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(18 0,2 0),\
+                       (3 0,17 0),(16 0,4 0))"),
+         "mlmli14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(6 0))"),
+#endif
+         "mlmli15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(6 0))"),
+#endif
+         "mlmli15a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(5 0,6 0))"),
+         "mlmli16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(6 0,5 0))"),
+         "mlmli16a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(25 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(4 0),(25 0))"),
+#endif
+         "mlmli17"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(25 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(4 0),(25 0))"),
+#endif
+         "mlmli17a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(4 0),\
+                      (8.3333333333333333333 0),(18 0))"),
+#endif
+         "mlmli18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,18 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,18 0,19 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(4 0),\
+                      (8.3333333333333333333 0),(18 0))"),
+#endif
+         "mlmli18a"
+         );
+}
+
+
+
+
+
+
+#ifndef BOOST_GEOMETRY_TEST_NO_DEGENERATE
+BOOST_AUTO_TEST_CASE( test_intersection_ml_ml_degenerate )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION"
+              << " (DEGENERATE) ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<ML, ML, ML> tester;
+
+    // the following test cases concern linestrings with duplicate
+    // points and possibly linestrings with zero length.
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((5 5,5 5),(0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 10),\
+                      (4 0,4 10),(5 5,5 5))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((5 5),(0 0),(1 0),(2 0),(3 0),\
+                      (4 0),(5 0,18 0,19 0,20 0),(2 0),(4 10))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0),(1 0),(2 0),(2 0),(3 0),\
+                      (0 0),(4 0),(4 10),(5 5))"),
+#endif
+         "mlmli20a"
+         );
+
+    // no unique: (3 0) appears three times
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((5 5,5 5),(0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0),(2 0,2 0),(4 10,4 10))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 10,4 10),(5 5,5 5))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((5 5),(0 0),(1 0),(2 0),(3 0),(4 0),\
+                      (5 0,18 0,19 0,20 0),(2 0),(4 10))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0),(1 0),(2 0),(2 0),\
+                      (3 0),(0 0),(4 0),(4 10),(5 5))"),
+#endif
+         "mlmli20aa"
+         );
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((5 5,5 5),(0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (4 0,4 0,4 10,4 10),(0 5,15 5))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((5 5),(0 0),(1 0),(2 0),(3 0),(4 0),\
+                      (5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0),(1 0),(2 0),(3 0),\
+                      (0 0),(4 0),(5 5))"),
+#endif
+         "mlmli20b"
+         );
+
+    // no unique: (3 0) and (30 0) appear twice
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (30 0,30 0,30 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),\
+                      (5 0,18 0,19 0,20 0),(30 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0),(1 0),(2 0),(3 0),\
+                      (0 0),(30 0))"),
+#endif
+         "mlmli20c"
+         );
+
+    // no unique: (3 0) appears twice
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-10 0,-9 0),(0 10,5 0,20 0,20 0,30 10),\
+                      (1 1,1 1,2 2,2 2),(1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (30 0,30 0,31 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),\
+                      (5 0,18 0,19 0,20 0),(30 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0),(1 0),(2 0),(3 0),\
+                      (0 0),(30 0))"),
+#endif
+         "mlmli20d"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,0 0,18 0,18 0,\
+                      19 0,19 0,19 0,30 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 10,5 0,20 0,20 0,30 0),\
+                      (1 10,1 10,1 0,1 0,1 -10),\
+                      (2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),\
+                      (30 0,30 0,31 0,31 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((5 0,18 0,19 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0,30 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(1 0),(2 0),(3 0),\
+                      (5 0,18 0,19 0,30 0),(30 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 0,20 0,30 0),(1 0),(2 0),(3 0),\
+                      (0 0),(30 0))"),
+#endif
+         "mlmli20e"
+         );
+}
+#endif // BOOST_GEOMETRY_TEST_NO_DEGENERATE
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_ml_ml_spikes )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING INTERSECTION" 
+              << " (WITH SPIKES) ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_intersection_of_geometries<ML, ML, ML> tester;
+
+    // the following test cases concern linestrings with spikes
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,5 0))"),
+         "mlmli-spikes-01"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,1 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,1 0,5 0))"),
+         "mlmli-spikes-02"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,2 0,8 0,3 0,7 0,4 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0,2 0,8 0,3 0,7 0,4 0,5 0))"),
+         "mlmli-spikes-03"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,3 0,2 0,4 0,3 0,5 0,4 0,6 0,\
+                      5 0,7 0,6 0,8 0,7 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,3 0,2 0,4 0,3 0,5 0,4 0,6 0,\
+                      5 0,7 0,6 0,8 0,7 0,9 0))"),
+         "mlmli-spikes-04"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),\
+                      (9 1,9 0,9 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(7 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(7 0,8 0),(9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),(9 0))"),
+#endif
+         "mlmli-spikes-05"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),\
+                      (9 0,9 2,9 1))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(7 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(7 0,8 0),(9 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,7 0),(9 0))"),
+#endif
+         "mlmli-spikes-05a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(9 0,6 0,8 0),\
+                      (11 0,8 0,12 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(6 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(9 0,6 0,8 0),\
+                      (10 0,8 0,10 0))"),
+         "mlmli-spikes-06"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,0 0,-2 0),(11 0,10 0,12 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(10 0))"),
+#endif
+         "mlmli-spikes-07"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,-2 -2),(11 1,10 0,12 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((0 0),(10 0))"),
+#endif
+         "mlmli-spikes-07a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(11 0,10 0,12 0),\
+                      (7 5,7 0,8 0,6.5 0,8.5 0,8.5 5))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(6.5 0,8.5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,6.5 0,8.5 0))"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0),(6.5 0,8.5 0),(10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,6 0,5 0),(7 0,8 0,6.5 0,8.5 0),(10 0))"),
+#endif
+         "mlmli-spikes-08"
+         );
+
+    // now the first geometry has a spike
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,7 0,4 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         "mlmli-spikes-09"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(9 0,10 0))"),
+         "mlmli-spikes-09a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(9 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(5 0,4 0,5 0),(9 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(9 0,10 0))"),
+         "mlmli-spikes-09b"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,7 0,4 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(6 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(6 0,7 0,6 0),(5 0,4 0,5 0),\
+                      (6 0,10 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0),(6 0,10 0))"),
+         "mlmli-spikes-09c"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0),(8 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0))"),
+         "mlmli-spikes-10"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0,4 0),(2 0,9 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,9 0),(9 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,8 0,4 0),(2 0,9 0,5 0))"),
+         "mlmli-spikes-11"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 1,10 0,12 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((10 0))"),
+#endif
+         "mlmli-spikes-12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 -1,10 0,12 -2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((10 0))"),
+#endif
+         "mlmli-spikes-12a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((11 0,10 0,12 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((10 0))"),
+#endif
+         "mlmli-spikes-13"
+         );
+
+    // the following three tests have been discussed with Adam
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 2,1 1,1 2))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 1))"),
+#endif
+         "mlmli-spikes-14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,1 0,2 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 0))"),
+#endif
+         "mlmli-spikes-15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,1 1,2 0))"),
+#ifdef BOOST_GEOMETRY_INTERSECTION_DO_NOT_INCLUDE_ISOLATED_POINTS
+         from_wkt<ML>("MULTILINESTRING()"),
+#else
+         from_wkt<ML>("MULTILINESTRING((1 1))"),
+#endif
+         "mlmli-spikes-16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((2 1,1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 1))"),
+         from_wkt<ML>("MULTILINESTRING((2 1,1 1,2 1))"),
+         "mlmli-spikes-17"
+         );
+
+    // test cases sent by Adam on the mailing list (equal slikes)
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         "mlmli-spikes-18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,0 0,1 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,0 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,0 0,1 1))"),
+         "mlmli-spikes-19"
+         );
+}
diff --git a/test/algorithms/intersection_pl_pl.cpp b/test/algorithms/intersection_pl_pl.cpp
new file mode 100644
index 000000000..a405f558a
--- /dev/null
+++ b/test/algorithms/intersection_pl_pl.cpp
@@ -0,0 +1,185 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_intersection_pointlike_pointlike
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_set_ops_pl_pl.hpp"
+
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>  multi_point_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_point_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** POINT / POINT INTERSECTION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            P, P, MP, bg::overlay_intersection
+        > tester;
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "ppi01");
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "ppi02");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_multipoint_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / POINT INTERSECTION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, P, MP, bg::overlay_intersection
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppi01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppi02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppi03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppi04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppi05");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0)"),
+         "mppi06");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppi07");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mppi08");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_intersection_multipoint_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / MULTIPOINT INTERSECTION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, MP, MP, bg::overlay_intersection
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(2 2,3 3,0 0,0 0,2 2,1 1,1 1,1 0,1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1,1 1)"),
+         "mpmpi01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         "mpmpi02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpi03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpi04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpi05");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 0,2 0,3 0,0 0,1 0,2 0)"),
+         from_wkt<MP>("MULTIPOINT(0 1,0 2,1 0,0 0,2 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,2 0)"),
+         "mpmpi06");
+}
+
diff --git a/test/algorithms/intersects.cpp b/test/algorithms/intersects.cpp
index adef1141f..82bd0fe8e 100644
--- a/test/algorithms/intersects.cpp
+++ b/test/algorithms/intersects.cpp
@@ -1,8 +1,11 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
+
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 // Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
-//
+
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // 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)
@@ -15,6 +18,120 @@
 
 #include <boost/geometry/util/rational.hpp>
 
+template <typename P>
+void test_intersects_polygon_polygon()
+{
+    typedef bg::model::polygon<P, false, false> poly_ccw_o;
+    test_geometry<poly_ccw_o, poly_ccw_o>("POLYGON((1 1, 3 3, 2 5))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+    test_geometry<poly_ccw_o, poly_ccw_o>("POLYGON((6 6, 7 6, 7 7, 6 7))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", false);
+    test_geometry<poly_ccw_o, poly_ccw_o>("POLYGON((7 7, 9 7, 9 9, 7 9))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+}
+
+template <typename P>
+void test_intersects_linestring_segment()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::segment<P> seg;
+
+    test_geometry<ls, seg>("LINESTRING(1 1, 3 3, 2 5)", "SEGMENT(2 0, 2 6)", true);
+    test_geometry<ls, seg>("LINESTRING(1 1, 3 3)", "SEGMENT(1 0, 1 1)", true);
+    test_geometry<ls, seg>("LINESTRING(1 1, 3 3)", "SEGMENT(2 0, 2 2)", true);
+    test_geometry<ls, seg>("LINESTRING(1 1, 3 3)", "SEGMENT(3 0, 4 1)", false);
+}
+
+template <typename P>
+void test_intersects_linestring_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0)", "LINESTRING(0 0,1 1,2 2)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0)", "LINESTRING(2 2,1 1,0 0)", true);
+    test_geometry<ls, ls>("LINESTRING(3 0,2 0,0 0)", "LINESTRING(0 0,1 1,2 2)", true);
+    test_geometry<ls, ls>("LINESTRING(3 0,2 0,0 0)", "LINESTRING(2 2,1 1,0 0)", true);
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0)", "LINESTRING(1 0,4 0,5 0)", true);
+    test_geometry<ls, ls>("LINESTRING(1 0,2 0)", "LINESTRING(1 0,0 0)", true);
+}
+
+template <typename P>
+void test_intersects_linestring_polygon()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+    typedef bg::model::polygon<P> poly_cw_c;
+    typedef bg::model::polygon<P, false> poly_ccw_c;
+    typedef bg::model::polygon<P, false, false> poly_ccw_o;
+    typedef bg::model::multi_polygon<poly_ccw_c> mpoly_ccw_c;
+
+    test_geometry<ls, poly_ccw_c>("LINESTRING(1 1,2 2)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", true);
+    test_geometry<ls, poly_ccw_c>("LINESTRING(1 0,2 2)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", true);
+    test_geometry<ls, poly_ccw_c>("LINESTRING(11 0,12 12)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", false);
+
+    test_geometry<ls, poly_ccw_o>("LINESTRING(1 1, 3 3, 2 5)", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+    test_geometry<ls, poly_ccw_o>("LINESTRING(6 6, 7 6, 7 7, 6 7)", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", false);
+    test_geometry<ls, poly_ccw_o>("LINESTRING(7 7, 9 7, 9 9, 7 9)", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+
+    test_geometry<poly_cw_c, ls>("POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", "LINESTRING(-2 -2, 12 7)", true);
+    test_geometry<poly_cw_c, ls>("POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", "LINESTRING(5 5, 15 4)", true);
+    test_geometry<poly_cw_c, ls>("POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", "LINESTRING(7 6, 15 4)", true);
+    test_geometry<poly_cw_c, ls>("POLYGON((0 0, 0 10, 10 10, 10 0, 0 0))", "LINESTRING(6 2, 12 1)", true);
+
+    // MULTI
+    test_geometry<ls, mpoly_ccw_c>("LINESTRING(1 1,2 2)", "MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))", true);
+    test_geometry<mls, mpoly_ccw_c>("MULTILINESTRING((1 1,2 2))", "MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0)))", true);
+}
+
+template <typename P>
+void test_intersects_linestring_ring()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+    typedef bg::model::ring<P, false> ring_ccw_c;
+
+    test_geometry<ls, ring_ccw_c>("LINESTRING(1 1,2 2)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", true);
+    test_geometry<ls, ring_ccw_c>("LINESTRING(1 0,2 2)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", true);
+    test_geometry<ls, ring_ccw_c>("LINESTRING(11 0,12 12)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", false);
+
+    // MULTI
+    test_geometry<mls, ring_ccw_c>("MULTILINESTRING((1 1,2 2))", "POLYGON((0 0,10 0,10 10,0 10,0 0))", true);
+}
+
+template <typename P>
+void test_intersects_ring_polygon()
+{
+    typedef bg::model::ring<P, false, false> ring_ccw_o;
+    typedef bg::model::polygon<P, false, false> poly_ccw_o;
+
+    test_geometry<ring_ccw_o, poly_ccw_o>("POLYGON((1 1, 3 3, 2 5))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+    test_geometry<ring_ccw_o, poly_ccw_o>("POLYGON((6 6, 7 6, 7 7, 6 7))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", false);
+    test_geometry<ring_ccw_o, poly_ccw_o>("POLYGON((7 7, 9 7, 9 9, 7 9))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", true);
+
+    test_geometry<ring_ccw_o, poly_ccw_o>("POLYGON((6 6,7 6,7 7,6 7))", "POLYGON((0 0, 9 0, 9 9, 0 9),(5 5,5 8,8 8,8 5))", false);
+}
+
+template <typename P>
+void test_intersects_point_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0,2 2,4 0)", true);
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0,2 2,4 0)", true);
+    test_geometry<P, ls>("POINT(1 0)", "LINESTRING(0 0,2 2,4 0)", false);
+
+    // MULTI
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,2 2,4 0))", true);
+}
+
+template <typename P>
+void test_intersects_point_segment()
+{
+    typedef bg::model::segment<P> seg;
+
+    test_geometry<P, seg>("POINT(0 0)", "LINESTRING(0 0,2 2)", true);
+    test_geometry<P, seg>("POINT(1 1)", "LINESTRING(0 0,2 2)", true);
+    test_geometry<P, seg>("POINT(1 0)", "LINESTRING(0 0,2 2)", false);
+}
 
 template <typename P>
 void test_all()
@@ -28,17 +145,25 @@ void test_all()
     test_geometry<P, bg::model::box<P> >("POINT(1 1)", "BOX(0 0,2 2)", true);
 
     test_geometry<polygon, bg::model::box<P> >(
-        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))", 
+        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))",
         "BOX(1941 2066, 2055 2166)", true);
 
     test_geometry<ring, bg::model::box<P> >(
-        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))", 
+        "POLYGON((1992 3240,1992 1440,3792 1800,3792 3240,1992 3240))",
         "BOX(1941 2066, 2055 2166)", true);
 
     test_geometry<polygon, bg::model::box<P> >(
-        "POLYGON((1941 2066,2055 2066,2055 2166,1941 2166))", 
+        "POLYGON((1941 2066,2055 2066,2055 2166,1941 2166))",
         "BOX(1941 2066, 2055 2166)", true);
 
+    test_intersects_point_segment<P>();
+    test_intersects_point_linestring<P>();
+    test_intersects_polygon_polygon<P>();
+    test_intersects_linestring_polygon<P>();
+    test_intersects_linestring_ring<P>();
+    test_intersects_linestring_segment<P>();
+    test_intersects_linestring_linestring<P>();
+    test_intersects_ring_polygon<P>();
 
     // self-intersecting is not tested in disjoint, so that is done here.
 
@@ -130,25 +255,25 @@ void test_all()
         "POLYGON((0 0,3 3,3 3,4 1))", false);
 
     test_geometry<P, bg::model::box<P> >(
-        "POINT(0 0)", 
+        "POINT(0 0)",
         "BOX(0 0,4 4)",
         true);
     test_geometry<P, bg::model::ring<P> >(
-        "POINT(0 0)", 
+        "POINT(0 0)",
         "POLYGON((0 0,3 3,3 3,4 1))",
         true);
     test_geometry<P, bg::model::polygon<P> >(
-        "POINT(0 0)", 
+        "POINT(0 0)",
         "POLYGON((0 0,3 3,3 3,4 1))",
         true);
 
     test_geometry<bg::model::ring<P>, P>(
         "POLYGON((0 0,3 3,3 3,4 1))",
-        "POINT(0 0)", 
+        "POINT(0 0)",
         true);
     test_geometry<bg::model::polygon<P>, P>(
         "POLYGON((0 0,3 3,3 3,4 1))",
-        "POINT(0 0)", 
+        "POINT(0 0)",
         true);
 }
 
@@ -158,7 +283,7 @@ void test_additional()
 {
     test_geometry<bg::model::segment<P>, bg::model::box<P> >(
         "SEGMENT(0 0,3 3)",
-        "BOX(1 2,3 5)", 
+        "BOX(1 2,3 5)",
         true);
     test_geometry<bg::model::segment<P>, bg::model::box<P> >(
         "SEGMENT(1 1,2 3)",
@@ -166,23 +291,23 @@ void test_additional()
         true);
     test_geometry<bg::model::segment<P>, bg::model::box<P> >(
         "SEGMENT(1 1,1 1)",
-        "BOX(1 0,3 5)", 
+        "BOX(1 0,3 5)",
         true);
     test_geometry<bg::model::segment<P>, bg::model::box<P> >(
         "SEGMENT(0 1,0 1)",
-        "BOX(1 0,3 5)", 
+        "BOX(1 0,3 5)",
         false);
     test_geometry<bg::model::segment<P>, bg::model::box<P> >(
         "SEGMENT(2 1,2 1)",
-        "BOX(1 0,3 5)", 
+        "BOX(1 0,3 5)",
         true);
     test_geometry<bg::model::linestring<P>, bg::model::box<P> >(
         "LINESTRING(0 0,1 0,10 10)",
-        "BOX(1 2,3 5)", 
+        "BOX(1 2,3 5)",
         true);
     test_geometry<bg::model::linestring<P>, bg::model::box<P> >(
         "LINESTRING(1 2)",
-        "BOX(0 0,3 5)", 
+        "BOX(0 0,3 5)",
         true);
 }
 
@@ -192,8 +317,10 @@ int test_main( int , char* [] )
     test_all<bg::model::d2::point_xy<double> >();
     test_additional<bg::model::d2::point_xy<double> >();
 
+#if ! defined(BOOST_GEOMETRY_RESCALE_TO_ROBUST)
     test_all<bg::model::d2::point_xy<boost::rational<int> > >();
-    
+#endif
+
 #if defined(HAVE_TTMATH)
     test_all<bg::model::d2::point_xy<ttmath_big> >();
 #endif
diff --git a/test/algorithms/is_simple.cpp b/test/algorithms/is_simple.cpp
new file mode 100644
index 000000000..b13241883
--- /dev/null
+++ b/test/algorithms/is_simple.cpp
@@ -0,0 +1,277 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_is_simple
+#endif
+
+#include <iostream>
+#include <string>
+
+#include <boost/assert.hpp>
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+
+#ifdef GEOMETRY_TEST_DEBUG
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
+#endif
+
+#include <boost/geometry/algorithms/is_valid.hpp>
+#include <boost/geometry/algorithms/is_simple.hpp>
+
+#include "from_wkt.hpp"
+
+#ifdef GEOMETRY_TEST_DEBUG
+#include "pretty_print_geometry.hpp"
+#endif
+
+
+namespace bg = ::boost::geometry;
+
+typedef bg::model::point<double, 2, bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                  segment_type;
+typedef bg::model::linestring<point_type>               linestring_type;
+typedef bg::model::multi_linestring<linestring_type>    multi_linestring_type;
+// ccw open and closed polygons
+typedef bg::model::polygon<point_type,false,false>      open_ccw_polygon_type;
+typedef bg::model::polygon<point_type,false,true>       closed_ccw_polygon_type;
+// multi-geometries
+typedef bg::model::multi_point<point_type>              multi_point_type;
+typedef bg::model::multi_polygon<open_ccw_polygon_type> multi_polygon_type;
+// box
+typedef bg::model::box<point_type>                      box_type;
+
+
+//----------------------------------------------------------------------------
+
+
+template <typename Geometry>
+void test_simple(Geometry const& g, bool simple_geometry)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "=======" << std::endl;
+#endif
+
+    bool simple = bg::is_simple(g);
+    BOOST_ASSERT( bg::is_valid(g) );
+    BOOST_CHECK( simple == simple_geometry );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "Geometry: ";
+    pretty_print_geometry<Geometry>::apply(std::cout, g);
+    std::cout << std::endl;
+    std::cout << std::boolalpha;
+    std::cout << "is simple: " << simple << std::endl;
+    std::cout << "expected result: " << simple_geometry << std::endl;
+    std::cout << "=======" << std::endl;
+    std::cout << std::endl << std::endl;
+    std::cout << std::noboolalpha;
+#endif
+}
+
+
+//----------------------------------------------------------------------------
+
+
+BOOST_AUTO_TEST_CASE( test_is_simple_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_simple: POINT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef point_type G;
+
+    test_simple(from_wkt<G>("POINT(0 0)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_simple_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_simple: MULTIPOINT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+    typedef multi_point_type G;
+
+    test_simple(from_wkt<G>("MULTIPOINT(0 0)"), true);
+    test_simple(from_wkt<G>("MULTIPOINT(0 0,1 0,1 1,0 1)"), true);
+    test_simple(from_wkt<G>("MULTIPOINT(0 0,1 0,1 1,1 0,0 1)"), false);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_simple_segment )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_simple: SEGMENT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef segment_type G;
+
+    test_simple(from_wkt<G>("SEGMENT(0 0,1 0)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_simple_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_simple: LINESTRING " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef linestring_type G;
+
+    // valid linestrings with multiple points
+    test_simple(from_wkt<G>("LINESTRING(0 0,0 0,1 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,0 0,1 0,0 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,0 0,1 0,1 0,1 1,0 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,2 0,1 1,1 0,1 -1)"), false);
+
+    // simple open linestrings
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 2)"), true);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 2,2 3)"), true);
+
+    // simple closed linestrings
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,1 1,0 0)"), true);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,1 1,0 1,0 0)"), true);
+
+    // non-simple linestrings
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,0 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,2 10,0.5 -1)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,2 1,1 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,1 0,2 1,0.5 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,2 0,1 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,3 0,5 0,1 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,3 0,5 0,4 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,3 0,5 0,4 0,2 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,3 0,2 0,5 0)"), false);
+    test_simple(from_wkt<G>("LINESTRING(0 0,2 0,2 2,1 0,0 0)"), false);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_simple_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_simple: MULTILINESTRING " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef multi_linestring_type G;
+
+    // multilinestrings with linestrings with spikes
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(5 0,6 0,7 0))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(5 0,1 0,4 1))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(5 0,1 0,4 0))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(1 0,2 0))"),
+                false);
+
+    // simple multilinestrings
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1),(1 1,1 0))"), true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1),(1 1,1 0),(0 1,1 1))"),
+                true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2),(0 0,1 0,2 0,2 2))"), true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2),(2 2,2 0,1 0,0 0))"), true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0),(0 0,-1 0),\
+                            (1 0,2 0))"),
+                true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0),(-1 0,0 0),\
+                            (2 0,1 0))"),
+                true);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0),(0 0,0 1),\
+                            (0 0,-1 0),(0 0,0 -1))"),
+                true);
+
+    // non-simple multilinestrings
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2),(0 0,2 2))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2),(2 2,0 0))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2),\
+                            (0 0,1 0,1 1,2 0,2 2))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1,2 2),\
+                            (0 0,1 0,1 1,2 0,2 2))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1,2 2),(2 2,0 0))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(0 0,1 1))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(0 0,3 3))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(1 1,3 3))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(1 1,2 2))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(2 2,3 3))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(2 2,4 4))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 2,4 4),(4 4,2 2))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1),(0 1,1 0))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,2 0),(1 0,0 1))"), false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 1),(1 1,1 0),\
+                             (1 1,0 1,0.5,0.5))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,1 1,0 1,0 0),(1 0,1 -1))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,1 1,0 1,0 0),(-1 0,0 0))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,1 1,0 1,0 0),\
+                            (0 0,-1 0,-1 -1,0 -1,0 0))"),
+                false);
+    test_simple(from_wkt<G>("MULTILINESTRING((0 0,1 0,1 1,0 1,0 0),\
+                            (-1 -1,-1 0,0 0,0 -1,-1 -1))"),
+                false);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_simple_areal )
+{
+    typedef box_type b;
+    typedef open_ccw_polygon_type o_ccw_p;
+    typedef multi_polygon_type mpl;
+
+    // check that is_simple compiles for boxes
+    test_simple(from_wkt<b>("BOX(0 0,1 1)"), true);
+
+    // simple polygons and multi-polygons
+    test_simple(from_wkt<o_ccw_p>("POLYGON((0 0,1 0,1 1))"), true);
+    test_simple(from_wkt<o_ccw_p>("POLYGON((0 0,10 0,10 10,0 10),\
+                                  (1 1,1 9,9 9,9 1))"),
+                true);
+    test_simple(from_wkt<mpl>("MULTIPOLYGON(((0 0,1 0,1 1)),\
+                              ((10 0,20 0,20 10,10 10)))"),
+                true);
+
+    // non-simple polygons & multi-polygons (have duplicate points)
+    test_simple(from_wkt<o_ccw_p>("POLYGON((0 0,1 0,1 0,1 1))"), false);
+    test_simple(from_wkt<o_ccw_p>("POLYGON((0 0,10 0,10 10,0 10),\
+                                  (1 1,1 9,9 9,9 9,9 1))"),
+                false);
+    test_simple(from_wkt<mpl>("MULTIPOLYGON(((0 0,1 0,1 1,1 1)),\
+                              ((10 0,20 0,20 0,20 10,10 10)))"),
+                false);
+}
diff --git a/test/algorithms/is_valid.cpp b/test/algorithms/is_valid.cpp
new file mode 100644
index 000000000..0433f9fde
--- /dev/null
+++ b/test/algorithms/is_valid.cpp
@@ -0,0 +1,729 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_is_valid
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <string>
+
+#include <boost/range.hpp>
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/geometry/core/closure.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/util/range.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/ring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/multi_point.hpp>
+#include <boost/geometry/geometries/multi_linestring.hpp>
+#include <boost/geometry/geometries/multi_polygon.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/io/wkt/wkt.hpp>
+
+#include <boost/geometry/algorithms/append.hpp>
+#include <boost/geometry/algorithms/is_valid.hpp>
+
+#include "from_wkt.hpp"
+
+#ifdef GEOMETRY_TEST_DEBUG
+#include "pretty_print_geometry.hpp"
+#endif
+
+
+namespace bg = ::boost::geometry;
+
+typedef bg::model::point<double, 2, bg::cs::cartesian> point_type;
+typedef bg::model::segment<point_type>                 segment_type;
+typedef bg::model::box<point_type>                     box_type;
+typedef bg::model::linestring<point_type>              linestring_type;
+typedef bg::model::multi_linestring<linestring_type>   multi_linestring_type;
+// cw, ccw, open and closed rings
+typedef bg::model::ring<point_type,false,false>        open_ccw_ring_type;
+typedef bg::model::ring<point_type,false,true>         closed_ccw_ring_type;
+typedef bg::model::ring<point_type,true,false>         open_cw_ring_type;
+typedef bg::model::ring<point_type,true,true>          closed_cw_ring_type;
+// cw, ccw, open and closed polygons
+typedef bg::model::polygon<point_type,false,false>     open_ccw_polygon_type;
+typedef bg::model::polygon<point_type,false,true>      closed_ccw_polygon_type;
+typedef bg::model::polygon<point_type,true,false>      open_cw_polygon_type;
+typedef bg::model::polygon<point_type,true,true>       closed_cw_polygon_type;
+
+// multi-geometries
+typedef bg::model::multi_point<point_type>             multi_point_type;
+
+
+//----------------------------------------------------------------------------
+
+
+template
+<
+    typename Geometry,
+    typename ClosedGeometry = Geometry,
+    typename Tag = typename bg::tag<Geometry>::type
+>
+struct test_valid
+{
+    static inline void apply(Geometry const& g, bool expected_result)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "=======" << std::endl;
+#endif
+        bool valid = bg::is_valid(g);
+        BOOST_CHECK_MESSAGE( valid == expected_result,
+            "Expected: " << valid
+            << " detected: " << expected_result
+            << " wkt: " << bg::wkt(g) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry: ";
+        pretty_print_geometry<Geometry>::apply(std::cout, g);
+        std::cout << std::endl;
+        std::cout << std::boolalpha;
+        std::cout << "is valid? " << valid << std::endl;
+        std::cout << "expected result: " << expected_result << std::endl;
+        std::cout << "=======" << std::endl;
+        std::cout << std::endl << std::endl;
+        std::cout << std::noboolalpha;
+#endif
+    }
+};
+
+template <typename Ring, typename ClosedRing>
+struct test_valid<Ring, ClosedRing, bg::ring_tag>
+{
+    template <typename OpenRing>
+    static inline ClosedRing convert_to_closed(OpenRing const& open_ring)
+    {
+        ClosedRing closed_ring;
+        bg::append(closed_ring, open_ring);
+        if ( boost::size(open_ring) > 0 )
+        {
+            bg::append(closed_ring, bg::range::front(open_ring));
+        }
+        return closed_ring;
+    }
+
+    static inline void apply(Ring const& ring, bool expected_result)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "=======" << std::endl;
+#endif
+
+        bool valid = bg::is_valid(ring);
+        BOOST_CHECK_MESSAGE( valid == expected_result,
+            "Expected: " << valid
+            << " detected: " << expected_result
+            << " wkt: " << bg::wkt(ring) );
+
+        ClosedRing closed_ring;
+        bool closed_valid(!expected_result);
+        if ( bg::closure<Ring>::value == bg::open )
+        {
+            closed_ring = convert_to_closed(ring);
+            closed_valid = bg::is_valid(closed_ring);
+            BOOST_CHECK( closed_valid == expected_result );
+        };
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Ring (";
+        if ( bg::closure<Ring>::value == bg::open )
+        {
+            std::cout << "open";
+        }
+        else
+        {
+            std::cout << "closed";
+        }
+        std::cout << "): ";
+        pretty_print_geometry<Ring>::apply(std::cout, ring);
+        std::cout << std::endl;
+        std::cout << "open: " << bg::wkt(ring) << std::endl;
+        if ( bg::closure<Ring>::value == bg::open )
+        {
+            std::cout << "closed: " << bg::wkt(closed_ring) << std::endl;
+        }
+        std::cout << std::boolalpha;
+        std::cout << "is valid? " << valid << std::endl;
+        if ( bg::closure<Ring>::value == bg::open )
+        {
+            std::cout << "is valid (closed)? " << closed_valid << std::endl;
+        }
+        std::cout << "expected result: " << expected_result << std::endl;
+        std::cout << "=======" << std::endl;
+        std::cout << std::endl << std::endl;
+        std::cout << std::noboolalpha;
+#endif
+    }
+};
+
+
+//----------------------------------------------------------------------------
+
+
+BOOST_AUTO_TEST_CASE( test_is_valid_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: POINT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef point_type G;
+
+    typedef test_valid<G> test;
+
+    test::apply(from_wkt<G>("POINT(0 0)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: MULTIPOINT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef multi_point_type G;
+
+    typedef test_valid<G> test;
+
+    test::apply(from_wkt<G>("MULTIPOINT()"), false);
+    test::apply(from_wkt<G>("MULTIPOINT(0 0,0 0)"), true);
+    test::apply(from_wkt<G>("MULTIPOINT(0 0,1 0,1 1,0 1)"), true);
+    test::apply(from_wkt<G>("MULTIPOINT(0 0,1 0,1 1,1 0,0 1)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_segment )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: SEGMENT " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef segment_type G;
+
+    typedef test_valid<G> test;
+
+    test::apply(from_wkt<G>("SEGMENT(0 0,0 0)"), false);
+    test::apply(from_wkt<G>("SEGMENT(0 0,1 0)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_box )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: BOX " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef box_type G;
+
+    typedef test_valid<G> test;
+
+    // boxes where the max corner and below and/or to the left of min corner
+    test::apply(from_wkt<G>("BOX(0 0,-1 0)"), false);
+    test::apply(from_wkt<G>("BOX(0 0,0 -1)"), false);
+    test::apply(from_wkt<G>("BOX(0 0,-1 -1)"), false);
+
+    // boxes of zero area; they are not 2-dimensional, so invalid
+    test::apply(from_wkt<G>("BOX(0, 0, 0, 0)"), false);
+    test::apply(from_wkt<G>("BOX(0 0,1 0)"), false);
+    test::apply(from_wkt<G>("BOX(0 0,0 1)"), false);
+
+    test::apply(from_wkt<G>("BOX(0 0,1 1)"), true);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: LINESTRING " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef linestring_type G;
+
+    typedef test_valid<G> test;
+
+    static const bool allow_spikes = true;
+
+    // empty linestring
+    test::apply(from_wkt<G>("LINESTRING()"), false);
+
+    // 1-point linestrings
+    test::apply(from_wkt<G>("LINESTRING(0 0)"), false);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0)"), false);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0,0 0)"), false);
+
+    // 2-point linestrings
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 2)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 2,1 2)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0,1 2,1 2)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0,0 0,1 2,1 2)"), true);
+
+    // 3-point linestrings
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,2 10)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,2 10,0 0)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0,4 0)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0,4 0,3 0)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0,4 0,-1 0)"), true);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,1 1,-1 1,-1 0,0 0)"), true);
+
+    // should this be valid? we have two overlapping segments
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,1 1,-1 1,-1 0,0.5 0)"), true);
+
+    // linestrings with spikes
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 2,0 0)"), allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 2,1 2,0 0)"), allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0,1 2,1 2,0 0)"), allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,0 0,0 0,1 2,1 2,0 0,0 0)"),
+                allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,5 0)"), allow_spikes);    
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0,0 0)"),
+                allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,10 0,10 10,5 0,4 0,6 0)"),
+                allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,1 1,5 5,4 4)"),
+                allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,1 1,5 5,4 4,6 6)"),
+                allow_spikes);
+    test::apply(from_wkt<G>("LINESTRING(0 0,1 0,1 1,5 5,4 4,4 0)"),
+                allow_spikes);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: MULTILINESTRING " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef multi_linestring_type G;
+
+    typedef test_valid<G> test;
+
+    static const bool allow_spikes = true;
+
+    // empty multilinestring
+    test::apply(from_wkt<G>("MULTILINESTRING()"), false);
+
+    // multilinestring with empty linestring(s)
+    test::apply(from_wkt<G>("MULTILINESTRING(())"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((),(),())"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((),(0 1,1 0))"), false);
+
+    // multilinestring with invalid linestrings
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0),(0 1,1 0))"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,0 0),(0 1,1 0))"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0),(1 0))"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,0 0),(1 0,1 0))"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0),(0 0))"), false);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(5 0))"), false);
+
+    // multilinstring that has linestrings with spikes
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(5 0,1 0,4 1))"),
+                allow_spikes);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 0,0 0),(1 0,2 0))"),
+                allow_spikes);
+    
+
+    // valid multilinestrings
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 0,2 0),(5 0,1 0,4 1))"),
+                true);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 0,2 0),(1 0,2 0))"),
+                true);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 1),(0 1,1 0))"), true);
+    test::apply(from_wkt<G>("MULTILINESTRING((0 0,1 1,2 2),(0 1,1 0,2 2))"),
+                true);
+}
+
+
+template <typename Point>
+void test_is_valid_open_ring()
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: RING (open) " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef bg::model::ring<Point, false, false> OG; // ccw, open ring
+    typedef bg::model::ring<Point, false, true> CG; // ccw, closed ring
+ 
+    typedef test_valid<OG, CG> test;
+
+    static const bool allow_duplicates = true;
+
+    // not enough points
+    test::apply(from_wkt<OG>("POLYGON(())"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0))"), false);
+
+    // duplicate points
+    test::apply(from_wkt<OG>("POLYGON((0 0,0 0,0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 1,0 0))"),
+                allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0,1 1))"),
+                allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0,1 1,0 0))"),
+                allow_duplicates);
+
+    // with spikes
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,2 2,0 2,1 2))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,1 0,2 2))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,2 0,1 0,4 0,4 4))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,2 2,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,5 5,0 5))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,3 3,5 5,0 5))"), false);
+
+    // with spikes and duplicate points
+    test::apply(from_wkt<OG>("POLYGON((0 0,0 0,2 0,2 0,1 0,1 0))"), false);
+
+    // with self-crossings
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 -1,0 5))"), false);
+
+    // with self-crossings and duplicate points
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,5 5,3 -1,0 5,0 5))"),
+                false);
+
+    // with self-intersections
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 5,3 0,2 0,2 5,0 5))"),
+                false);
+
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 5,3 0,2 5,0 5))"),
+                false);
+
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 1,1 1,1 2,2 2,3 1,4 2,5 2,5 5,0 5))"),
+                false);
+
+    // with self-intersections and duplicate points
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 5,3 5,3 0,3 0,2 0,2 0,2 5,2 5,0 5))"),
+                false);
+
+
+    // next two suggested by Adam Wulkiewicz
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,0 5,4 4,2 2,0 5))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,1 4,4 4,4 1,0 5))"),
+                false);
+
+    // and a few more
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,1 4,1 1,4 1,4 4,0 5))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,4 1,1 1,1 4,4 4,0 5))"),
+                false);
+
+    // valid rings
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 1))"), true);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 1,0 1))"), true);
+
+    typedef bg::model::ring<Point, true, false> OG1; // cw, open ring
+
+    typedef test_valid<OG1> test1;
+
+    test1::apply(from_wkt<OG1>("POLYGON((0 0,1 1,1 0))"), true);
+    test1::apply(from_wkt<OG1>("POLYGON((0 0,0 1,1 1,1 0))"), true);
+}
+
+
+template <typename Point>
+void test_is_valid_closed_ring()
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: RING (closed) " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef bg::model::ring<Point, false, false> CG; // ccw, closed ring
+
+    typedef test_valid<CG> test;
+
+    // not enough points
+    test::apply(from_wkt<CG>("POLYGON(())"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,0 0))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,1 0))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,2 0))"), false);
+
+#if 0
+    // TODO: these cases do not run and should be fixed
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,1 0,2 0))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,2 0,2 0))"), false);
+
+    // boundary not closed
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,1 1,1 2))"), false);
+    test::apply(from_wkt<CG>("POLYGON((0 0,1 0,1 0,1 1,1 1,1 2))"),
+                false);
+#endif
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_ring )
+{
+    test_is_valid_open_ring<point_type>();
+    test_is_valid_closed_ring<point_type>();
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_open_polygon )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: POLYGON (open) " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef open_ccw_polygon_type OG;
+    //    typedef closed_ccw_polygon_type CG;
+
+    typedef test_valid<OG> test;
+
+    static const bool allow_duplicates = true;
+
+    // not enough points in exterior ring
+    test::apply(from_wkt<OG>("POLYGON(())"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0))"), false);
+
+    // not enough points in interior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),())"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 2))"),
+                false);
+
+    // duplicate points in exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,0 0,0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,0 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 1,0 0))"), allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0,1 1))"), allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,1 0,1 1,0 0))"),
+                allow_duplicates);
+
+    // duplicate points in interior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 1,1 1))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 1,2 1))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 1,1 1))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 2,2 1,1 1))"),
+                allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 2,2 2,2 1))"),
+                allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 2,2 1,2 1,1 1))"),
+                allow_duplicates);
+
+    // with spikes in exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,2 2,0 2,1 2))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,1 0,2 2))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,1 0,2 0,1 0,4 0,4 4))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,2 2,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,2 0,1 0))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,5 5,0 5))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,3 3,5 5,0 5))"), false);
+
+    // with spikes in interior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,3 1,3 3,1 3,2 3))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,3 1,2 1,3 3))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,2 1,3 1,2 1,4 1,4 4))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,3 1,3 3,2 1))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,3 1,2 1))"),
+                false);
+
+    // with self-crossings in exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 -1,0 5))"),
+                false);
+
+    // example from Norvald Ryeng
+    test::apply(from_wkt<OG>("POLYGON((100 1300,140 1300,140 170,100 1700))"),
+                false);
+    // and with point order reversed
+    test::apply(from_wkt<OG>("POLYGON((100 1300,100 1700,140 170,140 1300))"),
+                false);
+
+    // with self-crossings in interior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(3 3,3 7,4 6,2 6))"),
+                false);
+
+    // with self-crossings between rings
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,0 5),(1 1,2 1,1 -1))"),
+                false);
+
+    // with self-intersections in exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 5,3 0,2 0,2 5,0 5))"),
+                false);
+
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,3 5,3 0,2 5,0 5))"),
+                false);
+
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 1,1 1,1 2,2 2,3 1,4 2,5 2,5 5,0 5))"),
+                false);
+
+    // next two suggested by Adam Wulkiewicz
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,0 5,4 4,2 2,0 5))"), false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,1 4,4 4,4 1,0 5))"),
+               false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,1 4,1 1,4 1,4 4,0 5))"),
+               false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,5 0,5 5,4 4,4 1,1 1,1 4,4 4,0 5))"),
+               false);
+
+    // with self-intersections in interior ring
+    test::apply(from_wkt<OG>("POLYGON((-10 -10,10 -10,10 10,-10 10),(0 0,5 0,5 5,3 5,3 0,2 0,2 5,0 5))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((-10 -10,10 -10,10 10,-10 10),(0 0,5 0,5 5,3 5,3 0,2 5,0 5))"),
+                false);
+
+    test::apply(from_wkt<OG>("POLYGON((-10 -10,10 -10,10 10,-10 10),(0 0,5 0,5 1,1 1,1 2,2 2,3 1,4 2,5 2,5 5,0 5))"),
+                false);
+
+    // with self-intersections between rings
+    // hole has common segment with exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 10,2 10,2 1))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,0 0,10 0,10 10,0 10,0 10),(1 1,1 10,1 10,2 10,2 10,2 1))"),
+                false);
+    // hole touches exterior ring at one point
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 10,2 1))"),
+                true);
+    // "hole" is outside the exterior ring, but touches it
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(5 10,4 11,6 11))"),
+                false);
+    // hole touches exterior ring at vertex
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 0,1 4,4 1))"),
+                true);
+    // "hole" is completely outside the exterior ring
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(20 20,20 21,21 21,21 20))"),
+                false);
+
+    // example from Norvald Ryeng
+    test::apply(from_wkt<OG>("POLYGON((58 31,56.57 30,62 33),(35 9,28 14,31 16),(23 11,29 5,26 4))"),
+                false);
+    // and with points reversed
+    test::apply(from_wkt<OG>("POLYGON((58 31,62 33,56.57 30),(35 9,31 16,28 14),(23 11,26 4,29 5))"),
+                false);
+
+    // "hole" is completely inside another "hole"
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 9,9 9,9 1),(2 2,2 8,8 8,8 2))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 9,9 9,9 1),(2 2,8 2,8 8,2 8))"),
+               false);
+
+    // "hole" is inside another "hole" (touching)
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 9,9 9,9 1),(2 2,2 8,8 8,9 6,8 2))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 9,9 9,9 1),(2 2,8 2,9 6,8 8,2 8))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,9 1,9 9,1 9),(2 2,2 8,8 8,9 6,8 2))"),
+                false);
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,9 1,9 9,1 9),(2 2,8 2,9 6,8 8,2 8))"),
+                false);
+    // hole touches exterior ring at two points
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(5 0,0 5,5 5))"),
+                false);
+
+    // cases with more holes
+    // two holes, touching the exterior at the same point
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 0,1 9,2 9),(0 0,9 2,9 1))"),
+                true);
+    test::apply(from_wkt<OG>("POLYGON((0 0,0 0,10 0,10 10,0 10,0 0),(0 0,0 0,1 9,2 9),(0 0,0 0,9 2,9 1))"),
+                allow_duplicates);
+    test::apply(from_wkt<OG>("POLYGON((0 10,0 0,0 0,0 0,10 0,10 10),(2 9,0 0,0 0,1 9),(9 1,0 0,0 0,9 2))"),
+                allow_duplicates);
+    // two holes, one inside the other
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 0,1 9,9 1),(0 0,4 5,5 4))"),
+                false);
+    // 1st hole touches has common segment with 2nd hole
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 5,5 5,5 1),(5 4,5 8,8 8,8 4))"),
+                false);
+    // 1st hole touches 2nd hole at two points
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(1 1,1 9,9 9,9 8,2 8,2 1),(2 5,5 8,5 5))"),
+                false);
+    // four holes, each two touching at different points
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 10,2 1,1 1),(0 10,4 1,3 1),(10 10,9 1,8 1),(10 10,7 1,6 1))"),
+                true);
+    // five holes, with two pairs touching each at some point, and
+    // fifth hole creating a disconnected component for the interior
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 10,2 1,1 1),(0 10,4 1,3 1),(10 10,9 1,8 1),(10 10,7 1,6 1),(4 1,4 4,6 4,6 1))"),
+                false);
+    // five holes, with two pairs touching each at some point, and
+    // fifth hole creating three disconnected components for the interior
+    test::apply(from_wkt<OG>("POLYGON((0 0,10 0,10 10,0 10),(0 10,2 1,1 1),(0 10,4 1,3 1),(10 10,9 1,8 1),(10 10,7 1,6 1),(4 1,4 4,6 4,6 1,5 0))"),
+                false);
+    
+
+    typedef open_cw_polygon_type OG1;
+
+    typedef test_valid<OG1> test1;
+
+    test1::apply(from_wkt<OG1>("POLYGON((0 0,0 10,10 10,10 0),(1 1,2 1,1 10))"),
+                 true);
+    test1::apply(from_wkt<OG1>("POLYGON((0 0,0 10,10 10,10 0),(0 10,1 1,2 1),(0 10,3 1,4 1),(10 10,8 1,9 1),(10 10,6 1,7 1))"),
+                 true);
+    test1::apply(from_wkt<OG1>("POLYGON((0 0,0 10,10 10,10 0),(0 10,1 1,2 1),(0 10,3 1,4 1),(10 10,8 1,9 1),(10 10,6 1,7 1),(4 1,5 0,6 1,6 4,4 4))"),
+                 false);
+}
+
+BOOST_AUTO_TEST_CASE( test_is_valid_multipolygon )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl;
+    std::cout << " is_valid: MULTIPOLYGON (open) " << std::endl;
+    std::cout << "************************************" << std::endl;
+#endif
+
+    typedef bg::model::multi_polygon<open_ccw_polygon_type> OG;
+    //    typedef closed_ccw_polygon_type CG;
+
+    typedef test_valid<OG> test;
+
+    static const bool allow_duplicates = true;
+
+    test::apply(from_wkt<OG>("MULTIPOLYGON((()))"), false);
+    test::apply(from_wkt<OG>("MULTIPOLYGON(((0 0)),(()))"), false);
+    test::apply(from_wkt<OG>("MULTIPOLYGON(((0 0,1 0)))"), false);
+    test::apply(from_wkt<OG>("MULTIPOLYGON(((0 0,1 0,1 1,0 1)),((2 2,3 2,3 3,2 3)))"),
+                true);
+    test::apply(from_wkt<OG>("MULTIPOLYGON(((0 0,1 0,1 0,1 1,0 1)),((2 2,3 2,3 3,3 3,2 3)))"),
+                allow_duplicates);
+}
diff --git a/test/algorithms/num_points.cpp b/test/algorithms/num_points.cpp
new file mode 100644
index 000000000..3abeed449
--- /dev/null
+++ b/test/algorithms/num_points.cpp
@@ -0,0 +1,65 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+// Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
+
+// 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)
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_num_points
+#endif
+
+#include <iostream>
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+template <typename Geometry>
+inline void test_num_points(std::string const& wkt, std::size_t expected)
+{
+    namespace bg = boost::geometry;
+    Geometry geometry;
+    boost::geometry::read_wkt(wkt, geometry);
+    std::size_t detected = bg::num_points(geometry);
+    BOOST_CHECK_EQUAL(expected, detected);
+    detected = bg::num_points(geometry, false);
+    BOOST_CHECK_EQUAL(expected, detected);
+    detected = bg::num_points(geometry, true);
+}
+
+BOOST_AUTO_TEST_CASE( test_num_points_closed )
+{
+    namespace bg = boost::geometry;
+    typedef bg::model::point<double,2,bg::cs::cartesian> point;
+    typedef bg::model::linestring<point> linestring;
+    typedef bg::model::segment<point> segment;
+    typedef bg::model::box<point> box;
+    typedef bg::model::ring<point> ring;
+    typedef bg::model::polygon<point> polygon;
+    typedef bg::model::multi_point<point> multi_point;
+    typedef bg::model::multi_linestring<linestring> multi_linestring;
+    typedef bg::model::multi_polygon<polygon> multi_polygon;
+
+    test_num_points<point>("POINT(0 0)", 1u);
+    test_num_points<linestring>("LINESTRING(0 0,1 1)", 2u);
+    test_num_points<segment>("LINESTRING(0 0,1 1)", 2u);
+    test_num_points<box>("POLYGON((0 0,10 10))", 4u);
+    test_num_points<ring>("POLYGON((0 0,1 1,0 1,0 0))", 4u);
+    test_num_points<polygon>("POLYGON((0 0,10 10,0 10,0 0))", 4u);
+    test_num_points<polygon>("POLYGON((0 0,0 10,10 10,10 0,0 0),(4 4,6 4,6 6,4 6,4 4))", 10u);
+    test_num_points<multi_point>("MULTIPOINT((0 0),(1 1))", 2u);
+    test_num_points<multi_linestring>("MULTILINESTRING((0 0,1 1),(2 2,3 3,4 4))", 5u);
+    test_num_points<multi_polygon>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((0 10,1 10,1 9,0 10)))", 9u);
+}
+
diff --git a/test/algorithms/overlaps.cpp b/test/algorithms/overlaps.cpp
index 6226ddd04..14c615e25 100644
--- a/test/algorithms/overlaps.cpp
+++ b/test/algorithms/overlaps.cpp
@@ -1,19 +1,20 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
+
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #include <algorithms/test_overlaps.hpp>
 
-
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/point_xy.hpp>
-
-
 template <typename P>
-void test_2d()
+void test_box_box_2d()
 {
 #if defined(BOOST_GEOMETRY_COMPILE_FAIL)
     test_geometry<P, P>("POINT(1 1)", "POINT(1 1)", true);
@@ -42,7 +43,56 @@ void test_3d()
     test_geometry<bg::model::box<P>, bg::model::box<P> >("BOX(1 1 1, 3 3 3)", "BOX(4 4 4,6 6 6)", false);
 }
 
+template <typename P>
+void test_pp()
+{
+    typedef bg::model::multi_point<P> mpt;
 
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0,1 1,2 2)", "MULTIPOINT(1 1,3 3,4 4)", true);
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0,1 1,2 2)", "MULTIPOINT(1 1,2 2)", false);
+}
+
+template <typename P>
+void test_ll()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 1)", "LINESTRING(1 1,2 2,4 4)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,4 0)", "LINESTRING(0 1,2 1,3 2)", false);
+
+    test_geometry<ls, mls>("LINESTRING(0 0,2 2,3 1)", "MULTILINESTRING((1 1,2 2),(2 2,4 4))", true);
+    test_geometry<ls, mls>("LINESTRING(0 0,2 2,3 1)", "MULTILINESTRING((1 1,2 2),(3 3,4 4))", true);
+    test_geometry<ls, mls>("LINESTRING(0 0,3 3,3 1)", "MULTILINESTRING((3 3,2 2),(0 0,1 1))", false);
+}
+
+template <typename P>
+void test_aa()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<poly, poly>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((3 3,3 9,9 9,9 3,3 3))", true);
+    test_geometry<poly, poly>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((5 5,5 9,9 9,9 5,5 5))", false);
+    test_geometry<poly, poly>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((3 3,3 5,5 5,5 3,3 3))", false);
+
+    test_geometry<poly, mpoly>("POLYGON((0 0,0 5,5 5,5 0,0 0))",
+                               "MULTIPOLYGON(((3 3,3 5,5 5,5 3,3 3)),((5 5,5 6,6 6,6 5,5 5)))",
+                               true);
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((3 3,3 5,5 5,5 3,3 3)),((0 0,0 3,3 3,3 0,0,0)))",
+                                "MULTIPOLYGON(((3 3,3 5,5 5,5 3,3 3)),((5 5,5 6,6 6,6 5,5 5)))",
+                                true);
+}
+
+template <typename P>
+void test_2d()
+{
+    test_pp<P>();
+    test_ll<P>();
+    test_aa<P>();
+
+    test_box_box_2d<P>();
+}
 
 int test_main( int , char* [] )
 {
diff --git a/test/algorithms/overlay/Jamfile.v2 b/test/algorithms/overlay/Jamfile.v2
index acd298a0c..9319330e9 100644
--- a/test/algorithms/overlay/Jamfile.v2
+++ b/test/algorithms/overlay/Jamfile.v2
@@ -4,18 +4,25 @@
 # Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
 # Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
 #
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014 Oracle and/or its affiliates.
+#
 # 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)
+#
+# Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 test-suite boost-geometry-algorithms-overlay
     : 
     [ run assemble.cpp ]
-    [ run ccw_traverse.cpp ]
+    [ run ccw_traverse.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
     [ run get_turn_info.cpp ]
     [ run get_turns.cpp ]
+    [ run get_turns_linear_linear.cpp ]
+    [ run get_turns_linear_areal.cpp ]
     [ run relative_order.cpp ]
     [ run select_rings.cpp ]
     [ run self_intersection_points.cpp ]
-    [ run traverse.cpp ]
+    [ run traverse.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE ]
      ;
diff --git a/test/algorithms/overlay/assemble.cpp b/test/algorithms/overlay/assemble.cpp
index f63e3b5ac..262f32f98 100644
--- a/test/algorithms/overlay/assemble.cpp
+++ b/test/algorithms/overlay/assemble.cpp
@@ -22,6 +22,7 @@
 #include <boost/geometry/algorithms/difference.hpp>
 #include <boost/geometry/algorithms/intersects.hpp>
 #include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
@@ -40,12 +41,18 @@
 template <typename Geometry>
 inline void test_assemble(std::string const& id, Geometry const& p, Geometry const& q, char operation = 'i')
 {
+    typedef typename bg::point_type<Geometry>::type point_type;
+    typedef typename bg::rescale_policy_type<point_type>::type
+        rescale_policy_type;
+    rescale_policy_type rescale_policy
+        = bg::get_rescale_policy<rescale_policy_type>(p, q);
+
 
     std::vector<Geometry> u, i, d1, 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));
+    bg::detail::difference::difference_insert<Geometry>(p, q, rescale_policy, std::back_inserter(d1));
+    bg::detail::difference::difference_insert<Geometry>(q, p, rescale_policy, std::back_inserter(d2));
 
     if (operation == 'i')
     {
@@ -72,21 +79,13 @@ inline void test_assemble(std::string const& id, Geometry const& p, Geometry con
             area_d2 += bg::area(g);
         }
 
-
         type diff = (area_p + area_q) - area_u - area_i;
         type diff_d1 = (area_u - area_q) - area_d1;
         type diff_d2 = (area_u - area_p) - area_d2;
 
-        BOOST_CHECK_CLOSE(diff, 0.0, 0.001);
-
-        // Gives small deviations on gcc:
-        // difference{0.001%} between diff_d1{1.1102230246251565e-016} and 0.0{0} exceeds 0.001%
-        //BOOST_CHECK_CLOSE(diff_d1, 0.0, 0.001);
-        //BOOST_CHECK_CLOSE(diff_d2, 0.0, 0.001);
-
         bool ok = abs(diff) < 0.001
-            || abs(diff_d1) < 0.001
-            || abs(diff_d2) < 0.001;
+            && abs(diff_d1) < 0.001
+            && abs(diff_d2) < 0.001;
 
         BOOST_CHECK_MESSAGE(ok,
             id << " diff:  "
diff --git a/test/algorithms/overlay/ccw_traverse.cpp b/test/algorithms/overlay/ccw_traverse.cpp
index bc7341b18..944f3937c 100644
--- a/test/algorithms/overlay/ccw_traverse.cpp
+++ b/test/algorithms/overlay/ccw_traverse.cpp
@@ -7,6 +7,8 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#define BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO
+
 #include <fstream>
 #include <iostream>
 #include <iomanip>
@@ -25,6 +27,7 @@
 #endif
 
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #include <algorithms/overlay/overlay_cases.hpp>
 
@@ -42,10 +45,19 @@ inline typename bg::coordinate_type<Geometry1>::type intersect(Geometry1 const&
     >::type side_strategy_type;
 
 
+    typedef typename bg::point_type<Geometry1>::type point_type;
+
+    typedef typename bg::rescale_policy_type<point_type>::type
+        rescale_policy_type;
+
+    rescale_policy_type rescale_policy
+            = bg::get_rescale_policy<rescale_policy_type>(g1, g2);
+
     typedef bg::detail::overlay::traversal_turn_info
-        <
-            typename bg::point_type<Geometry1>::type
-        > turn_info;
+    <
+        point_type,
+        typename bg::segment_ratio_type<point_type, rescale_policy_type>::type
+    > turn_info;
     std::vector<turn_info> turns;
 
     bg::detail::get_turns::no_interrupt_policy policy;
@@ -53,11 +65,11 @@ inline typename bg::coordinate_type<Geometry1>::type intersect(Geometry1 const&
         <
             rev<Geometry1>::value,
             rev<Geometry2>::value,
-            bg::detail::overlay::calculate_distance_policy
-        >(g1, g2, turns, policy);
+            bg::detail::overlay::assign_null_policy
+        >(g1, g2, rescale_policy, turns, policy);
 
     bg::enrich_intersection_points<rev<Geometry1>::value, rev<Geometry2>::value >(turns, bg::detail::overlay::operation_intersection,
-        g1, g2, side_strategy_type());
+        g1, g2, rescale_policy, side_strategy_type());
 
     typedef bg::model::ring<typename bg::point_type<Geometry1>::type> ring_type;
     typedef std::deque<ring_type> out_vector;
@@ -67,7 +79,7 @@ inline typename bg::coordinate_type<Geometry1>::type intersect(Geometry1 const&
         <
             rev<Geometry1>::value, rev<Geometry2>::value,
             Geometry1, Geometry2
-        >::apply(g1, g2, op, turns, v);
+        >::apply(g1, g2, op, rescale_policy, turns, v);
 
     typename bg::coordinate_type<Geometry1>::type result = 0.0;
     BOOST_FOREACH(ring_type& ring, v)
@@ -160,8 +172,8 @@ inline typename bg::coordinate_type<Geometry1>::type intersect(Geometry1 const&
                 out
 
                     << std::setprecision(3)
-                    << "dist: " << turn.operations[0].enriched.distance
-                    << " / "  << turn.operations[1].enriched.distance
+                    << "dist: " << turn.operations[0].fraction
+                    << " / "  << turn.operations[1].fraction
                     << std::endl;
 
                 offsets[p] += lineheight;
diff --git a/test/algorithms/overlay/dissolver.cpp b/test/algorithms/overlay/dissolver.cpp
index 41f4c60f7..28bd3e560 100644
--- a/test/algorithms/overlay/dissolver.cpp
+++ b/test/algorithms/overlay/dissolver.cpp
@@ -25,7 +25,6 @@
 #include <test_common/test_point.hpp>
 
 
-//#define TEST_WITH_SVG
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/io/svg/svg_mapper.hpp>
 #  include <boost/geometry/io/svg/write_svg_multi.hpp>
diff --git a/test/algorithms/overlay/get_turn_info.cpp b/test/algorithms/overlay/get_turn_info.cpp
index 979252e4d..1d2c4daa6 100644
--- a/test/algorithms/overlay/get_turn_info.cpp
+++ b/test/algorithms/overlay/get_turn_info.cpp
@@ -42,17 +42,23 @@ void test_with_point(std::string const& caseid,
     P qj = bg::make<P>(qj_x, qj_y);
     P qk = bg::make<P>(qk_x, qk_y);
 
+    typedef typename bg::detail::no_rescale_policy rescale_policy_type;
 
-    typedef bg::detail::overlay::turn_info<P> turn_info;
+    typedef bg::detail::overlay::turn_info
+        <
+            P,
+            typename bg::segment_ratio_type<P, rescale_policy_type>::type
+        > turn_info;
     typedef std::vector<turn_info> tp_vector;
     turn_info model;
     tp_vector info;
+    rescale_policy_type rescale_policy;
     bg::detail::overlay::get_turn_info
         <
-            P, P, turn_info,
             bg::detail::overlay::assign_null_policy
         >::apply(pi, pj, pk, qi, qj, qk,
-        model, std::back_inserter(info));
+                 false, false, false, false, // dummy parameters
+        model, rescale_policy, std::back_inserter(info));
 
 
     if (info.size() == 0)
@@ -72,18 +78,13 @@ void test_with_point(std::string const& caseid,
         }
     }
 
+    BOOST_CHECK_MESSAGE(detected == expected,
+    	caseid
+            << (caseid.find("_") == std::string::npos ? "  " : "")
+            << " method: " << method
+            << " detected: " << detected
+            << " expected: " << expected);
 
-    /*
-    std::cout << caseid
-        << (caseid.find("_") == std::string::npos ? "  " : "")
-        << " " << method
-        << " " << detected
-        << " " << order
-        << std::endl;
-    */
-
-
-    BOOST_CHECK_EQUAL(detected, expected);
 
     if (! info.empty())
     {
@@ -327,14 +328,16 @@ void test_all()
             5, 3,   5, 5,   6, 6, // q
             method_collinear, 5, 5, "ui");
 
+    // The next two cases are changed (BSG 2013-09-24), they contain turn info (#buffer_rt_g)
+    // In new approach they are changed back (BSG 2013-10-20)
     test_both<P, double>("ccx1",
             5, 1,   5, 6,   5, 8, // p
             5, 5,   5, 7,   3, 8, // q
-            method_collinear, 5, 6, "cc");
+            method_collinear, 5, 6, "cc"); // "iu");
     test_both<P, double>("cxc1",
             5, 1,   5, 6,   7, 8, // p
             5, 3,   5, 5,   5, 7, // q
-            method_collinear, 5, 5, "cc");
+            method_collinear, 5, 5, "cc"); // "iu");
 
     // Bug in case #54 of "overlay_cases.hpp"
     test_both<P, double>("c_bug1",
@@ -807,7 +810,7 @@ void test_all()
             4, 3,   2, 3,   0, 3, // q
             method_touch, 2, 3, "xx");
 
-    // BSG 2012-05-26 to be decided what's the problem here and what it tests... 
+    // BSG 2012-05-26 to be decided what's the problem here and what it tests...
     // Anyway, test results are not filled out.
     //test_both<P, double>("issue_buffer_mill",
     //        5.1983614873206241 , 6.7259025813913107 , 5.0499999999999998 , 6.4291796067500622 , 5.1983614873206241 , 6.7259025813913107, // p
diff --git a/test/algorithms/overlay/get_turns.cpp b/test/algorithms/overlay/get_turns.cpp
index ccada3485..3a3ab3620 100644
--- a/test/algorithms/overlay/get_turns.cpp
+++ b/test/algorithms/overlay/get_turns.cpp
@@ -24,6 +24,7 @@
 
 #include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 
@@ -42,8 +43,8 @@
 
 
 // To test that "get_turns" can be called using additional information
-template <typename P>
-struct my_turn_op : public bg::detail::overlay::turn_operation
+template <typename Point, typename SegmentRatio>
+struct my_turn_op : public bg::detail::overlay::turn_operation<SegmentRatio>
 {
 };
 
@@ -57,14 +58,23 @@ struct test_get_turns
             std::size_t expected_count,
             G1 const& g1, G2 const& g2, double precision)
     {
-            typedef bg::detail::overlay::turn_info
+        typedef typename bg::point_type<G2>::type point_type;
+        typedef typename bg::rescale_policy_type<point_type>::type
+            rescale_policy_type;
+
+        rescale_policy_type rescale_policy
+                = bg::get_rescale_policy<rescale_policy_type>(g1, g2);
+
+        typedef bg::detail::overlay::turn_info
             <
-                typename bg::point_type<G2>::type
+                point_type,
+                typename bg::segment_ratio_type<point_type, rescale_policy_type>::type
             > turn_info;
         std::vector<turn_info> turns;
 
+
         bg::detail::get_turns::no_interrupt_policy policy;
-        bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(g1, g2, turns, policy);
+        bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(g1, g2, rescale_policy, turns, policy);
 
         BOOST_CHECK_MESSAGE(
             expected_count == boost::size(turns),
@@ -133,7 +143,7 @@ struct test_get_turns
 template<typename G1, typename G2>
 struct test_get_turns
 {
-    inline static void apply(std::string const& id, std::size_t expected_count, 
+    inline static void apply(std::string const& id, std::size_t expected_count,
                 std::string const& wkt1, std::string const& wkt2,
                 double precision = 0.001)
     {
@@ -185,9 +195,6 @@ void test_all()
     typedef bg::model::linestring<P> linestring;
     typedef bg::model::box<P> box;
 
-    // Expected count, average x, average y
-    typedef boost::tuple<int> Tuple;
-
 #ifdef BOOST_GEOMETRY_DEBUG_INTERSECTION
     std::cout << string_from_type<T>::name() << std::endl;
 #endif
@@ -234,7 +241,7 @@ void test_all()
     test_get_turns<polygon, polygon>::apply("15", 2, case_15[0], case_15[1]);
     test_get_turns<polygon, polygon>::apply("16", 4, case_16[0], case_16[1]);
     test_get_turns<polygon, polygon>::apply("17", 2, case_17[0], case_17[1]);
-    test_get_turns<polygon, polygon>::apply("18", 4, case_18[0], case_18[1]);
+    ///test_get_turns<polygon, polygon>::apply("18", 4, case_18[0], case_18[1]);
 
     // 19-24
     test_get_turns<polygon, polygon>::apply("19", 2, case_19[0], case_19[1]);
@@ -334,8 +341,6 @@ void test_ccw()
 {
     typedef bg::model::point<T, 2, bg::cs::cartesian> P;
     typedef bg::model::polygon<P, false, true> polygon;
-    typedef boost::tuple<int> Tuple;
-
 
     test_get_turns<polygon, polygon>::apply("ccw_1",
                 6,
@@ -352,7 +357,6 @@ void test_open()
 {
     typedef bg::model::point<T, 2, bg::cs::cartesian> P;
     typedef bg::model::polygon<P, true, false> polygon;
-    typedef boost::tuple<int> Tuple;
 
     test_get_turns<polygon, polygon>::apply("open_1",
                 6,
diff --git a/test/algorithms/overlay/get_turns_linear_areal.cpp b/test/algorithms/overlay/get_turns_linear_areal.cpp
new file mode 100644
index 000000000..202eb28ed
--- /dev/null
+++ b/test/algorithms/overlay/get_turns_linear_areal.cpp
@@ -0,0 +1,176 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include "test_get_turns.hpp"
+#include <boost/geometry/geometries/geometries.hpp>
+
+//TEST
+//#include "to_svg.hpp"
+
+template <typename T>
+void test_all()
+{
+    typedef bg::model::point<T, 2, bg::cs::cartesian> pt;
+    typedef bg::model::linestring<pt> ls;
+    typedef bg::model::polygon<pt> poly;
+
+    test_geometry<ls, poly>("LINESTRING(15 5,24 5,20 2,19 0,13 -4,1 0,10 0,13 3,15 7,16 10,10 10,8 10,4 6,2 8,1 10)",
+                            "POLYGON((0 0,5 5,0 10,20 10,20 2,19 0,0 0)(10 3,15 3,15 7,10 7,10 3))",
+                            expected("miu+")("iuu+")("tcc+")("tuu=")("mcu+")("mic=")("muu+")
+                                    ("tiu+")("mcu+")("mic=")("mcc+")("miu=")("mxu+"));
+
+    test_geometry<ls, poly>("LINESTRING(5 0,5 5,10 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "miu+", "mxu+");
+    test_geometry<ls, poly>("LINESTRING(0 0,5 5,10 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "tiu+", "txu+");
+    test_geometry<ls, poly>("LINESTRING(0 0,5 0,5 5,10 5,10 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            expected("tcu+")("mic=")("mcc+")("txu="));
+    test_geometry<ls, poly>("LINESTRING(10 0,5 0,5 5,10 5,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            expected("tcc+")("miu=")("mcu+")("txc="));
+
+    test_geometry<ls, poly>("LINESTRING(0 0,10 0,10 10)",
+                            "POLYGON((0 0,5 5,0 10,20 10,20 2,19 0,0 0)(10 3,15 3,15 7,10 7,10 3))",
+                            expected("tcu+")("mic=")("mcu+")("mic=")("mxu+"));
+
+    test_geometry<ls, poly>("LINESTRING(11 1,10 0,0 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "tcc+", "txu=");
+    test_geometry<ls, poly>("LINESTRING(0 0,10 0,11 1)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "tcu+", "tuc=");
+    test_geometry<ls, poly>("LINESTRING(10 0,0 0,-1 1)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "tcc+", "tuu=");
+
+    // true hole
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,10 0,0 0)(2 2,10 5,2 8,2 2))",
+                            expected("tiu+")("tiu+"));
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,10 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,10 0,0 0)(2 2,10 5,2 8,2 2))",
+                            expected("mcu+")("ecc=")("tiu+")("mxc="));
+
+    // fake hole
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            expected("tuu+")("tiu+"));
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,10 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            expected("mcu+")("tuc=")("tcu+")("mxc="));
+
+    // true hole
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            expected("mcu+")("mic=")("tcu+")("txc="));
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,2 8)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            expected("mcu+")("mic=")("tcc+")("txu="));
+
+    // SPIKE - NON-ENDPOINT - NON-OPPOSITE
+
+    // spike - neq eq
+    test_geometry<ls, poly>("LINESTRING(2 2,4 4,1 1)", "POLYGON((0 0,4 4,6 3,6 0,0 0))",
+                            expected("mcc+")("txu=")("tcu=")("mxc="));
+    // spike - eq eq
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,1 1)", "POLYGON((0 0,4 4,6 3,6 0,0 0))",
+                          expected("tcc+")("txu=")("tcu=")("mxc="));
+    // spike - eq neq
+    test_geometry<ls, poly>("LINESTRING(0 0,3 3,1 1)", "POLYGON((0 0,4 4,6 3,6 0,0 0))",
+                            expected("tcc+")("mxu=")("mcu=")("mxc="));
+    // spike - neq neq
+    test_geometry<ls, poly>("LINESTRING(1 1,3 3,2 2)", "POLYGON((0 0,4 4,6 3,6 0,0 0))",
+                            expected("mcc+")("mxu=")("mcu=")("mxc="));
+    // spike - out neq
+    test_geometry<ls, poly>("LINESTRING(0 0,3 3,2 2)", "POLYGON((1 1,4 4,6 3,6 0,1 1))",
+                            expected("mcc+")("mxu=")("mcu=")("mxc="));
+    // spike - out eq
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,2 2)", "POLYGON((1 1,4 4,6 3,6 0,1 1))",
+                            expected("mcc+")("txu=")("tcu=")("mxc="));
+    // spike - out out/eq
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,2 2)", "POLYGON((1 0,4 4,6 3,1 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,2 2)", "POLYGON((0 1,4 4,6 3,6 0,-1 -1,0 1))",
+                            expected("tiu+"));
+    // spike - out out/neq
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,2 2)", "POLYGON((4 0,4 5,6 3,4 0))",
+                            expected("muu+"));
+    test_geometry<ls, poly>("LINESTRING(0 0,4 4,2 2)", "POLYGON((0 4,5 4,6 3,6 0,-1 -1,0 4))",
+                            expected("miu+"));
+
+    test_geometry<ls, poly>("LINESTRING(0 1,1 1,0 1)", "POLYGON((0 0,3 3,3 0,0 0))",
+                            expected("muu+"));
+    test_geometry<ls, poly>("LINESTRING(0 1,3 3,0 1)", "POLYGON((0 0,3 3,3 0,0 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(0 1,0 0,0 1)", "POLYGON((0 0,3 3,3 0,0 0))",
+                            expected("tuu+"));
+    
+    // SPIKE - NON-ENDPOINT - OPPOSITE
+
+    // opposite - eq eq
+    test_geometry<ls, poly>("LINESTRING(6 6,4 4,0 0,2 2)", "POLYGON((-1 -1,0 0,4 4,6 3,-1 -1))",
+                            expected("tcu+")("txc=")("tcc=")("mxu="));
+    // opposite - neq eq
+    test_geometry<ls, poly>("LINESTRING(6 6,4 4,0 0,2 2)", "POLYGON((-1 -1,0 0,5 5,6 3,-1 -1))",
+                            expected("mcu+")("txc=")("tcc=")("mxu="));
+    // opposite - eq, neq
+    test_geometry<ls, poly>("LINESTRING(6 6,4 4,0 0,2 2)", "POLYGON((-2 -2,-1 -1,4 4,6 3,-2 -2))",
+                            expected("tcu+")("mxc=")("mcc=")("mxu="));
+    // opposite - neq neq
+    test_geometry<ls, poly>("LINESTRING(6 6,4 4,0 0,2 2)", "POLYGON((-2 -2,-1 -1,3 3,6 3,-2 -2))",
+                            expected("mcu+")("mxc=")("mcc=")("mxu="));
+    // opposite - neq neq
+    test_geometry<ls, poly>("LINESTRING(6 6,4 4,0 0,2 2)", "POLYGON((-2 -2,-1 -1,3 3,5 5,6 3,-2 -2))",
+                            expected("mcu+")("mxc=")("mcc=")("mxu="));
+
+    // spike vs internal
+    test_geometry<ls, poly>("LINESTRING(0 1,1 1,0 1)", // --
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(1 2,1 1,1 2)", // |
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(0 2,1 1,0 2)",
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(2 0,1 1,2 0)",
+                            "POLYGON((1 0,1 1,2 1,2 0,1 0))",
+                            expected("tiu+")("tiu+")("txu+")); // TODO: should spike point be duplicated?
+    test_geometry<ls, poly>("LINESTRING(0 0,1 1,0 0)", // /
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tuu+"));
+    test_geometry<ls, poly>("LINESTRING(2 2,1 1,2 2)", // /
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tuu+"));
+
+    test_geometry<ls, poly>("LINESTRING(2 1,1 1,2 1)",
+                            "POLYGON((1 0,1 1,2 1,1 0))",
+                            expected("tcu+")("txc=")("tcc=")("txu="));
+}
+
+int test_main(int, char* [])
+{
+    test_all<float>();
+    test_all<double>();
+
+#if ! defined(_MSC_VER)
+    test_all<long double>();
+#endif
+
+#if defined(HAVE_TTMATH)
+    test_all<ttmath_big>();
+#endif
+    return 0;
+}
diff --git a/test/algorithms/overlay/get_turns_linear_linear.cpp b/test/algorithms/overlay/get_turns_linear_linear.cpp
new file mode 100644
index 000000000..5bb8c0a0d
--- /dev/null
+++ b/test/algorithms/overlay/get_turns_linear_linear.cpp
@@ -0,0 +1,530 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include "test_get_turns.hpp"
+#include <boost/geometry/geometries/geometries.hpp>
+
+//TEST
+//#include <to_svg.hpp>
+
+template <typename T>
+void test_all()
+{
+    typedef bg::model::point<T, 2, bg::cs::cartesian> pt;
+    typedef bg::model::linestring<pt> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    // NOTE: currently for the first endpoint of the Linestring on collinear segment
+    // is_collinear flags are set to FALSE!
+    // E.g. in the first test tii++, NOT tii==
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(0 0,2 0)", "tii++", "txx==");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(2 0,0 0)", "tix+=", "txi=+");
+    
+    test_geometry<ls, ls>("LINESTRING(1 0,1 1)", "LINESTRING(0 0,1 0,2 0)", "tuu++");
+    test_geometry<ls, ls>("LINESTRING(1 0,0 0)", "LINESTRING(0 0,1 0,2 0)", "txi=+", "tiu+=");
+    test_geometry<ls, ls>("LINESTRING(1 0,2 0)", "LINESTRING(0 0,1 0,2 0)", "tii++", "txx==");
+    test_geometry<ls, ls>("LINESTRING(1 1,1 0)", "LINESTRING(0 0,1 0,2 0)", "txu++");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(0 0,1 0,2 0)", "tii++", "txu==");
+    test_geometry<ls, ls>("LINESTRING(2 0,1 0)", "LINESTRING(0 0,1 0,2 0)", "txi=+", "tix+=");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,1 1)", "tuu++");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,0 0)", "tix+=", "tui=+");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,2 0)", "tii++", "txx==");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 1,1 0)", "tux++");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(0 0,1 0)", "tii++", "tux==");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(2 0,1 0)", "tix+=", "txi=+");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 1,1 0,3 0,3 1)", "mii++", "ccc==", "muu==");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 -1,1 0,3 0,3 -1)", "mii++", "ccc==", "muu==");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 1,3 0,1 0,1 1)", "miu+=", "mui=+");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 -1,3 0,1 0,1 -1)", "miu+=", "mui=+");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 1,2 0,4 0,4 1)", "tii++", "ccc==", "tuu==");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 -1,2 0,4 0,4 -1)", "tii++", "ccc==", "tuu==");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 1,4 0,2 0,2 1)", "tiu+=", "tui=+");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 -1,4 0,2 0,2 -1)", "tiu+=", "tui=+");
+
+    // same as above - TODO: reverse manually or automatically for all tests
+    /*test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 1,1 0,2 0,3 0,3 1)", "mii", "ecc", "muu");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 -1,1 0,2 0,3 0,3 -1)", "mii", "ecc", "muu");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 1,3 0,2 0,1 0,1 1)", "miu", "ecc", "mui");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 -1,3 0,2 0,1 0,1 -1)", "miu", "ecc", "mui");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 1,2 0,3 0,4 0,4 1)", "tii", "ecc", "tuu");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 -1,2 0,3 0,4 0,4 -1)", "tii", "ecc", "tuu");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 1,4 0,3 0,2 0,2 1)", "tiu", "ecc", "tui");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 -1,4 0,3 0,2 0,2 -1)", "tiu", "ecc", "tui");*/
+
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 1,3 5,4 0)", "LINESTRING(1 0,2 1,3 5)", "tii++", "ecc==", "tux==");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 1,3 5,4 0)", "LINESTRING(3 5,2 1,1 0)", "tix+=", "ecc==", "tui=+");
+    test_geometry<ls, ls>("LINESTRING(1 0,2 1,3 5)", "LINESTRING(0 0,1 0,2 1,3 5,4 0)", "txu==", "ecc==", "tii++");
+    test_geometry<ls, ls>("LINESTRING(3 5,2 1,1 0)", "LINESTRING(0 0,1 0,2 1,3 5,4 0)", "tiu+=", "ecc==", "txi=+");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(-1 -1,1 0,10 0,20 -1)", "mii++", "txu==");
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(20 -1,10 0,1 0,-1 -1)", "miu+=", "txi=+"); 
+    test_geometry<ls, ls>("LINESTRING(-1 -1,1 0,10 0,20 -1)", "LINESTRING(0 0,10 0)", "mii++", "tux==");
+    test_geometry<ls, ls>("LINESTRING(20 -1,10 0,1 0,-1 -1)", "LINESTRING(0 0,10 0)", "mui=+", "tix+="); 
+
+    test_geometry<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)",
+                          "LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)",
+                          expected("tii++")("ecc==")("muu==")("mii++")("muu==")("mii++")("mux=="));
+    test_geometry<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)",
+                          "LINESTRING(30 0,3 0,2.5 1,2 0,1 0,0 0,-1 -1)",
+                          expected("tiu+=")("ecc==")("mui=+")("miu+=")("mui=+")("miu+=")("mui=+"));
+    test_geometry<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,4 0,1 0,0 0,-1 1)",
+                          "LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)",
+                          expected("tui=+")("ecc==")("miu+=")("mui=+")("miu+=")("mui=+")("mix+="));
+    test_geometry<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,4 0,1 0,0 0,-1 1)",
+                          "LINESTRING(30 0,3 0,2.5 1,2 0,1 0,0 0,-1 -1)",
+                          expected("tuu==")("ecc==")("mii++")("muu==")("mii++")("muu==")("mii++"));
+
+    test_geometry<ls, ls>("LINESTRING(-1 0,1 0,2 1,3 2)", "LINESTRING(4 5,3 2,1 0,0 0)", "mix+=", "txi=+", "ecc==");
+    test_geometry<ls, ls>("LINESTRING(4 5,3 2,1 0,0 0)", "LINESTRING(-1 0,1 0,2 1,3 2)", "mxi=+", "tix+=", "ecc==");
+
+    test_geometry<ls, ls>("LINESTRING(30 1,20 1,10 0,0 0)", "LINESTRING(1 1,2 0,3 1,20 1,25 1)", "mix+=", "tui=+", "muu++");
+    test_geometry<ls, ls>("LINESTRING(1 1,2 0,3 1,20 1,25 1)", "LINESTRING(30 1,20 1,10 0,0 0)", "mxi=+", "tiu+=", "muu++");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,30 0)", "LINESTRING(4 0,4 1,20 1,5 0,1 0)", "muu++", "mui=+", "mix+=");
+    test_geometry<ls, ls>("LINESTRING(4 0,4 1,20 1,5 0,1 0)", "LINESTRING(0 0,30 0)", "muu++", "miu+=", "mxi=+");
+
+    test_geometry<ls, ls>("LINESTRING(30 0,0 0)", "LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)",
+                          expected("mui=+")("miu+=")("mui=+")("mix+="));
+    test_geometry<ls, ls>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)", "LINESTRING(30 0,0 0)",
+                          expected("miu+=")("mui=+")("miu+=")("mxi=+"));
+
+    test_geometry<ls, ls>("LINESTRING(1 0,7 0,8 1)", "LINESTRING(0 0,10 0,10 10,4 -1)",
+                          expected("mii++")("iuu++")("muu=="));
+    test_geometry<ls, ls>("LINESTRING(1 0,7 0,8 1)", "LINESTRING(0 0,10 0,10 10,5 0,4 1)",
+                          expected("mii++")("muu++")("muu=="));
+
+    // non-collinear
+    test_geometry<ls, ls>("LINESTRING(0 1,0 0)", "LINESTRING(0 0,1 0,2 0)", "txu++");
+    test_geometry<ls, ls>("LINESTRING(0 1,0 0,1 1)", "LINESTRING(0 0,1 0,2 0)", "tuu++");
+    test_geometry<ls, ls>("LINESTRING(0 1,1 0,2 1)", "LINESTRING(0 0,1 0,2 0)", "tuu++");
+
+    // SPIKE - NON-ENDPOINT - NON-OPPOSITE
+
+    // spike - neq eq
+    test_geometry<ls, ls>("LINESTRING(2 2,4 4,1 1)", "LINESTRING(0 0,4 4,6 3)",
+                          expected("mii++")("txu==")("tiu==")("mxi=+"));
+    // spike - eq eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,1 1)", "LINESTRING(0 0,4 4,6 3)",
+                          expected("tii++")("txu==")("tiu==")("mxi=+"));
+    // spike - eq neq
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(0 0,4 4,6 3)",
+                          expected("tii++")("mxu==")("miu==")("mxi=+"));
+    // spike - neq neq
+    test_geometry<ls, ls>("LINESTRING(1 1,3 3,2 2)", "LINESTRING(0 0,4 4,6 3)",
+                          expected("mii++")("mxu==")("miu==")("mxi=+"));
+    // spike - out neq
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,2 2)", "LINESTRING(1 1,4 4,6 3)",
+                          expected("mii++")("mxu==")("miu==")("mxi=+"));
+    // spike - out eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(1 1,4 4,6 3)",
+                          expected("mii++")("txu==")("tiu==")("mxi=+"));
+    // spike - out out/eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(1 0,4 4,6 3)",
+                          expected("tuu++"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(0 1,4 4,6 3)",
+                          expected("tuu++"));
+    // spike - out out/neq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(4 0,4 5,6 3)",
+                          expected("muu++"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(0 4,5 4,6 3)",
+                          expected("muu++"));
+    
+    // SPIKE - NON-ENDPOINT - OPPOSITE
+
+    // opposite - eq eq
+    test_geometry<ls, ls>("LINESTRING(6 6,4 4,0 0,2 2)", "LINESTRING(-1 -1,0 0,4 4,6 3)",
+                          expected("tiu+=")("txi=+")("tii=+")("mxu=="));
+    test_geometry<ls, ls>("LINESTRING(-1 -1,0 0,4 4,6 3)", "LINESTRING(6 6,4 4,0 0,2 2)",
+                          expected("tui=+")("tix+=")("tii+=")("mux=="));
+    // opposite - neq eq
+    test_geometry<ls, ls>("LINESTRING(6 6,4 4,0 0,2 2)", "LINESTRING(-1 -1,0 0,5 5,6 3)",
+                          expected("miu+=")("txi=+")("tii=+")("mxu=="));
+    // opposite - eq neq
+    test_geometry<ls, ls>("LINESTRING(6 6,4 4,0 0,2 2)", "LINESTRING(-2 -2,-1 -1,4 4,6 3)",
+                          expected("tiu+=")("mxi=+")("mii=+")("mxu=="));
+    // opposite - neq neq
+    test_geometry<ls, ls>("LINESTRING(6 6,4 4,0 0,2 2)", "LINESTRING(-2 -2,-1 -1,3 3,6 3)",
+                          expected("miu+=")("mxi=+")("mii=+")("mxu=="));
+    // opposite - neq neq
+    test_geometry<ls, ls>("LINESTRING(6 6,4 4,0 0,2 2)", "LINESTRING(-2 -2,-1 -1,3 3,5 5,6 3)",
+                          expected("miu+=")("mxi=+")("mii=+")("mxu=="));
+    // opposite - neq eq
+    test_geometry<ls, ls>("LINESTRING(6 3,3 3,0 0)", "LINESTRING(0 0,2 2,3 3,1 1)",
+                          expected("txi=+")("tix+=")("tii+=")("mux=="));
+
+    // SPIKE - ENDPOINT - NON-OPPOSITE
+
+    // spike - neq eq
+    test_geometry<ls, ls>("LINESTRING(2 2,4 4,1 1)", "LINESTRING(0 0,4 4)",
+                          expected("mii++")("txx==")("tix==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(2 2,4 4,1 1)", "LINESTRING(4 4,0 0)",
+                          expected("miu+=")("txi=+")("tii=+")("mxu=="));
+    // spike - eq eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,1 1)", "LINESTRING(0 0,4 4)",
+                          expected("tii++")("txx==")("tix==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,1 1)", "LINESTRING(4 4,0 0)",
+                          expected("tix+=")("txi=+")("tii=+")("mxu=="));
+    // spike - eq neq
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(0 0,4 4)",
+                          expected("tii++")("mxu==")("miu==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(4 4,0 0)",
+                          expected("tix+=")("mxi=+")("mii=+")("mxu=="));
+    // spike - neq neq
+    test_geometry<ls, ls>("LINESTRING(1 1,3 3,2 2)", "LINESTRING(0 0,4 4)",
+                          expected("mii++")("mxu==")("miu==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(1 1,3 3,2 2)", "LINESTRING(4 4,0 0)",
+                          expected("miu+=")("mxi=+")("mii=+")("mxu=="));
+    // spike - out neq
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,2 2)", "LINESTRING(1 1,4 4)",
+                          expected("mii++")("mxu==")("miu==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,2 2)", "LINESTRING(4 4,1 1)",
+                          expected("mix+=")("mxi=+")("mii=+")("mxu=="));
+    // spike - out eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(1 1,4 4)",
+                          expected("mii++")("txx==")("tix==")("mxi=+"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(4 4,1 1)",
+                          expected("mix+=")("txi=+")("tii=+")("mxu=="));
+    // spike - out out/eq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(1 0,4 4)",
+                          expected("tux++"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(0 1,4 4)",
+                          expected("tux++"));
+    // spike - out out/neq
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(4 0,4 5)",
+                          expected("muu++"));
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,2 2)", "LINESTRING(0 4,5 4)",
+                          expected("muu++"));
+    
+    // TODO:
+    //test_geometry<ls, ls>("LINESTRING(0 0,2 0,1 0)", "LINESTRING(0 1,0 0,2 0)", "1FF00F102");
+    //test_geometry<ls, ls>("LINESTRING(2 0,0 0,1 0)", "LINESTRING(0 1,0 0,2 0)", "1FF00F102");
+
+    //test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(3 0,3 3,3 1)", "0F1FF0102");
+    //test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(2 0,2 3,2 1)", "0F1FF0102");
+    //test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(2 0,2 2,2 1)", "0F1FF0102");
+
+    //test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,4 4)", "LINESTRING(0 0,1 1,4 4)", "1FFF0FFF2");
+
+
+    //if ( boost::is_same<T, double>::value )
+    //{
+    //    to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)", "LINESTRING(0 0,2 0,2.5 0,3 1)", "test11.svg");
+    //    to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)", "LINESTRING(3 1,2.5 0,2 0,0 0)", "test12.svg");
+    //    to_svg<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,30 0,31 1)", "LINESTRING(30 0,3 0,2.5 1,2 0,1 0,0 0,-1 -1)", "test21.svg");
+    //    to_svg<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,30 0,31 1)", "LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)", "test22.svg");
+
+    //    to_svg<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)", "LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)", "test31.svg");
+    //    to_svg<ls, ls>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)", "LINESTRING(30 0,3 0,2.5 1,2 0,1 0,0 0,-1 -1)", "test32.svg");
+    //    to_svg<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,4 0,1 0,0 0,-1 1)", "LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)", "test33.svg");
+    //    to_svg<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,4 0,1 0,0 0,-1 1)", "LINESTRING(30 0,3 0,2.5 1,2 0,1 0,0 0,-1 -1)", "test34.svg");
+    //}
+
+    // duplicated
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0,30 0))",
+                            "MULTILINESTRING((0 10,5 0,20 0,20 0,30 0),(2 0,2 0),(3 0,3 0,3 0))",
+                            expected("mii++")("ccc==")("ccc==")("txx=="));
+
+    // spike
+    test_geometry<ls, ls>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)",
+                          "LINESTRING(30 0,19 0,18 0,0 0)",
+                          expected("iuu++")("iuu++")("tiu+=")("mxi=+"));
+    // spike
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0,5 0))",
+                            "MULTILINESTRING((1 0,8 0,4 0))",
+                            expected("mii++")("mix+=")("mux==")("mui==")("mix+=")("mii+=")("mxu==")("mxi=+"));
+    
+    /*test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0,5 0))",
+                            "MULTILINESTRING((1 0,8 0,4 0),(2 0,9 0,5 0))",
+                            expected("mii")("ccc")("ccc")("txx"));*/
+
+    // spike vs endpoint
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0))",
+                            "MULTILINESTRING((-1 0,0 0,-2 0),(11 0,10 0,12 0))",
+                            expected("tuu++")("txu++"));
+    // internal turning R vs spike
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,2 1))",
+                            "MULTILINESTRING((0 1,1 1,0 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,2 1))",
+                            "MULTILINESTRING((1 2,1 1,1 2))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 0,0 0))",
+                            "MULTILINESTRING((2 0,1 0,2 0))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,2 1))",
+                            "MULTILINESTRING((0 2,1 1,0 2))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,2 1))",
+                            "MULTILINESTRING((2 0,1 1,2 0))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,2 1))",
+                            "MULTILINESTRING((2 1,1 1,2 1))",
+                            expected("txi=+")("tix+=")("tii+=")("txx=="));
+    // internal turning L vs spike
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,0 1))",
+                            "MULTILINESTRING((2 1,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,0 1))",
+                            "MULTILINESTRING((1 2,1 1,1 2))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,0 1))",
+                            "MULTILINESTRING((2 2,1 1,2 2))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,0 1))",
+                            "MULTILINESTRING((0 0,1 1,0 0))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 0,1 1,0 1))",
+                            "MULTILINESTRING((0 1,1 1,0 1))",
+                            expected("txi=+")("tix+=")("tii+=")("txx=="));
+    // spike vs internal turning R
+    test_geometry<mls, mls>("MULTILINESTRING((0 1,1 1,0 1))",
+                            "MULTILINESTRING((1 0,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 2,1 1,1 2))",
+                            "MULTILINESTRING((1 0,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((2 0,1 0,2 0))",
+                            "MULTILINESTRING((0 0,1 0,0 0))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 2,1 1,0 2))",
+                            "MULTILINESTRING((1 0,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((2 0,1 1,2 0))",
+                            "MULTILINESTRING((1 0,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((2 1,1 1,2 1))",
+                            "MULTILINESTRING((1 0,1 1,2 1))",
+                            expected("tix+=")("txi=+")("tii=+")("txx=="));
+    // spike vs internal turning L
+    test_geometry<mls, mls>("MULTILINESTRING((2 1,1 1,2 1))",
+                            "MULTILINESTRING((1 0,1 1,0 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((1 2,1 1,1 2))",
+                            "MULTILINESTRING((1 0,1 1,0 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((2 2,1 1,2 2))",
+                            "MULTILINESTRING((1 0,1 1,0 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((1 0,1 1,0 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 1,1 1,0 1))",
+                            "MULTILINESTRING((1 0,1 1,0 1))",
+                            expected("tix+=")("txi=+")("tii=+")("txx=="));
+    // spike vs internal collinear
+    test_geometry<mls, mls>("MULTILINESTRING((0 1,1 1,0 1))",
+                            "MULTILINESTRING((2 1,1 1,0 1))",
+                            expected("tix+=")("txi=+")("tii=+")("txx=="));
+    // internal collinear vs spike
+    test_geometry<mls, mls>("MULTILINESTRING((2 1,1 1,0 1))",
+                            "MULTILINESTRING((0 1,1 1,0 1))",
+                            expected("txi=+")("tix+=")("tii+=")("txx=="));
+    // spike vs spike
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((2 2,1 1,2 2))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((2 0,1 1,2 0))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((2 1,1 1,2 1))",
+                            expected("tuu++"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((0 1,1 1,0 1))",
+                            expected("tuu++"));
+    // collinear spikes
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((0 0,1 1,0 0))",
+                            expected("tii++")("tix+=")("txi=+")("txx==")
+                                    ("ecc=="));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,1 1,0 0))",
+                            "MULTILINESTRING((1 1,0 0,1 1))",
+                            expected("tix+=")("tii+=")("txx==")("txi==")
+                                    ("txi=+")("tii=+")("txx==")("tix=="));
+    // non-spike similar
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0))",
+                            "MULTILINESTRING((-1 0,0 0,2 0))",
+                            expected("tii++")("mux=="));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0))",
+                            "MULTILINESTRING((-1 -1,0 0,2 0))",
+                            expected("tii++")("mux=="));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0))",
+                            "MULTILINESTRING((2 0,0 0,-1 0))",
+                            expected("tiu+=")("mui=+"));
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,10 0))",
+                            "MULTILINESTRING((2 0,0 0,-1 -1))",
+                            expected("tiu+=")("mui=+"));
+}
+
+int test_main(int, char* [])
+{
+    test_all<float>();
+    test_all<double>();
+
+#if ! defined(_MSC_VER)
+    test_all<long double>();
+#endif
+
+#if defined(HAVE_TTMATH)
+    test_all<ttmath_big>();
+#endif
+    return 0;
+}
+
+/*
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,3 0)", "lsls0000.svg");
+to_svg<ls, ls>("LINESTRING(1 0,3 0)", "LINESTRING(2 0,0 0)", "lsls0001.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(3 0,1 0)", "lsls0002.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(1 0,2 0)", "lsls0003.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(2 0,1 0)", "lsls0004.svg");
+to_svg<ls, ls>("LINESTRING(1 0,2 0)", "LINESTRING(1 0,0 0)", "lsls0005.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(0 0,2 0)", "lsls0006.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(2 0,0 0)", "lsls0007.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,3 0)", "LINESTRING(1 0,2 0)", "lsls0008.svg");
+to_svg<ls, ls>("LINESTRING(0 0,3 0)", "LINESTRING(2 0,1 0)", "lsls0009.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(1 0,1 1)", "lsls00010.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(1 1,1 0)", "lsls00011.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(0 0,0 1)", "lsls00012.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(0 1,0 0)", "lsls00013.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,1 1)", "lsls00014.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 1,1 0)", "lsls00015.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,3 1)", "lsls00016.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(2 0,1 0)", "lsls00017.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(0 0,1 0)", "lsls00018.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,0 0)", "lsls00019.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,2 0)", "lsls00020.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0)", "LINESTRING(0 0,2 0)", "lsls000.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,2 0,3 0)", "LINESTRING(0 0,2 0)", "lsls001.svg");
+to_svg<ls, ls>("LINESTRING(1 0,1 1)", "LINESTRING(0 0,1 0,2 0)", "lsls0020.svg");
+to_svg<ls, ls>("LINESTRING(1 0,0 0)", "LINESTRING(0 0,1 0,2 0)", "lsls0021.svg");
+to_svg<ls, ls>("LINESTRING(1 0,2 0)", "LINESTRING(0 0,1 0,2 0)", "lsls0022.svg");
+to_svg<ls, ls>("LINESTRING(1 1,1 0)", "LINESTRING(0 0,1 0,2 0)", "lsls0023.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(0 0,1 0,2 0)", "lsls0024.svg");
+to_svg<ls, ls>("LINESTRING(2 0,1 0)", "LINESTRING(0 0,1 0,2 0)", "lsls0025.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,1 1)", "lsls00200.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,0 0)", "lsls00211.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 0,2 0)", "lsls00222.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(1 1,1 0)", "lsls00233.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(0 0,1 0)", "lsls00244.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,2 0)", "LINESTRING(2 0,1 0)", "lsls00255.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,6 0,8 0)", "LINESTRING(1 0,3 0,5 0,6 0,9 0)", "lsls01.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(1 0,3 0,4 0,4 2,4 5)", "lsls02.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(1 0,4 0,4 4)", "lsls031.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,2 0,0 0)", "lsls032.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,2 2,0 2)", "lsls0321.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,2 0)", "lsls033.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,4 4)", "lsls034.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,3 1)", "lsls035.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(4 0,4 -1)", "lsls036.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0,4 4)", "LINESTRING(1 0,4 0,4 3)", "lsls04.svg");
+to_svg<ls, ls>("LINESTRING(1 0,2 0,4 0,6 0,8 0)", "LINESTRING(0 0,3 0,5 0,6 0,9 0)", "lsls05.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,10 9)", "lsls061.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,10 -9)", "lsls062.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,-10 9)", "lsls063.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,-10 -9)", "lsls064.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,10 9,10 10)", "LINESTRING(1 0,10 9)", "lsls065.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,9 9)", "lsls071.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,9 -9)", "lsls072.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,-9 9)", "lsls073.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 0,-9 -9)", "lsls074.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,10 0,10 10)", "LINESTRING(1 0,9 9)", "lsls081.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0,10 0,10 10)", "LINESTRING(0 0,9 9)", "lsls082.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(1 0,9 9)", "lsls083.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(9 9,1 0)", "lsls084.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(1 0,2 0)", "lsls085.svg");
+to_svg<ls, ls>("LINESTRING(0 0,1 0)", "LINESTRING(2 0,1 0)", "lsls086.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(1 1,10 5)", "lsls091.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 5,10 10)", "LINESTRING(1 1,10 5)", "lsls092.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10)", "LINESTRING(19 1,10 5)", "lsls093.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 5,10 10)", "LINESTRING(19 1,10 5)", "lsls094.svg");
+
+to_svg<ls, ls>("LINESTRING(5 3,1 1,3 3,2 2,0 0)", "LINESTRING(0 0,3 3,6 3)", "1F100F10T.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 1,1 0,3 0,3 1)", "lsls_01.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 -1,1 0,3 0,3 -1)", "lsls_02.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 1,3 0,1 0,1 1)", "lsls_03.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 -1,3 0,1 0,1 -1)", "lsls_04.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 1,2 0,4 0,4 1)", "lsls_05.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 -1,2 0,4 0,4 -1)", "lsls_06.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 1,4 0,2 0,2 1)", "lsls_07.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 -1,4 0,2 0,2 -1)", "lsls_08.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 1,1 0,2 0,3 0,3 1)", "lsls_11.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(1 -1,1 0,2 0,3 0,3 -1)", "lsls_12.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 1,3 0,2 0,1 0,1 1)", "lsls_13.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,4 0)", "LINESTRING(3 -1,3 0,2 0,1 0,1 -1)", "lsls_14.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 1,2 0,3 0,4 0,4 1)", "lsls_15.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(2 -1,2 0,3 0,4 0,4 -1)", "lsls_16.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 1,4 0,3 0,2 0,2 1)", "lsls_17.svg");
+to_svg<ls, ls>("LINESTRING(0 0,2 0,3 0,4 0,6 0)", "LINESTRING(4 -1,4 0,3 0,2 0,2 -1)", "lsls_18.svg");
+
+to_svg<ls, ls>("LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,5 0)", "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", "lsls11.svg");
+to_svg<ls, ls>("LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,5 0)", "LINESTRING(5 0,5 5,10 5,10 10,5 10,5 5,0 5)", "lsls12.svg");
+to_svg<ls, ls>("LINESTRING(5 0,5 5,5 10,10 10,10 5,5 5,0 5)", "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", "lsls13.svg");
+to_svg<ls, ls>("LINESTRING(5 0,5 5,5 10,10 10,10 5,5 5,0 5)", "LINESTRING(5 0,5 5,10 5,10 10,5 10,5 5,0 5)", "lsls14.svg");
+
+to_svg<ls, ls>("LINESTRING(0 5,10 5,10 10,5 10,5 0)", "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", "lsls15.svg");
+to_svg<ls, ls>("LINESTRING(0 5,10 5,10 10,5 10,5 0)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls16.svg");
+to_svg<ls, ls>("LINESTRING(0 5,10 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls161.svg");
+to_svg<ls, ls>("LINESTRING(0 5,8 5,10 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls162.svg");
+to_svg<ls, ls>("LINESTRING(0 5,8 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1631.svg");
+to_svg<ls, ls>("LINESTRING(0 5,1 5,7 5,8 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1632.svg");
+to_svg<ls, ls>("LINESTRING(0 5,1 5,7 5,8 5)", "LINESTRING(5 10,10 10,10 5,0 5)", "lsls1633.svg");
+to_svg<ls, ls>("LINESTRING(0 5,8 4)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1641.svg");
+to_svg<ls, ls>("LINESTRING(0 5,8 6)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1642.svg");
+to_svg<ls, ls>("LINESTRING(1 5,8 4)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1643.svg");
+to_svg<ls, ls>("LINESTRING(1 5,8 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls1644.svg");
+to_svg<ls, ls>("LINESTRING(0 5,5 5,8 4)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls165.svg");
+to_svg<ls, ls>("LINESTRING(0 5,5 5,8 5)", "LINESTRING(5 0,5 10,10 10,10 5,0 5)", "lsls166.svg");
+to_svg<ls, ls>("LINESTRING(0 5,5 5,8 5)", "LINESTRING(0 10,10 0,5 0,5 10,10 10,10 5,0 5)", "lsls167.svg");
+to_svg<ls, ls>("LINESTRING(0 5,5 5,8 5)", "LINESTRING(0 10,5 5,10 0,5 0,5 5,5 10,10 10,10 5,0 5)", "lsls168.svg");
+
+to_svg<ls, ls>("LINESTRING(0 0,0 10,10 10,10 0,0 0)", "LINESTRING(0 2,0 0,10 0,10 10,0 10,0 8,0 2)", "lsls1690.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10,0 10,0 0)", "LINESTRING(0 8,0 0,10 0,10 10,0 10,0 8)", "lsls1691.svg");
+to_svg<ls, ls>("LINESTRING(0 0,10 0,10 10,0 10,0 0)", "LINESTRING(0 2,0 0,10 0,10 10,0 10,0 8)", "lsls1692.svg");
+to_svg<ls, ls>("LINESTRING(0 0,0 10,10 10,10 0,0 0)", "LINESTRING(0 2,0 0,10 0,10 10,0 10,0 8)", "lsls1693.svg");
+to_svg<ls, ls>("LINESTRING(0 2,0 0,10 0,10 10,0 10,0 8)", "LINESTRING(0 0,10 0,10 10,0 10,0 0)", "lsls1694.svg");
+to_svg<ls, ls>("LINESTRING(0 2,0 0,10 0,10 10,0 10,0 8)", "LINESTRING(0 0,0 10,10 10,10 0,0 0)", "lsls1695.svg");
+
+to_svg<ls>("LINESTRING(0 8,0 0,10 0,10 10,0 10,0 2)", "ls1.svg");
+to_svg<ls>("LINESTRING(8 8,0 0,10 0,10 10,0 10,8 2)", "ls2.svg");
+
+typedef bg::model::multi_linestring<ls> mls;
+to_svg<ls, mls>("LINESTRING(0 5,10 5,10 10,5 10,5 0)", "MULTILINESTRING((5 0,5 7),(5 8,5 10,10 10,10 5,0 5))", "lsls17.svg");
+to_svg<ls, mls>("LINESTRING(0 5,10 5,10 10,5 10,5 0)", "MULTILINESTRING((5 0,5 4,5 6,5 7),(5 8,5 10,10 10,10 5,0 5))", "lsls18.svg");
+to_svg<ls, mls>("LINESTRING(0 5,10 5,10 10,5 10,5 0)", "MULTILINESTRING((5 0,5 8),(5 7,5 10,10 10,10 5,0 5))", "lsls19.svg");
+to_svg<mls, ls>("MULTILINESTRING((5 0,5 7),(5 8,5 10,10 10,10 5,0 5))", "LINESTRING(0 5,10 5,10 10,5 10,5 0)", "lsls20.svg");
+to_svg<mls, ls>("MULTILINESTRING((5 0,5 8),(5 7,5 10,10 10,10 5,0 5))", "LINESTRING(0 5,10 5,10 10,5 10,5 0)", "lsls21.svg");
+
+to_svg<ls, ls>("LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,5 0)", "LINESTRING(0 5,5 5,0 10,10 10,10 5,5 5,5 0)", "lsls100.svg");
+
+to_svg<ls, ls>("LINESTRING(5 0,5 5,5 0)", "LINESTRING(0 5,5 5,0 10,2 10,5 5,5 10,10 10,10 5,5 5,10 2,10 0,8 0,5 5,5 0)", "lsls101.svg");
+*/
diff --git a/test/algorithms/overlay/overlay_cases.hpp b/test/algorithms/overlay/overlay_cases.hpp
index 33d09c215..c2b99bc3b 100644
--- a/test/algorithms/overlay/overlay_cases.hpp
+++ b/test/algorithms/overlay/overlay_cases.hpp
@@ -360,6 +360,9 @@ static std::string collinear_overlaps[2] = {
         "POLYGON((0 2,0 4,2 4,2 5,0 5,0 7,2 7,2 8,6 8,6 7,8 7,8 5,6 5,6 4,8 4,8 2,6 2,6 1,2 1,2 2,0 2))",
         "POLYGON((3 0,3 2,1 2,1 3,3 3,3 4,1 4,1 5,3 5,3 6,1 6,1 7,3 7,3 9,5 9,5 7,7 7,7 6,5 6,5 5,7 5,7 4,5 4,5 3,7 3,7 2,5 2,5 0,3 0))" };
 
+static std::string simplex_spike[2] = {
+        "POLYGON((0 1,2 5,5 3,0 1))",
+        "POLYGON((4 0,0 3,4 5,4 2,6 5,4 2,4 0))" };
 
 static std::string line_line1[2] = {
         "LINESTRING(0 1,2 5,5 3)", "LINESTRING(3 0,0 3,4 5)"};
@@ -387,6 +390,11 @@ static std::string pie_16_2_15_0[2] = {
     "POLYGON((2500 2500,1704 1704,1525 1937,2500 2500))"
     };
 
+static std::string pie_2_3_23_0[2] =
+{
+    "POLYGON((2500 2500,2855 3828,2500 3875,2500 2500))",
+    "POLYGON((2500 2500,2791 3586,2499 3625,2208 3586,2500 2500))"
+};
 
 // Shifted pies
 static std::string pie_20_20_7_100[2] = {
@@ -492,14 +500,14 @@ static std::string ggl_list_20110306_javier[2] =
     "POLYGON((-2 2,2002 2,2002 -2002,-2 -2002,-2 2),(0 -147.00000000000003,0 -2000,2000 -2000,2000 0,104 0,440 -240,400 -280,0 -147.00000000000003))",
     "POLYGON((359.99000000000001 -280,0 -182,0 -147,400.00999999999999 -280,359.99000000000001 -280))"
     };
-    
+
 static std::string ggl_list_20110307_javier[2] =
     {
     "POLYGON((-2 2, 1842 2, 1842 -2362, -2 -2362, -2 2), (0 0, 0 -2360, 1840 -2360, 1840 0, 0 0))",
     // "POLYGON((-0.01 -1960, 0 -1960, 0 -1880, 0.01 -1960, -0.01 -1960))"
     "POLYGON ((-0.01 -1960, 80.01 -1960, 0 -1880, -0.01 -1960))"
     };
-    
+
 
 static std::string ggl_list_20110627_phillip[2] =
     {
@@ -517,16 +525,34 @@ static std::string ggl_list_20110716_enrico[2] =
 // Send on ggl-list by Christoph/Angus at 2011-08-19/20
 // This polygon combination fails to union in <float> but do in <double> or <ttmath>
 // It had previosly an error which has been fixed at 2011-08-30
-static std::string ggl_list_20110820_christophe[2] = 
+static std::string ggl_list_20110820_christophe[2] =
 {
     "POLYGON((17.763942722600319 32.23605727739968,19.192448808558737 30.807551191441263,16.000000000000000 30.000000000000000,17.763942722600319 32.236057277399681))",
-    "POLYGON((0.24806946917841693 26.015444246572663,31.751930530821582 33.984555753427337,32.248069469178418 30.015444246572663,0.24806946917841693 26.015444246572663))" 
+    "POLYGON((0.24806946917841693 26.015444246572663,31.751930530821582 33.984555753427337,32.248069469178418 30.015444246572663,0.24806946917841693 26.015444246572663))"
+};
+
+static std::string ggl_list_20131119_james[2] =
+{
+    "POLYGON((7 8,6.42705 6.23664,4.92705 5.14683,3.07295 5.14683,1.57295 6.23664,1 8,1.57295 9.76336,3.07295 10.8532,4.92705 10.8532,6.42705 9.76336,7 8))",
+    "POLYGON((4 4,4 8,12 8,12 4,4 4))"
+};
+
+static std::string ggl_list_20140223_shalabuda[2] =
+{
+    "POLYGON((-7.1621621621621605058294335322 43.228378378378366164724866394, -4.52438675915238786018335304107 30.5670564439314631499655661173, -4.16280147451538873326626344351 27.5407467090450168711868172977, -6.19047619047618891130468909978 36.7666666666666515084216371179, -7.1621621621621605058294335322 43.228378378378366164724866394))",
+    "POLYGON((-8.16216216216216139400785323232 49.8783783783783789544941100758, -3.16280147451538873326626344351 44.228378378378366164724866394, 1 -10.5499999999999971578290569596, -1 2.25, -8.16216216216216139400785323232 49.8783783783783789544941100758))",
 };
 
 
+static std::string ggl_list_20140321_7415963[2] =
+{
+    "POLYGON((-6.0 3.2500000000000013, -9.0 3.2500000000000022, -9.0 6.5, -6.0 6.5, -6.0 3.2500000000000013))",
+    "POLYGON((-3.0 0.0, -6.0 0.0, -6.0 3.2500000000000013, -3.0 3.2500000000000009, -3.0 0.0))",
+};
+
 // GEOS "TestOverlay" test.
 // Note that the first one WAS invalid and is made valid using SQL Server 2008 Spatial MakeValid() function
-static std::string geos_1_test_overlay[2] =
+static std::string geos_1[2] =
     {
         // Original: POLYGON((5417148.108 5658342.603,5417139.016 5658338.009,5417126.791 5658331.833,5417116.292 5658327.518,5417112.871 5658325.598,5417110.25  5658324.127,5417106.071 5658321.781,5417104.226 5658320.745,5417093.266  5658315.008,5417091.265 5658313.961,5417085.335 5658310.857,5417060.44  5658326.26,5417064.68 5658327.52,5417088.83 5658336.46,5417088.52  5658337.31,5417102.92 5658342.65,5417103.26 5658341.83,5417111.76  5658345.51,5417121.662 5658349.583,5417121.878 5658349.672,5417125.217  5658351.119,5417131.761 5658353.388,5417137.589 5658356.276,5417142.166  5658359.67,5417146.599 5658364.988,5417151.395 5658370.641,5417150.853  5658371.392,5417152.59741167 5658373.52811061,5417154.92  5658376.37,5417155.18955743 5658376.89699992,5417154.919 5658376.371,5417155.814  5658378.111,5417157.051 5658380.297,5417158.004 5658382.304,5417159.014  5658384.47,5417159.775 5658386.619,5417160.629 5658389.278,5417161.5  5658399.49,5417160.773 5658404.194,5417159.41 5658413.02,5417158.853  5658414.442,5417153.671 5658427.659,5417153.67051161 5658427.6586943,5417153.67  5658427.66,5417152.73 5658427.07,5417149.993 5658436.599,5417148.81  5658439.42,5417149.233 5658439.67,5417148.36 5658440.81,5417146.41  5658446.6,5417144.321 5658453.127,5417144.32092232 5658453.13043826,5417154.59  5658458.01,5417154.99551047 5658455.8409905,5417155.446  5658453.413,5417157.23981414 5658448.75748237,5417157.22660892  5658448.57861162,5417157.22660849 5658448.57860592,5417157.22660865  5658448.57860812,5417157.128 5658447.265,5417157.64950997  5658446.06368023,5417157.64950961 5658446.06368108,5417158.314  5658444.533,5417172.322 5658417.957,5417174.99 5658418.57,5417175.23  5658417.74,5417176.696 5658412.61,5417177.875 5658408.488,5417178.76  5658405.39,5417178.1 5658393.55,5417178.08 5658393.36,5417177.11  5658384.95,5417178.151 5658384.915,5417178.14836289 5658384.91508866,5417178.12  5658384.83,5417177.91415246 5658383.81114117,5417176.927 5658378.944,5417176.603  5658377.341,5417176.73975922 5658378.01762048,5417176.6  5658377.34,5417176.51210558 5658376.89535766,5417176.428 5658376.483,5417175.235  5658370.602,5417171.577 5658362.886,5417170.762 5658360.107,5417168.522  5658357.989,5417166.042 5658355.047,5417164.137 5658352.264,5417162.642  5658351.593,5417160.702 5658350.843,5417160.05417889 5658350.5823586,5417158.82  5658350.09,5417158.82103105 5658350.0862195,5417159.50373263  5658350.36089455,5417158.818 5658350.085,5417159.055 5658349.214,5417155.754  5658347.679,5417156.78066321 5658348.15640928,5417155.7525011  5658347.6811561,5417155.161 5658348.532,5417149.028 5658343.237,5417152.26877967  5658346.03496647,5417149.03 5658343.24,5417148.78133339  5658343.06701453,5417148.108 5658342.603))
     "POLYGON((5417085.33499 5658310.85699,5417060.44 5658326.26001,5417064.67999 5658327.52002,5417088.82999 5658336.46002,5417088.51999 5658337.31,5417102.92001 5658342.65002,5417103.26001 5658341.83002,5417111.76001 5658345.51001,5417121.66199 5658349.58301,5417121.87799 5658349.672,5417125.21701 5658351.11902,5417131.76099 5658353.388,5417137.58899 5658356.276,5417142.16599 5658359.66998,5417146.599 5658364.98798,5417151.39499 5658370.64099,5417150.853 5658371.39203,5417152.59741 5658373.52814,5417154.92001 5658376.37,5417155.18806 5658376.89407,5417155.814 5658378.11102,5417157.05099 5658380.297,5417158.004 5658382.30402,5417159.01401 5658384.46997,5417159.77499 5658386.61902,5417160.629 5658389.27802,5417161.5 5658399.48999,5417160.77301 5658404.19397,5417159.41 5658413.02002,5417158.853 5658414.44202,5417153.67099 5658427.659,5417153.6705 5658427.65869,5417153.67001 5658427.65997,5417152.73001 5658427.07001,5417149.99301 5658436.599,5417148.81 5658439.41998,5417149.233 5658439.66998,5417148.35999 5658440.81,5417146.41 5658446.59998,5417144.32101 5658453.12701,5417144.32092 5658453.13043,5417154.59 5658458.01001,5417154.99551 5658455.841,5417155.44601 5658453.41302,5417157.23981 5658448.75751,5417157.22662 5658448.57861,5417157.12799 5658447.26501,5417157.64951 5658446.06366,5417158.314 5658444.53302,5417172.32199 5658417.95697,5417174.98999 5658418.57001,5417175.23001 5658417.73999,5417176.69601 5658412.60999,5417177.875 5658408.48798,5417178.76001 5658405.39001,5417178.10001 5658393.54999,5417178.07999 5658393.35999,5417177.10999 5658384.95001,5417178.14837 5658384.91507,5417178.12 5658384.83002,5417177.91415 5658383.81116,5417176.927 5658378.94397,5417176.603 5658377.341,5417176.73975 5658378.01764,5417176.60001 5658377.34003,5417176.51212 5658376.89539,5417176.42801 5658376.48297,5417175.23499 5658370.60199,5417171.577 5658362.88599,5417170.76199 5658360.10699,5417168.522 5658357.98901,5417166.04199 5658355.047,5417164.13699 5658352.26398,5417162.642 5658351.59302,5417160.702 5658350.84302,5417160.05417 5658350.58234,5417158.82001 5658350.09003,5417158.82104 5658350.08625,5417158.81799 5658350.08502,5417159.05499 5658349.21399,5417155.754 5658347.67902,5417156.78067 5658348.15643,5417155.7525 5658347.68115,5417155.16101 5658348.53198,5417149.02802 5658343.237,5417152.26877 5658346.03497,5417149.03 5658343.23999,5417148.78134 5658343.06702,5417148.108 5658342.60303,5417139.01599 5658338.00897,5417126.79099 5658331.83301,5417116.29199 5658327.51801,5417112.871 5658325.59802,5417110.25 5658324.12701,5417106.07101 5658321.78101,5417104.22601 5658320.745,5417093.26599 5658315.008,5417091.26501 5658313.961,5417085.33499 5658310.85699))",
@@ -572,6 +598,24 @@ static std::string ticket_7462[2] =
     "POLYGON((2.76143527 1.093332171 , 2.076887131 1.822299719 , 4.263789177 3.875944376 , 4.948337555 3.146976948 , 2.76143527 1.093332171))"
     };
 
+// Ticket 8310 https://svn.boost.org/trac/boost/ticket/8310
+// The problem was in disjoint, "point_on_border" on the smallest polygon
+// is not considered as "within" the other, though there are no further intersection points.
+static std::string ticket_8310a[2] =
+    {
+    "POLYGON(( -2.559375047683716 -0.615625500679016, -2.559375047683716 0.384374797344208, 7.940625190734863 0.384374588727951, 7.940625190734863 -0.615625441074371, -2.559375047683716 -0.615625500679016 ))",
+    "POLYGON(( 1.000000000000000 0.384374707937241, 1.000000000000000 0.000000000000000, 0.000000000000000 0.000000000000000, 0.000000000000000 0.384374737739563, 1.000000000000000 0.384374707937241 ))"
+    };
+static std::string ticket_8310b[2] =
+    {
+	"POLYGON(( -2.592187881469727 -0.626561701297760, -2.592187643051147 0.373438000679016, 7.907812595367432 0.373437851667404, 7.907812595367432 -0.626561224460602, -2.592187881469727 -0.626561701297760 ))",
+    "POLYGON(( 0.000000000000000 0.373437941074371, 1.000000000000000 0.373437792062759, 1.000000000000000 0.000000000000000, 0.000000000000000 0.000000000000000, 0.000000000000000 0.373437941074371 ))"
+    };
+static std::string ticket_8310c[2] =
+    {
+	"POLYGON(( 5.204249382019043 3.531043529510498, 5.204247951507568 2.531045675277710, -5.295750617980957 2.531046152114868, -5.295751094818115 3.531045913696289, 5.204249382019043 3.531043529510498 ))",
+    "POLYGON(( 1.000000000000000 2.531045913696289, 1.000000000000000 3.000000000000000, 2.000000000000000 3.000000000000000, 2.000000000000000 2.531045913696289, 1.000000000000000 2.531045913696289 ))"
+    };
 
 static std::string ticket_8254[2] =
     {
@@ -585,6 +629,14 @@ static std::string ticket_8652[2] =
     "POLYGON((0.02 -2.77556e-17, 0.05 0.02, 0.05 -2.77556e-17, 0.02 -2.77556e-17))"
     };
 
+static std::string ticket_9756[2] =
+{
+    // NOTE: these polygons are not closed. That is the reason the union failed for the library user.
+    // the unit test calls "correct" so this test is not a problem for the library. The ticket is closed as invalid.
+    "POLYGON((440820.110024126 4047009.80267429, 440806.545727707 4046942.39533656, 440797.171880196 4046895.8425726, 440804.202135392 4046888.73092639, 440813.573458131 4046935.27114371, 440827.140279322 4047002.69102807))",
+    "POLYGON((440855.857887967 4046932.1248641, 440813.740724389 4046942.21109839, 440806.376538684 4046935.44583646, 440848.493702262 4046925.35960217))",
+};
+
 static std::string ggl_list_20120229_volker[3] =
     {
     "POLYGON((1716 1554,2076 2250,2436 2352,2796 1248,3156 2484,3516 2688,3516 2688,3156 2484,2796 1248,2436 2352,2076 2250, 1716 1554))",
@@ -719,5 +771,30 @@ static std::string collinear_opposite_straight[2] =
         "POLYGON((6 6,6 9,7 10,7 7,7 5,6 6))"
     };
 
+static std::string ticket_9081_15[2] =
+    {
+        "POLYGON((0.6733025292237357 0.1677633042748119,0.4903155795903966 0.2232818375071136,0.4271130992272586 0.3070047723327289,0.786116554767879 0.3837165261542967,0.6733025292237357 0.1677633042748119))",
+        "POLYGON((0.6331466887796691 0.351029969741811,0.7496863892358909 0.3759321389935647,0.7688695634785153 0.35070163001261,0.7290398105918782 0.2744578879686089,0.6331466887796691 0.351029969741811))"
+    };
+
+static std::string ticket_9081_314[2] =
+    {
+        "POLYGON((0.4397162028773298 0.5045841729755439,0.8281201612335258 0.8974555101699454,0.7367863490883197 0.2443919592743702,0.4397162028773298 0.5045841729755439))",
+        "POLYGON((0.5414573257656662 0.6074955108670699,0.5789048944501695 0.6005510671998147,0.6254781598681494 0.5392960142449524,0.7838704066548215 0.5810567836448409,0.7367863490883197 0.2443919592743702,0.4522347054548293 0.4936197023297791,0.4539963238827925 0.4940841246816053,0.4402150043376781 0.5050887115944368,0.5414573257656662 0.6074955108670699))"
+    };
+
+static std::string ticket_9081_6690[2] =
+    {
+        "POLYGON((0.5489109414010371 0.5774835110050927,0.4099611282054447 0.4644351568071598,0.4294011278595494 0.4843224236729239,0.4205359995313906 0.5115225580860201,0.4441572412013468 0.5184999851878852,0.5489109414010371 0.5774835110050927))",
+        "POLYGON((0.3984249865018206 0.4526335964808558,0.3621206996557855 0.4602288471829723,0.4183516736935784 0.4730187483833363,0.4099611282054451 0.4644351568071601,0.3984249865018206 0.4526335964808558))"
+    };
+
+static std::string ticket_9563[2] =
+    {
+        "POLYGON((16.4030230586813990 21.4147098480789640, 17.3451877762964380 14.8677773110138890, 11.9421647176150360 6.4530674629349205, 5.5969769413186015 4.5852901519210345, 4.6548122237035621 11.1322226889861170, 10.0578352823849610 19.5469325370650790, 16.4030230586813990 21.4147098480789640, 16.4030230586813990 21.4147098480789640))",
+        "POLYGON((16.4030230586814020 21.414709848078967, 17.7828326880709360 18.936596729241124, 17.3451877762964410 14.867777311013885, 15.2073549240394820 10.298488470659295, 11.9421647176150340 6.4530674629349125, 8.4245222359685457 4.3618917414181650, 5.5969769413185944 4.5852901519210292, 4.2171673119290620 7.0634032707588670, 4.6548122237035567 11.132222688986115, 6.7926450759605128 15.701511529340699, 10.0578352823849570 19.546932537065082, 13.5754777640314510 21.638108258581831, 16.4030230586814020 21.414709848078967))"
+    };
+
+
 
 #endif // BOOST_GEOMETRY_TEST_OVERLAY_CASES_HPP
diff --git a/test/algorithms/overlay/robustness/Jamfile.v2 b/test/algorithms/overlay/robustness/Jamfile.v2
index d48296d4b..ca7f2e7c7 100644
--- a/test/algorithms/overlay/robustness/Jamfile.v2
+++ b/test/algorithms/overlay/robustness/Jamfile.v2
@@ -24,3 +24,5 @@ exe random_ellipses_stars : random_ellipses_stars.cpp ;
 exe recursive_polygons : recursive_polygons.cpp ;
 exe star_comb : star_comb.cpp ;
 
+exe ticket_9081 : ticket_9081.cpp ;
+
diff --git a/test/algorithms/overlay/robustness/intersection_stars.cpp b/test/algorithms/overlay/robustness/intersection_stars.cpp
index 5858d1d5a..0592e2af3 100644
--- a/test/algorithms/overlay/robustness/intersection_stars.cpp
+++ b/test/algorithms/overlay/robustness/intersection_stars.cpp
@@ -74,8 +74,8 @@ void test_star(int count, int min_points, int max_points, T rotation, p_q_settin
         for (int i = min_points; i <= max_points; i++)
         {
             std::ostringstream out;
-            out << "_" << string_from_type<T>::name() << "_"  
-                << string_from_type<CalculationType>::name() << "_" 
+            out << "_" << string_from_type<T>::name() << "_"
+                << string_from_type<CalculationType>::name() << "_"
                 << i << "_int";
 
             polygon p;
diff --git a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
index 2dca58bbc..2584aeea3 100644
--- a/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
+++ b/test/algorithms/overlay/robustness/random_ellipses_stars.cpp
@@ -175,6 +175,7 @@ void test_all(std::string const& type, int seed, int count, p_q_settings setting
     }
     else if (type == "double")
     {
+        settings.tolerance = 1.0e-4;
         test_type<double, Clockwise, Closed>(seed, count, settings);
     }
 #if defined(HAVE_TTMATH)
diff --git a/test/algorithms/overlay/robustness/recursive_polygons.cpp b/test/algorithms/overlay/robustness/recursive_polygons.cpp
index 19db1dab3..0c0a729f1 100644
--- a/test/algorithms/overlay/robustness/recursive_polygons.cpp
+++ b/test/algorithms/overlay/robustness/recursive_polygons.cpp
@@ -1,5 +1,5 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-// Unit Test
+// Robustness Test
 
 // Copyright (c) 2009-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
diff --git a/test/algorithms/overlay/robustness/star_comb.cpp b/test/algorithms/overlay/robustness/star_comb.cpp
index 6713c5618..40bec4052 100644
--- a/test/algorithms/overlay/robustness/star_comb.cpp
+++ b/test/algorithms/overlay/robustness/star_comb.cpp
@@ -8,9 +8,9 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 
-#define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
+// #define BOOST_GEOMETRY_REPORT_OVERLAY_ERROR
 #define BOOST_GEOMETRY_NO_BOOST_TEST
-#define BOOST_GEOMETRY_TIME_OVERLAY
+// #define BOOST_GEOMETRY_TIME_OVERLAY
 
 
 #include <test_overlay_p_q.hpp>
diff --git a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
index b13084982..912c0a8c9 100644
--- a/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
+++ b/test/algorithms/overlay/robustness/test_overlay_p_q.hpp
@@ -110,7 +110,7 @@ static bool test_overlay_p_q(std::string const& caseid,
         if ((area_i > 0 && bg::touches(p, q))
             || (area_i <= 0 && bg::intersects(p, q) && ! bg::touches(p, q)))
         {
-            std::cout << "Wrong 'touch'! " 
+            std::cout << "Wrong 'touch'! "
                 << " Intersection area: " << area_i
                 << " Touch gives: " << std::boolalpha << bg::touches(p, q)
                 << std::endl;
diff --git a/test/algorithms/overlay/robustness/ticket_9081.cpp b/test/algorithms/overlay/robustness/ticket_9081.cpp
new file mode 100644
index 000000000..9c2f81597
--- /dev/null
+++ b/test/algorithms/overlay/robustness/ticket_9081.cpp
@@ -0,0 +1,239 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library) // Robustness Test
+
+// Copyright (c) 2013 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)
+
+// Adapted from: the attachment of ticket 9081
+
+#define CHECK_SELF_INTERSECTIONS
+#define LIST_WKT
+
+ #include <iomanip>
+ #include <iostream>
+ #include <vector>
+ #include <boost/geometry.hpp>
+ #include <boost/geometry/geometries/point_xy.hpp>
+ #include <boost/geometry/geometries/polygon.hpp>
+ #include <boost/geometry/geometries/register/point.hpp>
+ #include <boost/geometry/geometries/register/ring.hpp>
+ #include <boost/geometry/io/wkt/wkt.hpp>
+ #include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+#include <boost/foreach.hpp>
+#include <boost/timer.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
+#include <fstream>
+
+
+typedef boost::geometry::model::d2::point_xy<double> pt;
+typedef boost::geometry::model::polygon<pt> polygon;
+typedef boost::geometry::model::segment<pt> segment;
+typedef boost::geometry::model::multi_polygon<polygon> multi_polygon;
+
+template <typename Geometry>
+inline void debug_with_svg(int index, char method, Geometry const& a, Geometry const& b, std::string const& headera, std::string const& headerb)
+{
+    multi_polygon output;
+    try
+    {
+        switch(method)
+        {
+            case 'i': boost::geometry::intersection(a, b, output); break;
+            case 'u': boost::geometry::union_(a, b, output); break;
+            case 'd': boost::geometry::difference(a, b, output); break;
+            case 'v': boost::geometry::difference(b, a, output); break;
+            default : return;
+        }
+    }
+    catch(...)
+    {}
+
+    std::ostringstream filename;
+    filename << "ticket_9081_" << method << "_" << (1000000 + index) << ".svg";
+    std::ofstream svg(filename.str().c_str());
+
+    boost::geometry::svg_mapper<pt> mapper(svg, 400, 400);
+    mapper.add(a);
+    mapper.add(b);
+
+    mapper.map(a, "fill-opacity:0.5;fill:rgb(153,204,0);stroke:rgb(153,204,0);stroke-width:2");
+    mapper.map(b, "fill-opacity:0.3;fill:rgb(51,51,153);stroke:rgb(51,51,153);stroke-width:2");
+    BOOST_FOREACH(polygon const& g, output)
+    {
+        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 << headera << std::endl << headerb;
+    mapper.map(boost::geometry::return_centroid<pt>(a), "fill:rgb(152,204,0);stroke:rgb(153,204,0);stroke-width:0.1", 3);
+    mapper.map(boost::geometry::return_centroid<pt>(b), "fill:rgb(51,51,153);stroke:rgb(153,204,0);stroke-width:0.1", 3);
+    mapper.text(boost::geometry::return_centroid<pt>(a), headera, "fill:rgb(0,0,0);font-family:Arial;font-size:10px");
+    mapper.text(boost::geometry::return_centroid<pt>(b), headerb, "fill:rgb(0,0,0);font-family:Arial;font-size:10px");
+}
+
+int main()
+{
+    int num_orig = 50;
+    int num_rounds = 30000;
+    srand(1234);
+    std::cout << std::setprecision(16);
+    std::map<int, std::string> genesis;
+    int pj;
+
+
+    std::string wkt1, wkt2, operation;
+
+    try
+    {
+
+
+    boost::timer t;
+    std::vector<multi_polygon> poly_list;
+
+    for(int i=0;i<num_orig;i++)
+    {
+        multi_polygon mp;
+        polygon p;
+        for(int j=0;j<3;j++)
+        {
+            double x=(double)rand()/RAND_MAX;
+            double y=(double)rand()/RAND_MAX;
+            p.outer().push_back(pt(x,y));
+        }
+        boost::geometry::correct(p);
+        mp.push_back(p);
+        boost::geometry::detail::overlay::has_self_intersections(mp);
+
+        std::ostringstream out;
+        out << "original " << poly_list.size();
+        genesis[poly_list.size()] = out.str();
+        poly_list.push_back(mp);
+
+#ifdef LIST_WKT
+        std::cout << "Original " << i << " " << boost::geometry::wkt(p) << std::endl;
+#endif
+    }
+
+
+    for(int j=0;j<num_rounds;j++)
+    {
+        if (j % 100 == 0) { std::cout << " " << j; }
+        pj = j;
+        int a = rand() % poly_list.size();
+        int b = rand() % poly_list.size();
+
+        debug_with_svg(j, 'i', poly_list[a], poly_list[b], genesis[a], genesis[b]);
+
+        { std::ostringstream out; out << boost::geometry::wkt(poly_list[a]); wkt1 = out.str(); }
+        { std::ostringstream out; out << boost::geometry::wkt(poly_list[b]); wkt2 = out.str(); }
+
+        multi_polygon mp_i, mp_u, mp_d, mp_e;
+        operation = "intersection";
+        boost::geometry::intersection(poly_list[a],poly_list[b],mp_i);
+        operation = "intersection";
+        boost::geometry::union_(poly_list[a],poly_list[b],mp_u);
+        operation = "difference";
+        boost::geometry::difference(poly_list[a],poly_list[b],mp_d);
+        boost::geometry::difference(poly_list[b],poly_list[a],mp_e);
+
+#ifdef LIST_WKT
+        std::cout << j << std::endl;
+        std::cout << "  Genesis a " << genesis[a] << std::endl;
+        std::cout << "  Genesis b " << genesis[b] << std::endl;
+        std::cout << "  Intersection " << boost::geometry::wkt(mp_i) << std::endl;
+        std::cout << "  Difference a " << boost::geometry::wkt(mp_d) << std::endl;
+        std::cout << "  Difference b " << boost::geometry::wkt(mp_e) << std::endl;
+#endif
+
+#ifdef CHECK_SELF_INTERSECTIONS
+        try
+        {
+            boost::geometry::detail::overlay::has_self_intersections(mp_i);
+        }
+        catch(...)
+        {
+            std::cout << "FAILED TO INTERSECT " << j << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[a]) << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[b]) << std::endl;
+            std::cout << boost::geometry::wkt(mp_i) << std::endl;
+            try
+            {
+                boost::geometry::detail::overlay::has_self_intersections(mp_i);
+            }
+            catch(...)
+            {
+            }
+            break;
+        }
+
+        try
+        {
+            boost::geometry::detail::overlay::has_self_intersections(mp_d);
+        }
+        catch(...)
+        {
+            std::cout << "FAILED TO SUBTRACT " << j << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[a]) << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[b]) << std::endl;
+            std::cout << boost::geometry::wkt(mp_d) << std::endl;
+            break;
+        }
+        try
+        {
+            boost::geometry::detail::overlay::has_self_intersections(mp_e);
+        }
+        catch(...)
+        {
+            std::cout << "FAILED TO SUBTRACT " << j << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[b]) << std::endl;
+            std::cout << boost::geometry::wkt(poly_list[a]) << std::endl;
+            std::cout << boost::geometry::wkt(mp_e) << std::endl;
+            break;
+        }
+#endif
+
+        if(boost::geometry::area(mp_i) > 0)
+        {
+            std::ostringstream out;
+            out << j << " intersection(" << genesis[a] << " , " << genesis[b] << ")";
+            genesis[poly_list.size()] = out.str();
+            poly_list.push_back(mp_i);
+        }
+        if(boost::geometry::area(mp_d) > 0)
+        {
+            std::ostringstream out;
+            out << j << " difference(" << genesis[a] << " - " << genesis[b] << ")";
+            genesis[poly_list.size()] = out.str();
+            poly_list.push_back(mp_d);
+        }
+        if(boost::geometry::area(mp_e) > 0)
+        {
+            std::ostringstream out;
+            out << j << " difference(" << genesis[b] << " - " << genesis[a] << ")";
+            genesis[poly_list.size()] = out.str();
+            poly_list.push_back(mp_e);
+        }
+    }
+
+    std::cout << "FINISHED " << t.elapsed() << std::endl;
+
+    }
+    catch(std::exception const& e)
+    {
+        std::cout << e.what()
+            << " in " << operation << " at " << pj << std::endl
+            << wkt1 << std::endl
+            << wkt2 << std::endl
+            << std::endl;
+    }
+    catch(...)
+    {
+        std::cout << "Other exception" << std::endl;
+    }
+
+    return 0;
+}
diff --git a/test/algorithms/overlay/select_rings.cpp b/test/algorithms/overlay/select_rings.cpp
index 4d81336c8..acc3e5011 100644
--- a/test/algorithms/overlay/select_rings.cpp
+++ b/test/algorithms/overlay/select_rings.cpp
@@ -26,15 +26,15 @@
 
 
 
-template 
+template
 <
-    typename Geometry1, 
-    typename Geometry2, 
-    bg::overlay_type OverlayType, 
+    typename Geometry1,
+    typename Geometry2,
+    bg::overlay_type OverlayType,
     typename RingIdVector,
     typename WithinVector
 >
-void test_geometry(std::string const& wkt1, std::string const& wkt2, 
+void test_geometry(std::string const& wkt1, std::string const& wkt2,
     RingIdVector const& expected_ids,
     WithinVector const& expected_withins)
 {
@@ -80,7 +80,7 @@ void test_all()
     typedef bg::ring_identifier rid;
 
     test_geometry<bg::model::polygon<P>, bg::model::polygon<P>, bg::overlay_union>(
-        winded[0], winded[1], 
+        winded[0], winded[1],
         boost::assign::list_of
                 (rid(0,-1,-1))
                 (rid(0,-1, 0))
@@ -97,7 +97,7 @@ void test_all()
                 (-1)
                 (-1)
             );
-            
+
             //boost::assign::tuple_list_of(0,-1,-1,-1)(0,-1,0,-1)(0,-1,1,-1)(0,-1,3,-1)(1,-1,1,-1)(1,-1,2,-1));
 
     test_geometry<bg::model::polygon<P>, bg::model::polygon<P>, bg::overlay_intersection>(
diff --git a/test/algorithms/overlay/self_intersection_points.cpp b/test/algorithms/overlay/self_intersection_points.cpp
index 91ee4bb34..24c51df57 100644
--- a/test/algorithms/overlay/self_intersection_points.cpp
+++ b/test/algorithms/overlay/self_intersection_points.cpp
@@ -19,12 +19,15 @@
 #include <geometry_test_common.hpp>
 
 
+#include <boost/geometry/algorithms/correct.hpp>
 #include <boost/geometry/algorithms/intersection.hpp>
 #include <boost/geometry/algorithms/intersects.hpp>
 //#include <boost/geometry/algorithms/detail/overlay/self_intersection_points.hpp>
 #include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
@@ -39,209 +42,240 @@
 #  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
 
-
-struct test_self_intersection_points
+template <typename Geometry>
+static void test_self_intersection_points(std::string const& case_id,
+            int expected_count,
+            Geometry const& geometry,
+            bool check_has_intersections,
+            double precision = 0.001)
 {
-    template <typename Geometry>
-    static void apply(std::string const& id,
-            boost::tuple<int, double, double> const& expected_count_and_center,
-            Geometry const& geometry, double precision)
-    {
-
-        typedef bg::detail::overlay::turn_info
+    typedef typename bg::point_type<Geometry>::type point_type;
+    //typedef typename bg::rescale_policy_type<point_type>::type rescale_policy_type;
+    typedef bg::detail::no_rescale_policy rescale_policy_type;
+    typedef bg::detail::overlay::turn_info
         <
-            typename bg::point_type<Geometry>::type
+            point_type,
+            typename bg::segment_ratio_type
+                <
+                    point_type, rescale_policy_type
+                >::type
         > turn_info;
 
-        std::vector<turn_info> turns;
-
-        ///bg::get_intersection_points(geometry, turns);
-
-        bg::detail::self_get_turn_points::no_interrupt_policy policy;
-        bg::self_turns
-            <
-                bg::detail::overlay::assign_null_policy
-            >(geometry, turns, policy);
+    std::vector<turn_info> turns;
 
 
-        typedef typename bg::coordinate_type<Geometry>::type ct;
-        ct zero = ct();
-        ct x = zero, y = zero;
-        BOOST_FOREACH(turn_info const& turn, turns)
+    rescale_policy_type rescale_policy
+    ;
+           // = bg::get_rescale_policy<rescale_policy_type>(geometry);
+    ///bg::get_intersection_points(geometry, turns);
+
+    bg::detail::self_get_turn_points::no_interrupt_policy policy;
+    bg::self_turns
+        <
+            bg::detail::overlay::assign_null_policy
+        >(geometry, rescale_policy, turns, policy);
+
+
+    typedef typename bg::coordinate_type<Geometry>::type ct;
+    ct zero = ct();
+    ct x = zero, y = zero;
+    BOOST_FOREACH(turn_info const& turn, turns)
+    {
+        x += bg::get<0>(turn.point);
+        y += bg::get<1>(turn.point);
+    }
+    int n = boost::size(turns);
+    if (n > 0)
+    {
+        x /= n;
+        y /= n;
+    }
+
+    BOOST_CHECK_EQUAL(expected_count, n);
+
+    if (expected_count > 0)
+    {
+        BOOST_CHECK_EQUAL(bg::intersects(geometry), true);
+
+        if (check_has_intersections)
         {
-            x += bg::get<0>(turn.point);
-            y += bg::get<1>(turn.point);
+            try
+            {
+                boost::geometry::detail::overlay::has_self_intersections(geometry);
+                BOOST_CHECK_MESSAGE(false, "Case " << case_id << " there are no self-intersections detected!");
+            }
+            catch(...)
+            {
+            }
         }
-        int n = boost::size(turns);
-        if (n > 0)
+    }
+    else
+    {
+        if (check_has_intersections)
         {
-            x /= n;
-            y /= n;
-        }
-        /*std::cout << std::setprecision(8) << x << ", " << y << " "
-            << expected_count_and_center.get<1>()
-            << " " << expected_count_and_center.get<2>()
-            << std::endl;
-        */
-
-        BOOST_CHECK_EQUAL(expected_count_and_center.get<0>(), n);
-        //BOOST_CHECK_CLOSE(expected_count_and_center.get<1>(), x, precision);
-        //BOOST_CHECK_CLOSE(expected_count_and_center.get<2>(), y, precision);
-
-        if (n > 0)
-        {
-            BOOST_CHECK_EQUAL(bg::intersects(geometry), true);
+            try
+            {
+                boost::geometry::detail::overlay::has_self_intersections(geometry);
+            }
+            catch(...)
+            {
+                BOOST_CHECK_MESSAGE(false, "Case " << case_id << " there are self-intersections detected!");
+            }
         }
+    }
 
 
 #if defined(TEST_WITH_SVG)
-        {
-            std::ostringstream filename;
-            filename << "self_ip" << id << ".svg";
-
-            std::ofstream svg(filename.str().c_str());
-
-            bg::svg_mapper<typename bg::point_type<Geometry>::type> mapper(svg, 500, 500);
-            mapper.add(geometry);
-
-            mapper.map(geometry, "fill:rgb(255,255,128);stroke:rgb(0,0,0);stroke-width:1");
-
-            BOOST_FOREACH(turn_info const& turn, turns)
-            {
-                mapper.map(turn.point, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1");
-            }
-        }
-#endif
-    }
-};
-
-
-template <typename Geometry, typename T>
-void test_self_overlay(std::string const& id, T const& expected,
-            std::string const& wkt, double precision = 0.001)
-{
-    if (wkt.empty())
     {
-        return;
+        std::ostringstream filename;
+        filename << "self_ip" << case_id << ".svg";
+
+        std::ofstream svg(filename.str().c_str());
+
+        bg::svg_mapper<typename bg::point_type<Geometry>::type> mapper(svg, 500, 500);
+        mapper.add(geometry);
+
+        mapper.map(geometry, "fill:rgb(255,255,128);stroke:rgb(0,0,0);stroke-width:1");
+
+        BOOST_FOREACH(turn_info const& turn, turns)
+        {
+            mapper.map(turn.point, "fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1");
+        }
     }
-
-    Geometry geometry;
-    bg::read_wkt(wkt, geometry);
-
-    std::string caseid = id;
-
-#ifdef GEOMETRY_DEBUG_INTERSECTION
-    std::cout << std::endl << std::endl << "# " << caseid << std::endl;
 #endif
-    test_self_intersection_points::apply(caseid, expected, geometry, precision);
 }
 
 
-#if ! defined(GEOMETRY_TEST_MULTI)
+template <typename Geometry, typename T>
+void test_self_overlay(std::string const& case_id, T const& expected,
+            std::string const& wkt,
+            bool check_has_intersections = true)
+{
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    bg::correct(geometry);
+
+#ifdef GEOMETRY_DEBUG_INTERSECTION
+    std::cout << std::endl << std::endl << "# " << case_id << std::endl;
+#endif
+    test_self_intersection_points(case_id, expected, geometry, check_has_intersections);
+}
+
+
 
 template <typename P>
-void test_self_all()
+void test_self_poly()
 {
     typedef bg::model::polygon<P> polygon;
 
     // Just a normal polygon
-    test_self_overlay<polygon>("1", boost::make_tuple(0, 0, 0),
+    test_self_overlay<polygon>("1", 0,
             "POLYGON((0 0,0 4,1.5 2.5,2.5 1.5,4 0,0 0))");
 
     // TODO: clean-up and visualize testcases
 
-
-
     // Self intersecting
-    test_self_overlay<polygon>("2", boost::make_tuple(2, 2.40625, 2.125),
+    test_self_overlay<polygon>("2", 2,
             "POLYGON((1 2,1 1,2 1,2 2.25,3 2.25,3 0,0 0,0 3,3 3,2.75 2,1 2))");
 
-
     // Self intersecting in last segment
-
-    test_self_overlay<polygon>("3", boost::make_tuple(1, 2, 2),
+    test_self_overlay<polygon>("3", 1,
             "POLYGON((0 2,2 4,2 0,4 2,0 2))");
 
-
     // Self tangent
-
-    test_self_overlay<polygon>("4", boost::make_tuple(1, 2, 4),
-            "POLYGON((0 0,0 4,4 4,4 0,2 4,0 0))");
-
+    test_self_overlay<polygon>("4", 1,
+            "POLYGON((0 0,0 4,4 4,4 0,2 4,0 0))", false);
 
     // Self tangent in corner
-
-    test_self_overlay<polygon>("5", boost::make_tuple(1, 0, 4),
-            "POLYGON((0 0,0 4,4 4,4 0,0 4,2 0,0 0))");
-
+    test_self_overlay<polygon>("5", 1,
+            "POLYGON((0 0,0 4,4 4,4 0,0 4,2 0,0 0))", false);
 
     // With spike
-
-    test_self_overlay<polygon>("6", boost::make_tuple(1, 4, 2),
+    test_self_overlay<polygon>("6", 1,
             "POLYGON((0 0,0 4,4 4,4 2,6 2,4 2,4 0,0 0))");
 
-
     // Non intersection, but with duplicate
-
-    test_self_overlay<polygon>("d1", boost::make_tuple(0, 0, 0),
+    test_self_overlay<polygon>("d1", 0,
             "POLYGON((0 0,0 4,4 0,4 0,0 0))");
 
-
     // With many duplicates
-
-    test_self_overlay<polygon>("d2", boost::make_tuple(0, 0, 0),
+    test_self_overlay<polygon>("d2", 0,
             "POLYGON((0 0,0 1,0 1,0 1,0 2,0 2,0 3,0 3,0 3,0 3,0 4,2 4,2 4,4 4,4 0,4 0,3 0,3 0,3 0,3 0,3 0,0 0))");
 
-
     // Hole: interior tangent to exterior
-
-    test_self_overlay<polygon>("h1", boost::make_tuple(1, 2, 4),
-            "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 2,2 4,3 2,1 2))");
-
+    test_self_overlay<polygon>("h1", 1,
+            "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 2,2 4,3 2,1 2))", false);
 
     // Hole: interior intersecting exterior
-
-    test_self_overlay<polygon>("h2", boost::make_tuple(2, 4, 3.5),
+    test_self_overlay<polygon>("h2", 2,
             "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 3,5 4,1 1))");
 
-
     // Hole: two intersecting holes
-    test_self_overlay<polygon>("h3", boost::make_tuple(2, 2.5, 2.5),
+    test_self_overlay<polygon>("h3", 2,
             "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,1 3,3 3,3 1,1 1),(2 2,2 3.5,3.5 3.5,3.5 2,2 2))");
 
     // Hole: self-intersecting hole
-    test_self_overlay<polygon>("h4", boost::make_tuple(2, 2.06060606, 2.96969697),
+    test_self_overlay<polygon>("h4", 2,
             "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,3 3,3 2.5,1 3.5,1.5 3.5,1 1))");
 
     // Many loops (e.g. as result from buffering)
-    test_self_overlay<polygon>("case_1", boost::make_tuple(6, 0, 0),
+    test_self_overlay<polygon>("case_1", 6,
             "POLYGON((1 3,0 9,9 5,1 7,9 8,2 5,10 10,9 2,1 3))");
 
-    test_self_overlay<polygon>("buffer_poly_indentation8_d_r", boost::make_tuple(3, 0, 0),
+    test_self_overlay<polygon>("buffer_poly_indentation8_d_r", 3,
             "POLYGON((-0.8 5,-0.799036 5.03925,-0.796148 5.07841,-0.791341 5.11738,-0.784628 5.15607,-0.776025 5.19438,-0.765552 5.23223,-0.753235 5.26951,-0.739104 5.30615,-0.723191 5.34204,-0.705537 5.37712,-0.686183 5.41128,-0.665176 5.44446,-0.642566 5.47656,-0.618408 5.50751,-0.592761 5.53725,-0.537247 5.59276,-0.507515 5.61841,-0.476559 5.64257,-0.444456 5.66518,-0.411282 5.68618,-0.377117 5.70554,-0.342044 5.72319,-0.306147 5.7391,-0.269512 5.75324,-0.232228 5.76555,-0.194384 5.77603,-0.156072 5.78463,-0.117384 5.79134,-0.0784137 5.79615,-0.0392541 5.79904,0 5.8,4 5.8,4.03925 5.79904,4.07841 5.79615,4.11738 5.79134,4.15607 5.78463,4.19438 5.77603,4.23223 5.76555,4.26951 5.75324,4.30615 5.7391,4.34204 5.72319,4.37712 5.70554,4.41128 5.68618,4.44446 5.66518,4.47656 5.64257,4.50751 5.61841,4.53725 5.59276,4.59276 5.53725,4.61841 5.50751,4.64257 5.47656,4.66518 5.44446,4.68618 5.41128,4.70554 5.37712,4.72319 5.34204,4.7391 5.30615,4.75324 5.26951,4.76555 5.23223,4.77603 5.19438,4.78463 5.15607,4.79134 5.11738,4.79615 5.07841,4.79904 5.03925,4.8 5,4.8 4,4.79976 3.98037,4.79904 3.96075,4.79783 3.94115,4.79615 3.92159,4.79398 3.90207,4.79134 3.88262,4.78822 3.86323,4.78463 3.84393,4.78056 3.82472,4.77603 3.80562,4.77102 3.78663,4.76555 3.76777,4.75962 3.74905,4.75324 3.73049,4.74639 3.71208,4.73137 3.67581,4.72319 3.65796,4.71458 3.64031,4.70554 3.62288,4.69607 3.60568,4.68618 3.58872,4.67588 3.572,4.66518 3.55554,4.65407 3.53935,4.64257 3.52344,4.63068 3.50781,4.61841 3.49249,4.60577 3.47746,4.59276 3.46275,4.5794 3.44837,4.56569 3.43431,3.56569 2.43431,3.53725 2.40724,3.50751 2.38159,3.47656 2.35743,3.44446 2.33482,3.41128 2.31382,3.37712 2.29446,3.34204 2.27681,3.30615 2.2609,3.26951 2.24676,3.23223 2.23445,3.19438 2.22397,3.15607 2.21537,3.11738 2.20866,3.07841 2.20385,3.03925 2.20096,2.96075 2.20096,2.92159 2.20385,2.88262 2.20866,2.84393 2.21537,2.80562 2.22397,2.76777 2.23445,2.73049 2.24676,2.69385 2.2609,2.65796 2.27681,2.62288 2.29446,2.58872 2.31382,2.55554 2.33482,2.52344 2.35743,2.49249 2.38159,2.46275 2.40724,2.43431 2.43431,2.8 2.06863,2.8 2.93137,2.43431 2.56569,2.46275 2.59276,2.49249 2.61841,2.52344 2.64257,2.55554 2.66518,2.58872 2.68618,2.62288 2.70554,2.65796 2.72319,2.69385 2.7391,2.73049 2.75324,2.76777 2.76555,2.80562 2.77603,2.84393 2.78463,2.88262 2.79134,2.92159 2.79615,2.96075 2.79904,3.03925 2.79904,3.07841 2.79615,3.11738 2.79134,3.15607 2.78463,3.19438 2.77603,3.23223 2.76555,3.26951 2.75324,3.30615 2.7391,3.34204 2.72319,3.37712 2.70554,3.41128 2.68618,3.44446 2.66518,3.47656 2.64257,3.50751 2.61841,3.53725 2.59276,3.56569 2.56569,4.56569 1.56569,4.5794 1.55163,4.59276 1.53725,4.60577 1.52254,4.61841 1.50751,4.63068 1.49219,4.64257 1.47656,4.65407 1.46065,4.66518 1.44446,4.67588 1.428,4.68618 1.41128,4.69607 1.39432,4.70554 1.37712,4.71458 1.35969,4.72319 1.34204,4.73137 1.32419,4.74639 1.28792,4.75324 1.26951,4.75962 1.25095,4.76555 1.23223,4.77102 1.21337,4.77603 1.19438,4.78056 1.17528,4.78463 1.15607,4.78822 1.13677,4.79134 1.11738,4.79398 1.09793,4.79615 1.07841,4.79783 1.05885,4.79904 1.03925,4.79976 1.01963,4.8 1,4.8 0,4.79904 -0.0392541,4.79615 -0.0784137,4.79134 -0.117384,4.78463 -0.156072,4.77603 -0.194384,4.76555 -0.232228,4.75324 -0.269512,4.7391 -0.306147,4.72319 -0.342044,4.70554 -0.377117,4.68618 -0.411282,4.66518 -0.444456,4.64257 -0.476559,4.61841 -0.507515,4.59276 -0.537247,4.53725 -0.592761,4.50751 -0.618408,4.47656 -0.642566,4.44446 -0.665176,4.41128 -0.686183,4.37712 -0.705537,4.34204 -0.723191,4.30615 -0.739104,4.26951 -0.753235,4.23223 -0.765552,4.19438 -0.776025,4.15607 -0.784628,4.11738 -0.791341,4.07841 -0.796148,4.03925 -0.799036,4 -0.8,0 -0.8,-0.0392541 -0.799036,-0.0784137 -0.796148,-0.117384 -0.791341,-0.156072 -0.784628,-0.194384 -0.776025,-0.232228 -0.765552,-0.269512 -0.753235,-0.306147 -0.739104,-0.342044 -0.723191,-0.377117 -0.705537,-0.411282 -0.686183,-0.444456 -0.665176,-0.476559 -0.642566,-0.507515 -0.618408,-0.537247 -0.592761,-0.592761 -0.537247,-0.618408 -0.507515,-0.642566 -0.476559,-0.665176 -0.444456,-0.686183 -0.411282,-0.705537 -0.377117,-0.723191 -0.342044,-0.739104 -0.306147,-0.753235 -0.269512,-0.765552 -0.232228,-0.776025 -0.194384,-0.784628 -0.156072,-0.791341 -0.117384,-0.796148 -0.0784137,-0.799036 -0.0392541,-0.8 0,-0.8 5))");
 
-    test_self_overlay<polygon>("toolkit_2", boost::make_tuple(12, 0, 0),
+    test_self_overlay<polygon>("toolkit_2", 12,
             "POLYGON((170718 605997,170718 605997,170776 606016,170773 606015,170786 606020,170778 606016,170787 606021,170781 606017,170795 606028,170795 606028,170829 606055,170939 606140,170933 605968,170933 605968,170932 605908,170929 605834,170920 605866,170961 605803,170739 605684,170699 605749,170691 605766,170693 605762,170686 605775,170688 605771,170673 605794,170676 605790,170668 605800,170672 605796,170651 605818,170653 605816,170639 605829,170568 605899,170662 605943,170633 605875,170603 605961,170718 605997))");
 
     // Real-life
 
     std::string const ticket17 = "POLYGON ((-122.28139163 37.37319149,-122.28100699 37.37273669,-122.28002186 37.37303123,-122.27979681 37.37290072,-122.28007349 37.37240493,-122.27977334 37.37220360,-122.27819720 37.37288580,-122.27714184 37.37275161,-122.27678628 37.37253167,-122.27766437 37.37180973,-122.27804382 37.37121453,-122.27687664 37.37101354,-122.27645829 37.37203386,-122.27604423 37.37249110,-122.27632234 37.37343339,-122.27760980 37.37391082,-122.27812478 37.37800320,-122.26117222 37.39121007,-122.25572289 37.39566631,-122.25547269 37.39564971,-122.25366304 37.39552993,-122.24919976 37.39580268,-122.24417933 37.39366907,-122.24051443 37.39094143,-122.23246277 37.38100418,-122.23606766 37.38141338,-122.24001587 37.37738940,-122.23666848 37.37609347,-122.23057450 37.37882170,-122.22679803 37.37807143,-122.22525727 37.37448817,-122.22523229 37.37443000,-122.23083199 37.37609347,-122.23033486 37.37777891,-122.23169030 37.37732117,-122.23229178 37.37709687,-122.23237761 37.37631249,-122.23297776 37.37438834,-122.23872850 37.37165986,-122.24044511 37.36934068,-122.24671067 37.36865847,-122.24825570 37.36981819,-122.25151719 37.36947713,-122.25357721 37.36756706,-122.26001451 37.36579354,-122.25615213 37.36545239,-122.25486458 37.36245083,-122.25357721 37.36108651,-122.25194642 37.36013139,-122.24885652 37.35958557,-122.24911401 37.35849399,-122.25357721 37.35808470,-122.25675286 37.35897159,-122.25855539 37.35753887,-122.26181687 37.35828939,-122.26713837 37.35897159,-122.26782510 37.36108651,-122.26662339 37.36456559,-122.27288911 37.36722601,-122.27366159 37.36531602,-122.27168740 37.36470213,-122.27391900 37.36374701,-122.27074326 37.36245083,-122.27134408 37.35951742,-122.27426240 37.36135926,-122.27709482 37.36115474,-122.27966974 37.36231438,-122.27958391 37.36463382,-122.27572152 37.36463382,-122.27563569 37.36524779,-122.27700899 37.36593000,-122.27709482 37.36763529,-122.27554978 37.36838573,-122.27667254 37.36931478,-122.27677932 37.36932073,-122.27769362 37.36853987,-122.27942490 37.36830803,-122.28178776 37.36677917,-122.28509559 37.36443500,-122.28845129 37.36413744,-122.29194403 37.36695946,-122.29382577 37.36726817,-122.29600414 37.36898512,-122.29733083 37.36995398,-122.29593239 37.37141436,-122.29416649 37.37075898,-122.29325026 37.37108436,-122.29652910 37.37311697,-122.29584237 37.37374461,-122.29537583 37.37573372,-122.29487677 37.37752502,-122.30923212 37.37593011,-122.31122484 37.38230086,-122.31467994 37.38092472,-122.31715663 37.38252181,-122.32307970 37.38166978,-122.31985618 37.37667694,-122.32210304 37.37580220,-122.32581446 37.37589532,-122.32401730 37.37331839,-122.32960417 37.37189020,-122.33465527 37.37331906,-122.33425328 37.37623680,-122.33620676 37.37726132,-122.33397986 37.37822382,-122.33358918 37.38036590,-122.33202637 37.37986918,-122.33147954 37.38101784,-122.33394080 37.38198017,-122.33545239 37.38587943,-122.33478058 37.38785697,-122.33386050 37.38723721,-122.33350041 37.38571137,-122.33122003 37.38548891,-122.33140008 37.38650606,-122.33366042 37.38817490,-122.33244019 37.39157602,-122.33298157 37.39419201,-122.33164013 37.39477028,-122.33202017 37.39518351,-122.33358038 37.39499282,-122.33376050 37.39597811,-122.33550067 37.39734478,-122.33556069 37.39481797,-122.33344040 37.39292676,-122.33638094 37.38892189,-122.34240644 37.38852719,-122.34906293 37.38726898,-122.35072321 37.39338769,-122.34910291 37.39445252,-122.34796272 37.39410291,-122.34449043 37.39640534,-122.34500223 37.39729709,-122.34936291 37.39670910,-122.35098322 37.39531066,-122.35364623 37.39554510,-122.35434369 37.39612111,-122.35798429 37.39600988,-122.35768430 37.39478621,-122.36334519 37.39206871,-122.36604726 37.39203267,-122.36778592 37.39335592,-122.36518870 37.40022011,-122.36554552 37.40247752,-122.36370519 37.40331974,-122.36270506 37.40530591,-122.36320512 37.40670418,-122.36149849 37.40851392,-122.36730580 37.41054938,-122.37263720 37.41378932,-122.37161871 37.42076600,-122.36566153 37.42006292,-122.36520547 37.42742106,-122.37165953 37.43661157,-122.35943972 37.44459022,-122.35356359 37.44600810,-122.33792254 37.45796329,-122.35228518 37.47478091,-122.35127080 37.48181199,-122.34867342 37.48487322,-122.34359717 37.48801082,-122.33388431 37.48677650,-122.33142321 37.48429747,-122.32929580 37.48473149,-122.32609609 37.48291144,-122.32344850 37.48228229,-122.31924364 37.48410234,-122.31677299 37.48114051,-122.31431751 37.47848973,-122.31259201 37.47682190,-122.31515972 37.47568196,-122.31691389 37.47360309,-122.31292494 37.46960081,-122.31130153 37.46937743,-122.30889894 37.47124987,-122.30612839 37.47011613,-122.30149630 37.46568378,-122.30064277 37.46363784,-122.29283821 37.45922376,-122.28630141 37.45415497,-122.28883099 37.44629920,-122.28316717 37.44197138,-122.27554148 37.42297597,-122.25597410 37.40553692,-122.25196579 37.40129593,-122.25012043 37.40049143,-122.24823207 37.39897758,-122.24754551 37.39740941,-122.24778582 37.39621607,-122.24934787 37.39599102,-122.25005170 37.39871849,-122.25222328 37.39863668,-122.25342491 37.39737529,-122.25520162 37.39667289,-122.25528737 37.39522726,-122.27747460 37.37809616,-122.27977493 37.37858717,-122.28157729 37.37920106,-122.28322534 37.37952846,-122.28416939 37.38092656,-122.28621223 37.37984219,-122.28638389 37.37613857,-122.28382607 37.37843722,-122.27930278 37.37718220,-122.28196361 37.37652740,-122.28295058 37.37568167,-122.28216101 37.37523148,-122.28114822 37.37543608,-122.27934569 37.37528613,-122.27996369 37.37448121,-122.28104521 37.37454944,-122.28185197 37.37422883,-122.28290767 37.37474038,-122.28376597 37.37467224,-122.28428104 37.37399012,-122.28402346 37.37338989,-122.28610922 37.37364914,-122.28651264 37.37327388,-122.28672722 37.37207343,-122.28628398 37.37205448,-122.28574460 37.37166682,-122.28479711 37.37200981,-122.28327731 37.37137228,-122.28285511 37.37100700,-122.28279409 37.37125669,-122.28315527 37.37173756,-122.28321872 37.37220569,-122.28187007 37.37231918,-122.28193109 37.37294908,-122.28139163 37.37319149))";
-    test_self_overlay<polygon>("ticket17", boost::make_tuple(2, 0, 0), ticket17);
+    test_self_overlay<polygon>("ticket17", 2, ticket17);
 
     std::string const uscounty_ne = "POLYGON((-72.297814 44.183545,-72.30498 44.183149,-72.306552 44.183668,-72.321587 44.188629,-72.368353 44.204057,-72.362972 44.211115,-72.357354 44.218485,-72.336176 44.246264,-72.333283 44.25006,-72.329737 44.254806,-72.327061 44.258388,-72.316301 44.272583,-72.317394 44.293961,-72.317455 44.295412,-72.317621 44.298382,-72.31757 44.298423,-72.308843 44.30567,-72.308336 44.306161,-72.305947 44.30843,-72.295321 44.31908,-72.292014 44.321754,-72.289771 44.323567,-72.283878 44.32772,-72.282024 44.32927,-72.275139 44.335778,-72.271225 44.339322,-72.269779 44.340275,-72.269584 44.340461,-72.267563 44.343747,-72.255707 44.359532,-72.254273 44.361075,-72.249662 44.367162,-72.249549 44.367339,-72.24832 44.369514,-72.247963 44.369843,-72.245885 44.372717,-72.244210 44.375223,-72.240219 44.380321,-72.24014 44.380422,-72.229086 44.391162,-72.224592 44.39553,-72.224364 44.395751,-72.224549 44.395985,-72.226261 44.398726,-72.225478 44.399979,-72.223603 44.402875,-72.222984 44.403317,-72.222454 44.403753,-72.217109 44.411083,-72.218322 44.411745,-72.218833 44.412134,-72.218904 44.412313,-72.219023 44.412613,-72.219444 44.412803,-72.21963 44.412887,-72.220395 44.413162,-72.220619 44.413527,-72.22215 44.414167,-72.222276 44.414327,-72.222276 44.414784,-72.222565 44.415058,-72.22266 44.415469,-72.222565 44.415583,-72.22282 44.416063,-72.222757 44.416452,-72.222543 44.416596,-72.222247 44.416792,-72.221852 44.416792,-72.221439 44.416564,-72.22084 44.416647,-72.220708 44.416898,-72.221268 44.417736,-72.221378 44.418454,-72.220846 44.418454,-72.220492 44.418406,-72.220095 44.418422,-72.219850 44.418865,-72.220006 44.419292,-72.220514 44.419909,-72.220846 44.420637,-72.220581 44.421159,-72.220824 44.421665,-72.221732 44.42214,-72.222374 44.422757,-72.222971 44.422583,-72.223103 44.422282,-72.223259 44.421981,-72.223923 44.42195,-72.224874 44.421491,-72.22514 44.420827,-72.225557 44.420503,-72.226261 44.420157,-72.226305 44.419869,-72.226807 44.419643,-72.226863 44.419618,-72.227333 44.41927,-72.22776 44.41927,-72.228341 44.419488,-72.22864 44.419675,-72.229199 44.420381,-72.229136 44.421066,-72.228977 44.421181,-72.228945 44.421569,-72.228404 44.421958,-72.228297 44.421996,-72.228021 44.422096,-72.227097 44.422119,-72.226936 44.422302,-72.22649 44.422508,-72.225917 44.422645,-72.224831 44.423217,-72.224068 44.42324,-72.223654 44.423537,-72.223654 44.423717,-72.223654 44.423742,-72.223781 44.42381,-72.223908 44.424587,-72.223924 44.424667,-72.227403 44.426083,-72.228008 44.426329,-72.228662 44.426595,-72.229395 44.426894,-72.230747 44.427231,-72.230971 44.427489,-72.234293 44.428436,-72.236972 44.429199,-72.23719 44.430035,-72.238801 44.430515,-72.24147 44.43131,-72.249962 44.43504,-72.252411 44.436005,-72.255865 44.437305,-72.263358 44.440285,-72.268753 44.442368,-72.277045 44.445563,-72.282573 44.447693,-72.292033 44.451282,-72.299916 44.454331,-72.30082 44.45469,-72.321277 44.462572,-72.325974 44.464436,-72.337127 44.468707,-72.341171 44.470234,-72.348117 44.472931,-72.350859 44.473996,-72.358758 44.477037,-72.371940 44.482113,-72.37455 44.483117,-72.374648 44.483164,-72.374779 44.483225,-72.381115 44.485666,-72.381492 44.485688,-72.392298 44.489866,-72.403342 44.494088,-72.418579 44.499928,-72.418900 44.500046,-72.4255 44.502596,-72.426254 44.502888,-72.434315 44.506098,-72.429847 44.512045,-72.428773 44.513475,-72.421543 44.522929,-72.42088 44.523797,-72.419175 44.524889,-72.416181 44.528756,-72.415673 44.529497,-72.411684 44.534382,-72.403416 44.545482,-72.401901 44.547507,-72.398575 44.553005,-72.396373 44.555888,-72.394723 44.556887,-72.389997 44.563861,-72.38785 44.567083,-72.374786 44.584125,-72.374551 44.584042,-72.374141 44.583887,-72.364296 44.579947,-72.363627 44.579974,-72.362284 44.579484,-72.354192 44.576537,-72.351726 44.575587,-72.346763 44.573679,-72.326173 44.566333,-72.322536 44.56502,-72.312109 44.560996,-72.303198 44.557718,-72.30252 44.557467,-72.299574 44.556334,-72.28218 44.550137,-72.282083 44.550101,-72.280975 44.54965,-72.278823 44.548773,-72.268653 44.544573,-72.268148 44.544564,-72.267242 44.544547,-72.267178 44.544523,-72.266593 44.544303,-72.264975 44.543192,-72.263435 44.542639,-72.263284 44.542541,-72.262964 44.542336,-72.261344 44.544238,-72.259827 44.54559,-72.257865 44.548899,-72.254187 44.554001,-72.249372 44.560675,-72.241644 44.570815,-72.237928 44.576139,-72.237433 44.576818,-72.236396 44.578188,-72.226097 44.591711,-72.224712 44.59373,-72.21978 44.600803,-72.218155 44.602206,-72.210135 44.612594,-72.209324 44.613712,-72.208816 44.614535,-72.207016 44.617438,-72.202901 44.624073,-72.202293 44.625051,-72.199855 44.62841,-72.198157 44.630644,-72.194619 44.635355,-72.193153 44.637354,-72.19052 44.641163,-72.188343 44.644224,-72.184378 44.649871,-72.182172 44.652973,-72.176 44.661598,-72.173651 44.665011,-72.169648 44.67078,-72.165261 44.676857,-72.163971 44.678423,-72.162882 44.679959,-72.158868 44.685588,-72.156736 44.688747,-72.152374 44.694988,-72.150094 44.698355,-72.147612 44.7018,-72.147155 44.702567,-72.146873 44.703032,-72.146226 44.703325,-72.145589 44.702653,-72.141899 44.701438,-72.132779 44.698434,-72.128309 44.696934,-72.124544 44.695638,-72.110654 44.691192,-72.109358 44.690747,-72.088864 44.683714,-72.09305 44.694921,-72.094078 44.697511,-72.094433 44.698327,-72.09461 44.698776,-72.094955 44.699515,-72.095146 44.700011,-72.099952 44.712285,-72.100813 44.714476,-72.101332 44.715715,-72.101783 44.717146,-72.108368 44.733658,-72.114503 44.749624,-72.091369 44.738322,-72.083693 44.734606,-72.061312 44.723479,-72.039137 44.7125,-72.036351 44.711121,-72.02562 44.705812,-72.024818 44.705401,-72.012503 44.698821,-72.010696 44.699614,-72.007273 44.70299,-72.006749 44.703702,-72.005453 44.70441,-72.004999 44.704665,-72.002948 44.706065,-72.002574 44.706344,-71.998947 44.710903,-71.9954 44.715164,-71.995032 44.715247,-71.989775 44.720625,-71.988815 44.721224,-71.981344 44.728822,-71.98093 44.729224,-71.977211 44.732588,-71.976089 44.733763,-71.974770 44.735186,-71.974591 44.73538,-71.973434 44.736503,-71.97039 44.73946,-71.959927 44.749625,-71.958846 44.750086,-71.950606 44.758585,-71.950276 44.758952,-71.943595 44.765337,-71.939936 44.769032,-71.930968 44.765049,-71.928756 44.762738,-71.921857 44.759843,-71.902374 44.750318,-71.882733 44.740608,-71.882573 44.740269,-71.881573 44.739354,-71.876888 44.736935,-71.875148 44.736035,-71.874539 44.735721,-71.858381 44.72766,-71.837294 44.716637,-71.83775 44.716201,-71.852267 44.702366,-71.856071 44.69874,-71.856484 44.698345,-71.87445 44.681027,-71.881231 44.674373,-71.882862 44.67311,-71.883675 44.67175,-71.88436 44.671401,-71.885978 44.669571,-71.888314 44.667829,-71.890624 44.665594,-71.891007 44.664845,-71.898726 44.657917,-71.902653 44.654205,-71.910085 44.64718,-71.910282 44.647038,-71.907401 44.645283,-71.894791 44.638722,-71.89426 44.638626,-71.892962 44.637931,-71.874538 44.628066,-71.86852 44.625053,-71.848306 44.614173,-71.848221 44.614129,-71.842803 44.611203,-71.842732 44.611165,-71.843021 44.610884,-71.856079 44.597255,-71.856286 44.59707,-71.874003 44.580903,-71.874537 44.580409,-71.898111 44.557857,-71.89867 44.557286,-71.908656 44.54708,-71.884835 44.524403,-71.884487 44.524048,-71.874412 44.51323,-71.871838 44.510637,-71.871760 44.51054,-71.861209 44.500056,-71.856636 44.496178,-71.8567 44.496122,-71.874535 44.480282,-71.885627 44.470472,-71.891883 44.464859,-71.893164 44.46383,-71.903342 44.454655,-71.903549 44.454476,-71.912995 44.450245,-71.921348 44.446484,-71.922164 44.44623,-71.925058 44.444914,-71.926307 44.44418,-71.933287 44.441174,-71.91481 44.423081,-71.90842 44.416928,-71.905891 44.414322,-71.898406 44.407105,-71.897962 44.406696,-71.897325 44.406109,-71.886305 44.395364,-71.874506 44.383831,-71.867904 44.377301,-71.865579 44.374962,-71.858643 44.368062,-71.849854 44.359674,-71.847478 44.357361,-71.844776 44.354732,-71.841775 44.351811,-71.840508 44.350578,-71.837656 44.347801,-71.838072 44.347593,-71.83875 44.34721,-71.839767 44.346579,-71.840775 44.345795,-71.84159 44.3453,-71.842483 44.344757,-71.843283 44.34444,-71.844319 44.344204,-71.845288 44.343871,-71.845882 44.343666,-71.846346 44.343506,-71.848005 44.342766,-71.849099 44.342345,-71.849899 44.341978,-71.851118 44.341405,-71.85184 44.341143,-71.852628 44.340873,-71.85355 44.340717,-71.854404 44.340617,-71.855257 44.340589,-71.85619 44.340522,-71.857168 44.340463,-71.858155 44.340363,-71.859166 44.340369,-71.859940 44.340357,-71.860974 44.340282,-71.861941 44.340109,-71.86265 44.33992,-71.863291 44.339778,-71.863719 44.339644,-71.864485 44.339374,-71.865196 44.339071,-71.865895 44.338801,-71.866458 44.338514,-71.866753 44.338322,-71.867509 44.337964,-71.868253 44.337638,-71.869120 44.337288,-71.869616 44.337129,-71.869909 44.336962,-71.870573 44.336804,-71.871203 44.336686,-71.871488 44.336689,-71.871833 44.336641,-71.872472 44.336628,-71.873009 44.336736,-71.873713 44.336973,-71.874326 44.337195,-71.874535 44.337123,-71.874997 44.337226,-71.875514 44.337266,-71.875863 44.33737,-71.876122 44.337482,-71.8762 44.337539,-71.87629 44.337651,-71.876313 44.337732,-71.876324 44.337844,-71.876324 44.337925,-71.876358 44.338054,-71.876403 44.338167,-71.876448 44.338287,-71.876583 44.338424,-71.876685 44.338512,-71.876731 44.338548,-71.876973 44.338572,-71.877493 44.338615,-71.877628 44.338623,-71.877965 44.338719"
         ",-71.878695 44.338964,-71.879896 44.339367,-71.880546 44.339559,-71.880962 44.33976,-71.881154 44.33988,-71.881895 44.340209,-71.883973 44.341228,-71.884917 44.341717,-71.885044 44.341794,-71.887531 44.3426,-71.888182 44.342807,-71.888483 44.342846,-71.888866 44.342916,-71.88893 44.342938,-71.888994 44.342945,-71.889404 44.343039,-71.889893 44.343174,-71.890324 44.343274,-71.890332 44.343272,-71.890380 44.343255,-71.890408 44.343246,-71.890456 44.343228,-71.890548 44.343209,-71.890644 44.343192,-71.890739 44.343177,-71.890844 44.343173,-71.890926 44.343201,-71.891373 44.343335,-71.892197 44.343693,-71.894326 44.344591,-71.895856 44.345209,-71.898726 44.346251,-71.900162 44.346722,-71.902332 44.347499,-71.903115 44.347694,-71.905036 44.348154,-71.906001 44.348239,-71.906909 44.348284,-71.917008 44.346714,-71.917434 44.346535,-71.918748 44.345555,-71.921314 44.343835,-71.921459 44.343739,-71.924607 44.342252,-71.925088 44.342024,-71.926666 44.340286,-71.928041 44.338516,-71.929109 44.337577,-71.932138 44.336541,-71.935395 44.33577,-71.936773 44.335684,-71.939049 44.335843,-71.942442 44.336805,-71.943365 44.337188,-71.944254 44.337643,-71.945162 44.337744,-71.952593 44.337689,-71.956516 44.337632,-71.958119 44.337544,-71.959965 44.337013,-71.961822 44.336634,-71.963133 44.336556,-71.972572 44.336781,-71.973300 44.336777,-71.977175 44.337518,-71.977971 44.33757,-71.979505 44.337354,-71.980559 44.337486,-71.98112 44.3375,-71.984281 44.336414,-71.984617 44.336243,-71.984729 44.335882,-71.986483 44.331218,-71.987862 44.330081,-71.988305 44.329768,-71.989058 44.329561,-71.992446 44.328548,-71.993662 44.327611,-71.999448 44.325595,-72.000793 44.325295,-72.001221 44.325234,-72.001792 44.325079,-72.002314 44.324871,-72.003547 44.324397,-72.00485 44.324054,-72.005532 44.323829,-72.00676 44.323357,-72.009976 44.321951,-72.012172 44.321408,-72.014543 44.321032,-72.015936 44.320849,-72.01913 44.320383,-72.019577 44.320498,-72.019801 44.32052,-72.019908 44.320683,-72.020149 44.320818,-72.021041 44.320887,-72.021994 44.321184,-72.025782 44.322054,-72.028201 44.322375,-72.029061 44.322398,-72.029698 44.32217,-72.031322 44.320936,-72.031959 44.320662,-72.033136 44.320365,-72.033137 44.319543,-72.033773 44.317989,-72.033806 44.317349,-72.033678 44.316823,-72.03317 44.31632,-72.032341 44.315752,-72.031937 44.315475,-72.031802 44.315383,-72.031739 44.314652,-72.031549 44.313966,-72.031708 44.313007,-72.032218 44.311955,-72.032505 44.310653,-72.032444 44.307134,-72.032316 44.306677,-72.032541 44.303752,-72.032955 44.302701,-72.033464 44.301878,-72.034324 44.300941,-72.03487 44.300512,-72.035660 44.29989,-72.03633 44.298634,-72.03703 44.297834,-72.039003 44.296463,-72.039836 44.296087,-72.040117 44.295962,-72.040543 44.295876,-72.041609 44.295665,-72.041856 44.29565,-72.043202 44.295579,-72.043775 44.295608,-72.044546 44.294969,-72.044926 44.294636,-72.045137 44.29391,-72.045265 44.293198,-72.045745 44.292448,-72.046302 44.291983,-72.047349 44.291581,-72.048216 44.291404,-72.049472 44.291186,-72.051541 44.290889,-72.053355 44.290501,-72.054046 44.289971,-72.055002 44.288945,-72.055964 44.288162,-72.056078 44.287893,-72.056409 44.287618,-72.057273 44.287163,-72.05888 44.28624,-72.059957 44.284767,-72.062298 44.281754,-72.065434 44.277235,-72.066464 44.275093,-72.067774 44.270976,-72.066464 44.268331,-72.065949 44.268666,-72.064544 44.267997,-72.062671 44.269336,-72.060846 44.269972,-72.05874 44.270005,-72.058646 44.269269,-72.059395 44.268365,-72.05888 44.266926,-72.059113 44.265787,-72.058553 44.265285,-72.059021 44.265018,-72.059581 44.264315,-72.059535 44.265687,-72.060378 44.264951,-72.061173 44.263377,-72.061033 44.26244,-72.060333 44.261643,-72.060398 44.261463,-72.060723 44.261313,-72.061173 44.261258,-72.061495 44.260726,-72.06156 44.260621,-72.061542 44.26047,-72.060878 44.260436,-72.060518 44.260284,-72.060307 44.259961,-72.060259 44.259789,-72.060163 44.259766,-72.060194 44.257778,-72.060099 44.257595,-72.059838 44.256295,-72.059782 44.256018,-72.059523 44.255798,-72.059432 44.255721,-72.059018 44.255013,-72.058161 44.253916,-72.058224 44.253823,-72.058033 44.253664,-72.05708 44.252064,-72.056889 44.251859,-72.055694 44.250061,-72.055641 44.249649,-72.055515 44.249615,-72.055483 44.24912,-72.055134 44.248435,-72.054276 44.247703,-72.05399 44.246926,-72.051002 44.244892,-72.050112 44.244046,-72.049604 44.243292,-72.048999 44.242058,-72.04846 44.241212,-72.04792 44.239498,-72.047889 44.238493,-72.048621 44.237145,-72.050209 44.235066,-72.050656 44.233581,-72.052118 44.229856,-72.052469 44.229239,-72.052532 44.228805,-72.053264 44.227114,-72.053581 44.22604,-72.053995 44.224028,-72.0539 44.222703,-72.053614 44.221081,-72.053518 44.221035,-72.053518 44.220852,-72.053423 44.220784,-72.053423 44.220601,-72.053328 44.220487,-72.053328 44.220327,-72.053043 44.219732,-72.052662 44.218841,-72.052966 44.217794,-72.053232 44.216876,-72.05495 44.213677,-72.055903 44.212694,-72.056952 44.212169,-72.058605 44.211803,-72.058954 44.211597,-72.059716 44.210752,-72.060067 44.209998,-72.060067 44.209816,-72.058987 44.208512,-72.058605 44.208215,-72.058542 44.208032,-72.05886 44.207667,-72.058987 44.207164,-72.058906 44.20701,-72.058796 44.206798,-72.058066 44.206067,-72.058194 44.204907,-72.058287 44.204056,-72.058987 44.202114,-72.059564 44.201223,-72.059614 44.201144,-72.059669 44.201061,-72.060067 44.200446,-72.060543 44.200012,-72.062035 44.199074,-72.063560 44.198457,-72.064005 44.198069,-72.064577 44.196949,-72.064608 44.196058,-72.064608 44.195692,-72.06499 44.194801,-72.065213 44.194115,-72.065403 44.192607,-72.066102 44.19039,-72.066166 44.189773,-72.065911 44.189293,-72.065085 44.188631,-72.064285 44.187888,-72.06299 44.186688,-72.061337 44.184951,-72.05956 44.182666,-72.059116 44.181912,-72.058956 44.18182,-72.057496 44.179444,-72.056987 44.178096,-72.056861 44.178027,-72.056862 44.177822,-72.056798 44.17773,-72.056798 44.177433,-72.056575 44.176679,-72.056480 44.176633,-72.05629 44.175742,-72.054734 44.173114,-72.054227 44.172108,-72.054005 44.170646,-72.05391 44.170577,-72.053783 44.169869,-72.053021 44.167903,-72.052196 44.166921,-72.051655 44.166463,-72.050575 44.165961,-72.049179 44.165138,-72.048925 44.164795,-72.048799 44.164498,-72.048672 44.164452,-72.048639 44.164201,-72.048418 44.163926,-72.048355 44.163058,-72.048101 44.162144,-72.047592 44.161801,-72.047022 44.161595,-72.046133 44.161549,-72.043244 44.161869,-72.042830 44.161754,-72.042386 44.161343,-72.042386 44.160817,-72.042672 44.160292,-72.043785 44.158852,-72.044102 44.158121,-72.044039 44.157435,-72.043785 44.157047,-72.0435 44.156841,-72.042801 44.156613,-72.042103 44.15659,-72.041119 44.156864,-72.040167 44.157023,-72.039594 44.156749,-72.039245 44.156703,-72.039150 44.156498,-72.03988 44.155932,-72.039976 44.155858,-72.040082 44.155749,-72.040737 44.155972,-72.041923 44.156312,-72.042043 44.156349,-72.042801 44.156613,-72.044676 44.157097,-72.044884 44.157151,-72.045078 44.157206,-72.045767 44.157401,-72.046234 44.157563,-72.047344 44.157836,-72.048554 44.158134,-72.058602 44.160893,-72.065528 44.162794,-72.066594 44.163099,-72.070984 44.164364,-72.083157 44.167671,-72.083344 44.167722,-72.083451 44.167775,-72.087279 44.168733,-72.091724 44.16998,-72.092625 44.170284,-72.097954 44.171765,-72.100237 44.172391,-72.100809 44.172548,-72.100996 44.172599,-72.101265 44.172673,-72.10189 44.172759,-72.102047 44.172803,-72.105729 44.173842,-72.109921 44.175046,-72.110927 44.175333,-72.116790 44.176949,-72.122705 44.178552,-72.124310 44.179174,-72.133395 44.181725,-72.138984 44.183365,-72.139194 44.183494,-72.139466 44.183503,-72.140796 44.183868,-72.151283 44.186773,-72.166147 44.190938,-72.16836 44.191508,-72.17026 44.192053,-72.171978 44.19207,-72.174381 44.192183,-72.175395 44.192186,-72.187153 44.191379,-72.190945 44.191111,-72.191322 44.191101,-72.192686 44.190957,-72.199012 44.190573,-72.204065 44.190303,-72.209594 44.190003,-72.210965 44.189741,-72.221076 44.189175,-72.229408 44.188625,-72.237321 44.188057,-72.238117 44.188023,-72.24954 44.187528,-72.271323 44.185807,-72.282972 44.184887,-72.297814 44.183545))";
-    test_self_overlay<polygon>("uscounty_ne", boost::make_tuple(1, 0, 0), uscounty_ne);
+    test_self_overlay<polygon>("uscounty_ne", 1, uscounty_ne, false);
 
+    // First two points are similar but not equal, causing a self-intersection (continuation)
+    //   ----s-C------
+    // C=closing point, s=similar point, lying a little south-west. This causes a c/c (continue) intersection point.
+    // Was caused by error in neighbouring (get_turns.cpp)
+    std::string const ticket_9081_20873 =
+        "POLYGON((0.5246796698528305436  0.56288112949742163948,"
+                 "0.52467966985283021053 0.56288112949742141744,"
+                                                                   "0.51150490059304598578 0.55384245388529118603,0.51053725440836283944 0.56288079068493779289,"
+                                                                   "0.55019180962335967333 0.60735187918348676472,0.5445123657939807682 0.58331435417450905323,"
+                 "0.5246796698528305436  0.56288112949742163948))";
+    test_self_overlay<polygon>("ticket_9081_20873", 0, ticket_9081_20873);
 
+    // Was caused by error in neighbouring (get_turns.cpp)
+    std::string const ggl_list_2013_11_06_joan = "POLYGON((137.14632454923444 200.61927877947369,50 224, 323 497,255 169,137.14632454923444 200.61927877947369))";
+    test_self_overlay<polygon>("ggl_list_2013_11_06_joan", 0, ggl_list_2013_11_06_joan);
 
+    test_self_overlay<polygon>("ggl_list_20131119_james", 0, ggl_list_20131119_james[0]);
 }
-#endif
 
+template <typename P>
+void test_self_ls()
+{
+    //typedef bg::model::linestring<P> linestring;
+
+    // Same case - but if this is a linestring.
+    // TODO: this does not compile yet, but it should return 1 intersection point at the "closing" point
+    // std::string const ggl_list_2013_11_06_joan_linestring = "LINESTRING(137.14632454923444 200.61927877947369,50 224, 323 497,255 169,137.14632454923444 200.61927877947369)";
+    // test_self_overlay<linestring>("ggl_list_2013_11_06_joan_linestring", 1, ggl_list_2013_11_06_joan_linestring);
+}
+
+template <typename P>
+void test_self_all()
+{
+    test_self_poly<P>();
+    test_self_ls<P>();
+}
 
-#if ! defined(GEOMETRY_TEST_MULTI)
 int test_main(int, char* [])
 {
     test_self_all<bg::model::d2::point_xy<double> >();
     return 0;
 }
-#endif
diff --git a/test/algorithms/overlay/test_get_turns.hpp b/test/algorithms/overlay/test_get_turns.hpp
new file mode 100644
index 000000000..0950ebfe1
--- /dev/null
+++ b/test/algorithms/overlay/test_get_turns.hpp
@@ -0,0 +1,217 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_ALGORITHMS_OVERLAY_TEST_GET_TURNS_HPP
+#define BOOST_GEOMETRY_TEST_ALGORITHMS_OVERLAY_TEST_GET_TURNS_HPP
+
+#include <iostream>
+#include <iomanip>
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+
+template <int Version = 0>
+struct expected_pusher
+{
+    static const int version = Version;
+
+    void push_back(std::string const& ex) { vec.push_back(ex); }
+    expected_pusher & operator()(std::string const& ex)
+    {
+        push_back(ex);
+        return *this;
+    }
+
+    typedef std::vector<std::string>::iterator iterator;
+    typedef std::vector<std::string>::const_iterator const_iterator;
+
+    iterator begin() { return vec.begin(); }
+    iterator end() { return vec.end(); }
+    const_iterator begin() const { return vec.begin(); }
+    const_iterator end() const { return vec.end(); }
+
+    std::vector<std::string> vec;
+};
+
+expected_pusher<1> expected(std::string const& ex)
+{
+    expected_pusher<1> res;
+    return res(ex);
+}
+
+template <int Version>
+struct equal_turn
+{
+    equal_turn(std::string const& s) : turn_ptr(&s) {}
+    
+    template <typename T>
+    bool operator()(T const& t) const
+    {
+        BOOST_ASSERT(turn_ptr && turn_ptr->size() == 3);
+        return bg::method_char(t.method) == (*turn_ptr)[0]
+            && bg::operation_char(t.operations[0].operation) == (*turn_ptr)[1]
+            && bg::operation_char(t.operations[1].operation) == (*turn_ptr)[2];
+    }
+
+    const std::string * turn_ptr;
+};
+
+template <>
+struct equal_turn<1>
+{
+    equal_turn(std::string const& s) : turn_ptr(&s) {}
+    
+    template <typename T>
+    bool operator()(T const& t) const
+    {
+        unsigned count = turn_ptr->size();
+        BOOST_ASSERT(turn_ptr && count >= 1);
+        return bg::method_char(t.method) == (*turn_ptr)[0]
+            && ( count > 1
+               ? bg::operation_char(t.operations[0].operation) == (*turn_ptr)[1]
+               : true )
+            && ( count > 2
+               ? bg::operation_char(t.operations[1].operation) == (*turn_ptr)[2]
+               : true )
+            && ( count > 3
+               ? is_colinear_char(t.operations[0].is_collinear) == (*turn_ptr)[3]
+               : true )
+            && ( count > 4
+               ? is_colinear_char(t.operations[1].is_collinear) == (*turn_ptr)[4]
+               : true );
+    }
+
+    static inline char is_colinear_char(bool is_collinear)
+    {
+        return is_collinear ? '=' : '+';
+    }
+
+    const std::string * turn_ptr;
+};
+
+template <typename Geometry1, typename Geometry2, typename Expected>
+void check_geometry_range(
+    Geometry1 const& g1,
+    Geometry2 const& g2,
+    std::string const& wkt1,
+    std::string const& wkt2,
+    Expected const& expected)
+{
+    typedef bg::detail::no_rescale_policy robust_policy_type;
+    typedef typename bg::point_type<Geometry2>::type point_type;
+
+    typedef typename bg::segment_ratio_type<point_type, robust_policy_type>::type segment_ratio_type;
+
+    typedef bg::detail::overlay::turn_info
+        <
+            typename bg::point_type<Geometry2>::type,
+            segment_ratio_type,
+            typename bg::detail::get_turns::turn_operation_type
+            <
+                Geometry1,
+                Geometry2,
+                segment_ratio_type
+            >::type
+        > turn_info;
+    typedef bg::detail::overlay::assign_null_policy assign_policy_t;
+    typedef bg::detail::get_turns::no_interrupt_policy interrupt_policy_t;
+
+    std::vector<turn_info> turns;
+    interrupt_policy_t interrupt_policy;
+    robust_policy_type robust_policy;
+    
+    // Don't switch the geometries
+    typedef bg::detail::get_turns::get_turn_info_type<Geometry1, Geometry2, assign_policy_t> turn_policy_t;
+    bg::dispatch::get_turns
+        <
+            typename bg::tag<Geometry1>::type, typename bg::tag<Geometry2>::type,
+            Geometry1, Geometry2, false, false,
+            turn_policy_t
+        >::apply(0, g1, 1, g2, robust_policy, turns, interrupt_policy);
+
+    bool ok = boost::size(expected) == turns.size();
+
+    BOOST_CHECK_MESSAGE(ok,
+        "get_turns: " << wkt1 << " and " << wkt2
+        << " -> Expected turns #: " << boost::size(expected) << " detected turns #: " << turns.size());
+
+    for ( typename boost::range_iterator<Expected const>::type sit = boost::begin(expected) ;
+          sit != boost::end(expected) ; ++sit)
+    {
+        typename std::vector<turn_info>::iterator
+            it = std::find_if(turns.begin(), turns.end(), equal_turn<Expected::version>(*sit));
+
+        if ( it != turns.end() )
+            turns.erase(it);
+        else
+        {
+            BOOST_CHECK_MESSAGE(false,
+                "get_turns: " << wkt1 << " and " << wkt2
+                << " -> Expected turn: " << *sit << " not found");
+        }
+    }
+}
+
+template <typename Geometry1, typename Geometry2, typename Expected>
+void test_geometry_range(std::string const& wkt1, std::string const& wkt2,
+                         Expected const& expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+    check_geometry_range(geometry1, geometry2, wkt1, wkt2, expected);
+}
+
+template <typename G1, typename G2>
+void test_geometry(std::string const& wkt1, std::string const& wkt2,
+                   std::string const& ex0)
+{
+    test_geometry_range<G1, G2>(wkt1, wkt2, expected(ex0));
+}
+
+template <typename G1, typename G2>
+void test_geometry(std::string const& wkt1, std::string const& wkt2,
+    std::string const& ex0, std::string const& ex1)
+{
+    test_geometry_range<G1, G2>(wkt1, wkt2, expected(ex0)(ex1));
+}
+
+template <typename G1, typename G2>
+void test_geometry(std::string const& wkt1, std::string const& wkt2,
+    std::string const& ex0, std::string const& ex1, std::string const& ex2)
+{
+    test_geometry_range<G1, G2>(wkt1, wkt2, expected(ex0)(ex1)(ex2));
+}
+
+template <typename G1, typename G2, int Version>
+void test_geometry(std::string const& wkt1, std::string const& wkt2,
+                   expected_pusher<Version> const& expected)
+{
+    test_geometry_range<G1, G2>(wkt1, wkt2, expected);
+}
+
+#endif // BOOST_GEOMETRY_TEST_ALGORITHMS_OVERLAY_TEST_GET_TURNS_HPP
diff --git a/test/algorithms/overlay/traverse.cpp b/test/algorithms/overlay/traverse.cpp
index f3705ca03..1fb7123b2 100644
--- a/test/algorithms/overlay/traverse.cpp
+++ b/test/algorithms/overlay/traverse.cpp
@@ -7,9 +7,9 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
+#define BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO
+//#define BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE
 //#define BOOST_GEOMETRY_OVERLAY_NO_THROW
-//#define TEST_WITH_SVG
 //#define HAVE_TTMATH
 
 #include <iostream>
@@ -43,7 +43,6 @@
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
-#include <boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp>
 
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp>
@@ -51,6 +50,7 @@
 
 #include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
 
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
 
 #include <boost/geometry/algorithms/area.hpp>
 #include <boost/geometry/algorithms/correct.hpp>
@@ -74,6 +74,7 @@ static inline std::string operation(int d)
     return d == 1 ? "union" : "intersection";
 }
 
+
 namespace detail
 {
 
@@ -145,19 +146,26 @@ struct test_traverse
             typename bg::cs_tag<G1>::type
         >::type side_strategy_type;
 
+        typedef typename bg::point_type<G2>::type point_type;
+        typedef typename bg::rescale_policy_type<point_type>::type
+            rescale_policy_type;
+
+        rescale_policy_type rescale_policy
+                = bg::get_rescale_policy<rescale_policy_type>(g1, g2);
 
         typedef bg::detail::overlay::traversal_turn_info
-            <
-                typename bg::point_type<G2>::type
-            > turn_info;
+        <
+            point_type,
+            typename bg::segment_ratio_type<point_type, rescale_policy_type>::type
+        > turn_info;
         std::vector<turn_info> turns;
 
         bg::detail::get_turns::no_interrupt_policy policy;
-        bg::get_turns<Reverse1, Reverse2, bg::detail::overlay::calculate_distance_policy>(g1, g2, turns, policy);
+        bg::get_turns<Reverse1, Reverse2, bg::detail::overlay::assign_null_policy>(g1, g2, rescale_policy, turns, policy);
         bg::enrich_intersection_points<Reverse1, Reverse2>(turns,
                     Direction == 1 ? bg::detail::overlay::operation_union
                     : bg::detail::overlay::operation_intersection,
-            g1, g2, side_strategy_type());
+            g1, g2, rescale_policy, side_strategy_type());
 
         typedef bg::model::ring<typename bg::point_type<G2>::type> ring_type;
         typedef std::vector<ring_type> out_vector;
@@ -168,11 +176,12 @@ struct test_traverse
             <
                 Reverse1, Reverse2,
                 G1, G2
-            >::apply(g1, g2, Direction, turns, v);
+            >::apply(g1, g2, Direction, rescale_policy, turns, v);
 
         // Check number of resulting rings
         BOOST_CHECK_MESSAGE(expected_count == boost::size(v),
                 "traverse: " << id
+                << " (" << operation(Direction) << ")"
                 << " #shapes expected: " << expected_count
                 << " detected: " << boost::size(v)
                 << " type: " << string_from_type
@@ -226,7 +235,7 @@ struct test_traverse
 
             BOOST_FOREACH(turn_info const& turn, turns)
             {
-                int lineheight = 10;
+                int lineheight = 8;
                 mapper.map(turn.point, "fill:rgb(255,128,0);"
                         "stroke:rgb(0,0,0);stroke-width:1", 3);
 
@@ -242,7 +251,7 @@ struct test_traverse
                             boost::numeric_cast<int>(half
                                 + ten * bg::get<1>(turn.point))
                             );
-                std::string style =  "fill:rgb(0,0,0);font-family:Arial;font-size:10px";
+                std::string style =  "fill:rgb(0,0,0);font-family:Arial;font-size:8px";
 
                 if (turn.discarded)
                 {
@@ -262,6 +271,9 @@ struct test_traverse
                         << (turn.is_discarded() ? " (discarded) " : turn.blocked() ? " (blocked)" : "")
                         << std::endl;
 
+                    out << "r: " << turn.operations[0].fraction
+                        << " ; " << turn.operations[1].fraction
+                        << std::endl;
                     if (turn.operations[0].enriched.next_ip_index != -1)
                     {
                         out << "ip: " << turn.operations[0].enriched.next_ip_index;
@@ -281,7 +293,7 @@ struct test_traverse
                         out << "vx: " << turn.operations[1].enriched.travels_to_vertex_index
                          << " -> ip: " << turn.operations[1].enriched.travels_to_ip_index;
                     }
-                    
+
                     out << std::endl;
 
                     /*out
@@ -322,9 +334,9 @@ struct test_traverse
                             << std::endl
 
                             << std::setprecision(3)
-                            << "dist: " << turn.operations[0].enriched.distance
-                            << " / "  << turn.operations[1].enriched.distance
-                            << std::endl
+                            << "dist: " << turn.operations[0].fraction
+                            << " / "  << turn.operations[1].fraction
+                            << std::endl;
                             */
 
 
@@ -411,7 +423,7 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
 
     typedef bg::model::point<T, 2, bg::cs::cartesian> P;
     typedef bg::model::polygon<P> polygon;
-    typedef bg::model::box<P> box;
+    //typedef bg::model::box<P> box;
 
     // 1-6
     test_traverse<polygon, polygon, operation_intersection>::apply("1", 1, 5.4736, case_1[0], case_1[1]);
@@ -685,9 +697,12 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
     test_traverse<polygon, polygon, operation_union>::apply("72",
         1, 10.65, case_72[0], case_72[1]);
 
-
-
     // other
+    test_traverse<polygon, polygon, operation_union>::apply("box_poly5",
+            2, 4.7191,
+            "POLYGON((1.5 1.5, 1.5 2.5, 4.5 2.5, 4.5 1.5, 1.5 1.5))",
+            "POLYGON((2 1.3,2.4 1.7,2.8 1.8,3.4 1.2,3.7 1.6,3.4 2,4.1 2.5,4.5 2.5,4.5 2.3,5.0 2.3,5.0 2.1,4.5 2.1,4.5 1.9,4.0 1.9,4.5 1.2,4.9 0.8,2.9 0.7,2 1.3))");
+
     test_traverse<polygon, polygon, operation_intersection>::apply("collinear_overlaps",
         1, 24,
         collinear_overlaps[0], collinear_overlaps[1]);
@@ -729,9 +744,6 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
 
     static const bool is_float
         = boost::is_same<T, float>::value;
-    static const bool is_double
-        = boost::is_same<T, double>::value
-        || boost::is_same<T, long double>::value;
 
     static const double float_might_deviate_more = is_float ? 0.1 : 0.001; // In some cases up to 1 promille permitted
 
@@ -789,17 +801,17 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
     if (! is_float_on_non_msvc)
     {
         test_traverse<polygon, polygon, operation_intersection>::apply("dz_1",
-                3, 16.887537949472005, dz_1[0], dz_1[1]);
+                2, 16.887537949472005, dz_1[0], dz_1[1]);
         test_traverse<polygon, polygon, operation_union>::apply("dz_1",
                 3, 1444.2621305732864, dz_1[0], dz_1[1]);
 
         test_traverse<polygon, polygon, operation_intersection>::apply("dz_2",
                 2, 68.678921274288541, dz_2[0], dz_2[1]);
         test_traverse<polygon, polygon, operation_union>::apply("dz_2",
-                2, 1505.4202304878663, dz_2[0], dz_2[1]);
+                1, 1505.4202304878663, dz_2[0], dz_2[1]);
 
         test_traverse<polygon, polygon, operation_intersection>::apply("dz_3",
-                6, 192.49316937645651, dz_3[0], dz_3[1]);
+                5, 192.49316937645651, dz_3[0], dz_3[1]);
         test_traverse<polygon, polygon, operation_union>::apply("dz_3",
                 6, 1446.496005965641, dz_3[0], dz_3[1]);
 
@@ -813,18 +825,15 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
 
     // SNL (Subsidiestelsel Natuur & Landschap - verAANnen)
 
-    if (! is_float_on_non_msvc)
-    {
-        test_traverse<polygon, polygon, operation_intersection>::apply("snl-1",
-            2, 286.996062095888,
-            snl_1[0], snl_1[1],
-            float_might_deviate_more);
+    test_traverse<polygon, polygon, operation_intersection>::apply("snl-1",
+        2, 286.996062095888,
+        snl_1[0], snl_1[1],
+        float_might_deviate_more);
 
-        test_traverse<polygon, polygon, operation_union>::apply("snl-1",
-            2, 51997.5408506132,
-            snl_1[0], snl_1[1],
-            float_might_deviate_more);
-    }
+    test_traverse<polygon, polygon, operation_union>::apply("snl-1",
+        2, 51997.5408506132,
+        snl_1[0], snl_1[1],
+        float_might_deviate_more);
 
     {
         test_traverse<polygon, polygon, operation_intersection>::apply("isov",
@@ -835,54 +844,10 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
                 float_might_deviate_more);
     }
 
-    // GEOS tests
-    if (! is_float)
-    {
-        test_traverse<polygon, polygon, operation_intersection>::apply("geos_1_test_overlay",
-                1, 3461.02330171138, geos_1_test_overlay[0], geos_1_test_overlay[1]);
-        test_traverse<polygon, polygon, operation_union>::apply("geos_1_test_overlay",
-                1, 3461.31592235516, geos_1_test_overlay[0], geos_1_test_overlay[1]);
-
-        if (! is_double)
-        {
-            test_traverse<polygon, polygon, operation_intersection>::apply("geos_2",
-                    2, 2.157e-6, // by bg/ttmath; sql server reports: 2.20530228034477E-06
-                    geos_2[0], geos_2[1]);
-        }
-        test_traverse<polygon, polygon, operation_union>::apply("geos_2",
-                1, 350.550662845485,
-                geos_2[0], geos_2[1]);
-    }
-
-    if (! is_float && ! is_double)
-    {
-        test_traverse<polygon, polygon, operation_intersection>::apply("geos_3",
-                1, 2.484885e-7,
-                geos_3[0], geos_3[1]);
-    }
-
-    if (! is_float_on_non_msvc)
-    {
-        // Sometimes output is reported as 29229056
-        test_traverse<polygon, polygon, operation_union>::apply("geos_3",
-                1, 29391548.5,
-                geos_3[0], geos_3[1],
-                float_might_deviate_more);
-
-        // Sometimes output is reported as 0.078125
-        test_traverse<polygon, polygon, operation_intersection>::apply("geos_4",
-                1, 0.0836884926070727,
-                geos_4[0], geos_4[1],
-                float_might_deviate_more);
-    }
-
-    test_traverse<polygon, polygon, operation_union>::apply("geos_4",
-            1, 2304.41633605957,
-            geos_4[0], geos_4[1]);
-	
     if (! is_float)
     {
 
+/* TODO check this BSG 2013-09-24
 #if defined(_MSC_VER)
         double const expected = if_typed_tt<T>(3.63794e-17, 0.0);
         int expected_count = if_typed_tt<T>(1, 0);
@@ -892,48 +857,48 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
 #endif
 
         // Calculate intersection/union of two triangles. Robustness case.
-        // ttmath can form a very small intersection triangle 
+        // ttmath can form a very small intersection triangle
         // (which is even not accomplished by SQL Server/PostGIS)
         std::string const caseid = "ggl_list_20110820_christophe";
-        test_traverse<polygon, polygon, operation_intersection>::apply(caseid, 
+        test_traverse<polygon, polygon, operation_intersection>::apply(caseid,
             expected_count, expected,
             ggl_list_20110820_christophe[0], ggl_list_20110820_christophe[1]);
-        test_traverse<polygon, polygon, operation_union>::apply(caseid, 
-            1, 67.3550722317627, 
+        test_traverse<polygon, polygon, operation_union>::apply(caseid,
+            1, 67.3550722317627,
             ggl_list_20110820_christophe[0], ggl_list_20110820_christophe[1]);
+*/
     }
 
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_f", 
-        1, 4.60853, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_f",
+        1, 4.60853,
         buffer_rt_f[0], buffer_rt_f[1]);
-    test_traverse<polygon, polygon, operation_intersection>::apply("buffer_rt_f", 
-        1, 0.0002943725152286, 
+    test_traverse<polygon, polygon, operation_intersection>::apply("buffer_rt_f",
+        1, 0.0002943725152286,
         buffer_rt_f[0], buffer_rt_f[1], 0.01);
 
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g", 
-        1, 16.571, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g",
+        1, 16.571,
         buffer_rt_g[0], buffer_rt_g[1]);
 
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes1", 
-        1, 20, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes1",
+        1, 20,
         buffer_rt_g_boxes[0], buffer_rt_g_boxes[1]);
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes2", 
-        1, 24, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes2",
+        1, 24,
         buffer_rt_g_boxes[0], buffer_rt_g_boxes[2]);
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes3", 
-        1, 28, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes3",
+        1, 28,
         buffer_rt_g_boxes[0], buffer_rt_g_boxes[3]);
 
-    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes43", 
-        1, 30, 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_g_boxes43",
+        1, 30,
         buffer_rt_g_boxes[4], buffer_rt_g_boxes[3]);
 
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_rt_l",
+        1, 19.3995, buffer_rt_l[0], buffer_rt_l[1]);
 
-    if (boost::is_same<T, double>::value)
-    {
-        test_traverse<polygon, polygon, operation_union>::apply("buffer_mp2", 
-                2, 36.7535642, buffer_mp2[0], buffer_mp2[1], 0.01);
-    }
+    test_traverse<polygon, polygon, operation_union>::apply("buffer_mp2",
+            1, 36.7535642, buffer_mp2[0], buffer_mp2[1], 0.01);
     test_traverse<polygon, polygon, operation_union>::apply("collinear_opposite_rr",
             1, 6.41, collinear_opposite_right[0], collinear_opposite_right[1]);
     test_traverse<polygon, polygon, operation_union>::apply("collinear_opposite_ll",
@@ -947,22 +912,26 @@ void test_all(bool test_self_tangencies = true, bool test_mixed = false)
 
     test_traverse<polygon, polygon, operation_intersection>::apply("ticket_7462", 1, 0.220582, ticket_7462[0], ticket_7462[1]);
 
+    test_traverse<polygon, polygon, operation_intersection>::apply
+        ("ticket_9081_15", 1, 0.006889578,
+            ticket_9081_15[0], ticket_9081_15[1]);
+
 #ifdef BOOST_GEOMETRY_OVERLAY_NO_THROW
     {
         // NOTE: currently throws (normally)
         std::string caseid = "ggl_list_20120229_volker";
-        test_traverse<polygon, polygon, operation_union>::apply(caseid, 
-            1, 99, 
+        test_traverse<polygon, polygon, operation_union>::apply(caseid,
+            1, 99,
             ggl_list_20120229_volker[0], ggl_list_20120229_volker[1]);
-        test_traverse<polygon, polygon, operation_intersection>::apply(caseid, 
-            1, 99, 
+        test_traverse<polygon, polygon, operation_intersection>::apply(caseid,
+            1, 99,
             ggl_list_20120229_volker[0], ggl_list_20120229_volker[1]);
         caseid = "ggl_list_20120229_volker_2";
-        test_traverse<polygon, polygon, operation_union>::apply(caseid, 
-            1, 99, 
+        test_traverse<polygon, polygon, operation_union>::apply(caseid,
+            1, 99,
             ggl_list_20120229_volker[2], ggl_list_20120229_volker[1]);
-        test_traverse<polygon, polygon, operation_intersection>::apply(caseid, 
-            1, 99, 
+        test_traverse<polygon, polygon, operation_intersection>::apply(caseid,
+            1, 99,
             ggl_list_20120229_volker[2], ggl_list_20120229_volker[1]);
     }
 #endif
diff --git a/test/algorithms/overlay/traverse_gmp.cpp b/test/algorithms/overlay/traverse_gmp.cpp
index 46da653d8..b3db22cce 100644
--- a/test/algorithms/overlay/traverse_gmp.cpp
+++ b/test/algorithms/overlay/traverse_gmp.cpp
@@ -35,7 +35,6 @@
 #include <boost/geometry/algorithms/detail/overlay/turn_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
 #include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
-#include <boost/geometry/algorithms/detail/overlay/calculate_distance_policy.hpp>
 #include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
 #include <boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp>
 #include <boost/geometry/algorithms/detail/overlay/traverse.hpp>
@@ -44,9 +43,6 @@
 
 #include <boost/geometry/io/wkt/wkt.hpp>
 
-#define TEST_WITH_SVG
-
-
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/io/svg/svg_mapper.hpp>
 #endif
@@ -75,7 +71,7 @@ void test_traverse(std::string const& caseid, G1 const& g1, G2 const& g2)
     typedef typename boost::range_iterator<const std::vector<turn_info> >::type iterator;
     std::vector<turn_info> ips;
 
-    bg::get_turns<false, false, bg::detail::overlay::calculate_distance_policy>(g1, g2, ips);
+    bg::get_turns<false, false, bg::detail::overlay::assign_null_policy>(g1, g2, ips);
     bg::enrich_intersection_points(ips, g1, g2, strategy_type());
 
     typedef bg::model::ring<typename bg::point_type<G2>::type> ring_type;
diff --git a/test/algorithms/point_on_surface.cpp b/test/algorithms/point_on_surface.cpp
new file mode 100644
index 000000000..b393a35b8
--- /dev/null
+++ b/test/algorithms/point_on_surface.cpp
@@ -0,0 +1,314 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+// Instead of having a separate (and nearly similar) unit test to test multipolygons,
+// we now include them here and compile them by default. Only undefining the next line
+// will avoid testing multi-geometries
+#define BOOST_GEOMETRY_UNIT_TEST_MULTI
+
+#include <geometry_test_common.hpp>
+
+// The include to test
+#include <boost/geometry/algorithms/point_on_surface.hpp>
+
+// Helper includes
+#include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/algorithms/within.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
+// Include from unit tests
+#include <algorithms/test_overlay.hpp>
+#include <algorithms/predef_relop.hpp>
+#include <algorithms/overlay/overlay_cases.hpp>
+
+#if defined(BOOST_GEOMETRY_UNIT_TEST_MULTI)
+#  include <boost/geometry/multi/algorithms/correct.hpp>
+#  include <boost/geometry/multi/algorithms/within.hpp>
+#  include <boost/geometry/multi/algorithms/detail/extreme_points.hpp>
+#  include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#  include <boost/geometry/multi/io/wkt/wkt.hpp>
+#endif
+
+
+#if defined(TEST_WITH_SVG)
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
+#endif
+
+template <typename Geometry>
+void test_geometry(std::string const& case_id, std::string const& wkt, double expected_x, double expected_y)
+{
+//std::cout << case_id << std::endl;
+    typedef typename bg::point_type<Geometry>::type point_type;
+
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    bg::correct(geometry);
+
+    point_type point;
+    bg::point_on_surface(geometry, point);
+
+    BOOST_CHECK_MESSAGE(bg::within(point, geometry),
+        case_id << " generated point_on_surface (dim 1) is not within geometry");
+
+#ifdef BOOST_GEOMETRY_POINT_ON_SURFACE_COMPLETE
+    // For the algorithm we also check generation in the other dimension
+    point_type right_point;
+    bg::detail::point_on_surface::calculate_point_on_surface<0>(geometry, right_point);
+
+    BOOST_CHECK_MESSAGE(bg::within(right_point, geometry),
+        case_id << " generated point_on_surface (dim 0) is not within geometry");
+
+    point_type returned_point = bg::return_point_on_surface(geometry);
+#endif
+
+#if defined(TEST_WITH_SVG)
+    {
+        std::ostringstream filename;
+        filename << "point_on_surface_" << case_id << "_"
+            << string_from_type<typename bg::coordinate_type<Geometry>::type>::name()
+            << ".svg";
+
+        std::ofstream svg(filename.str().c_str());
+
+        // To map the intermediate products:
+        bg::model::linestring<point_type> top_points;
+        typedef bg::model::linestring<point_type> intruder_type;
+        std::vector<intruder_type> top_intruders;
+        bg::extreme_points<1>(geometry, top_points, top_intruders);
+
+#ifdef BOOST_GEOMETRY_POINT_ON_SURFACE_COMPLETE
+        bg::model::linestring<point_type> right_points;
+        std::vector<bg::model::linestring<point_type> > right_intruders;
+        bg::extreme_points<0>(geometry, right_points, right_intruders);
+#endif
+
+        bg::svg_mapper<point_type> mapper(svg, 500, 500);
+        mapper.add(geometry);
+        mapper.map(geometry, "fill-opacity:0.5;fill:rgb(153,204,0);stroke:rgb(153,204,0);stroke-width:1");
+
+        // Top (red/magenta)
+        mapper.map(top_points, "stroke:rgb(255,0,0);stroke-width:2");
+        BOOST_FOREACH(intruder_type const& intruder, top_intruders)
+        {
+            mapper.map(intruder, "stroke:rgb(255,0,255);stroke-width:2");
+        }
+        mapper.map(point, "opacity:0.8;fill:rgb(255,128,0);stroke:rgb(0,0,100);stroke-width:1", 3);
+
+#ifdef BOOST_GEOMETRY_POINT_ON_SURFACE_COMPLETE
+        //// Right (blue/cyan)
+        // (mostly commented, makes the picture less clear)
+        //mapper.map(right_points, "stroke:rgb(0,0,255);stroke-width:2");
+        //BOOST_FOREACH(intruder_type const& intruder, right_intruders)
+        //{
+        //    mapper.map(intruder, "stroke:rgb(0,255,255);stroke-width:2");
+        //}
+        mapper.map(right_point, "opacity:0.8;fill:rgb(0,128,255);stroke:rgb(0,0,100);stroke-width:1", 3);
+#endif
+    }
+#endif
+
+}
+
+template <typename Point>
+void test_all()
+{
+    typedef bg::model::polygon<Point> polygon;
+
+    // Specific test-cases for point-on-surface:
+    test_geometry<polygon>("ice", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0))", 0, 0);
+    test_geometry<polygon>("intruding", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,7 2,4 7,6 1,5 0))", 0, 0);
+    test_geometry<polygon>("intruding2", "polygon((5 0,3 2,4 6,2 3,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,7 2,4 7,6 1,5 0))", 0, 0);
+    test_geometry<polygon>("intruding3", "polygon((5 0,3 2,3 6,2 3,0 5,1 6,3 7,2 5,4 8,6 5,5 7,7 6,8 5,9 6,10 5,7 2,5 6,6 1,5 0))", 0, 0);
+    test_geometry<polygon>("intruding4", "polygon((5 0,3 2,3 6,2 3,0 5,1 6,3 7,2 5,4 8,6 5,5 8,7 6,8 5,9 6,10 5,7 2,5 6,6 1,5 0))", 0, 0);
+    test_geometry<polygon>("intruding5", "polygon((5 0,3 2,3 6,2 3,0 5,1 6,3 8,2 5,4 8,6 5,5 8,7 6,8 5,9 6,10 5,7 2,5 6,6 1,5 0))", 0, 0);
+    test_geometry<polygon>("ice_int", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,4 3,5 4,4 7,3 4))", 0, 0);
+    test_geometry<polygon>("ice_int2", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(4 7,3 4,4 3,5 4,4 7))", 0, 0);
+    test_geometry<polygon>("ice_in3", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,5 4,5 6,3 6,3 4))", 0, 0);
+    test_geometry<polygon>("simplex_normal", simplex_normal[0], 0, 0);
+    test_geometry<polygon>("sqr", "polygon((0 0,0 5,0 10,5 10,10 10,10 5,10 0,5 0,0 0))", 0, 0);
+    test_geometry<polygon>("self_tangent", "polygon((0 0,5 10,10 0,9 0,7 4,8 0,7 0,5 10,3 0,2 0,3 4,1 0,0 0))", 0, 0);
+    test_geometry<polygon>("self_tangent2", "polygon((5 0,2 3,4 8,1.5 3.5,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0))", 0, 0);
+    test_geometry<polygon>("self_tangent_int", "polygon((5 0,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,4 3,5 4,4 8,3 4))", 0, 0);
+    test_geometry<polygon>("self_tangent_int2", "polygon((5 0,2 3,3.5 7,1.5 3.5,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,4 3,5 4,4 8,3 4))", 0, 0);
+    test_geometry<polygon>("self_tangent_int3", "polygon((5 0,2 3,4 8,1.5 3.5,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,4 3,5 4,4 8,3 4))", 0, 0);
+
+    test_geometry<polygon>("self_tangent_int3", "polygon((5 0,2 3,4 8,1.5 3.5,0 5,1 6,2 5,4 8,6 5,7 6,8 5,9 6,10 5,5 0),(3 4,4 3,5 4,4 8,3 4))", 0, 0);
+    test_geometry<polygon>("disjoint_simplex0", disjoint_simplex[0], 0, 0);
+    test_geometry<polygon>("disjoint_simplex1", disjoint_simplex[1], 0, 0);
+
+#if defined(BOOST_GEOMETRY_UNIT_TEST_MULTI)
+    {
+        typedef bg::model::multi_polygon<polygon> multi_polygon;
+        test_geometry<multi_polygon>("mp_simplex", "multipolygon(((0 0,0 5,5 0, 0 0)),((7 1,7 6,10 1,7 1)))", 0, 0);
+        // Wrapped polygon in two orders
+        test_geometry<multi_polygon>("mp_wrapped1",
+                "multipolygon("
+                "((4 10,9 11,10 16,11 11,16 10,11 9,10 4,9 9,4 10))"
+                ","
+                "((0 10,10 20,20 10,10 0,0 10),(10 2,18 10,10 18,2 10,10 2))"
+                ")",
+                0, 0);
+        test_geometry<multi_polygon>("mp_wrapped2",
+                "multipolygon("
+                "((0 10,10 20,20 10,10 0,0 10),(10 2,18 10,10 18,2 10,10 2))"
+                ","
+                "((4 10,9 11,10 16,11 11,16 10,11 9,10 4,9 9,4 10))"
+                ")",
+                0, 0);
+    }
+#endif
+
+
+    // Overlay testcases
+    test_geometry<polygon>("buffer_mp1", buffer_mp1[0],  0, 0);
+    test_geometry<polygon>("buffer_mp2", buffer_mp2[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_a", buffer_rt_a[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_f", buffer_rt_f[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_g", buffer_rt_g[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_i", buffer_rt_i[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_j", buffer_rt_j[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_l", buffer_rt_l[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_m1", buffer_rt_m1[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_m2", buffer_rt_m2[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_n", buffer_rt_n[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_q", buffer_rt_q[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_r", buffer_rt_r[0],  0, 0);
+    test_geometry<polygon>("buffer_rt_t", buffer_rt_t[0],  0, 0);
+    test_geometry<polygon>("case_10", case_10[0],  0, 0);
+    test_geometry<polygon>("case_11", case_11[0],  0, 0);
+    test_geometry<polygon>("case_12", case_12[0],  0, 0);
+    test_geometry<polygon>("case_13", case_13[0],  0, 0);
+    test_geometry<polygon>("case_14", case_14[0],  0, 0);
+    test_geometry<polygon>("case_15", case_15[0],  0, 0);
+    test_geometry<polygon>("case_16", case_16[0],  0, 0);
+    test_geometry<polygon>("case_17", case_17[0],  0, 0);
+    test_geometry<polygon>("case_18", case_18[0],  0, 0);
+    test_geometry<polygon>("case_19", case_19[0],  0, 0);
+    test_geometry<polygon>("case_1", case_1[0],  0, 0);
+    test_geometry<polygon>("case_20", case_20[0],  0, 0);
+    test_geometry<polygon>("case_21", case_21[0],  0, 0);
+    test_geometry<polygon>("case_22", case_22[0],  0, 0);
+    test_geometry<polygon>("case_23", case_23[0],  0, 0);
+    test_geometry<polygon>("case_24", case_24[0],  0, 0);
+    test_geometry<polygon>("case_25", case_25[0],  0, 0);
+    test_geometry<polygon>("case_26", case_26[0],  0, 0);
+    test_geometry<polygon>("case_27", case_27[0],  0, 0);
+    test_geometry<polygon>("case_28", case_28[0],  0, 0);
+    test_geometry<polygon>("case_29", case_29[0],  0, 0);
+    test_geometry<polygon>("case_2", case_2[0],  0, 0);
+    test_geometry<polygon>("case_30", case_30[0],  0, 0);
+    test_geometry<polygon>("case_31", case_31[0],  0, 0);
+    test_geometry<polygon>("case_32", case_32[0],  0, 0);
+    test_geometry<polygon>("case_33", case_33[0],  0, 0);
+    test_geometry<polygon>("case_34", case_34[0],  0, 0);
+    test_geometry<polygon>("case_35", case_35[0],  0, 0);
+    test_geometry<polygon>("case_36", case_36[0],  0, 0);
+    test_geometry<polygon>("case_37", case_37[0],  0, 0);
+    test_geometry<polygon>("case_38", case_38[0],  0, 0);
+    test_geometry<polygon>("case_39", case_39[0],  0, 0);
+    test_geometry<polygon>("case_3", case_3[0],  0, 0);
+    test_geometry<polygon>("case_40", case_40[0],  0, 0);
+    test_geometry<polygon>("case_41", case_41[0],  0, 0);
+    test_geometry<polygon>("case_42", case_42[0],  0, 0);
+    test_geometry<polygon>("case_43", case_43[0],  0, 0);
+    test_geometry<polygon>("case_44", case_44[0],  0, 0);
+    test_geometry<polygon>("case_45", case_45[0],  0, 0);
+    test_geometry<polygon>("case_46", case_46[0],  0, 0);
+    test_geometry<polygon>("case_47", case_47[0],  0, 0);
+    test_geometry<polygon>("case_49", case_49[0],  0, 0);
+    test_geometry<polygon>("case_4", case_4[0],  0, 0);
+    test_geometry<polygon>("case_50", case_50[0],  0, 0);
+    test_geometry<polygon>("case_51", case_51[0],  0, 0);
+    test_geometry<polygon>("case_52", case_52[0],  0, 0);
+    test_geometry<polygon>("case_53", case_53[0],  0, 0);
+    test_geometry<polygon>("case_54", case_54[0],  0, 0);
+    test_geometry<polygon>("case_55", case_55[0],  0, 0);
+    test_geometry<polygon>("case_56", case_56[0],  0, 0);
+    test_geometry<polygon>("case_57", case_57[0],  0, 0);
+    test_geometry<polygon>("case_58", case_58[0],  0, 0);
+    test_geometry<polygon>("case_59", case_59[0],  0, 0);
+    test_geometry<polygon>("case_5", case_5[0],  0, 0);
+    test_geometry<polygon>("case_60", case_60[0],  0, 0);
+    test_geometry<polygon>("case_61", case_61[0],  0, 0);
+    test_geometry<polygon>("case_6", case_6[0],  0, 0);
+    test_geometry<polygon>("case_70", case_70[0],  0, 0);
+    test_geometry<polygon>("case_71", case_71[0],  0, 0);
+    test_geometry<polygon>("case_72", case_72[0],  0, 0);
+    test_geometry<polygon>("case_79", case_79[0],  0, 0);
+    test_geometry<polygon>("case_7", case_7[0],  0, 0);
+    test_geometry<polygon>("case_8", case_8[0],  0, 0);
+    test_geometry<polygon>("case_9", case_9[0],  0, 0);
+    test_geometry<polygon>("case_many_situations", case_many_situations[0],  0, 0);
+    test_geometry<polygon>("ccw_case_1", ccw_case_1[0],  0, 0);
+    test_geometry<polygon>("ccw_case_9", ccw_case_9[0],  0, 0);
+    test_geometry<polygon>("collinear_opposite_left", collinear_opposite_left[0],  0, 0);
+    test_geometry<polygon>("collinear_opposite_right", collinear_opposite_right[0],  0, 0);
+    test_geometry<polygon>("collinear_opposite_straight", collinear_opposite_straight[0],  0, 0);
+    test_geometry<polygon>("collinear_overlaps", collinear_overlaps[0],  0, 0);
+    test_geometry<polygon>("dz_1", dz_1[0],  0, 0);
+    test_geometry<polygon>("dz_2", dz_2[0],  0, 0);
+    test_geometry<polygon>("dz_3", dz_3[0],  0, 0);
+    test_geometry<polygon>("dz_4", dz_4[0],  0, 0);
+    test_geometry<polygon>("geos_1", geos_1[0],  0, 0);
+    test_geometry<polygon>("geos_2", geos_2[0],  0, 0);
+    test_geometry<polygon>("geos_3", geos_3[0],  0, 0);
+    test_geometry<polygon>("geos_4", geos_4[0],  0, 0);
+    test_geometry<polygon>("ggl_list_20110306_javier", ggl_list_20110306_javier[0],  0, 0);
+    test_geometry<polygon>("ggl_list_20110307_javier", ggl_list_20110307_javier[0],  0, 0);
+    test_geometry<polygon>("ggl_list_20110627_phillip", ggl_list_20110627_phillip[0],  0, 0);
+    test_geometry<polygon>("ggl_list_20110716_enrico", ggl_list_20110716_enrico[0],  0, 0);
+    test_geometry<polygon>("ggl_list_20110820_christophe ", ggl_list_20110820_christophe [0],  0, 0);
+    test_geometry<polygon>("ggl_list_20120717_volker", ggl_list_20120717_volker[0],  0, 0);
+    test_geometry<polygon>("hv_1", hv_1[0],  0, 0);
+    test_geometry<polygon>("hv_2", hv_2[0],  0, 0);
+    test_geometry<polygon>("hv_3", hv_3[0],  0, 0);
+    test_geometry<polygon>("hv_4", hv_4[0],  0, 0);
+    test_geometry<polygon>("hv_5", hv_5[0],  0, 0);
+    test_geometry<polygon>("hv_6", hv_6[0],  0, 0);
+    test_geometry<polygon>("hv_7", hv_7[0],  0, 0);
+    test_geometry<polygon>("isovist", isovist[0],  0, 0);
+    test_geometry<polygon>("open_case_1", open_case_1[0],  0, 0);
+    test_geometry<polygon>("open_case_9", open_case_9[0],  0, 0);
+    test_geometry<polygon>("pie_16_2_15_0", pie_16_2_15_0[0],  0, 0);
+    test_geometry<polygon>("pie_16_4_12", pie_16_4_12[0],  0, 0);
+    test_geometry<polygon>("pie_20_20_7_100", pie_20_20_7_100[0],  0, 0);
+    test_geometry<polygon>("pie_23_16_16", pie_23_16_16[0],  0, 0);
+    test_geometry<polygon>("pie_23_21_12_500", pie_23_21_12_500[0],  0, 0);
+    test_geometry<polygon>("pie_23_23_3_2000", pie_23_23_3_2000[0],  0, 0);
+    test_geometry<polygon>("pie_4_13_15", pie_4_13_15[0],  0, 0);
+    test_geometry<polygon>("pie_5_12_12_0_7s", pie_5_12_12_0_7s[0],  0, 0);
+    test_geometry<polygon>("snl_1", snl_1[0],  0, 0);
+    test_geometry<polygon>("ticket_17", ticket_17[0],  0, 0);
+    test_geometry<polygon>("ticket_5103", ticket_5103[0],  0, 0);
+    test_geometry<polygon>("ticket_7462", ticket_7462[0],  0, 0);
+    test_geometry<polygon>("ticket_8310a", ticket_8310a[0],  0, 0);
+    test_geometry<polygon>("ticket_8310b", ticket_8310b[0],  0, 0);
+    test_geometry<polygon>("ticket_8310c", ticket_8310c[0],  0, 0);
+    test_geometry<polygon>("ticket_8254", ticket_8254[0],  0, 0);
+}
+
+
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::d2::point_xy<double> >();
+
+    return 0;
+}
+
diff --git a/test/algorithms/predef_relop.hpp b/test/algorithms/predef_relop.hpp
new file mode 100644
index 000000000..eda98ac01
--- /dev/null
+++ b/test/algorithms/predef_relop.hpp
@@ -0,0 +1,33 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2010-2012 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)
+
+#ifndef BOOST_GEOMETRY_PREDEF_RELOP_HPP
+#define BOOST_GEOMETRY_PREDEF_RELOP_HPP
+
+#include <string>
+
+
+static std::string disjoint_simplex[2] =
+    {"POLYGON((0 0,0 2,2 2,0 0))",
+    "POLYGON((1 0,3 2,3 0,1 0))"};
+
+static std::string touch_simplex[2] =
+    {"POLYGON((0 0,0 2,2 2,0 0))",
+    "POLYGON((2 2,3 2,3 0,2 2))"};
+
+static std::string overlaps_box[2] =
+    {"POLYGON((0 0,0 2,2 2,0 0))",
+    "POLYGON((1 1,3 2,3 0,1 1))"};
+
+static std::string within_simplex[2] =
+    {"POLYGON((0 0,1 4,4 1,0 0))",
+    "POLYGON((1 1,1 3,3 1,1 1))"};
+
+
+
+#endif
diff --git a/test/algorithms/pretty_print_geometry.hpp b/test/algorithms/pretty_print_geometry.hpp
new file mode 100644
index 000000000..2f3275cba
--- /dev/null
+++ b/test/algorithms/pretty_print_geometry.hpp
@@ -0,0 +1,69 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Tests
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_TEST_PRETTY_PRINT_GEOMETRY_HPP
+#define BOOST_GEOMETRY_TEST_PRETTY_PRINT_GEOMETRY_HPP
+
+#include <iostream>
+
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/io/dsv/write.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+
+
+template
+<
+    typename Geometry,
+    typename Tag = typename boost::geometry::tag<Geometry>::type
+>
+struct pretty_print_geometry
+{
+    static inline std::ostream&
+    apply(std::ostream& os, Geometry const& geometry)
+    {
+        os << boost::geometry::wkt(geometry);
+        return os;
+    }
+};
+
+template <typename Box>
+struct pretty_print_geometry<Box, boost::geometry::box_tag>
+{
+    static inline std::ostream&
+    apply(std::ostream& os, Box const& box)
+    {
+        return os << "BOX" << boost::geometry::dsv(box);
+    }
+};
+
+template <typename Segment>
+struct pretty_print_geometry<Segment, boost::geometry::segment_tag>
+{
+    static inline std::ostream&
+    apply(std::ostream& os, Segment const& segment)
+    {
+        return os << "SEGMENT" << boost::geometry::dsv(segment);
+    }
+};
+
+template <typename Ring>
+struct pretty_print_geometry<Ring, boost::geometry::ring_tag>
+{
+    static inline std::ostream&
+    apply(std::ostream& os, Ring const& ring)
+    {
+        return os << "RING" << boost::geometry::dsv(ring);
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_PRETTY_PRINT_GEOMETRY_HPP
diff --git a/test/algorithms/relate_areal_areal.cpp b/test/algorithms/relate_areal_areal.cpp
new file mode 100644
index 000000000..fd9e84c40
--- /dev/null
+++ b/test/algorithms/relate_areal_areal.cpp
@@ -0,0 +1,323 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_relate.hpp>
+
+//TEST
+//#include <to_svg.hpp>
+
+template <typename P>
+void test_polygon_polygon()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::ring<P> ring;
+
+    // touching
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((10 0,10 10,20 10,20 0,10 0))",
+                              "FF2F11212");
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((0 -10,0 0,10 0,10 -10,0 -10))",
+                              "FF2F11212");
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((10 0,15 10,20 10,20 0,10 0))",
+                              "FF2F01212");
+
+    // containing
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 5,5 10,6 10,6 5,5 5))",
+                              "212F11FF2");
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 5,5 10,6 5,5 5))",
+                              "212F01FF2");
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 5,5 6,6 6,6 5,5 5))",
+                              "212FF1FF2");
+
+    // fully containing
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 5,5 9,6 9,6 5,5 5))",
+                              "212FF1FF2");
+    // fully containing, with a hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,7 3,7 7,3 7,3 3))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1))",
+                              "2121F12F2");
+    // fully containing, both with holes
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,7 3,7 7,3 7,3 3))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1),(2 2,8 2,8 8,2 8,2 2))",
+                              "212FF1FF2");
+    // fully containing, both with holes
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,7 3,7 7,3 7,3 3))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1),(4 4,6 4,6 6,4 6,4 4))",
+                              "2121F1212");
+
+    // overlapping
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 0,5 10,20 10,20 0,5 0))",
+                              "212111212");
+    test_geometry<ring, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 0,5 10,20 10,20 0,5 0))",
+                              "212111212");
+    test_geometry<ring, ring>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 0,5 10,20 10,20 0,5 0))",
+                              "212111212");
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,15 5,10 0,0 0))",
+                              "POLYGON((10 0,5 5,10 10,20 10,20 0,10 0))",
+                              "212101212");
+
+    // equal
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((10 10,10 5,10 0,5 0,0 0,0 10,5 10,10 10))",
+                              "2FFF1FFF2");
+    // hole-sized
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,6 5,6 6,5 6,5 5))",
+                              "POLYGON((5 5,5 6,6 6,6 5,5 5))",
+                              "FF2F112F2");
+
+    // disjoint
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((0 20,0 30,10 30,10 20,0 20))",
+                              "FF2FF1212");
+    // disjoint
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,7 3,7 7,3 7,3 3))",
+                              "POLYGON((0 20,0 30,10 30,10 20,0 20))",
+                              "FF2FF1212");
+
+    // equal non-simple / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,10 5,5 6,5 5))",
+                              "POLYGON((0 0,0 10,10 10,10 5,5 6,5 5,10 5,10 0,0 0))",
+                              "2FFF1FFF2");
+
+    // within non-simple / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,5 6,5 5,10 5,10 0,0 0))",
+                              "POLYGON((0 0,5 5,10 5,10 0,0 0))",
+                              "212F11FF2");
+    // within non-simple hole / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,10 5,5 6,5 5))",
+                              "POLYGON((0 0,5 5,10 5,10 0,0 0))",
+                              "212F11FF2");
+
+
+    // not within non-simple / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,5 6,5 5,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "2FF11F2F2");
+    // not within non-simple hole / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,10 5,5 6,5 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "2FF11F2F2");
+    // not within simple hole / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,9 5,5 6,5 5))",
+                              "POLYGON((0 0,0 10,10 10,9 5,10 0,0 0))",
+                              "2121112F2");
+
+    // within non-simple fake hole / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,4 7,4 3,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "2FF11F2F2");
+    // within non-simple fake hole / non-simple fake hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,4 7,4 3,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 5,5 6,5 4,10 5,10 0,0 0))",
+                              "2FF11F212");
+    // within non-simple fake hole / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,4 7,4 3,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,5 6,5 4,10 5))",
+                              "2FF11F212");
+    // containing non-simple fake hole / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,4 7,4 3,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,3 8,3 2,10 5))",
+                              "212F11FF2");
+
+    // within non-simple hole / simple
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "2FF11F2F2");
+    // within non-simple hole / non-simple fake hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 5,5 6,5 4,10 5,10 0,0 0))",
+                              "2FF11F212");
+    // containing non-simple hole / non-simple fake hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 5,3 8,3 2,10 5,10 0,0 0))",
+                              "212F11FF2");
+    // equal non-simple hole / non-simple fake hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 5,4 7,4 3,10 5,10 0,0 0))",
+                              "2FFF1FFF2");
+    // within non-simple hole / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,5 6,5 4,10 5))",
+                              "2FF11F212");
+    // containing non-simple hole / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,3 8,3 2,10 5))",
+                              "212F11FF2");
+    // equal non-simple hole / non-simple hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,4 7,4 3,10 5))",
+                              "2FFF1FFF2");
+
+    // intersecting non-simple hole / non-simple hole - touching holes
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(5 5,10 5,5 6,5 5))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(0 5,5 4,5 5,0 5))",
+                              "21211F2F2");
+    // intersecting non-simple fake hole / non-simple hole - touching holes
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,5 6,5 5,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(0 5,5 4,5 5,0 5))",
+                              "21211F2F2");
+    // intersecting non-simple fake hole / non-simple fake hole - touching holes
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 5,5 6,5 5,10 5,10 0,0 0))",
+                              "POLYGON((0 0,0 5,5 4,5 5,0 5,0 10,10 10,10 0,0 0))",
+                              "21211F2F2");
+
+    // intersecting simple - i/i
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,4 10,6 8,5 5,6 2,4 0,0 0))",
+                              "POLYGON((5 5,4 8,6 10,10 10,10 0,6 0,4 2,5 5))",
+                              "212101212");
+    // intersecting non-simple hole / non-simple hole - i/i
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,4 10,6 8,5 5,6 2,4 0,0 0),(5 5,2 6,2 4,5 5))",
+                              "POLYGON((5 5,4 8,6 10,10 10,10 0,6 0,4 2,5 5),(5 5,8 4,8 6,5 5))",
+                              "212101212");
+    // intersecting non-simple hole / simple - i/i
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,4 10,6 8,5 5,6 2,4 0,0 0),(5 5,2 6,2 4,5 5))",
+                              "POLYGON((5 5,4 8,6 10,10 10,10 0,6 0,4 2,5 5))",
+                              "212101212");
+
+    // no turns - disjoint inside a hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(1 1,9 1,9 9,1 9,1 1))",
+                              "POLYGON((3 3,3 7,7 7,7 3,3 3))",
+                              "FF2FF1212");
+    // no turns - within
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(1 1,9 1,9 9,1 9,1 1))",
+                              "POLYGON((-1 -1,-1 11,11 11,11 -1,-1 -1))",
+                              "2FF1FF212");
+    // no-turns - intersects
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,8 2,8 8,2 8,2 2))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1))",
+                              "2121F12F2");
+    // no-turns - intersects, hole in a hole
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,8 2,8 8,2 8,2 2))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1),(3 3,7 3,7 7,3 7,3 3))",
+                              "2121F1212");
+
+    // no-turns ring - for exteriors
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,8 2,8 8,2 8,2 2))",
+                              "POLYGON((1 1,1 9,9 9,9 1,1 1),(2 2,8 2,8 8,2 8,2 2))",
+                              "212F11FF2");
+    // no-turns ring - for interiors
+    test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,7 3,7 7,3 7,3 3))",
+                              "POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,8 2,8 8,2 8,2 2))",
+                              "212F11FF2");
+
+    {
+        test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                              "POLYGON((5 5,5 10,6 10,6 5,5 5))",
+                              "212F11FF2");
+
+        test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                                  "POLYGON((10 0,10 10,20 10,20 0,10 0))",
+                                  "FF2F11212");
+
+        namespace bgdr = bg::detail::relate;
+        poly p1, p2, p3;
+        bg::read_wkt("POLYGON((0 0,0 10,10 10,10 0,0 0))", p1);
+        bg::read_wkt("POLYGON((10 0,10 10,20 10,20 0,10 0))", p2);
+        bg::read_wkt("POLYGON((5 5,5 10,6 10,6 5,5 5))", p3);
+        BOOST_CHECK(bgdr::relate(p1, p2, bgdr::mask9("FT*******")
+                                      || bgdr::mask9("F**T*****")
+                                      || bgdr::mask9("F***T****"))); // touches()
+        BOOST_CHECK(bgdr::relate(p1, p3, bgdr::mask9("T*****FF*"))); // contains()
+        BOOST_CHECK(bgdr::relate(p2, p3, bgdr::mask9("FF*FF****"))); // disjoint()
+    }
+
+    // CCW
+    {
+        typedef bg::model::polygon<P, false> poly;
+        // within non-simple hole / simple
+        test_geometry<poly, poly>("POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,5 6,10 5,5 5))",
+                                  "POLYGON((0 0,10 0,10 5,5 5,0 0))",
+                                  "212F11FF2");
+    }
+    // OPEN
+    {
+        typedef bg::model::polygon<P, true, false> poly;
+        // within non-simple hole / simple
+        test_geometry<poly, poly>("POLYGON((0 0,0 10,10 10,10 0),(5 5,10 5,5 6))",
+                                  "POLYGON((0 0,5 5,10 5,10 0))",
+                                  "212F11FF2");
+    }
+    // CCW, OPEN
+    {
+        typedef bg::model::polygon<P, false, false> poly;
+        // within non-simple hole / simple
+        test_geometry<poly, poly>("POLYGON((0 0,10 0,10 10,0 10),(5 5,5 6,10 5))",
+                                  "POLYGON((0 0,10 0,10 5,5 5))",
+                                  "212F11FF2");
+    }
+}
+
+template <typename P>
+void test_polygon_multi_polygon()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::ring<P> ring;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<poly, mpoly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                               "MULTIPOLYGON(((5 5,5 10,6 10,6 5,5 5)),((0 20,0 30,10 30,10 20,0 20)))",
+                               "212F11212");
+    test_geometry<ring, mpoly>("POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                               "MULTIPOLYGON(((5 5,5 10,6 10,6 5,5 5)),((0 20,0 30,10 30,10 20,0 20)))",
+                               "212F11212");
+}
+
+template <typename P>
+void test_multi_polygon_multi_polygon()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                                "MULTIPOLYGON(((5 5,5 10,6 10,6 5,5 5)),((0 20,0 30,10 30,10 20,0 20)))",
+                                "212F11212");
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((0 20,0 30,10 30,10 20,0 20)))",
+                                "MULTIPOLYGON(((5 5,5 10,6 10,6 5,5 5)))",
+                                "212F11FF2");
+
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                                "MULTIPOLYGON(((5 5,5 6,6 6,6 5,5 5)),((0 20,0 30,10 30,10 20,0 20)))",
+                                "212FF1212");
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((0 20,0 30,10 30,10 20,0 20)))",
+                                "MULTIPOLYGON(((5 5,5 6,6 6,6 5,5 5)))",
+                                "212FF1FF2");
+}
+
+template <typename P>
+void test_all()
+{
+    test_polygon_polygon<P>();
+    test_polygon_multi_polygon<P>();
+    test_multi_polygon_multi_polygon<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/relate_linear_areal.cpp b/test/algorithms/relate_linear_areal.cpp
new file mode 100644
index 000000000..0096a01aa
--- /dev/null
+++ b/test/algorithms/relate_linear_areal.cpp
@@ -0,0 +1,336 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_relate.hpp>
+
+//TEST
+//#include <to_svg.hpp>
+
+template <typename P>
+void test_linestring_polygon()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::ring<P> ring;
+
+    // LS disjoint
+    test_geometry<ls, poly>("LINESTRING(11 0,11 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "FF1FF0212");
+    test_geometry<ls, ring>("LINESTRING(11 0,11 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "FF1FF0212");
+
+    // II BB
+    test_geometry<ls, poly>("LINESTRING(0 0,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",    "1FFF0F212");
+    test_geometry<ls, poly>("LINESTRING(5 0,5 5,10 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "1FFF0F212");
+    test_geometry<ls, poly>("LINESTRING(5 1,5 5,9 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",  "1FF0FF212");
+    
+    // IE 
+    test_geometry<ls, poly>("LINESTRING(11 1,11 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "FF1FF0212");
+    // IE IB0
+    test_geometry<ls, poly>("LINESTRING(11 1,10 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "FF1F00212");
+    // IE IB1
+    test_geometry<ls, poly>("LINESTRING(11 1,10 5,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+    test_geometry<ls, poly>("LINESTRING(11 1,10 10,0 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+    test_geometry<ls, poly>("LINESTRING(11 1,10 0,0 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+    test_geometry<ls, poly>("LINESTRING(0 -1,1 0,2 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+    // IE IB0 II
+    test_geometry<ls, poly>("LINESTRING(11 1,10 5,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "1010F0212");
+    // IE IB0 lring
+    test_geometry<ls, poly>("LINESTRING(11 1,10 5,11 5,11 1)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F01FFF212");
+    // IE IB1 lring
+    test_geometry<ls, poly>("LINESTRING(11 1,10 5,10 10,11 5,11 1)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11FFF212");
+    
+    // IB1 II
+    test_geometry<ls, poly>("LINESTRING(0 0,5 0,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "11F00F212");
+    // BI0 II IB1
+    test_geometry<ls, poly>("LINESTRING(5 0,5 5,10 5,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "11FF0F212");
+
+    // IB1 II IB1
+    test_geometry<ls, poly>("LINESTRING(1 0,2 0,3 1,4 0,5 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "11FF0F212");
+    // IB1 IE IB1
+    test_geometry<ls, poly>("LINESTRING(1 0,2 0,3 -1,4 0,5 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F0F212");
+
+    // II IB1
+    test_geometry<ls, poly>("LINESTRING(5 5,10 5,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "11F00F212");
+    // IB1 II
+    test_geometry<ls, poly>("LINESTRING(10 10,10 5,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "11F00F212");
+    // IE IB1
+    test_geometry<ls, poly>("LINESTRING(15 5,10 5,10 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+    // IB1 IE
+    test_geometry<ls, poly>("LINESTRING(10 10,10 5,15 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "F11F00212");
+
+    // duplicated points
+    {
+        // II IB0 IE
+        test_geometry<ls, poly>("LINESTRING(5 5,10 5,15 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "1010F0212");
+        test_geometry<ls, poly>("LINESTRING(5 5,5 5,5 5,10 5,10 5,10 5,15 10,15 10,15 10)",
+            "POLYGON((0 0,0 0,0 0,0 10,0 10,0 10,10 10,10 10,10 10,10 0,10 0,10 0,0 0,0 0,0 0))",
+            "1010F0212");
+        test_geometry<ls, poly>("LINESTRING(5 5,5 5,5 5,10 0,10 0,10 0,15 10,15 10,15 10)",
+            "POLYGON((0 0,0 0,0 0,0 10,0 10,0 10,10 10,10 10,10 10,10 0,10 0,10 0,0 0,0 0,0 0))",
+            "1010F0212");
+        // IE IB0 II
+        test_geometry<ls, poly>("LINESTRING(15 10,15 10,15 10,10 5,10 5,10 5,5 5,5 5,5 5)",
+            "POLYGON((0 0,0 0,0 0,0 10,0 10,0 10,10 10,10 10,10 10,10 0,10 0,10 0,0 0,0 0,0 0))",
+            "1010F0212");
+        test_geometry<ls, poly>("LINESTRING(15 10,15 10,15 10,10 0,10 0,10 0,5 5,5 5,5 5)",
+            "POLYGON((0 0,0 0,0 0,0 10,0 10,0 10,10 10,10 10,10 10,10 0,10 0,10 0,0 0,0 0,0 0))",
+            "1010F0212");
+
+        // TEST
+        //test_geometry<ls, poly>("LINESTRING(5 5,5 5,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "1010F0212");
+        test_geometry<ls, poly>("LINESTRING(5 5,5 5,5 5,15 5,15 5,15 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", "1010F0212");
+    }
+
+    // non-simple polygon with hole
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "10F0FF212");
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,10 9)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F1FF0F212");
+    test_geometry<ls, poly>("LINESTRING(2 8,10 5,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F1FF0F212");
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F1FF0F212");
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,2 8)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F1FF0F212");
+
+    // non-simple polygon with hole, linear ring
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9,1 9,1 1,9 1)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "10FFFF212");
+    test_geometry<ls, poly>("LINESTRING(10 5,10 9,11 5,10 1,10 5)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F11FFF212");
+    test_geometry<ls, poly>("LINESTRING(11 5,10 1,10 5,10 9,11 5)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5))",
+                            "F11FFF212");
+
+    // non-simple polygon with self-touching holes
+    test_geometry<ls, poly>("LINESTRING(7 1,8 5,7 9)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(8 1,9 1,9 9,8 9,8 1),(2 2,8 5,2 8,2 2))",
+                            "10F0FF212");
+    test_geometry<ls, poly>("LINESTRING(8 2,8 5,8 8)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(8 1,9 1,9 9,8 9,8 1),(2 2,8 5,2 8,2 2))",
+                            "F1FF0F212");
+    test_geometry<ls, poly>("LINESTRING(2 8,8 5,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(8 1,9 1,9 9,8 9,8 1),(2 2,8 5,2 8,2 2))",
+                            "F1FF0F212");
+
+    // non-simple polygon self-touching
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "10F0FF212");
+    test_geometry<ls, poly>("LINESTRING(10 1,10 5,10 9)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "F1FF0F212");
+    test_geometry<ls, poly>("LINESTRING(2 8,10 5,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "F1FF0F212");
+
+    // non-simple polygon self-touching, linear ring
+    test_geometry<ls, poly>("LINESTRING(9 1,10 5,9 9,1 9,1 1,9 1)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "10FFFF212");
+    test_geometry<ls, poly>("LINESTRING(10 5,10 9,11 5,10 1,10 5)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "F11FFF212");
+    test_geometry<ls, poly>("LINESTRING(11 5,10 1,10 5,10 9,11 5)",
+                            "POLYGON((0 0,0 10,10 10,10 5,2 8,2 2,10 5,10 0,0 0))",
+                            "F11FFF212");
+
+    // polygons with some ring equal to the linestring
+    test_geometry<ls, poly>("LINESTRING(0 0,10 0,10 10,0 10,0 0)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "F1FFFF2F2");
+    test_geometry<ls, poly>("LINESTRING(0 0,10 0,10 10,0 10,0 0)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,5 5,2 8,2 2))",
+                            "F1FFFF212");
+    test_geometry<ls, poly>("LINESTRING(2 2,5 5,2 8,2 2)",
+                            "POLYGON((0 0,0 10,10 10,10 0,0 0),(2 2,5 5,2 8,2 2))",
+                            "F1FFFF212");
+
+    // self-IP going on the boundary then into the exterior and to the boundary again
+    test_geometry<ls, poly>("LINESTRING(2 10,5 10,5 15,6 15,5 10,8 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "F11F0F212");
+    // self-IP going on the boundary then into the interior and to the boundary again
+    test_geometry<ls, poly>("LINESTRING(2 10,5 10,5 5,6 5,5 10,8 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))",
+                            "11FF0F212");
+
+    // self-IP with a hole -> B to I to B to E
+    test_geometry<ls, poly>("LINESTRING(0 0,3 3)", "POLYGON((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0))",
+                            "FF1F00212");
+
+    // ccw
+    {
+        typedef bg::model::polygon<P, false> ccwpoly;
+
+        // IE IB0 II
+        test_geometry<ls, ccwpoly>("LINESTRING(11 1,10 5,5 5)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1010F0212");
+        // IE IB1 II
+        test_geometry<ls, ccwpoly>("LINESTRING(11 1,10 1,10 5,5 5)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1110F0212");
+        test_geometry<ls, ccwpoly>("LINESTRING(11 1,10 5,10 1,5 5)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1110F0212");
+        // II IB0 IE
+        test_geometry<ls, ccwpoly>("LINESTRING(5 1,10 5,11 1)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1010F0212");
+        // IE IB1 II
+        test_geometry<ls, ccwpoly>("LINESTRING(5 5,10 1,10 5,11 5)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1110F0212");
+        test_geometry<ls, ccwpoly>("LINESTRING(5 5,10 5,10 1,11 5)", "POLYGON((0 0,10 0,10 10,0 10,0 0))", "1110F0212");
+
+    }
+
+    {
+        // SPIKES
+
+        test_geometry<ls, poly>("LINESTRING(0 0,2 2,3 3,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(0 0,3 3,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(0 0,2 2,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(1 1,3 3,2 2)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(1 1,2 2,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FFFF212");
+
+        test_geometry<ls, poly>("LINESTRING(3 3,1 1,0 0,2 2)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(3 3,0 0,2 2)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(2 2,0 0,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(3 3,1 1,2 2)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FF0F212");
+        test_geometry<ls, poly>("LINESTRING(2 2,1 1,2 2)", "POLYGON((0 0,3 3,3 0,0 0))", "F1FFFF212");
+
+        test_geometry<ls, poly>("LINESTRING(0 0,2 2,4 4,1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F11F0F212");
+
+        test_geometry<ls, poly>("LINESTRING(0 1,1 1,0 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F01FFF212");
+        test_geometry<ls, poly>("LINESTRING(0 1,3 3,0 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F01FFF212");
+        test_geometry<ls, poly>("LINESTRING(0 1,0 0,0 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F01FFF212");
+        
+        test_geometry<ls, poly>("LINESTRING(0 1,1 1,-1 1)", "POLYGON((0 0,3 3,3 0,0 0))", "F01FF0212");
+    }
+}
+
+template <typename P>
+void test_linestring_multi_polygon()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,10 9)",
+                            "MULTIPOLYGON(((0 20,0 30,10 30,10 20,0 20)),((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,10 9)",
+                            "MULTIPOLYGON(((0 20,0 30,10 30,10 20,0 20)),((0 0,0 10,10 10,10 0,0 0)))",
+                            "F1FF0F212");
+
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,2 2)",
+                            "MULTIPOLYGON(((0 20,0 30,10 30,10 20,0 20)),((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,2 2)",
+                            "MULTIPOLYGON(((0 20,0 30,10 30,10 20,0 20)),((0 0,0 10,10 10,10 0,0 0)))",
+                            "11F00F212");
+
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,2 2)",
+                            "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)),((10 5,3 3,3 7,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,2 8)",
+                            "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)),((10 5,3 3,3 7,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,3 3)",
+                            "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)),((10 5,3 3,3 7,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,3 7)",
+                            "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)),((10 5,3 3,3 7,10 5)))",
+                            "F1FF0F212");
+    test_geometry<ls, mpoly>("LINESTRING(10 1,10 5,5 5)",
+                            "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(10 5,2 8,2 2,10 5)),((10 5,3 3,3 7,10 5)))",
+                            "11F00F212");
+
+    test_geometry<ls, mpoly>("LINESTRING(0 0,10 0,10 10,0 10,0 0)",
+                             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((20 0,20 10,30 20,20 0)))",
+                             "F1FFFF212");
+
+    // degenerated points
+    test_geometry<ls, mpoly>("LINESTRING(5 5,10 10,10 10,10 10,15 15)",
+                             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((10 10,10 20,20 20,20 10,10 10)))",
+                             "10F0FF212");
+
+    // self-IP polygon with a hole and second polygon with a hole -> B to I to B to B to I to B to E
+    test_geometry<ls, mpoly>("LINESTRING(0 0,3 3)",
+                             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0)),((0 0,2 8,8 8,8 2,0 0),(0 0,7 3,7 7,3 7,0 0)))",
+                             "FF1F00212");
+    // self-IP polygon with a hole and second polygon -> B to I to B to B to I
+    test_geometry<ls, mpoly>("LINESTRING(0 0,3 3)",
+                             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0)),((0 0,2 8,8 8,8 2,0 0)))",
+                             "1FF00F212");
+    test_geometry<ls, mpoly>("LINESTRING(0 0,3 3)",
+                             "MULTIPOLYGON(((0 0,2 8,8 8,8 2,0 0)),((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0)))",
+                             "1FF00F212");
+}
+
+template <typename P>
+void test_multi_linestring_multi_polygon()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_linestring<ls> mls;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    // polygons with some ring equal to the linestrings
+    test_geometry<mls, mpoly>("MULTILINESTRING((0 0,10 0,10 10,0 10,0 0),(20 20,50 50,20 80,20 20))",
+                              "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                              "F11FFF2F2");
+
+    test_geometry<mls, mpoly>("MULTILINESTRING((0 0,10 0,10 10,0 10,0 0),(2 2,5 5,2 8,2 2))",
+                              "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(2 2,5 5,2 8,2 2)))",
+                              "F1FFFF2F2");
+
+
+    test_geometry<mls, mpoly>("MULTILINESTRING((0 0,10 0,10 10),(10 10,0 10,0 0))",
+                              "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                              "F1FFFF2F2");
+    test_geometry<mls, mpoly>("MULTILINESTRING((0 0,10 0,10 10),(10 10,0 10,0 0),(20 20,50 50,20 80,20 20))",
+                              "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                              "F11FFF2F2");
+
+    // disjoint
+    test_geometry<mls, mpoly>("MULTILINESTRING((20 20,30 30),(30 30,40 40))",
+                              "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
+                              "FF1FF0212");
+
+    test_geometry<mls, mpoly>("MULTILINESTRING((5 5,0 5),(5 5,5 0),(10 10,10 5,5 5,5 10,10 10))",
+                              "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)),((5 5,10 1,10 0,5 5)))",
+                              "F1FF0F212");
+    test_geometry<mls, mpoly>("MULTILINESTRING((5 5,0 5),(5 5,5 0),(0 5,0 0,5 0),(10 10,10 5,5 5,5 10,10 10))",
+                              "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)),((5 5,10 1,10 0,5 5)))",
+                              "F1FFFF212");
+    test_geometry<mls, mpoly>("MULTILINESTRING((5 5,0 0),(5 5,5 0),(10 10,10 5,5 5,5 10,10 10))",
+                              "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)),((5 5,10 1,10 0,5 5)))",
+                              "11FF0F212");
+}
+
+template <typename P>
+void test_all()
+{
+    test_linestring_polygon<P>();
+    test_linestring_multi_polygon<P>();
+    test_multi_linestring_multi_polygon<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/relate_linear_linear.cpp b/test/algorithms/relate_linear_linear.cpp
new file mode 100644
index 000000000..f847db6fd
--- /dev/null
+++ b/test/algorithms/relate_linear_linear.cpp
@@ -0,0 +1,364 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_relate.hpp>
+
+//TEST
+//#include <to_svg.hpp>
+
+template <typename P>
+void test_linestring_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+
+    test_geometry<ls, ls>("LINESTRING(0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(0 0,3 2)", "LINESTRING(0 0, 2 2, 3 2)", "FF1F0F1F2");
+    test_geometry<ls, ls>("LINESTRING(1 0,2 2,2 3)", "LINESTRING(0 0, 2 2, 3 2)", "0F1FF0102");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(0 0,1 1,2 0,2 -1)", "0F1F00102");
+    
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 3 2)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(3 2, 2 2, 0 0)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(3 2, 2 2, 0 0)", "1FFF0FFF2");
+
+    test_geometry<ls, ls>("LINESTRING(3 1, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 3 2)", "1F1F00102");
+    test_geometry<ls, ls>("LINESTRING(3 3, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 3 2)", "1F1F00102");
+
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 2 3)", "LINESTRING(0 0, 2 2, 2 3)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(2 3, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 2 3)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 2 3)", "LINESTRING(2 3, 2 2, 0 0)", "1FFF0FFF2");
+    test_geometry<ls, ls>("LINESTRING(2 3, 2 2, 1 1, 0 0)", "LINESTRING(2 3, 2 2, 0 0)", "1FFF0FFF2");
+
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", "1FF0FF102");
+
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(0 0, 2 2, 4 2)", "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(4 2, 2 2, 0 0)", "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(4 2, 2 2, 0 0)", "1FF0FF102");
+
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 1, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(0 1, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 0, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1)", "LINESTRING(0 0, 2 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0, 2 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(0 0, 1 1)", "LINESTRING(0 0)", false);
+
+//    test_geometry<ls, ls>("LINESTRING(0 0,5 0,3 0,6 0)", "LINESTRING(0 0,6 0)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,3 3,6 3)", true);
+
+    // SPIKES!
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1,5 3)", "LINESTRING(0 0,3 3,6 3)", "1F100F102");
+    test_geometry<ls, ls>("LINESTRING(5 3,1 1,3 3,2 2,0 0)", "LINESTRING(0 0,3 3,6 3)", "1F100F102");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1,5 3)", "LINESTRING(6 3,3 3,0 0)", "1F100F102");
+    test_geometry<ls, ls>("LINESTRING(5 3,1 1,3 3,2 2,0 0)", "LINESTRING(6 3,3 3,0 0)", "1F100F102");
+
+    test_geometry<ls, ls>("LINESTRING(6 3,3 3,0 0)", "LINESTRING(0 0,2 2,3 3,1 1,5 3)", "101F001F2");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(1 0,9 0,2 0)", "101FF0FF2");
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,3 3,6 3)", "1FF00F102");
+    // TODO: REWRITE MATRICES
+    // BEGIN
+    /*test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,4 4,6 3)", "1FF00F102");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 0,1 0)", "LINESTRING(0 1,0 0,2 0)", "1FF00F102");
+    test_geometry<ls, ls>("LINESTRING(2 0,0 0,1 0)", "LINESTRING(0 1,0 0,2 0)", "1FF00F102");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(3 0,3 3,3 1)", "0F1FF0102");
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(2 0,2 3,2 1)", "0F1FF0102");
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,1 1)", "LINESTRING(2 0,2 2,2 1)", "0F1FF0102");
+ 
+     test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,4 4)", "LINESTRING(0 0,1 1,4 4)", "1FFF0FFF2");*/
+    // END
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,4 4)", "LINESTRING(0 0,1 1,4 4)", "1FFF0FFF2");
+
+    // loop i/i i/i u/u u/u
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)",
+                          "LINESTRING(1 1,1 0,6 0,6 1,4 1,4 0,9 0,9 1)", "1F1FF0102");
+
+    // self-intersecting and self-touching equal
+    test_geometry<ls, ls>("LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,5 0)",
+                          "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", "1FFF0FFF2");
+    // self-intersecting loop and self-touching equal
+    test_geometry<ls, ls>("LINESTRING(0 5,5 5,10 5,10 10,5 10,5 5,10 5,10 10,5 10,5 5,5 0)",
+                          "LINESTRING(0 5,5 5,5 10,10 10,10 5,5 5,5 0)", "1FFF0FFF2");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,1 1)", "LINESTRING(0 1,1 0)", "0F1FF0102");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 1)", "LINESTRING(1 1,2 0)", "FF1F00102");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 1)", "LINESTRING(2 0,1 1)", "FF1F00102");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 1,3 5,4 0)", "LINESTRING(1 0,2 1,3 5)", "101FF0FF2");
+    test_geometry<ls, ls>("LINESTRING(0 0,1 0,2 1,3 5,4 0)", "LINESTRING(3 5,2 1,1 0)", "101FF0FF2");
+    test_geometry<ls, ls>("LINESTRING(1 0,2 1,3 5)", "LINESTRING(4 0,3 5,2 1,1 0,0 0)", "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(3 5,2 1,1 0)", "LINESTRING(4 0,3 5,2 1,1 0,0 0)", "1FF0FF102");
+    
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(-1 -1,1 0,10 0,20 -1)", "1F10F0102");
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(20 -1,10 0,1 0,-1 -1)", "1F10F0102");
+
+    test_geometry<ls, ls>("LINESTRING(-1 1,0 0,1 0,5 0,5 5,10 5,15 0,31 0)",
+                          "LINESTRING(-1 -1,0 0,1 0,2 0,3 1,4 0,30 0)",
+                          "101FF0102");
+    test_geometry<ls, ls>("LINESTRING(-1 1,0 0,1 0,5 0,5 5,10 5,15 0,31 0)",
+                          "LINESTRING(30 0,4 0,3 1,2 0,1 0,0 0,-1 -1)",
+                          "101FF0102");
+    test_geometry<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,5 0,1 0,0 0,-1 1)",
+                          "LINESTRING(-1 -1,0 0,1 0,2 0,3 1,4 0,30 0)",
+                          "101FF0102");
+    test_geometry<ls, ls>("LINESTRING(31 0,15 0,10 5,5 5,5 0,1 0,0 0,-1 1)",
+                          "LINESTRING(30 0,4 0,3 1,2 0,1 0,0 0,-1 -1)",
+                          "101FF0102");
+
+    // self-IP
+    test_geometry<ls, ls>("LINESTRING(1 0,9 0)",
+                          "LINESTRING(0 0,10 0,10 10,5 0,0 10)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,5 0,9 0)",
+                          "LINESTRING(0 0,10 0,10 10,5 0,0 10)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,9 0)",
+                          "LINESTRING(0 0,10 0,10 10,5 10,5 -1)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,9 0)",
+                          "LINESTRING(0 0,10 0,5 0,5 5)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,7 0)", "LINESTRING(0 0,10 0,10 10,4 -1)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,5 0,7 0)", "LINESTRING(0 0,10 0,10 10,4 -1)",
+                          "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,7 0,8 1)", "LINESTRING(0 0,10 0,10 10,4 -1)",
+                          "1F10F0102");
+    test_geometry<ls, ls>("LINESTRING(1 0,5 0,7 0,8 1)", "LINESTRING(0 0,10 0,10 10,4 -1)",
+                          "1F10F0102");
+
+    // self-IP going out and in on the same point
+    test_geometry<ls, ls>("LINESTRING(2 0,5 0,5 5,6 5,5 0,8 0)", "LINESTRING(1 0,9 0)",
+                          "1F10FF102");
+
+    // duplicated points
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", "1FF0FF102");
+    test_geometry<ls, ls>("LINESTRING(1 1, 1 1, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", "1FF0FF102");
+
+    // linear ring
+    test_geometry<ls, ls>("LINESTRING(0 0,10 0)", "LINESTRING(5 0,9 0,5 5,1 0,5 0)", "1F1FF01F2");
+    test_geometry<ls, ls>("LINESTRING(0 0,5 0,10 0)", "LINESTRING(5 0,9 0,5 5,1 0,5 0)", "1F1FF01F2");
+    test_geometry<ls, ls>("LINESTRING(0 0,5 0,10 0)", "LINESTRING(5 0,10 0,5 5,1 0,5 0)", "1F10F01F2");
+
+    test_geometry<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(5 0,10 0,5 5,0 0,5 0)", "1FF0FF1F2");
+    test_geometry<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(5 0,10 0,5 5,5 0)", "FF10F01F2");
+
+    test_geometry<ls, ls>("LINESTRING(1 0,1 6)", "LINESTRING(0 0,5 0,5 5,0 5)", "0F10F0102");
+
+    // point-size Linestring
+    test_geometry<ls, ls>("LINESTRING(1 0,1 0)", "LINESTRING(0 0,5 0)", "0FFFFF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,1 0)", "LINESTRING(1 0,5 0)", "F0FFFF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,1 0)", "LINESTRING(0 0,1 0)", "F0FFFF102");
+    test_geometry<ls, ls>("LINESTRING(1 0,1 0)", "LINESTRING(1 0,1 0)", "0FFFFFFF2");
+    test_geometry<ls, ls>("LINESTRING(1 0,1 0)", "LINESTRING(0 0,0 0)", "FF0FFF0F2");
+
+    //to_svg<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(5 0,10 0,5 5,5 0)", "test_relate_00.svg");
+
+    // INVALID LINESTRINGS
+    // 1-point LS (a Point) NOT disjoint
+    //test_geometry<ls, ls>("LINESTRING(1 0)", "LINESTRING(0 0,5 0)", "0FFFFF102");
+    //test_geometry<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(1 0)", "0F1FF0FF2");
+    //test_geometry<ls, ls>("LINESTRING(0 0,5 0)", "LINESTRING(1 0,1 0,1 0)", "0F1FF0FF2");
+    // Point/Point
+    //test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0)", "0FFFFFFF2");
+
+    // OTHER MASKS
+    {
+        namespace bgdr = bg::detail::relate;
+        ls ls1, ls2, ls3, ls4;
+        bg::read_wkt("LINESTRING(0 0,2 0)", ls1);
+        bg::read_wkt("LINESTRING(2 0,4 0)", ls2);
+        bg::read_wkt("LINESTRING(1 0,1 1)", ls3);
+        bg::read_wkt("LINESTRING(1 0,4 0)", ls4);
+        BOOST_CHECK(bgdr::relate(ls1, ls2, bgdr::mask9("FT*******")
+                                        || bgdr::mask9("F**T*****")
+                                        || bgdr::mask9("F***T****")));
+        BOOST_CHECK(bgdr::relate(ls1, ls3, bgdr::mask9("FT*******")
+                                        || bgdr::mask9("F**T*****")
+                                        || bgdr::mask9("F***T****")));
+        BOOST_CHECK(bgdr::relate(ls3, ls1, bgdr::mask9("FT*******")
+                                        || bgdr::mask9("F**T*****")
+                                        || bgdr::mask9("F***T****")));
+        BOOST_CHECK(bgdr::relate(ls2, ls4, bgdr::mask9("T*F**F***"))); // within
+    }
+}
+
+template <typename P>
+void test_linestring_multi_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    // LS disjoint
+    test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1,2 1))", "101FF0102");
+    // linear ring disjoint
+    test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1,2 1,2 2,1 1))", "101FF01F2");
+    // 2xLS forming non-simple linear ring disjoint
+    test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1,2 1,2 2),(1 1,2 2))", "101FF01F2");
+
+    test_geometry<ls, mls>("LINESTRING(0 0,10 0)",
+                           "MULTILINESTRING((1 0,9 0),(9 0,2 0))",
+                           "101FF0FF2");
+
+    // rings
+    test_geometry<ls, mls>("LINESTRING(0 0,5 0,5 5,0 5,0 0)",
+                           "MULTILINESTRING((5 5,0 5,0 0),(0 0,5 0,5 5))",
+                           "1FFFFFFF2");
+    test_geometry<ls, mls>("LINESTRING(0 0,5 0,5 5,0 5,0 0)",
+                           "MULTILINESTRING((5 5,5 0,0 0),(0 0,0 5,5 5))",
+                           "1FFFFFFF2");
+    // overlapping rings
+    test_geometry<ls, mls>("LINESTRING(0 0,5 0,5 5,0 5,0 0)",
+                           "MULTILINESTRING((5 5,0 5,0 0),(0 0,5 0,5 5,0 5))",
+                           "10FFFFFF2");
+    test_geometry<ls, mls>("LINESTRING(0 0,5 0,5 5,0 5,0 0)",
+                           "MULTILINESTRING((5 5,5 0,0 0),(0 0,0 5,5 5,5 0))",
+                           "10FFFFFF2");
+
+    // INVALID LINESTRINGS
+    // 1-point LS (a Point) disjoint
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1))", "101FF00F2");
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1,1 1))", "101FF00F2");
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,2 0),(1 1,1 1,1 1))", "101FF00F2");
+    // 1-point LS (a Point) NOT disjoint
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,9 0),(2 0))", "101FF0FF2");
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,9 0),(2 0,2 0))", "101FF0FF2");
+    //test_geometry<ls, mls>("LINESTRING(0 0,10 0)", "MULTILINESTRING((1 0,9 0),(2 0,2 0,2 0))", "101FF0FF2");
+
+    // point-like
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 1 0),(2 0, 2 0))",    // |------|  *
+                           "101F00FF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 1 0),(1 0, 1 0))",    // |------*
+                           "101F00FF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((5 0, 1 0),(1 0, 1 0))",    //        *-------|
+                           "101F00FF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 1 0),(5 0, 5 0))",    // |------|       *
+                           "10100FFF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 1 0),(0 0, 0 0))",    // *------|
+                           "101000FF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((4 0, 5 0),(5 0, 5 0))",    //         |------*
+                           "101000FF2");
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((1 0, 2 0),(0 0, 0 0))",    // *  |------|
+                           "1010F0FF2");
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((2 0, 2 0),(2 0, 2 2))",    //            *
+                           "001FF0102");                                //            |
+
+    // for consistency
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(0 0, 2 0))",    // |--------------|
+                           "10F00FFF2");                                // |------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(3 0, 5 0))",    // |--------------|
+                           "10F00FFF2");                                //         |------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      // |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(0 0, 6 0))",    // |--------------|
+                           "1FF00F102");                                // |----------------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(-1 0, 5 0))",   //   |--------------|
+                           "1FF00F102");                                // |----------------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(-1 0, 6 0))",   //   |--------------|
+                           "1FF00F102");                                // |------------------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(-1 0, 2 0))",   //   |--------------|
+                           "10F00F102");                                // |-------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(2 0, 6 0))",    //   |--------------|
+                           "10F00F102");                                //            |-------|
+
+    test_geometry<ls, mls>("LINESTRING(0 0, 5 0)",                      //   |--------------|
+                           "MULTILINESTRING((0 0, 5 0),(2 0, 2 2))",    //   |--------------|
+                           "10FF0F102");                                //            |
+                                                                        //            |
+}
+
+template <typename P>
+void test_multi_linestring_multi_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0))",
+                            "MULTILINESTRING((0 10,5 0,20 0,20 0,30 0))",
+                            "1F1F00102");
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0))",
+                            //"MULTILINESTRING((0 10,5 0,20 0,20 0,30 0),(1 10,1 10,1 0,1 0,1 -10),(2 0,2 0),(3 0,3 0,3 0),(0 0,0 0,0 10,0 10),(30 0,30 0,31 0,31 0))",
+                            "MULTILINESTRING((0 10,5 0,20 0,20 0,30 0),(1 10,1 10,1 0,1 0,1 -10),(0 0,0 0,0 10,0 10),(30 0,30 0,31 0,31 0))",
+                            "1F100F102");
+    test_geometry<mls, mls>("MULTILINESTRING((0 0,0 0,18 0,18 0,19 0,19 0,19 0,30 0,30 0))",
+                            "MULTILINESTRING((0 10,5 0,20 0,20 0,30 0),(0 0,0 0,0 10,0 10))",
+                            "1F1F0F1F2");
+
+    // point-like
+    test_geometry<mls, mls>("MULTILINESTRING((0 0, 0 0),(1 1, 1 1))",
+                            "MULTILINESTRING((0 0, 0 0))",
+                            "0F0FFFFF2");
+    test_geometry<mls, mls>("MULTILINESTRING((0 0, 0 0),(1 1, 1 1))",
+                            "MULTILINESTRING((0 0, 0 0),(1 1, 1 1))",
+                            "0FFFFFFF2");
+    test_geometry<mls, mls>("MULTILINESTRING((0 0, 0 0),(1 1, 1 1))",
+                            "MULTILINESTRING((2 2, 2 2),(3 3, 3 3))",
+                            "FF0FFF0F2");
+
+    test_geometry<mls, mls>("MULTILINESTRING((0 5,10 5,10 10,5 10),(5 10,5 0,5 2),(5 2,5 5,0 5))",
+                            "MULTILINESTRING((5 5,0 5),(5 5,5 0),(10 10,10 5,5 5,5 10,10 10))",
+                            "10FFFFFF2");
+}
+
+template <typename P>
+void test_all()
+{
+    test_linestring_linestring<P>();
+    test_linestring_multi_linestring<P>();
+    test_multi_linestring_multi_linestring<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/relate_pointlike_xxx.cpp b/test/algorithms/relate_pointlike_xxx.cpp
new file mode 100644
index 000000000..02d1fd84e
--- /dev/null
+++ b/test/algorithms/relate_pointlike_xxx.cpp
@@ -0,0 +1,103 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_relate.hpp>
+
+//TEST
+//#include <to_svg.hpp>
+
+template <typename P>
+void test_point_point()
+{
+    test_geometry<P, P>("POINT(0 0)", "POINT(0 0)", "0FFFFFFF2");
+    test_geometry<P, P>("POINT(1 0)", "POINT(0 0)", "FF0FFF0F2");
+}
+
+template <typename P>
+void test_point_multipoint()
+{
+    typedef bg::model::multi_point<P> mpt;
+
+    test_geometry<P, mpt>("POINT(0 0)", "MULTIPOINT(0 0)", "0FFFFFFF2");
+    test_geometry<P, mpt>("POINT(1 0)", "MULTIPOINT(0 0)", "FF0FFF0F2");
+    test_geometry<P, mpt>("POINT(0 0)", "MULTIPOINT(0 0, 1 0)", "0FFFFF0F2");
+}
+
+template <typename P>
+void test_multipoint_multipoint()
+{
+    typedef bg::model::multi_point<P> mpt;
+
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0)", "MULTIPOINT(0 0)", "0FFFFFFF2");
+    test_geometry<mpt, mpt>("MULTIPOINT(1 0)", "MULTIPOINT(0 0)", "FF0FFF0F2");
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0)", "MULTIPOINT(0 0, 1 0)", "0FFFFF0F2");
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0, 1 0)", "MULTIPOINT(0 0)", "0F0FFFFF2");
+    test_geometry<mpt, mpt>("MULTIPOINT(0 0, 1 1)", "MULTIPOINT(0 0, 1 0)", "0F0FFF0F2");
+
+    //typedef bg::model::d2::point_xy<float> ptf;
+    //typedef bg::model::multi_point<ptf> mptf;
+    //test_geometry<mptf, mpt>("MULTIPOINT(0 0)", "MULTIPOINT(0 0)", "0FFFFFFF2");
+}
+
+template <typename P>
+void test_point_linestring()
+{
+    typedef bg::model::linestring<P> ls;
+    
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0, 2 2, 3 2)", "F0FFFF102");
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0, 2 2, 3 2)", "0FFFFF102");
+    test_geometry<P, ls>("POINT(3 2)", "LINESTRING(0 0, 2 2, 3 2)", "F0FFFF102");
+    test_geometry<P, ls>("POINT(1 0)", "LINESTRING(0 0, 2 2, 3 2)", "FF0FFF102");
+
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0, 2 2, 3 2, 0 0)", "0FFFFF1F2");
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0, 2 2, 3 2, 0 0)", "0FFFFF1F2");
+    test_geometry<P, ls>("POINT(3 2)", "LINESTRING(0 0, 2 2, 3 2, 0 0)", "0FFFFF1F2");
+    test_geometry<P, ls>("POINT(1 0)", "LINESTRING(0 0, 2 2, 3 2, 0 0)", "FF0FFF1F2");
+}
+
+template <typename P>
+void test_point_multilinestring()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0, 2 0, 2 2),(0 0, 0 2))", "0FFFFF102");
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0, 2 0, 2 2),(0 0, 0 2, 2 2))", "0FFFFF1F2");
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0, 2 0, 2 2),(0 0, 0 2, 2 2),(0 0, 1 1))", "F0FFFF102");
+
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,5 0),(0 0,0 5,5 0),(0 0,-5 0),(0 0,0 -5,-5 0))", "0FFFFF1F2");
+    test_geometry<P, mls>("POINT(5 0)", "MULTILINESTRING((0 0,5 0),(0 0,0 5,5 0),(0 0,-5 0),(0 0,0 -5,-5 0))", "0FFFFF1F2");
+    test_geometry<P, mls>("POINT(1 0)", "MULTILINESTRING((0 0,5 0),(0 0,0 5,5 0),(0 0,-5 0),(0 0,0 -5,-5 0))", "0FFFFF1F2");
+}
+
+template <typename P>
+void test_all()
+{
+    test_point_point<P>();
+    test_point_multipoint<P>();
+    test_multipoint_multipoint<P>();
+    test_point_linestring<P>();
+    test_point_multilinestring<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/remove_spikes.cpp b/test/algorithms/remove_spikes.cpp
new file mode 100644
index 000000000..f4c0a21dc
--- /dev/null
+++ b/test/algorithms/remove_spikes.cpp
@@ -0,0 +1,193 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2013 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2013 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2013 Mateusz Loskot, London, UK.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// 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 <iostream>
+#include <iomanip>
+#include <string>
+
+// Instead of having a separate (and nearly similar) unit test to test multipolygons,
+// we now include them here and compile them by default. Only undefining the next line
+// will avoid testing multi-geometries
+#define BOOST_GEOMETRY_UNIT_TEST_MULTI
+
+#include <boost/variant/variant.hpp>
+
+#include <geometry_test_common.hpp>
+
+// The include to test
+#include <boost/geometry/algorithms/remove_spikes.hpp>
+
+// Helper includes
+#include <boost/geometry/algorithms/area.hpp>
+#include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/algorithms/perimeter.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+
+#if defined(BOOST_GEOMETRY_UNIT_TEST_MULTI)
+
+#  include <boost/geometry/multi/algorithms/remove_spikes.hpp>
+
+#  include <boost/geometry/multi/algorithms/area.hpp>
+#  include <boost/geometry/multi/algorithms/correct.hpp>
+#  include <boost/geometry/multi/algorithms/perimeter.hpp>
+#  include <boost/geometry/multi/geometries/multi_polygon.hpp>
+#  include <boost/geometry/multi/io/wkt/wkt.hpp>
+#endif
+
+
+#if defined(TEST_WITH_SVG)
+#  include <boost/geometry/io/svg/svg_mapper.hpp>
+#endif
+
+
+template <typename Geometry>
+inline void test_remove_spikes(std::string const& id,
+            Geometry& geometry,
+            double expected_area, double expected_perimeter)
+{
+    bg::remove_spikes(geometry);
+
+    double detected_area = bg::area(geometry);
+    double detected_perimeter = bg::perimeter(geometry);
+
+    BOOST_CHECK_CLOSE(detected_area, expected_area, 0.01);
+    BOOST_CHECK_CLOSE(detected_perimeter, expected_perimeter, 0.01);
+}
+
+template <typename Geometry>
+void test_geometry(std::string const& id, std::string const& wkt,
+            double expected_area, double expected_perimeter)
+{
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    bg::correct(geometry);
+    boost::variant<Geometry> v(geometry);
+
+#if defined(TEST_WITH_SVG)
+    std::ostringstream filename;
+    filename << "remove_spikes_" << id;
+    if (! bg::closure<Geometry>::value)
+    {
+        filename << "_open";
+    }
+    filename << ".svg";
+    std::ofstream svg(filename.str().c_str());
+
+    bg::svg_mapper<typename bg::point_type<Geometry>::type> mapper(svg, 500, 500);
+    mapper.add(geometry);
+    mapper.map(geometry, "fill-opacity:0.3;opacity:0.6;fill:rgb(51,51,153);stroke:rgb(0,0,255);stroke-width:2");
+#endif
+
+    test_remove_spikes(id, geometry, expected_area, expected_perimeter);
+    test_remove_spikes(id, v, expected_area, expected_perimeter);
+
+#if defined(TEST_WITH_SVG)
+    mapper.map(geometry, "opacity:0.6;fill:none;stroke:rgb(255,0,0);stroke-width:3");
+#endif
+}
+
+template <typename P, bool Clockwise, bool Closed>
+void test_polygons()
+{
+    typedef bg::model::ring<P, Clockwise, Closed> ring;
+    typedef bg::model::polygon<P, Clockwise, Closed> polygon;
+
+    test_geometry<ring>("box",
+            "POLYGON((0 0,0 4,4 4,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("box",
+            "POLYGON((0 0,0 4,4 4,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("box2",
+            "POLYGON((0 0,0 2,0 4,2 4,4 4,4 2,4 0,2 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_right",
+            "POLYGON((0 0,0 4,4 4,4 2,6 2,4 2,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_at_corner",
+            "POLYGON((0 0,0 4,6 4,4 4,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_at_first",
+            "POLYGON((0 0,-1 3,0 0,0 4,4 4,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_at_last",
+            "POLYGON((0 0,0 4,4 4,4 0,6 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_at_closing",
+            "POLYGON((-1 0,0 0,0 4,4 4,4 0,0 0,-1 0))",
+            16, 16);
+    test_geometry<polygon>("double_spike",
+            "POLYGON((0 0,0 4,4 4,4 2,6 2,5 2,4 2,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("three_double_spike",
+            "POLYGON((0 0,0 4,4 4,4 2,6 2,5 2,4.5 2,4 2,4 0,0 0))",
+            16, 16);
+    test_geometry<polygon>("spike_with_corner",
+            "POLYGON((0 0,0 4,4 4,4 2,6 2,6 4,6 2,4 2,4 0,0 0))",
+            16, 16);
+
+    test_geometry<polygon>("triangle0",
+            "POLYGON((0 0,0 4,2 0,4 0,0 0))",
+            4, 6 + sqrt(20.0));
+    test_geometry<polygon>("triangle1",
+            "POLYGON((0 4,2 0,4 0,0 0,0 4))",
+            4, 6 + sqrt(20.0));
+    test_geometry<polygon>("triangle2",
+            "POLYGON((2 0,4 0,0 0,0 4,2 0))",
+            4, 6 + sqrt(20.0));
+    test_geometry<polygon>("triangle3",
+            "POLYGON((4 0,0 0,0 4,2 0,4 0))",
+            4, 6 + sqrt(20.0));
+
+    test_geometry<polygon>("only_spike1",
+            "POLYGON((0 0,2 2,0 0))",
+            0, 0);
+    test_geometry<polygon>("only_spike2",
+            "POLYGON((0 0,2 2,4 4,2 2,0 0))",
+            0, 0);
+    test_geometry<polygon>("only_spike3",
+            "POLYGON((0 0,2 2,4 4,0 0))",
+            0, 0);
+    test_geometry<polygon>("only_spike4",
+            "POLYGON((0 0,4 4,2 2,0 0))",
+            0, 0);
+}
+
+
+template <typename P, bool Clockwise, bool Closed>
+void test_multi_polygons()
+{
+    typedef bg::model::polygon<P, Clockwise, Closed> polygon;
+    typedef bg::model::multi_polygon<polygon> multi_polygon;
+
+    test_geometry<multi_polygon>("multi_spike_with_corner",
+            "MULTIPOLYGON(((0 0,0 4,4 4,4 2,6 2,6 4,6 2,4 2,4 0,0 0)))",
+            16, 16);
+}
+
+template <typename P, bool Clockwise, bool Closed>
+void test_all()
+{
+    test_polygons<P, Clockwise, Closed>();
+    test_multi_polygons<P, Clockwise, Closed>();
+}
+
+int test_main(int, char* [])
+{
+    test_all<bg::model::d2::point_xy<double>, true, true>();
+    test_all<bg::model::d2::point_xy<double>, true, false>();
+    return 0;
+}
+
diff --git a/test/algorithms/set_ops_ll.cpp b/test/algorithms/set_ops_ll.cpp
new file mode 100644
index 000000000..c3311a054
--- /dev/null
+++ b/test/algorithms/set_ops_ll.cpp
@@ -0,0 +1,17 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_set_ops_linear_linear
+#endif
+
+#include "intersection_linear_linear.cpp"
+#include "union_linear_linear.cpp"
+#include "difference_linear_linear.cpp"
+#include "sym_difference_linear_linear.cpp"
diff --git a/test/algorithms/set_ops_pp.cpp b/test/algorithms/set_ops_pp.cpp
new file mode 100644
index 000000000..725737e1b
--- /dev/null
+++ b/test/algorithms/set_ops_pp.cpp
@@ -0,0 +1,16 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_set_ops_pointlike_pointlike
+#endif
+
+#include "intersection_pl_pl.cpp"
+#include "union_pl_pl.cpp"
+#include "difference_pl_pl.cpp"
diff --git a/test/algorithms/simplify.cpp b/test/algorithms/simplify.cpp
index 66c8599c4..919e84c69 100644
--- a/test/algorithms/simplify.cpp
+++ b/test/algorithms/simplify.cpp
@@ -38,6 +38,21 @@ void test_all()
         "LINESTRING(0 0,5 5,7 5,10 10)",
         "LINESTRING(0 0,5 5,7 5,10 10)", 1.0);
 
+    // Mail 2013-10-07, real-life test, piece of River Leine
+    // PostGIS returns exactly the same result
+    test_geometry<bg::model::linestring<P> >(
+         "LINESTRING(4293586 3290439,4293568 3290340,4293566 3290332,4293570 3290244,4293576 3290192"
+                   ",4293785 3289660,4293832 3289597,4293879 3289564,4293937 3289545,4294130 3289558"
+                   ",4294204 3289553,4294240 3289539,4294301 3289479,4294317 3289420,4294311 3289353"
+                   ",4294276 3289302,4293870 3289045,4293795 3288978,4293713 3288879,4293669 3288767"
+                   ",4293654 3288652,4293657 3288563,4293690 3288452,4293761 3288360,4293914 3288215"
+                   ",4293953 3288142,4293960 3288044,4293951 3287961,4293913 3287875,4293708 3287628"
+                   ",4293658 3287542,4293633 3287459,4293630 3287383,4293651 3287323,4293697 3287271"
+                   ",4293880 3287128,4293930 3287045,4293938 3286977,4293931 3286901,4293785 3286525"
+                   ",4293775 3286426,4293786 3286358,4293821 3286294,4294072 3286076,4294134 3285986)",
+          "LINESTRING(4293586 3290439,4293785 3289660,4294317 3289420,4293654 3288652,4293960 3288044"
+                  ",4293633 3287459,4293786 3286358,4294134 3285986)", 250);
+
     /* TODO fix this
     test_geometry<test::wrapped_boost_array<P, 10> >(
         "LINESTRING(0 0,5 5,7 5,10 10)",
@@ -62,9 +77,7 @@ Above can be checked in PostGIS by:
 
 select astext(ST_Simplify(geomfromtext('LINESTRING(0 0, 5 5, 10 10)'),1.0)) as simplified
 union all select astext(ST_Simplify(geomfromtext('LINESTRING(0 0, 5 5, 6 5, 10 10)'),1.0))
-union all select astext(ST_Simplify(geomfromtext('LINESTRING(0 0, 5 5, 7 5, 10 10)'),1.0))
-union all select astext(ST_Simplify(geomfromtext('POLYGON((4 0, 8 2, 8 7, 4 9, 0 7, 0 2, 2 1, 4 0))'),1.0))
-union all select astext(ST_Simplify(geomfromtext('POLYGON((4 0, 8 2, 8 7, 4 9, 0 7, 0 2, 2 1, 4 0),(7 3, 7 6, 1 6, 1 3, 4 3, 7 3))'),1.0))
+etc
 */
 
     // Just check compilation
diff --git a/test/algorithms/sym_difference_linear_linear.cpp b/test/algorithms/sym_difference_linear_linear.cpp
new file mode 100644
index 000000000..ec58da2f9
--- /dev/null
+++ b/test/algorithms/sym_difference_linear_linear.cpp
@@ -0,0 +1,944 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_sym_difference_linear_linear
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_sym_difference_linear_linear.hpp"
+
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/algorithms/sym_difference.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / LINESTRING SYMMETRIC DIFFERENCE ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_sym_difference_of_geometries<L, L, ML> tester;
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 1,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0 2,1 1,2 1,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1),(2 1,3 2),\
+                      (0 2,1 1),(2 1,3 0))"),
+         "llsdf00");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,3 0),(4 0,5 0))"),
+         "llsdf01");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,3 0),(4 0,6 0))"),
+         "llsdf01-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((4 0,6 0))"),
+         "llsdf01-2");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0),(5 0,20 0),\
+                      (0 0,1 1,2 0,3 1,4 0),(5 0,6 1,7 -1,8 0))"),
+         "llsdf01-3");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-20 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((-20 0,4 0),(5 0,20 0),\
+                      (0 0,1 1,2 0,3 1,4 0),(5 0,6 1,7 -1,8 0))"),
+         "llsdf01-4");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0))"),
+         "llsdf01-5");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,5 0))"),
+         "llsdf01-6");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(2 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(2 0,5 0))"),
+         "llsdf01-7");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,3 0),(4 0,5 0))"),
+         "llsdf01-8");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,3 0),(4 0,5 0))"),
+         "llsdf01-9");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,6 0))"),
+         "llsdf01-10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0)"),
+         from_wkt<L>("LINESTRING(-1 6,0 5,15 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,5 5),(10 5,15 0),\
+                      (-1 6,0 5,5 5),(10 5,15 5))"),
+         "llsdf02");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         "llsdf03");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 5,10 5,15 0),\
+                      (-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         "llsdf04");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,25 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (20 0,25 1),(-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         "llsdf05");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (-1 0,0 0),(1 0,15 0))"),
+         "llsdf05-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0),(-1 0,0 0),(1 0,15 0))"),
+         "llsdf06");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,25 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0),(-1 0,0 0),(1 0,15 0))"),
+         "llsdf07");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 0),(-1 0,0 0),(1 0,15 0))"),
+         "llsdf08");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 1),(-1 0,0 0),(1 0,15 0))"),
+         "llsdf09");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(1 0,5 5,10 5,15 0),\
+                      (30 0,31 1),(-1 -1,0 0),(1 0,2 1,3 0,15 0))"),
+         "llsdf10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,\
+                                 30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(2 0,3 0),\
+                      (4 0,5 5,10 5,15 0),(30 0,31 1),(-1 -1,0 0),\
+                      (2 0,2.5 1,3 0),(4 0,15 0))"),
+         "llsdf11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(2 0,3 0),\
+                      (4 0,5 5,10 5,15 0),(30 0,31 0),(-1 -1,0 0),\
+                      (2 0,2.5 1,3 0),(4 0,15 0))"),
+         "llsdf11-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "llsdf12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(3 1,2 0,0 0)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "llsdf12-1");
+
+   tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5,4 0,5 10)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(4 0,5 10))"),
+         "llsdf13");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,2.5 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING()"),
+         "llsdf14");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(3 5,4 0))"),
+         "llsdf15");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0.5 0,1 0,3 2,4 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0.5 0),(3 2,4 5))"),
+         "llsdf16");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(4 5,3 2,1 0,0.5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,0.5 0),(4 5,3 2))"),
+         "llsdf16-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,30 1)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(25 1,30 1),\
+                      (1 1,2 0,3 1,20 1))"),
+         "llsdf17");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,21 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1,21 0,30 0),\
+                      (1 1,2 0,3 1,20 1,25 0))"),
+         "llsdf18");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0,5 1))"),
+         "llsdf19");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 1,4 0,4 1,20 1,5 0))"),
+         "llsdf19-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0))"),
+         "llsdf19a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (4 0,4 1,20 1,5 0))"),
+         "llsdf19a-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0))"),
+         "llsdf19b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,6 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0),(5 0,6 1))"),
+         "llsdf19c");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0))"),
+         "llsdf19d");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0),(3 0,3 1))"),
+         "llsdf19e");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,4 0),(5 0,5 1))"),
+         "llsdf19f");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 1,5 0),(4 0,4 1,20 1,5 0))"),
+         "llsdf19f-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 0,20 1,4 1,5 0,5 1))"),
+         "llsdf19g");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(5 0,30 0),\
+                      (5 1,5 0,4 1,20 1,5 0))"),
+         "llsdf19g-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,35 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(25 0,30 0,30 30,10 30),\
+                      (10 0,10 -10,15 0,20 0),(25 0,35 0),\
+                      (5 5,10 0),(10 30,20 0),(25 0,25 25,50 0,40 0))"),
+         "llsdf20");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,15 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,15 0),(30 0,30 30,10 30),\
+                      (10 0,10 -10,15 0),(5 5,10 0),(10 30,20 0),\
+                      (25 0,25 25,50 0,40 0))"),
+         "llsdf20a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0),(20 0,30 0),\
+                      (2 2,5 -1,15 2,18 0))"),
+         "llsdf21"
+         );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( test_sym_difference_linestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / MULTILINESTRING SYMMETRIC DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_sym_difference_of_geometries<L, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),\
+                       (1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         "lmlsdf01"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 1,2 0),(1 1,3 0))"),
+         "lmlsdf02"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,10 0,20 1),\
+                      (1 1,2 0),(1 1,3 0))"),
+         "lmlsdf03"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 1,2 0))"),
+         "lmlsdf04"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(-1 -1,1 0),(101 0,200 -1))"),
+         "lmlsdf07"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         "lmlsdf07a"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0),(19 -1,20 0),\
+                      (101 0,200 -1))"),
+         "lmlsdf07b"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(0 1,1 1,2 0),\
+                      (-1 -1,1 0),(101 0,200 -1))"),
+         "lmlsdf08"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0),\
+                      (0 1,1 1,2 0.5),(-1 -1,1 0,3 0),(101 0,200 -1))"),
+         "lmlsdf09"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,1.5 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(1.5 0,2 0.5,3 0),\
+                      (0 1,1 1,1 0,2 0.5),(-1 -1,1 0),(1.5 0,3 0),\
+                      (101 0,200 -1))"),
+         "lmlsdf10"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(1 1,2 0),(18 0,19 1),\
+                      (2 1,3 0),(17 0,18 1),(3 1,4 0),(16 0,17 1))"),
+         "lmlsdf12"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (19 0,20 1),(18 0,19 1),(17 0,18 1),(16 0,17 1))"),
+         "lmlsdf13"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(2 0,18 0),(3 0,17 0),\
+                      (4 0,16 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "lmlsdf13a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1,19 1,18 0),(2 0,1 1,2 1,3 0),\
+                      (17 0,18 1,17 1,16 0),(4 0,3 1))"),
+         "lmlsdf14"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 2,6 0))"),
+         "lmlsdf15"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(6 0,4 2,2 2))"),
+         "lmlsdf15a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 2,5 0))"),
+         "lmlsdf16"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(5 0,4 2,2 2))"),
+         "lmlsdf16a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 0,5 2,20 2,25 0))"),
+         "lmlsdf17"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 0,5 2,20 2,25 0,26 2))"),
+         "lmlsdf17a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "lmlsdf18"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "lmlsdf18a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(20 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "lmlsdf18b"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,26 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,25 0),(26 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,25 0))"),
+         "lmlsdf18c"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,21 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,21 0),(25 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,25 0))"),
+         "lmlsdf18d"
+         );
+}
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_sym_difference_multilinestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / LINESTRING SYMMETRIC DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_sym_difference_of_geometries<ML, L, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 2,4 3)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                                       (1 1,2 2,4 3))"),
+         "mllsdf01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(1 1,2 0))"),
+         "mllsdf02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<L>("LINESTRING(-1 -1,1 0,101 0,200 -1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(-1 -1,1 0),(101 0,200 -1))"),
+         "mllsdf03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<L>("LINESTRING(0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1,19 1,18 0),(2 0,1 1,2 1,3 0),\
+                      (17 0,18 1,17 1,16 0),(4 0,3 1))"),
+         "mllsdf04"
+         );
+}
+
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_sym_difference_multilinestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING SYMMETRIC DIFFERENCE ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_sym_difference_of_geometries<ML, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         "mlmlsdf01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(1 1,2 0),(1 1,3 0))"),
+         "mlmlsdf02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(5 0,10 0,20 1),\
+                      (1 0,2 0),(5 0,7 0),(1 1,2 0),(1 1,3 0))"),
+         "mlmlsdf03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(1 1,2 0))"),
+         "mlmlsdf04"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(10 10,15 10),(20 10,30 20),\
+                      (1 1,2 0),(10 20,15 10),(20 10,25 10,30 15))"),
+         "mlmlsdf05"
+        );
+
+#ifdef GEOMETRY_TEST_INCLUDE_FAILING_TESTS
+    // the following produces an assertion failure in line 483 of
+    // get_turn_info_ll
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (-1 -1,0 0,9 0,11 10,12 10,13 0.3,14 0.4,15 0.5),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,10 0,13 0.3),(15 0.5,20 1),\
+                      (10 10,11 10),(12 10,15 10),(20 10,30 20),\
+                      (1 1,2 0),(-1 -1,0 0),(9 0,11 10),(12 10,13 0.3),\
+                      (10 20,15 10),(20 10,25 10,30 15))"),
+         "mlmlsdf06"
+        );
+#endif
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                       (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                       (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                       (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((9 0,10 0,13 3),(15 5,20 10),\
+                      (10 10,11 10),(12 10,15 10),(20 10,30 20),\
+                      (1 1,2 0),(-1 -1,0 0),(9 0,11 10),(12 10,13 3),\
+                      (10 20,15 10),(20 10,25 10,30 15))"),
+         "mlmlsdf06"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(-1 -1,1 0),\
+                      (101 0,200 -1))"),
+         "mlmlsdf07"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         "mlmlsdf07a"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0),(19 -1,20 0),\
+                      (101 0,200 -1))"),
+         "mlmlsdf07b"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(0 1,1 1,2 0),\
+                      (-1 -1,1 0),(101 0,200 -1))"),
+         "mlmlsdf08"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0),(0 1,1 1,2 0.5),\
+                      (-1 -1,1 0,3 0),(101 0,200 -1))"),
+         "mlmlsdf09"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(1.5 0,2 0.5,3 0),\
+                      (0 1,1 1,1 0,2 0.5),(-1 -1,1 0),(1.5 0,3 0),\
+                      (101 0,200 -1))"),
+         "mlmlsdf10"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,100 1,101 0),\
+                       (0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1,3 0,4 0,5 1,6 1,\
+                       7 0,8 0,9 1,10 1,11 0,12 0,13 1,14 1,15 0),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1),(2 1,5 1),(6 1,9 1),\
+                       (10 1,13 1),(14 1,100 1,101 0),(0 0,1 0),\
+                       (1 0,1 1),(2 1,3 0),(4 0,5 1),(6 1,7 0),\
+                       (8 0,9 1),(10 1,11 0),(12 0,13 1),(14 1,15 0),\
+                       (-1 -1,1 0),(101 0,200 -1))"),
+         "mlmlsdf11"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(1 1,2 0),(18 0,19 1),\
+                      (2 1,3 0),(17 0,18 1),(3 1,4 0),(16 0,17 1))"),
+         "mlmlsdf12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (19 0,20 1),(18 0,19 1),(17 0,18 1),(16 0,17 1))"),
+         "mlmlsdf13"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0),(2 0,18 0),(3 0,17 0),\
+                      (4 0,16 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0))"),
+         "mlmlsdf13a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1,19 1,18 0),(2 0,1 1,2 1,3 0),\
+                      (17 0,18 1,17 1,16 0),(4 0,3 1))"),
+         "mlmlsdf14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 2,6 0))"),
+         "mlmlsdf15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(6 0,4 2,2 2))"),
+         "mlmlsdf15a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 2,5 0))"),
+         "mlmlsdf16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,20 0),\
+                      (0 1,1 0),(19 0,20 1),(5 0,4 2,2 2))"),
+         "mlmlsdf16a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 0,5 2,20 2,25 0))"),
+         "mlmlsdf17"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,4 0,5 2,20 2,25 0,26 2))"),
+         "mlmlsdf17a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "mlmlsdf18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0),(19 0,30 0),\
+                      (0 1,1 0),(19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "mlmlsdf18a"
+         );
+}
diff --git a/test/algorithms/test_centroid.hpp b/test/algorithms/test_centroid.hpp
index 2ab584ef6..14e0ceff1 100644
--- a/test/algorithms/test_centroid.hpp
+++ b/test/algorithms/test_centroid.hpp
@@ -11,6 +11,8 @@
 
 // Test-functionality, shared between single and multi tests
 
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/strategies/strategies.hpp>
@@ -63,9 +65,13 @@ void test_centroid(std::string const& wkt, T const& d1, T const& d2, T const& d3
     bg::read_wkt(wkt, geometry);
     typedef typename bg::point_type<Geometry>::type point_type;
     point_type c1;
+
     bg::centroid(geometry, c1);
     check_result<bg::dimension<Geometry>::type::value>::apply(c1, boost::make_tuple(d1, d2, d3, d4, d5));
 
+    boost::variant<Geometry> v(geometry);
+    bg::centroid(v, c1);
+
 #ifdef REPORT_RESULTS
     std::cout << "normal: " << std::setprecision(20) << bg::get<0>(c1) << " " << bg::get<1>(c1) << std::endl;
 
diff --git a/test/algorithms/test_convert.hpp b/test/algorithms/test_convert.hpp
index 281fdf936..fe91907da 100644
--- a/test/algorithms/test_convert.hpp
+++ b/test/algorithms/test_convert.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -33,7 +33,7 @@ BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
 
 
 template <typename Geometry2, typename Geometry1>
-void check_mixed(Geometry1 const& geometry1, std::string const& expected)
+void check_mixed(Geometry1 const& geometry1, std::string const& expected, int expected_point_count)
 {
     Geometry2 geometry2;
     bg::convert(geometry1, geometry2);
@@ -41,29 +41,37 @@ void check_mixed(Geometry1 const& geometry1, std::string const& expected)
     std::ostringstream out;
     out << bg::wkt(geometry2);
     BOOST_CHECK_EQUAL(out.str(), expected);
+
+    std::size_t n = bg::num_points(geometry2);
+    BOOST_CHECK_MESSAGE(expected_point_count < 0 || int(n) == expected_point_count,
+            "convert: "
+            << " #points expected: " << expected_point_count
+            << " detected: " << n
+            << " expected wkt: " << expected
+            );
 }
 
 template <typename Geometry1, typename Geometry2>
-void test_mixed(std::string const& wkt, std::string const& expected)
+void test_mixed(std::string const& wkt, std::string const& expected, int expected_point_count)
 {
     Geometry1 geometry1;
     bg::read_wkt(wkt, geometry1);
-    check_mixed<Geometry2>(geometry1, expected);
-    check_mixed<Geometry2>(boost::variant<Geometry1>(geometry1), expected);
+    check_mixed<Geometry2>(geometry1, expected, expected_point_count);
+    check_mixed<Geometry2>(boost::variant<Geometry1>(geometry1), expected, expected_point_count);
 }
 
 template <typename Geometry1, typename Geometry2>
 void test_mixed_identical_result(std::string const& wkt)
 {
-    test_mixed<Geometry1, Geometry2>(wkt, wkt);
-    test_mixed<Geometry2, Geometry1>(wkt, wkt);
+    test_mixed<Geometry1, Geometry2>(wkt, wkt, -1);
+    test_mixed<Geometry2, Geometry1>(wkt, wkt, -1);
 }
 
 template <typename Geometry1, typename Geometry2>
 void test_mixed_reversible_result(std::string const& wkt1, std::string const& wkt2)
 {
-    test_mixed<Geometry1, Geometry2>(wkt1, wkt2);
-    test_mixed<Geometry2, Geometry1>(wkt2, wkt1);
+    test_mixed<Geometry1, Geometry2>(wkt1, wkt2, -1);
+    test_mixed<Geometry2, Geometry1>(wkt2, wkt1, -1);
 }
 
 #endif
diff --git a/test/algorithms/test_convex_hull.hpp b/test/algorithms/test_convex_hull.hpp
index a6a108a79..a11b42dd7 100644
--- a/test/algorithms/test_convex_hull.hpp
+++ b/test/algorithms/test_convex_hull.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -9,6 +9,8 @@
 #ifndef BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP
 #define BOOST_GEOMETRY_TEST_CONVEX_HULL_HPP
 
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/algorithms/convex_hull.hpp>
@@ -24,11 +26,10 @@
 
 
 template <typename Geometry, typename Hull>
-void test_convex_hull(Geometry const& geometry, Hull const& hull,
-                      std::size_t size_original, std::size_t size_hull,
+void check_convex_hull(Geometry const& geometry, Hull const& hull,
+                      std::size_t /*size_original*/, std::size_t size_hull,
                       double expected_area, bool reverse)
 {
-
     std::size_t n = bg::num_points(hull);
 
     BOOST_CHECK_MESSAGE(n == size_hull,
@@ -49,55 +50,67 @@ void test_convex_hull(Geometry const& geometry, Hull const& hull,
         ah = -ah;
     }
 
-//std::cout << "Area: " << bg::area(geometry) << std::endl;
-//std::cout << bg::wkt(hull) << std::endl;
-
     BOOST_CHECK_CLOSE(ah, expected_area, 0.001);
 }
 
+template <typename Hull, typename Strategy, typename Geometry>
+void test_convex_hull(Geometry const& geometry,
+                      std::size_t size_original, std::size_t size_hull,
+                      double expected_area,
+                      bool reverse)
+{
+    Hull hull;
+
+    // Test version with output iterator
+    bg::detail::convex_hull::convex_hull_insert(geometry, std::back_inserter(hull.outer()));
+    check_convex_hull(geometry, hull,
+        size_original, size_hull, expected_area, reverse);
+
+    // Test version with ring as output
+    bg::clear(hull);
+    bg::convex_hull(geometry, hull.outer());
+    check_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
+
+    // Test version with polygon as output
+    bg::clear(hull);
+    bg::convex_hull(geometry, hull);
+    check_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
+
+    // Test version with strategy
+    bg::clear(hull);
+    bg::convex_hull(geometry, hull.outer(), Strategy());
+    check_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
+
+    // Test version with output iterator and strategy
+    bg::clear(hull);
+    bg::detail::convex_hull::convex_hull_insert(geometry, std::back_inserter(hull.outer()), Strategy());
+    check_convex_hull(geometry, hull, size_original, size_hull, expected_area, reverse);
+}
+
+
 template <typename Geometry, bool Clockwise>
 void test_geometry_order(std::string const& wkt,
                       std::size_t size_original, std::size_t size_hull,
                       double expected_area)
 {
-    Geometry geometry;
-    bg::read_wkt(wkt, geometry);
-
-    bg::model::polygon
+    typedef bg::model::polygon
         <
             typename bg::point_type<Geometry>::type,
             Clockwise
-        > hull;
+        > hull_type;
 
-    // Test version with output iterator
-    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);
-
-    // Test version with ring as output
-    bg::clear(hull);
-    bg::convex_hull(geometry, hull.outer());
-    test_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
-
-    // Test version with polygon as output
-    bg::clear(hull);
-    bg::convex_hull(geometry, hull);
-    test_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
-
-    // Test version with strategy
-    bg::clear(hull);
-    bg::strategy::convex_hull::graham_andrew
+    typedef bg::strategy::convex_hull::graham_andrew
         <
             Geometry,
             typename bg::point_type<Geometry>::type
-        > graham;
-    bg::convex_hull(geometry, hull.outer(), graham);
-    test_convex_hull(geometry, hull, size_original, size_hull, expected_area, false);
+        > strategy_type;
 
-    // Test version with output iterator and strategy
-    bg::clear(hull);
-    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);
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
+    test_convex_hull<hull_type, strategy_type>(geometry, size_original, size_hull, expected_area, !Clockwise);
+    test_convex_hull<hull_type, strategy_type>(v, size_original, size_hull, expected_area, !Clockwise);
 }
 
 template <typename Geometry>
diff --git a/test/algorithms/test_correct.hpp b/test/algorithms/test_correct.hpp
new file mode 100644
index 000000000..2d2723cd5
--- /dev/null
+++ b/test/algorithms/test_correct.hpp
@@ -0,0 +1,55 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_TEST_CORRECT_HPP
+#define BOOST_GEOMETRY_TEST_CORRECT_HPP
+
+
+// Test-functionality, shared between single and multi tests
+
+#include <sstream>
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/variant/variant.hpp>
+
+
+template <typename Geometry>
+void check_geometry(Geometry const& geometry, std::string const& expected)
+{
+    std::ostringstream out;
+    out << bg::wkt(geometry);
+
+    BOOST_CHECK_EQUAL(out.str(), expected);
+}
+
+template <typename Geometry>
+void test_geometry(std::string const& wkt, std::string const& expected)
+{
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
+    bg::correct(geometry);
+    check_geometry(geometry, expected);
+
+    bg::correct(v);
+    check_geometry(v, expected);
+}
+
+
+#endif
diff --git a/test/algorithms/test_covered_by.hpp b/test/algorithms/test_covered_by.hpp
index efaa6f789..b9d8f5853 100644
--- a/test/algorithms/test_covered_by.hpp
+++ b/test/algorithms/test_covered_by.hpp
@@ -1,7 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
 // 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)
@@ -13,6 +15,8 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/variant/variant.hpp>
+
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/algorithms/covered_by.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
@@ -21,17 +25,17 @@
 
 #include <boost/geometry/io/wkt/read.hpp>
 
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
 
 template <typename Geometry1, typename Geometry2>
-void test_geometry(std::string const& wkt1,
-        std::string const& wkt2, bool expected)
+void check_geometry(Geometry1 const& geometry1,
+                    Geometry2 const& geometry2,
+                    std::string const& wkt1,
+                    std::string const& wkt2,
+                    bool expected)
 {
-    Geometry1 geometry1;
-    Geometry2 geometry2;
-
-    bg::read_wkt(wkt1, geometry1);
-    bg::read_wkt(wkt2, geometry2);
-
     bool detected = bg::covered_by(geometry1, geometry2);
 
     BOOST_CHECK_MESSAGE(detected == expected,
@@ -41,6 +45,23 @@ void test_geometry(std::string const& wkt1,
         << " detected: " << detected);
 }
 
+template <typename Geometry1, typename Geometry2>
+void test_geometry(std::string const& wkt1,
+        std::string const& wkt2, bool expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+    boost::variant<Geometry1> v1(geometry1);
+    boost::variant<Geometry2> v2(geometry2);
+
+    check_geometry(geometry1, geometry2, wkt1, wkt2, expected);
+    check_geometry(v1, geometry2, wkt1, wkt2, expected);
+    check_geometry(geometry1, v2, wkt1, wkt2, expected);
+    check_geometry(v1, v2, wkt1, wkt2, expected);
+}
+
 /*
 
 template <typename Point, bool Clockwise, bool Closed>
diff --git a/test/algorithms/test_crosses.hpp b/test/algorithms/test_crosses.hpp
new file mode 100644
index 000000000..6d17bb312
--- /dev/null
+++ b/test/algorithms/test_crosses.hpp
@@ -0,0 +1,83 @@
+// Generic Geometry2 Library
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_CROSSES_HPP
+#define BOOST_GEOMETRY_TEST_CROSSES_HPP
+
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/algorithms/crosses.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/variant/variant.hpp>
+
+
+template <typename Geometry1, typename Geometry2>
+void test_geometry(std::string const& wkt1,
+        std::string const& wkt2, bool expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+
+    bool detected = bg::crosses(geometry1, geometry2);
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "crosses: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+#if !defined(GEOMETRY_TEST_DEBUG)
+    detected = bg::crosses(
+        geometry1,
+        boost::variant<Geometry2>(geometry2));
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "crosses: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+    detected = bg::crosses(
+        boost::variant<Geometry1>(geometry1),
+        geometry2);
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "crosses: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+    detected = bg::crosses(
+        boost::variant<Geometry1>(geometry1),
+        boost::variant<Geometry2>(geometry2));
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "crosses: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+#endif
+}
+
+
+#endif // BOOST_GEOMETRY_TEST_CROSSES_HPP
diff --git a/test/algorithms/test_difference.hpp b/test/algorithms/test_difference.hpp
index d5b8ab682..4520cd311 100644
--- a/test/algorithms/test_difference.hpp
+++ b/test/algorithms/test_difference.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -12,9 +12,11 @@
 #include <fstream>
 #include <iomanip>
 
-#include <boost/foreach.hpp>
 #include <geometry_test_common.hpp>
 
+#include <boost/core/ignore_unused.hpp>
+#include <boost/foreach.hpp>
+
 #include <boost/range/algorithm/copy.hpp>
 
 #include <boost/geometry/algorithms/correct.hpp>
@@ -57,6 +59,9 @@ void difference_output(std::string const& caseid, G1 const& g1, G2 const& g2, Ou
         filename << "difference_"
             << caseid << "_"
             << string_from_type<coordinate_type>::name()
+#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+            << "_no_rob"
+#endif
             << ".svg";
 
         std::ofstream svg(filename.str().c_str());
@@ -82,14 +87,15 @@ void difference_output(std::string const& caseid, G1 const& g1, G2 const& g2, Ou
 
 template <typename OutputType, typename G1, typename G2>
 void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2,
-        std::size_t expected_count, int expected_point_count,
+        int expected_count, int expected_point_count,
         double expected_area,
         double percentage = 0.0001,
         bool sym = false)
 {
-    std::vector<OutputType> clip;
-
     typedef typename bg::coordinate_type<G1>::type coordinate_type;
+    boost::ignore_unused<coordinate_type>();
+
+    std::vector<OutputType> clip;
 
     if (sym)
     {
@@ -101,7 +107,7 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2,
     }
 
     typename bg::default_area_result<G1>::type area = 0;
-    std::size_t n = 0;
+    int n = 0;
     for (typename std::vector<OutputType>::iterator it = clip.begin();
             it != clip.end();
             ++it)
@@ -120,15 +126,26 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2,
     {
         // Test inserter functionality
         // Test if inserter returns output-iterator (using Boost.Range copy)
+        typedef typename bg::point_type<G1>::type point_type;
+        typedef typename bg::rescale_policy_type<point_type>::type
+            rescale_policy_type;
+
+        rescale_policy_type rescale_policy
+                = bg::get_rescale_policy<rescale_policy_type>(g1, g2);
+
         std::vector<OutputType> inserted, array_with_one_empty_geometry;
         array_with_one_empty_geometry.push_back(OutputType());
         if (sym)
         {
-            boost::copy(array_with_one_empty_geometry, bg::detail::sym_difference::sym_difference_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
+            boost::copy(array_with_one_empty_geometry,
+                bg::detail::sym_difference::sym_difference_insert<OutputType>
+                    (g1, g2, rescale_policy, std::back_inserter(inserted)));
         }
         else
         {
-            boost::copy(array_with_one_empty_geometry, bg::detail::difference::difference_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
+            boost::copy(array_with_one_empty_geometry,
+                bg::detail::difference::difference_insert<OutputType>(
+                    g1, g2, rescale_policy, std::back_inserter(inserted)));
         }
 
         BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1);
@@ -140,7 +157,7 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2,
 #if ! defined(BOOST_GEOMETRY_NO_BOOST_TEST)
     if (expected_point_count >= 0)
     {
-        BOOST_CHECK_MESSAGE(n == std::size_t(expected_point_count),
+        BOOST_CHECK_MESSAGE(bg::math::abs(n - expected_point_count) < 3,
                 "difference: " << caseid
                 << " #points expected: " << expected_point_count
                 << " detected: " << n
@@ -148,9 +165,9 @@ void test_difference(std::string const& caseid, G1 const& g1, G2 const& g2,
                 );
     }
 
-    if (expected_count > 0)
+    if (expected_count >= 0)
     {
-        BOOST_CHECK_MESSAGE(clip.size() == expected_count,
+        BOOST_CHECK_MESSAGE(int(clip.size()) == expected_count,
                 "difference: " << caseid
                 << " #outputs expected: " << expected_count
                 << " detected: " << clip.size()
@@ -173,11 +190,11 @@ static int counter = 0;
 template <typename OutputType, typename G1, typename G2>
 void test_one(std::string const& caseid,
         std::string const& wkt1, std::string const& wkt2,
-        std::size_t expected_count1,
+        int expected_count1,
         int expected_point_count1,
         double expected_area1,
 
-        std::size_t expected_count2,
+        int expected_count2,
         int expected_point_count2,
         double expected_area2,
 
@@ -216,7 +233,8 @@ void test_one(std::string const& caseid,
         expected_area2, percentage);
     test_difference<OutputType>(caseid + "_s", g1, g2,
         expected_count1 + expected_count2,
-        expected_point_count1 + expected_point_count2,
+        expected_point_count1 >= 0 && expected_point_count2 >= 0
+            ? (expected_point_count1 + expected_point_count2) : -1,
         expected_area1 + expected_area2,
         percentage, true);
 
diff --git a/test/algorithms/test_difference_linear_linear.hpp b/test/algorithms/test_difference_linear_linear.hpp
new file mode 100644
index 000000000..00146ed1c
--- /dev/null
+++ b/test/algorithms/test_difference_linear_linear.hpp
@@ -0,0 +1,144 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
+
+#include "from_wkt.hpp"
+#include <boost/geometry/geometry.hpp>
+#include "test_set_ops_linear_linear.hpp"
+#include "to_svg.hpp"
+
+
+//==================================================================
+//==================================================================
+// difference of (linear) geometries
+//==================================================================
+//==================================================================
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename MultiLineString
+>
+class test_difference_of_geometries
+{
+private:
+    static inline void base_test(Geometry1 const& geometry1,
+                                 Geometry2 const& geometry2,
+                                 MultiLineString const& mls_diff,
+                                 std::string const& case_id,
+                                 bool test_vector_and_deque = true,
+                                 bool reverse_output_for_checking = false)
+    {
+        static bool vector_deque_already_tested = false;
+
+        typedef typename boost::range_value<MultiLineString>::type LineString;
+        typedef std::vector<LineString> linestring_vector;
+        typedef std::deque<LineString> linestring_deque;
+
+        MultiLineString mls_output;
+
+        linestring_vector ls_vector_output;
+        linestring_deque ls_deque_output;
+
+        bg::difference(geometry1, geometry2, mls_output);
+
+        if ( reverse_output_for_checking ) 
+        {
+            bg::reverse(mls_output);
+        }
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_diff, mls_output),
+                             "difference L/L: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mls_diff)
+                             << " computed: " << bg::wkt(mls_output) );
+
+        set_operation_output("difference", case_id,
+                             geometry1, geometry2, mls_output);
+
+        if ( !vector_deque_already_tested && test_vector_and_deque )
+        {
+            vector_deque_already_tested = true;
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << std::endl;
+            std::cout << "Testing with vector and deque as output container..."
+                      << std::endl;
+#endif
+            bg::difference(geometry1, geometry2, ls_vector_output);
+            bg::difference(geometry1, geometry2, ls_deque_output);
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_diff,
+                                                             ls_vector_output));
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_diff,
+                                                             ls_deque_output));
+
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "Done!" << std::endl << std::endl;
+#endif
+        }
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "difference : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected difference : " << bg::wkt(mls_diff) << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+public:
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_diff,
+                             std::string const& case_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "test case: " << case_id << std::endl;
+        std::stringstream sstr;
+        sstr << "svgs/" << case_id << ".svg";
+#ifdef TEST_WITH_SVG
+        to_svg(geometry1, geometry2, sstr.str());
+#endif
+#endif
+
+        Geometry1 rg1(geometry1);
+        bg::reverse<Geometry1>(rg1);
+
+        Geometry2 rg2(geometry2);
+        bg::reverse<Geometry2>(rg2);
+
+        test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl
+                  << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+                  << std::endl << std::endl;
+#endif
+        test_get_turns_ll_invariance<>::apply(rg1, geometry2);
+
+        base_test(geometry1, geometry2, mls_diff, case_id);
+        base_test(geometry1, rg2, mls_diff, case_id, false);
+        base_test(rg1, geometry2, mls_diff, case_id, false, true);
+        base_test(rg1, rg2, mls_diff, case_id, false, true);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_DIFFERENCE_LINEAR_LINEAR_HPP
diff --git a/test/algorithms/test_disjoint.hpp b/test/algorithms/test_disjoint.hpp
new file mode 100644
index 000000000..55a22e9bd
--- /dev/null
+++ b/test/algorithms/test_disjoint.hpp
@@ -0,0 +1,63 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_GEOMETRY_TEST_DISJOINT_HPP
+#define BOOST_GEOMETRY_TEST_DISJOINT_HPP
+
+#include <iostream>
+#include <string>
+#include <boost/variant/variant.hpp>
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/algorithms/disjoint.hpp>
+#include <boost/geometry/multi/algorithms/disjoint.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+
+template <typename G1, typename G2>
+void check_disjoint(std::string const& id,
+                    G1 const& g1,
+                    G2 const& g2,
+                    bool expected)
+{
+    bool detected = bg::disjoint(g1, g2);
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "disjoint: " << id
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+}
+
+template <typename G1, typename G2>
+void test_disjoint(std::string const& id,
+            std::string const& wkt1,
+            std::string const& wkt2, bool expected)
+{
+    G1 g1;
+    bg::read_wkt(wkt1, g1);
+
+    G2 g2;
+    bg::read_wkt(wkt2, g2);
+
+    boost::variant<G1> v1(g1);
+    boost::variant<G2> v2(g2);
+
+    check_disjoint(id, g1, g2, expected);
+    check_disjoint(id, v1, g2, expected);
+    check_disjoint(id, g1, v2, expected);
+    check_disjoint(id, v1, v2, expected);
+}
+
+
+#endif // BOOST_GEOMETRY_TEST_DISJOINT_HPP
diff --git a/test/algorithms/test_distance.hpp b/test/algorithms/test_distance.hpp
index a28e777ea..6e2100971 100644
--- a/test/algorithms/test_distance.hpp
+++ b/test/algorithms/test_distance.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/algorithms/test_distance_common.hpp b/test/algorithms/test_distance_common.hpp
new file mode 100644
index 000000000..e7205f78c
--- /dev/null
+++ b/test/algorithms/test_distance_common.hpp
@@ -0,0 +1,599 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_TEST_DISTANCE_COMMON_HPP
+#define BOOST_GEOMETRY_TEST_DISTANCE_COMMON_HPP
+
+#include <iostream>
+#include <string>
+
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_integral.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/geometry/multi/io/wkt/write.hpp>
+
+#include <boost/geometry/io/dsv/write.hpp>
+#include <boost/geometry/multi/io/dsv/write.hpp>
+
+#include <boost/geometry/algorithms/num_interior_rings.hpp>
+#include <boost/geometry/algorithms/distance.hpp>
+#include <boost/geometry/algorithms/comparable_distance.hpp>
+
+#include "from_wkt.hpp"
+
+#include <string_from_type.hpp>
+
+
+#ifndef BOOST_GEOMETRY_TEST_DISTANCE_HPP
+
+namespace bg = ::boost::geometry;
+
+// function copied from BG's test_distance.hpp
+
+template <typename Geometry1, typename Geometry2>
+void test_empty_input(Geometry1 const& geometry1, Geometry2 const& geometry2)
+{
+    try
+    {
+        bg::distance(geometry1, geometry2);
+    }
+    catch(bg::empty_input_exception const& )
+    {
+        return;
+    }
+    BOOST_CHECK_MESSAGE(false, "A empty_input_exception should have been thrown" );
+}
+#endif // BOOST_GEOMETRY_TEST_DISTANCE_HPP
+
+
+
+//========================================================================
+
+
+
+#ifdef GEOMETRY_TEST_DEBUG
+// pretty print geometry -- START
+template <typename Geometry, typename GeometryTag>
+struct pretty_print_geometry_dispatch
+{
+    template <typename Stream>
+    static inline Stream& apply(Geometry const& geometry, Stream& os)
+    {
+        os << bg::wkt(geometry);
+        return os;
+    }
+};
+
+template <typename Geometry>
+struct pretty_print_geometry_dispatch<Geometry, bg::segment_tag>
+{
+    template <typename Stream>
+    static inline Stream& apply(Geometry const& geometry, Stream& os)
+    {
+        os << "SEGMENT" << bg::dsv(geometry);
+        return os;
+    }
+};
+
+template <typename Geometry>
+struct pretty_print_geometry_dispatch<Geometry, bg::box_tag>
+{
+    template <typename Stream>
+    static inline Stream& apply(Geometry const& geometry, Stream& os)
+    {
+        os << "BOX" << bg::dsv(geometry);
+        return os;
+    }
+};
+
+
+template <typename Geometry>
+struct pretty_print_geometry
+{
+    template <typename Stream>
+    static inline Stream& apply(Geometry const& geometry, Stream& os)
+    {
+        return pretty_print_geometry_dispatch
+            <
+                Geometry, typename bg::tag<Geometry>::type
+            >::apply(geometry, os);
+    }
+};
+// pretty print geometry -- END
+#endif // GEOMETRY_TEST_DEBUG
+
+
+//========================================================================
+
+
+template <typename T>
+struct check_equal
+{
+    static inline void apply(T const& value1, T const& value2)
+    {
+        BOOST_CHECK( value1 == value2 );
+    }
+};
+
+template <>
+struct check_equal<double>
+{
+    static inline void apply(double value1, double value2)
+    {
+        BOOST_CHECK_CLOSE( value1, value2, 0.0001 );
+    }
+};
+
+
+//========================================================================
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    int id1 = bg::geometry_id<Geometry1>::value,
+    int id2 = bg::geometry_id<Geometry2>::value
+>
+struct test_distance_of_geometries
+    : public test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
+{};
+
+
+template <typename Geometry1, typename Geometry2>
+struct test_distance_of_geometries<Geometry1, Geometry2, 0, 0>
+{
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(std::string const& wkt1,
+               std::string const& wkt2,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy,
+               bool test_reversed = true)
+    {
+        Geometry1 geometry1 = from_wkt<Geometry1>(wkt1);
+        Geometry2 geometry2 = from_wkt<Geometry2>(wkt2);
+
+        apply(geometry1, geometry2,
+              expected_distance, expected_comparable_distance,
+              strategy, test_reversed);
+    }
+
+
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(Geometry1 const& geometry1,
+               Geometry2 const& geometry2,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy,
+               bool test_reversed = true)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        typedef pretty_print_geometry<Geometry1> PPG1;
+        typedef pretty_print_geometry<Geometry2> PPG2;
+        PPG1::apply(geometry1, std::cout);
+        std::cout << " - ";
+        PPG2::apply(geometry2, std::cout);
+        std::cout << std::endl;
+#endif
+        typedef typename bg::default_distance_result
+            <
+                Geometry1, Geometry2
+            >::type default_distance_result;
+
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                Strategy, Geometry1, Geometry2
+            >::type distance_result_from_strategy;
+
+        static const bool same_regular = boost::is_same
+            <
+                default_distance_result,
+                distance_result_from_strategy
+            >::type::value;
+
+        BOOST_CHECK( same_regular );
+    
+
+        typedef typename bg::default_comparable_distance_result
+            <
+                Geometry1, Geometry2
+            >::type default_comparable_distance_result;
+
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                typename bg::strategy::distance::services::comparable_type
+                    <
+                        Strategy
+                    >::type,
+                Geometry1,
+                Geometry2
+            >::type comparable_distance_result_from_strategy;
+
+        static const bool same_comparable = boost::is_same
+            <
+                default_comparable_distance_result,
+                comparable_distance_result_from_strategy
+            >::type::value;
+        
+        BOOST_CHECK( same_comparable );
+
+
+        // check distance with default strategy
+        default_distance_result dist_def = bg::distance(geometry1, geometry2);
+
+        check_equal
+            <
+                default_distance_result
+            >::apply(dist_def, expected_distance);
+
+
+        // check distance with passed strategy
+        distance_result_from_strategy dist =
+            bg::distance(geometry1, geometry2, strategy);
+
+        check_equal
+            <
+                default_distance_result
+            >::apply(dist, expected_distance);
+
+
+        // check comparable distance with default strategy
+        default_comparable_distance_result cdist_def =
+            bg::comparable_distance(geometry1, geometry2);
+
+        check_equal
+            <
+                default_comparable_distance_result
+            >::apply(cdist_def, expected_comparable_distance);
+
+
+        // check comparable distance with passed strategy
+        comparable_distance_result_from_strategy cdist =
+            bg::comparable_distance(geometry1, geometry2, strategy);
+
+        check_equal
+            <
+                default_comparable_distance_result
+            >::apply(cdist, expected_comparable_distance);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << string_from_type<typename bg::coordinate_type<Geometry1>::type>::name()
+                  << string_from_type<typename bg::coordinate_type<Geometry2>::type>::name()
+                  << " -> "
+                  << string_from_type<default_distance_result>::name()
+                  << string_from_type<default_comparable_distance_result>::name()
+                  << std::endl;
+        std::cout << "distance (default strategy) = " << dist_def << " ; " 
+                  << "distance (passed strategy) = " << dist << " ; " 
+                  << "comp. distance (default strategy) = "
+                  << cdist_def << " ; "
+                  << "comp. distance (passed strategy) = "
+                  << cdist << std::endl;
+
+        if ( !test_reversed )
+        {
+            std::cout << std::endl;
+        }
+#endif
+
+        if ( test_reversed )
+        {
+            // check distance with default strategy
+            dist_def = bg::distance(geometry2, geometry1);
+
+            check_equal
+                <
+                    default_distance_result
+                >::apply(dist_def, expected_distance);
+
+
+            // check distance with given strategy
+            dist = bg::distance(geometry2, geometry1, strategy);
+
+            check_equal
+                <
+                    default_distance_result
+                >::apply(dist, expected_distance);
+
+
+            // check comparable distance with default strategy
+            cdist_def = bg::comparable_distance(geometry2, geometry1);
+
+            check_equal
+                <
+                    default_comparable_distance_result
+                >::apply(cdist_def, expected_comparable_distance);
+
+            // check comparable distance with given strategy
+            cdist = bg::comparable_distance(geometry2, geometry1, strategy);
+
+            check_equal
+                <
+                    default_comparable_distance_result
+                >::apply(cdist, expected_comparable_distance);
+
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "distance[reversed args] (def. startegy) = "
+                      << dist_def << " ; "
+                      << "distance[reversed args] (passed startegy) = "
+                      << dist << " ; "
+                      << "comp. distance[reversed args] (def. strategy) = "
+                      << cdist_def << " ; "
+                      << "comp. distance[reversed args] (passed strategy) = "
+                      << cdist << std::endl;
+            std::cout << std::endl;
+#endif
+        }
+    }
+};
+
+
+//========================================================================
+
+template <typename Segment, typename Polygon>
+struct test_distance_of_geometries
+<
+    Segment, Polygon,
+    92 /* segment */, 3 /* polygon */
+>
+    : public test_distance_of_geometries<Segment, Polygon, 0, 0>
+{
+    typedef test_distance_of_geometries<Segment, Polygon, 0, 0> base;
+
+    typedef typename bg::ring_type<Polygon>::type ring_type;
+
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(std::string const& wkt_segment,
+               std::string const& wkt_polygon,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy)
+    {
+        Segment segment = from_wkt<Segment>(wkt_segment);
+        Polygon polygon = from_wkt<Polygon>(wkt_polygon);
+        apply(segment,
+              polygon,
+              expected_distance,
+              expected_comparable_distance,
+              strategy);
+    }
+
+
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(Segment const& segment,
+               Polygon const& polygon,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy)
+    {
+        base::apply(segment, polygon, expected_distance,
+                    expected_comparable_distance, strategy);
+        if ( bg::num_interior_rings(polygon) == 0 ) {
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "... testing also exterior ring ..." << std::endl;
+#endif
+            test_distance_of_geometries
+                <
+                    Segment, ring_type
+                >::apply(segment,
+                         bg::exterior_ring(polygon),
+                         expected_distance,
+                         expected_comparable_distance,
+                         strategy);
+        }
+    }
+};
+
+//========================================================================
+
+template <typename Box, typename Segment>
+struct test_distance_of_geometries
+<
+    Box, Segment,
+    94 /* box */, 92 /* segment */
+>
+{
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(std::string const& wkt_box,
+               std::string const& wkt_segment,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy)
+    {
+        test_distance_of_geometries
+            <
+                Segment, Box, 92, 94
+            >::apply(wkt_segment,
+                     wkt_box,
+                     expected_distance,
+                     expected_comparable_distance,
+                     strategy);
+    }
+};
+
+
+template <typename Segment, typename Box>
+struct test_distance_of_geometries
+<
+    Segment, Box,
+    92 /* segment */, 94 /* box */
+>
+    : public test_distance_of_geometries<Segment, Box, 0, 0>
+{
+    typedef test_distance_of_geometries<Segment, Box, 0, 0> base;
+
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(std::string const& wkt_segment,
+               std::string const& wkt_box,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy)
+    {
+        Segment segment = from_wkt<Segment>(wkt_segment);
+        Box box = from_wkt<Box>(wkt_box);
+        apply(segment,
+              box,
+              expected_distance,
+              expected_comparable_distance,
+              strategy);
+    }
+
+
+    template
+    <
+        typename DistanceType,
+        typename ComparableDistanceType,
+        typename Strategy
+    >
+    static inline
+    void apply(Segment const& segment,
+               Box const& box,
+               DistanceType const& expected_distance,
+               ComparableDistanceType const& expected_comparable_distance,
+               Strategy const& strategy)
+    {
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                Strategy, Segment, Box
+            >::type distance_result_type;
+
+        typedef typename bg::strategy::distance::services::comparable_type
+            <
+                Strategy
+            >::type comparable_strategy;
+
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                comparable_strategy, Segment, Box
+            >::type comparable_distance_result_type;
+
+
+        base::apply(segment, box, expected_distance,
+                    expected_comparable_distance, strategy);
+
+        comparable_strategy cstrategy =
+            bg::strategy::distance::services::get_comparable
+                <
+                    Strategy
+                >::apply(strategy);
+
+        distance_result_type distance_generic =
+            bg::detail::distance::segment_to_box_2D_generic
+                <
+                    Segment, Box, Strategy
+                >::apply(segment, box, strategy);
+
+        comparable_distance_result_type comparable_distance_generic =
+            bg::detail::distance::segment_to_box_2D_generic
+                <
+                    Segment, Box, comparable_strategy
+                >::apply(segment, box, cstrategy);
+
+
+        check_equal
+            <
+                distance_result_type
+            >::apply(distance_generic, expected_distance);
+
+        check_equal
+            <
+                comparable_distance_result_type
+            >::apply(comparable_distance_generic, expected_comparable_distance);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "... testing with naive seg-box distance algorithm..."
+                  << std::endl;
+        std::cout << "distance (generic algorithm) = "
+                  << distance_generic << " ; "
+                  << "comp. distance (generic algorithm) = "            
+                  << comparable_distance_generic
+                  << std::endl;
+        std::cout << std::endl << std::endl;
+#endif
+    }
+};
+
+//========================================================================
+
+
+template <typename Geometry1, typename Geometry2, typename Strategy>
+void test_empty_input(Geometry1 const& geometry1,
+                      Geometry2 const& geometry2,
+                      Strategy const& strategy)
+{
+    try
+    {
+        bg::distance(geometry1, geometry2, strategy);
+    }
+    catch(bg::empty_input_exception const& )
+    {
+        return;
+    }
+    BOOST_CHECK_MESSAGE(false, "A empty_input_exception should have been thrown" );
+
+    try
+    {
+        bg::distance(geometry2, geometry1, strategy);
+    }
+    catch(bg::empty_input_exception const& )
+    {
+        return;
+    }
+    BOOST_CHECK_MESSAGE(false, "A empty_input_exception should have been thrown" );
+}
+
+#endif // BOOST_GEOMETRY_TEST_DISTANCE_COMMON_HPP
diff --git a/test/algorithms/test_envelope.hpp b/test/algorithms/test_envelope.hpp
index 3010ef901..bf00d1282 100644
--- a/test/algorithms/test_envelope.hpp
+++ b/test/algorithms/test_envelope.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -10,6 +10,8 @@
 #define BOOST_GEOMETRY_TEST_ENVELOPE_HPP
 
 
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/algorithms/envelope.hpp>
@@ -34,8 +36,8 @@ struct check_result<Box, 2>
                 ctype
             >::type type;
 
-    static void apply(Box const& b, const type& x1, const type& y1, const type& z1,
-                const type& x2, const type& y2, const type& z2)
+    static void apply(Box const& b, const type& x1, const type& y1, const type& /*z1*/,
+                const type& x2, const type& y2, const type& /*z2*/)
     {
         BOOST_CHECK_CLOSE((bg::get<bg::min_corner, 0>(b)), x1, 0.001);
         BOOST_CHECK_CLOSE((bg::get<bg::min_corner, 1>(b)), y1, 0.001);
@@ -77,31 +79,17 @@ void test_envelope(std::string const& wkt,
                    const T& z1 = 0, const T& z2 = 0)
 {
     typedef bg::model::box<typename bg::point_type<Geometry>::type > box_type;
+    box_type b;
 
     Geometry geometry;
     bg::read_wkt(wkt, geometry);
-    box_type b;
     bg::envelope(geometry, b);
+    check_result<box_type, bg::dimension<Geometry>::type::value>::apply(b, x1, y1, z1, x2, y2, z2);
 
+    boost::variant<Geometry> v(geometry);
+    bg::envelope(v, b);
     check_result<box_type, bg::dimension<Geometry>::type::value>::apply(b, x1, y1, z1, x2, y2, z2);
 }
 
-template <typename Geometry, typename T>
-void test_envelope_strategy(std::string const& wkt,
-                   const T& x1, const T& x2,
-                   const T& y1, const T& y2,
-                   const T& z1 = 0, const T& z2 = 0)
-{
-    typedef bg::model::box<typename bg::point_type<Geometry>::type > box_type;
-
-    Geometry geometry;
-    bg::read_wkt(wkt, geometry);
-    box_type b;
-    bg::envelope(geometry, b);
-
-    check_result<box_type, bg::dimension<Geometry>::type::value>::apply(b, x1, y1, z1, x2, y2, z2);
-}
-
-
 
 #endif
diff --git a/test/algorithms/test_equals.hpp b/test/algorithms/test_equals.hpp
index f641a96af..485dc700c 100644
--- a/test/algorithms/test_equals.hpp
+++ b/test/algorithms/test_equals.hpp
@@ -1,7 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2014 Adam Wulkiewicz, Lodz, Poland.
+
 // 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)
@@ -29,6 +31,15 @@ void check_geometry(Geometry1 const& geometry1,
 {
     bool detected = bg::equals(geometry1, geometry2);
 
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "case: " << caseid
+        << " equals: " << wkt1
+        << " to " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+    detected = bg::equals(geometry2, geometry1);
+
     BOOST_CHECK_MESSAGE(detected == expected,
         "case: " << caseid
         << " equals: " << wkt1
diff --git a/test/algorithms/test_expand.hpp b/test/algorithms/test_expand.hpp
index ebf22e374..8f989397e 100644
--- a/test/algorithms/test_expand.hpp
+++ b/test/algorithms/test_expand.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -17,6 +17,16 @@
 #include <boost/geometry/io/wkt/read.hpp>
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/io/dsv/write.hpp>
+#include <boost/variant/variant.hpp>
+
+
+template <typename Box>
+inline std::string to_dsv(const Box& box)
+{
+    std::ostringstream out;
+    out << bg::dsv(box, ",", "(", ")", ",", "", "");
+    return out.str();
+}
 
 
 template <typename Geometry, typename Box>
@@ -29,10 +39,13 @@ void test_expand(Box& box,
 
     bg::expand(box, geometry);
 
-    std::ostringstream out;
-    out << bg::dsv(box, ",", "(", ")", ",", "", "");
+    BOOST_CHECK_EQUAL(to_dsv(box), expected);
 
-    BOOST_CHECK_EQUAL(out.str(), expected);
+#if !defined(GEOMETRY_TEST_DEBUG)
+    bg::expand(box, boost::variant<Geometry>(geometry));
+
+    BOOST_CHECK_EQUAL(to_dsv(box), expected);
+#endif
 }
 
 template <typename Geometry, typename Box>
@@ -43,13 +56,15 @@ void test_expand_other_strategy(Box& box,
     Geometry geometry;
     bg::read_wkt(wkt, geometry);
 
-
     bg::expand(box, geometry);
 
-    std::ostringstream out;
-    out << bg::dsv(box, ",", "(", ")", ",", "", "");
+    BOOST_CHECK_EQUAL(to_dsv(box), expected);
 
-    BOOST_CHECK_EQUAL(out.str(), expected);
+#if !defined(GEOMETRY_TEST_DEBUG)
+    bg::expand(box, boost::variant<Geometry>(geometry));
+
+    BOOST_CHECK_EQUAL(to_dsv(box), expected);
+#endif
 }
 
 
diff --git a/test/algorithms/test_for_each.hpp b/test/algorithms/test_for_each.hpp
index b93b72de3..71d2c6d07 100644
--- a/test/algorithms/test_for_each.hpp
+++ b/test/algorithms/test_for_each.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -101,12 +101,12 @@ void test_per_point_const(Geometry const& geometry, int expected)
 
 	bg::for_each_point
         (
-            geometry, 
-            [&sum_x](point_type const& p) 
-                { 
+            geometry,
+            [&sum_x](point_type const& p)
+                {
                     sum_x += bg::get<0>(p);
                 }
-                    
+
         );
 
     BOOST_CHECK_EQUAL(sum_x, expected);
@@ -151,23 +151,23 @@ void test_per_point_non_const(Geometry& geometry,
     geometry = copy;
 	bg::for_each_point
         (
-            geometry, 
-            [](point_type& p) 
-                { 
+            geometry,
+            [](point_type& p)
+                {
                     bg::set<0>(p, bg::get<0>(p) + 100);
                 }
-                    
+
         );
 
 	typename bg::coordinate_type<point_type>::type scale = 100;
 	bg::for_each_point
         (
-            geometry, 
-            [&](point_type& p) 
-                { 
+            geometry,
+            [&](point_type& p)
+                {
                     bg::set<1>(p, bg::get<1>(p) * scale);
                 }
-                    
+
         );
 
     std::ostringstream out3;
diff --git a/test/algorithms/test_get_turns_ll_invariance.hpp b/test/algorithms/test_get_turns_ll_invariance.hpp
new file mode 100644
index 000000000..b0c981e64
--- /dev/null
+++ b/test/algorithms/test_get_turns_ll_invariance.hpp
@@ -0,0 +1,163 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_GET_TURNS_LL_INVARIANCE_HPP
+#define BOOST_GEOMETRY_TEST_GET_TURNS_LL_INVARIANCE_HPP
+
+#include <vector>
+
+#include <boost/geometry/algorithms/reverse.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+
+#include <boost/geometry/algorithms/detail/turns/compare_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/print_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/filter_continue_turns.hpp>
+#include <boost/geometry/algorithms/detail/turns/remove_duplicate_turns.hpp>
+
+
+namespace bg_detail = ::boost::geometry::detail;
+namespace bg_turns = bg_detail::turns;
+
+template
+<
+    bool EnableRemoveDuplicateTurns = true,
+    bool EnableDegenerateTurns = true
+>
+class test_get_turns_ll_invariance
+{
+private:
+    struct assign_policy
+    {
+        static bool const include_no_turn = false;
+        static bool const include_degenerate = EnableDegenerateTurns;
+        static bool const include_opposite = false;
+
+        template
+        <
+            typename Info,
+            typename Point1,
+            typename Point2,
+            typename IntersectionInfo,
+            typename DirInfo
+        >
+        static inline void apply(Info& , Point1 const& , Point2 const& ,
+                                 IntersectionInfo const& , DirInfo const& )
+        {
+        }
+    };
+
+
+
+    template
+    <
+        typename Turns,
+        typename LinearGeometry1,
+        typename LinearGeometry2
+    >
+    static inline void compute_turns(Turns& turns,
+                                     LinearGeometry1 const& linear1,
+                                     LinearGeometry2 const& linear2)
+    {
+        turns.clear();
+        bg_detail::relate::turns::get_turns
+            <
+                LinearGeometry1,
+                LinearGeometry2,
+                bg_detail::get_turns::get_turn_info_type
+                <
+                    LinearGeometry1,
+                    LinearGeometry2,
+                    assign_policy
+                >
+            >::apply(turns, linear1, linear2);
+    }
+
+
+
+public:
+    template <typename Linear1, typename Linear2>
+    static inline void apply(Linear1 const& lineargeometry1,
+                             Linear2 const& lineargeometry2)
+    {
+        typedef typename bg_detail::relate::turns::get_turns
+            <
+                Linear1, Linear2
+            >::turn_info turn_info;
+
+        typedef std::vector<turn_info> turns_container;
+
+        typedef bg_turns::filter_continue_turns
+            <
+                turns_container, true
+            > filter_continue_turns;
+
+        typedef bg_turns::remove_duplicate_turns
+            <
+                turns_container, EnableRemoveDuplicateTurns
+            > remove_duplicate_turns;
+
+        turns_container turns;
+
+        Linear1 linear1(lineargeometry1);
+        Linear2 linear2(lineargeometry2);
+
+        Linear2 linear2_reverse(linear2);
+        boost::geometry::reverse(linear2_reverse);
+
+        turns_container turns_all, rturns_all;
+        compute_turns(turns_all, linear1, linear2);
+        compute_turns(rturns_all, linear1, linear2_reverse);
+
+        turns_container turns_wo_cont(turns_all);
+        turns_container rturns_wo_cont(rturns_all);
+
+        filter_continue_turns::apply(turns_wo_cont);
+        filter_continue_turns::apply(rturns_wo_cont);
+
+        std::sort(boost::begin(turns_all), boost::end(turns_all),
+                  bg_turns::less_seg_fraction_other_op<>());
+
+        std::sort(boost::begin(turns_wo_cont), boost::end(turns_wo_cont),
+                  bg_turns::less_seg_fraction_other_op<>());
+
+        std::sort(boost::begin(rturns_all), boost::end(rturns_all),
+                  bg_turns::less_seg_fraction_other_op<std::greater<int> >());
+
+        std::sort(boost::begin(rturns_wo_cont), boost::end(rturns_wo_cont),
+                  bg_turns::less_seg_fraction_other_op<std::greater<int> >());
+
+        remove_duplicate_turns::apply(turns_all);
+        remove_duplicate_turns::apply(turns_wo_cont);
+        remove_duplicate_turns::apply(rturns_all);
+        remove_duplicate_turns::apply(rturns_wo_cont);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl << std::endl;
+        std::cout << "### ORIGINAL TURNS ###" << std::endl;
+        bg_turns::print_turns(linear1, linear2, turns_all);
+        std::cout << std::endl << std::endl;
+        std::cout << "### ORIGINAL REVERSE TURNS ###" << std::endl;
+        bg_turns::print_turns(linear1, linear2_reverse, rturns_all);
+        std::cout << std::endl << std::endl;
+        std::cout << "### TURNS W/O CONTINUE TURNS ###" << std::endl;
+        bg_turns::print_turns(linear1, linear2, turns_wo_cont);
+        std::cout << std::endl << std::endl;
+        std::cout << "### REVERSE TURNS W/O CONTINUE TURNS ###" << std::endl;
+        bg_turns::print_turns(linear1, linear2_reverse, rturns_wo_cont);
+        std::cout << std::endl << std::endl;
+#endif
+
+        BOOST_ASSERT(boost::size(turns_wo_cont) == boost::size(rturns_wo_cont));
+    }
+};
+
+
+
+#endif // BOOST_GEOMETRY_TEST_GET_TURNS_LL_INVARIANCE_HPP
diff --git a/test/algorithms/test_intersection.hpp b/test/algorithms/test_intersection.hpp
index 119bdfbc7..36c4c1154 100644
--- a/test/algorithms/test_intersection.hpp
+++ b/test/algorithms/test_intersection.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -12,7 +12,9 @@
 #include <fstream>
 #include <iomanip>
 
+#include <boost/core/ignore_unused.hpp>
 #include <boost/foreach.hpp>
+#include <boost/variant/variant.hpp>
 
 #include <boost/geometry/algorithms/intersection.hpp>
 #include <boost/geometry/algorithms/area.hpp>
@@ -33,49 +35,26 @@
 
 #include <geometry_test_common.hpp>
 
-
-template <typename OutputType, typename CalculationType, typename G1, typename G2>
-typename bg::default_area_result<G1>::type test_intersection(std::string const& caseid,
-        G1 const& g1, G2 const& g2,
-        std::size_t expected_count = 0, std::size_t expected_point_count = 0,
-        double expected_length_or_area = 0,
-        double percentage = 0.0001,
-        bool debug = false)
+template <typename G1, typename G2, typename OutputType>
+typename bg::default_area_result<G1>::type
+check_result(
+    std::vector<OutputType> const& intersection_output,
+    std::string const& caseid,
+    std::size_t expected_count = 0, int expected_point_count = 0,
+    double expected_length_or_area = 0,
+    double percentage = 0.0001,
+    bool debug = false)
 {
     bool const is_line = bg::geometry_id<OutputType>::type::value == 2;
 
-    if (debug)
-    {
-        std::cout << std::endl << "case " << caseid << std::endl;
-    }
-
-
     typedef typename bg::coordinate_type<G1>::type coordinate_type;
     typedef typename bg::point_type<G1>::type point_type;
-
-    typedef bg::strategy_intersection
-        <
-            typename bg::cs_tag<point_type>::type,
-            G1,
-            G2,
-            point_type,
-            CalculationType
-        > strategy;
-
-    // Check both normal behaviour, and _inserter behaviour
-    if (! debug)
-    {
-        std::vector<OutputType> out;
-        bg::intersection(g1, g2, out);
-    }
-    std::vector<OutputType> clip;
-    bg::detail::intersection::intersection_insert<OutputType>(g1, g2, std::back_inserter(clip), strategy());
-
+    boost::ignore_unused<coordinate_type, point_type>();
 
     typename bg::default_area_result<G1>::type length_or_area = 0;
-    std::size_t n = 0;
-    for (typename std::vector<OutputType>::iterator it = clip.begin();
-            it != clip.end();
+    int n = 0;
+    for (typename std::vector<OutputType>::const_iterator it = intersection_output.begin();
+            it != intersection_output.end();
             ++it)
     {
         if (expected_point_count > 0)
@@ -84,7 +63,7 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
         }
 
         // instead of specialization we check it run-time here
-        length_or_area += is_line 
+        length_or_area += is_line
             ? bg::length(*it)
             : bg::area(*it);
 
@@ -94,24 +73,25 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
         }
     }
 
-
 #if ! defined(BOOST_GEOMETRY_NO_BOOST_TEST)
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     if (expected_point_count > 0)
     {
-        BOOST_CHECK_MESSAGE(n == expected_point_count,
+        BOOST_CHECK_MESSAGE(bg::math::abs(n - expected_point_count) < 3,
                 "intersection: " << caseid
                 << " #points expected: " << expected_point_count
                 << " detected: " << n
                 << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
+#endif
 
     if (expected_count > 0)
     {
-        BOOST_CHECK_MESSAGE(clip.size() == expected_count,
+        BOOST_CHECK_MESSAGE(intersection_output.size() == expected_count,
                 "intersection: " << caseid
                 << " #outputs expected: " << expected_count
-                << " detected: " << clip.size()
+                << " detected: " << intersection_output.size()
                 << " type: " << (type_for_assert_message<G1, G2>())
                 );
     }
@@ -120,7 +100,6 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
     BOOST_CHECK_CLOSE(detected_length_or_area, expected_length_or_area, percentage);
 #endif
 
-
 #if defined(TEST_WITH_SVG)
     {
         bool const ccw =
@@ -137,6 +116,9 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
             << string_from_type<CalculationType>::name()
             << (ccw ? "_ccw" : "")
             << (open ? "_open" : "")
+#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+            << "_no_rob"
+#endif
             << ".svg";
 
         std::ofstream svg(filename.str().c_str());
@@ -153,8 +135,8 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
         mapper.map(g2, "fill-opacity:0.3;fill:rgb(51,51,153);"
                     "stroke:rgb(51,51,153);stroke-width:3");
 
-        for (typename std::vector<OutputType>::const_iterator it = clip.begin();
-                it != clip.end(); ++it)
+        for (typename std::vector<OutputType>::const_iterator it = intersection_output.begin();
+                it != intersection_output.end(); ++it)
         {
             mapper.map(*it, "fill-opacity:0.2;stroke-opacity:0.4;fill:rgb(255,0,0);"
                         "stroke:rgb(255,0,255);stroke-width:8");
@@ -162,6 +144,69 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
     }
 #endif
 
+    return length_or_area;
+}
+
+
+template <typename OutputType, typename CalculationType, typename G1, typename G2>
+typename bg::default_area_result<G1>::type test_intersection(std::string const& caseid,
+        G1 const& g1, G2 const& g2,
+        std::size_t expected_count = 0, int expected_point_count = 0,
+        double expected_length_or_area = 0,
+        double percentage = 0.0001,
+        bool debug = false)
+{
+    if (debug)
+    {
+        std::cout << std::endl << "case " << caseid << std::endl;
+    }
+
+    typedef typename bg::point_type<G1>::type point_type;
+
+    if (! debug)
+    {
+        // Check _inserter behaviour with stratey
+        typedef bg::strategy_intersection
+            <
+                typename bg::cs_tag<point_type>::type,
+                G1,
+                G2,
+                point_type,
+                typename bg::rescale_policy_type<point_type>::type,
+                CalculationType
+            > strategy;
+        std::vector<OutputType> clip;
+        bg::detail::intersection::intersection_insert<OutputType>(g1, g2, std::back_inserter(clip), strategy());
+    }
+
+    typename bg::default_area_result<G1>::type length_or_area = 0;
+
+    // Check normal behaviour
+    std::vector<OutputType> intersection_output;
+    bg::intersection(g1, g2, intersection_output);
+
+    check_result<G1, G2>(intersection_output, caseid, expected_count, expected_point_count,
+        expected_length_or_area, percentage, debug);
+
+    // Check variant behaviour
+    intersection_output.clear();
+    bg::intersection(boost::variant<G1>(g1), g2, intersection_output);
+
+    check_result<G1, G2>(intersection_output, caseid, expected_count, expected_point_count,
+        expected_length_or_area, percentage, debug);
+
+    intersection_output.clear();
+    bg::intersection(g1, boost::variant<G2>(g2), intersection_output);
+
+    check_result<G1, G2>(intersection_output, caseid, expected_count, expected_point_count,
+        expected_length_or_area, percentage, debug);
+
+    intersection_output.clear();
+    bg::intersection(boost::variant<G1>(g1), boost::variant<G2>(g2), intersection_output);
+
+    check_result<G1, G2>(intersection_output, caseid, expected_count, expected_point_count,
+        expected_length_or_area, percentage, debug);
+
     if (debug)
     {
         std::cout << "end case " << caseid << std::endl;
@@ -173,7 +218,7 @@ typename bg::default_area_result<G1>::type test_intersection(std::string const&
 template <typename OutputType, typename G1, typename G2>
 typename bg::default_area_result<G1>::type test_one(std::string const& caseid,
         std::string const& wkt1, std::string const& wkt2,
-        std::size_t expected_count = 0, std::size_t expected_point_count = 0,
+        std::size_t expected_count = 0, int expected_point_count = 0,
         double expected_length_or_area = 0,
         double percentage = 0.0001,
         bool debug = false)
@@ -197,7 +242,7 @@ typename bg::default_area_result<G1>::type test_one(std::string const& caseid,
 template <typename OutputType, typename Areal, typename Linear>
 void test_one_lp(std::string const& caseid,
         std::string const& wkt_areal, std::string const& wkt_linear,
-        std::size_t expected_count = 0, std::size_t expected_point_count = 0,
+        std::size_t expected_count = 0, int expected_point_count = 0,
         double expected_length = 0,
         double percentage = 0.0001,
         bool debug1 = false, bool debug2 = false)
@@ -227,7 +272,7 @@ void test_point_output(std::string const& wkt1, std::string const& wkt2, unsigne
     Geometry1 g1;
     bg::read_wkt(wkt1, g1);
     bg::correct(g1);
-        
+
     Geometry2 g2;
     bg::read_wkt(wkt2, g2);
     bg::correct(g2);
diff --git a/test/algorithms/test_intersection_linear_linear.hpp b/test/algorithms/test_intersection_linear_linear.hpp
new file mode 100644
index 000000000..9fbb71d08
--- /dev/null
+++ b/test/algorithms/test_intersection_linear_linear.hpp
@@ -0,0 +1,213 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
+
+#include "from_wkt.hpp"
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/geometry.hpp>
+#include "test_set_ops_linear_linear.hpp"
+#include "to_svg.hpp"
+
+
+//==================================================================
+//==================================================================
+// intersection of (linear) geometries
+//==================================================================
+//==================================================================
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename MultiLineString
+>
+class test_intersection_of_geometries
+{
+private:
+    static inline void base_test(Geometry1 const& geometry1,
+                                 Geometry2 const& geometry2,
+                                 MultiLineString const& mls_int1,
+                                 MultiLineString const& mls_int2,
+                                 std::string const& case_id,
+                                 bool test_vector_and_deque = false)
+    {
+        static bool vector_deque_already_tested = false;
+
+        typedef typename boost::range_value<MultiLineString>::type LineString;
+        typedef std::vector<LineString> linestring_vector;
+        typedef std::deque<LineString> linestring_deque;
+
+        MultiLineString mls_output;
+
+        linestring_vector ls_vector_output;
+        linestring_deque ls_deque_output;
+
+        bg::intersection(geometry1, geometry2, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_int1, mls_output)
+                             || equals::apply(mls_int2, mls_output),
+                             "intersection L/L: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mls_int1)
+                             << " or: " << bg::wkt(mls_int2)
+                             << " computed: " << bg::wkt(mls_output) );
+
+        set_operation_output("intersection", case_id,
+                             geometry1, geometry2, mls_output);
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "intersection : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected intersection : " << bg::wkt(mls_int1)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+
+        if ( !vector_deque_already_tested && test_vector_and_deque )
+        {
+            vector_deque_already_tested = true;
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << std::endl;
+            std::cout << "Testing with vector and deque as output container..."
+                      << std::endl;
+#endif
+            bg::intersection(geometry1, geometry2, ls_vector_output);
+            bg::intersection(geometry1, geometry2, ls_deque_output);
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_int1,
+                                                             ls_vector_output));
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_int1,
+                                                             ls_deque_output));
+
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "Done!" << std::endl << std::endl;
+#endif
+        }
+
+        // check the intersection where the order of the two
+        // geometries is reversed
+        bg::clear(mls_output);
+        bg::intersection(geometry2, geometry1, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_int1, mls_output)
+                             || equals::apply(mls_int2, mls_output),
+                             "intersection L/L: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mls_int1)
+                             << " or: " << bg::wkt(mls_int2)
+                             << " computed: " << bg::wkt(mls_output) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "intersection : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected intersection : " << bg::wkt(mls_int2)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+    static inline void base_test_all(Geometry1 const& geometry1,
+                                     Geometry2 const& geometry2)
+    {
+        //typedef typename boost::range_value<MultiLineString>::type LineString;
+        typedef typename bg::point_type<MultiLineString>::type Point;
+        typedef bg::model::multi_point<Point> multi_point;
+
+        MultiLineString mls12_output, mls21_output;
+        multi_point mp12_output, mp21_output;
+
+        bg::intersection(geometry1, geometry2, mls12_output);
+        bg::intersection(geometry1, geometry2, mp12_output);
+        bg::intersection(geometry2, geometry1, mls21_output);
+        bg::intersection(geometry2, geometry1, mp21_output);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "************************************" << std::endl;
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "intersection(1,2) [MLS]: " << bg::wkt(mls12_output)
+                  << std::endl;
+        std::cout << "intersection(2,1) [MLS]: " << bg::wkt(mls21_output)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "intersection(1,2) [MP]: " << bg::wkt(mp12_output)
+                  << std::endl;
+        std::cout << "intersection(2,1) [MP]: " << bg::wkt(mp21_output)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+public:
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_int1,
+                             MultiLineString const& mls_int2,
+                             std::string const& case_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "test case: " << case_id << std::endl;
+        std::stringstream sstr;
+        sstr << "svgs/" << case_id << ".svg";
+#ifdef TEST_WITH_SVG
+        to_svg(geometry1, geometry2, sstr.str());
+#endif
+#endif
+
+        Geometry1 rg1(geometry1);
+        bg::reverse<Geometry1>(rg1);
+
+        Geometry2 rg2(geometry2);
+        bg::reverse<Geometry2>(rg2);
+
+        test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl
+                  << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+                  << std::endl << std::endl;
+#endif
+        test_get_turns_ll_invariance<>::apply(rg1, geometry2);
+
+
+        base_test(geometry1, geometry2, mls_int1, mls_int2, case_id);
+        //        base_test(rg1, rg2, mls_int1, mls_int2);
+        base_test_all(geometry1, geometry2);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_int,
+                             std::string const& case_id)
+    {
+        apply(geometry1, geometry2, mls_int, mls_int, case_id);
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_INTERSECTION_LINEAR_LINEAR_HPP
diff --git a/test/algorithms/test_intersects.hpp b/test/algorithms/test_intersects.hpp
index dac1b1eae..7a8af7161 100644
--- a/test/algorithms/test_intersects.hpp
+++ b/test/algorithms/test_intersects.hpp
@@ -1,7 +1,9 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
 // 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)
@@ -20,6 +22,18 @@
 
 #include <boost/geometry/io/wkt/read.hpp>
 
+#include <boost/geometry/multi/core/geometry_id.hpp>
+#include <boost/geometry/multi/core/point_order.hpp>
+#include <boost/geometry/multi/core/ring_type.hpp>
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
+#include <boost/geometry/multi/algorithms/detail/point_on_border.hpp>
+#include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
+#include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
+#include <boost/geometry/multi/views/detail/range_type.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+#include <boost/geometry/multi/io/wkt/read.hpp>
 
 template <typename Geometry1, typename Geometry2>
 void test_geometry(std::string const& wkt1,
diff --git a/test/algorithms/test_length.hpp b/test/algorithms/test_length.hpp
index d91ba4989..485c38056 100644
--- a/test/algorithms/test_length.hpp
+++ b/test/algorithms/test_length.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -44,7 +44,9 @@ void test_geometry(std::string const& wkt, double expected_length)
     Geometry geometry;
     bg::read_wkt(wkt, geometry);
     test_length(geometry, expected_length);
+#if !defined(GEOMETRY_TEST_DEBUG)
     test_length(boost::variant<Geometry>(geometry), expected_length);
+#endif
 }
 
 template <typename Geometry>
diff --git a/test/algorithms/test_overlaps.hpp b/test/algorithms/test_overlaps.hpp
index b4e76a340..862fe7389 100644
--- a/test/algorithms/test_overlaps.hpp
+++ b/test/algorithms/test_overlaps.hpp
@@ -1,4 +1,4 @@
-// Generic Geometry2 Library 
+// Generic Geometry2 Library
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -15,8 +15,8 @@
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/algorithms/overlaps.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/geometries/ring.hpp>
-#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/io/wkt/read.hpp>
 
@@ -33,6 +33,14 @@ void test_geometry(std::string const& wkt1,
 
     bool detected = bg::overlaps(geometry1, geometry2);
 
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "overlaps: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+    detected = bg::overlaps(geometry2, geometry1);
+
     BOOST_CHECK_MESSAGE(detected == expected,
         "overlaps: " << wkt1
         << " with " << wkt2
diff --git a/test/algorithms/test_overlay.hpp b/test/algorithms/test_overlay.hpp
index 8b7bd0172..69a0d17a3 100644
--- a/test/algorithms/test_overlay.hpp
+++ b/test/algorithms/test_overlay.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/algorithms/test_perimeter.hpp b/test/algorithms/test_perimeter.hpp
index 0d6a9537a..74f04648a 100644
--- a/test/algorithms/test_perimeter.hpp
+++ b/test/algorithms/test_perimeter.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -10,25 +10,26 @@
 #define BOOST_GEOMETRY_TEST_PERIMETER_HPP
 
 
+#include <boost/typeof/typeof.hpp>
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/algorithms/perimeter.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-
-
 #include <boost/geometry/io/wkt/read.hpp>
 
 
 template <typename Geometry>
 void test_perimeter(Geometry const& geometry, long double expected_perimeter)
 {
-    typename bg::default_distance_result<Geometry>::type perimeter = bg::perimeter(geometry);
+    BOOST_AUTO(perimeter, bg::perimeter(geometry));
 
 #ifdef GEOMETRY_TEST_DEBUG
     std::ostringstream out;
     out << typeid(typename bg::coordinate_type<Geometry>::type).name()
         << std::endl
-        << typeid(typename bg::perimeter_result<Geometry>::type).name()
+        << typeid(typename bg::default_length_result<Geometry>::type).name()
         << std::endl
         << "perimeter : " << bg::perimeter(geometry)
         << std::endl;
@@ -44,7 +45,12 @@ void test_geometry(std::string const& wkt, double expected_perimeter)
 {
     Geometry geometry;
     bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
     test_perimeter(geometry, expected_perimeter);
+#if !defined(GEOMETRY_TEST_DEBUG)
+    test_perimeter(v, expected_perimeter);
+#endif
 }
 
 template <typename Geometry>
diff --git a/test/algorithms/test_relate.hpp b/test/algorithms/test_relate.hpp
index e747a4047..116d47de9 100644
--- a/test/algorithms/test_relate.hpp
+++ b/test/algorithms/test_relate.hpp
@@ -1,33 +1,121 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
-// Unit Test
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013-2014 Oracle and/or its affiliates.
 
-// Copyright (c) 2010-2012 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #ifndef BOOST_GEOMETRY_TEST_RELATE_HPP
 #define BOOST_GEOMETRY_TEST_RELATE_HPP
 
-#include <string>
+#include <geometry_test_common.hpp>
 
+#include <boost/geometry/core/ring_type.hpp>
+#include <boost/geometry/algorithms/detail/relate/relate.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
-static std::string disjoint_simplex[2] =
-    {"POLYGON((0 0,0 2,2 2,0 0))",
-    "POLYGON((1 0,3 2,3 0,1 0))"};
+#include <boost/geometry/io/wkt/read.hpp>
 
-static std::string touch_simplex[2] =
-    {"POLYGON((0 0,0 2,2 2,0 0))",
-    "POLYGON((2 2,3 2,3 0,2 2))"};
+#include <boost/geometry/strategies/cartesian/point_in_box.hpp>
+#include <boost/geometry/strategies/cartesian/box_in_box.hpp>
+#include <boost/geometry/strategies/agnostic/point_in_box_by_side.hpp>
 
-static std::string overlaps_box[2] =
-    {"POLYGON((0 0,0 2,2 2,0 0))",
-    "POLYGON((1 1,3 2,3 0,1 1))"};
+namespace bgdr = bg::detail::relate;
 
-static std::string within_simplex[2] =
-    {"POLYGON((0 0,1 4,4 1,0 0))",
-    "POLYGON((1 1,1 3,3 1,1 1))"};
+std::string transposed(std::string matrix)
+{
+    std::swap(matrix[1], matrix[3]);
+    std::swap(matrix[2], matrix[6]);
+    std::swap(matrix[5], matrix[7]);
+    return matrix;
+}
 
+template <typename Geometry1, typename Geometry2>
+void check_geometry(Geometry1 const& geometry1,
+                    Geometry2 const& geometry2,
+                    std::string const& wkt1,
+                    std::string const& wkt2,
+                    std::string const& expected)
+{
+    {
+        std::string res_str = bgdr::relate<bgdr::matrix9>(geometry1, geometry2);
+        bool ok = boost::equal(res_str, expected);
+        BOOST_CHECK_MESSAGE(ok,
+            "relate: " << wkt1
+            << " and " << wkt2
+            << " -> Expected: " << expected
+            << " detected: " << res_str);
+    }
 
+    // changed sequence of geometries - transposed result
+    {
+        std::string res_str = bgdr::relate(geometry2, geometry1, bgdr::matrix9());
+        std::string expected_tr = transposed(expected);
+        bool ok = boost::equal(res_str, expected_tr);
+        BOOST_CHECK_MESSAGE(ok,
+            "relate: " << wkt2
+            << " and " << wkt1
+            << " -> Expected: " << expected_tr
+            << " detected: " << res_str);
+    }
 
-#endif
+    {
+        bool result = bgdr::relate(geometry1, geometry2, bgdr::mask9(expected));
+        // TODO: SHOULD BE !interrupted - CHECK THIS!
+        BOOST_CHECK_MESSAGE(result, 
+            "relate: " << wkt1
+            << " and " << wkt2
+            << " -> Expected: " << expected);
+    }
+
+    if ( bg::detail::relate::interruption_enabled<Geometry1, Geometry2>::value )
+    {
+        // brake the expected output
+        std::string expected_interrupt = expected;
+        bool changed = false;
+        BOOST_FOREACH(char & c, expected_interrupt)
+        {
+            if ( c >= '0' && c <= '9' )
+            {
+                if ( c == '0' )
+                    c = 'F';
+                else
+                    --c;
+
+                changed = true;
+            }
+        }
+
+        if ( changed )
+        {
+            bool result = bgdr::relate(geometry1, geometry2, bgdr::mask9(expected_interrupt));
+            // TODO: SHOULD BE interrupted - CHECK THIS!
+            BOOST_CHECK_MESSAGE(!result,
+                "relate: " << wkt1
+                << " and " << wkt2
+                << " -> Expected interrupt for:" << expected_interrupt);
+        }
+    }
+}
+
+template <typename Geometry1, typename Geometry2>
+void test_geometry(std::string const& wkt1,
+                   std::string const& wkt2,
+                   std::string const& expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+    check_geometry(geometry1, geometry2, wkt1, wkt2, expected);
+}
+
+#endif // BOOST_GEOMETRY_TEST_RELATE_HPP
diff --git a/test/algorithms/test_reverse.hpp b/test/algorithms/test_reverse.hpp
index 97e537f7b..101429251 100644
--- a/test/algorithms/test_reverse.hpp
+++ b/test/algorithms/test_reverse.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -13,16 +13,13 @@
 
 #include <geometry_test_common.hpp>
 #include <boost/geometry/algorithms/reverse.hpp>
-
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/variant/variant.hpp>
 
 
 template <typename Geometry>
-void test_geometry(std::string const& wkt, std::string const& expected)
+void check_geometry(Geometry& geometry, std::string const& wkt, std::string const& expected)
 {
-    Geometry geometry;
-
-    bg::read_wkt(wkt, geometry);
     bg::reverse(geometry);
 
     std::ostringstream out;
@@ -34,5 +31,16 @@ void test_geometry(std::string const& wkt, std::string const& expected)
         << " got " << out.str());
 }
 
+template <typename Geometry>
+void test_geometry(std::string const& wkt, std::string const& expected)
+{
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
+    check_geometry(geometry, wkt, expected);
+    check_geometry(v, wkt, expected);
+}
+
 
 #endif
diff --git a/test/algorithms/test_set_ops_linear_linear.hpp b/test/algorithms/test_set_ops_linear_linear.hpp
new file mode 100644
index 000000000..c3ff6757d
--- /dev/null
+++ b/test/algorithms/test_set_ops_linear_linear.hpp
@@ -0,0 +1,307 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
+
+
+#include <string>
+#include <fstream>
+#include <sstream>
+#include <algorithm>
+
+#include <boost/range.hpp>
+#include <boost/geometry/policies/compare.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/reverse.hpp>
+#include <boost/geometry/multi/algorithms/reverse.hpp>
+
+#include "test_get_turns_ll_invariance.hpp"
+
+namespace bg = ::boost::geometry;
+
+
+
+template <typename Linestring1, typename Linestring2>
+struct ls_less
+{
+    typedef typename boost::range_iterator<Linestring1 const>::type Iterator1;
+    typedef typename boost::range_iterator<Linestring2 const>::type Iterator2;
+
+    typedef bg::less<typename bg::point_type<Linestring1>::type> point_less;
+
+    bool operator()(Linestring1 const& linestring1,
+                    Linestring2 const& linestring2) const
+    {
+        if ( boost::size(linestring1) != boost::size(linestring2) )
+            return boost::size(linestring1) < boost::size(linestring2);
+
+        Iterator1 it1 = boost::begin(linestring1);
+        Iterator2 it2 = boost::begin(linestring2);
+        point_less less;
+        for (; it1 != boost::end(linestring1); ++it1, ++it2)
+        {
+            if ( less(*it1, *it2) )
+                return true;
+            if ( less(*it2, *it1) )
+                return false;
+        }
+        return false;
+    }
+};
+
+
+template <typename Linestring1, typename Linestring2>
+struct ls_equal
+{
+    bool operator()(Linestring1 const& linestring1,
+                    Linestring2 const& linestring2) const
+    {
+        ls_less<Linestring1, Linestring2> less;
+
+        return !less(linestring1, linestring2)
+            && !less(linestring2, linestring1);
+    }    
+};
+
+
+template <bool EnableUnique = false>
+struct multilinestring_equals
+{
+    template <typename MultiLinestring, bool Enable>
+    struct unique
+    {
+        typedef typename boost::range_value<MultiLinestring>::type Linestring;
+        typedef ls_equal<Linestring, Linestring> linestring_equal;
+
+        void operator()(MultiLinestring& mls)
+        {
+            mls.erase(std::unique(boost::begin(mls),
+                                  boost::end(mls),
+                                  linestring_equal()),
+                      boost::end(mls));
+        }
+    };
+
+    template <typename MultiLinestring>
+    struct unique<MultiLinestring, false>
+    {
+        void operator()(MultiLinestring&)
+        {
+        }
+    };
+
+    template <typename MultiLinestring1, typename MultiLinestring2>
+    static inline
+    bool apply(MultiLinestring1 const& multilinestring1,
+               MultiLinestring2 const& multilinestring2)
+    {
+        typedef typename boost::range_iterator
+            <
+                MultiLinestring1 const
+            >::type ls1_iterator;
+
+        typedef typename boost::range_iterator
+            <
+                MultiLinestring2 const
+            >::type ls2_iterator;
+
+        typedef typename boost::range_value<MultiLinestring1>::type Linestring1;
+
+        typedef typename boost::range_value<MultiLinestring2>::type Linestring2;
+
+        typedef typename boost::range_iterator
+            <
+                Linestring1 const
+            >::type point1_iterator;
+
+        typedef typename boost::range_iterator
+            <
+                Linestring2 const
+            >::type point2_iterator;
+
+        typedef ls_less<Linestring1, Linestring2> linestring_less;
+
+        MultiLinestring1 mls1 = multilinestring1;
+        MultiLinestring2 mls2 = multilinestring2;
+
+        std::sort(boost::begin(mls1), boost::end(mls1), linestring_less());
+        std::sort(boost::begin(mls2), boost::end(mls2), linestring_less());
+
+        unique<MultiLinestring1, EnableUnique>()(mls1);
+        unique<MultiLinestring2, EnableUnique>()(mls2);
+
+        if ( boost::size(mls1) != boost::size(mls2) )
+        {
+            return false;
+        }
+
+        ls1_iterator it1 = boost::begin(mls1);
+        ls2_iterator it2 = boost::begin(mls2);
+        for (; it1 != boost::end(mls1); ++it1, ++it2)
+        {
+            if ( boost::size(*it1) != boost::size(*it2) )
+            {
+                return false;
+            }
+            point1_iterator pit1 = boost::begin(*it1);
+            point2_iterator pit2 = boost::begin(*it2);
+            for (; pit1 != boost::end(*it1); ++pit1, ++pit2)
+            {
+                if ( !bg::equals(*pit1, *pit2) )
+                {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+};
+
+
+
+
+class equals
+{
+private:
+    template <typename Linestring, typename OutputIterator>
+    static inline OutputIterator
+    isolated_point_to_segment(Linestring const& linestring, OutputIterator oit)
+    {
+        BOOST_ASSERT( boost::size(linestring) == 1 );
+
+        *oit++ = *boost::begin(linestring);
+        *oit++ = *boost::begin(linestring);
+        return oit;
+    }
+
+
+    template <typename MultiLinestring, typename OutputIterator>
+    static inline OutputIterator
+    convert_isolated_points_to_segments(MultiLinestring const& multilinestring,
+                                        OutputIterator oit)
+    {
+        BOOST_AUTO_TPL(it, boost::begin(multilinestring));
+
+        for (; it != boost::end(multilinestring); ++it)
+        {
+            if ( boost::size(*it) == 1 )
+            {
+                typename boost::range_value<MultiLinestring>::type linestring;
+                isolated_point_to_segment(*it, std::back_inserter(linestring));
+                *oit++ = linestring;
+            }
+            else
+            {
+                *oit++ = *it;
+            }
+        }
+        return oit;
+    }
+
+
+    template <typename MultiLinestring1, typename MultiLinestring2>
+    static inline bool apply_base(MultiLinestring1 const& multilinestring1,
+                                  MultiLinestring2 const& multilinestring2)
+    {
+        typedef multilinestring_equals<true> mls_equals;
+
+        if ( mls_equals::apply(multilinestring1, multilinestring2) )
+        {
+            return true;
+        }
+
+        MultiLinestring1 reverse_multilinestring1 = multilinestring1;
+        bg::reverse(reverse_multilinestring1);
+        if ( mls_equals::apply(reverse_multilinestring1, multilinestring2) )
+        {
+            return true;
+        }
+
+        MultiLinestring2 reverse_multilinestring2 = multilinestring2;
+        bg::reverse(reverse_multilinestring2);
+        if ( mls_equals::apply(multilinestring1, reverse_multilinestring2) )
+        {
+            return true;
+        }
+
+        return mls_equals::apply(reverse_multilinestring1,
+                                 reverse_multilinestring2);
+    }
+
+
+
+public:
+    template <typename MultiLinestring1, typename MultiLinestring2>
+    static inline bool apply(MultiLinestring1 const& multilinestring1,
+                             MultiLinestring2 const& multilinestring2)
+    {
+#ifndef BOOST_GEOMETRY_ALLOW_ONE_POINT_LINESTRINGS
+        MultiLinestring1 converted_multilinestring1;
+        convert_isolated_points_to_segments
+            (multilinestring1, std::back_inserter(converted_multilinestring1));
+        MultiLinestring2 converted_multilinestring2;
+        convert_isolated_points_to_segments
+            (multilinestring2, std::back_inserter(converted_multilinestring2));
+        return apply_base(converted_multilinestring1,
+                          converted_multilinestring2);
+#else
+        return apply_base(multilinestring1, multilinestring2);
+#endif
+    }
+};
+
+
+
+
+template <typename Output, typename G1, typename G2>
+void set_operation_output(std::string const& set_op_id,
+                          std::string const& caseid,
+                          G1 const& g1, G2 const& g2,
+                          Output const& output)
+{
+#if defined(TEST_WITH_SVG)
+    typedef typename bg::coordinate_type<G1>::type coordinate_type;
+    typedef typename bg::point_type<G1>::type point_type;
+
+    std::ostringstream filename;
+    filename << "svgs/" << set_op_id << "_" << caseid << ".svg";
+
+    std::ofstream svg(filename.str().c_str());
+
+    bg::svg_mapper<point_type> mapper(svg, 500, 500);
+
+    mapper.add(g1);
+    mapper.add(g2);
+
+    mapper.map(g2, "stroke-opacity:1;stroke:rgb(153,204,0);stroke-width:4");
+    mapper.map(g1, "stroke-opacity:1;stroke:rgb(51,51,153);stroke-width:2");
+
+    BOOST_AUTO_TPL(it, output.begin());
+    for (; it != output.end(); ++it)
+    {
+        if ( boost::size(*it) == 2
+             && bg::equals(*boost::begin(*it), *++boost::begin(*it)) )
+        {
+            // draw isolated points (generated by the intersection operation)
+            mapper.map(*boost::begin(*it),
+                       "fill:rgb(255,0,255);stroke:rgb(0,0,0);stroke-width:1",
+                       4);
+        }
+        else
+        {
+            mapper.map(*it,
+                       "stroke-opacity:0.4;stroke:rgb(255,0,255);stroke-width:8");
+        }
+    }
+#endif
+}
+
+
+#endif // BOOST_GEOMETRY_TEST_SET_OPS_LINEAR_LINEAR_HPP
diff --git a/test/algorithms/test_set_ops_pl_pl.hpp b/test/algorithms/test_set_ops_pl_pl.hpp
new file mode 100644
index 000000000..28c20423a
--- /dev/null
+++ b/test/algorithms/test_set_ops_pl_pl.hpp
@@ -0,0 +1,253 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_SET_OPS_PL_PL_HPP
+#define BOOST_GEOMETRY_TEST_SET_OPS_PL_PL_HPP
+
+
+#include <boost/geometry/geometry.hpp>
+
+namespace bg = ::boost::geometry;
+
+#include "from_wkt.hpp"
+#include "to_svg.hpp"
+
+#include <algorithm>
+#include <fstream>
+#include <boost/geometry/policies/compare.hpp>
+#include <boost/geometry/algorithms/equals.hpp>
+
+#include <boost/geometry/algorithms/union.hpp>
+#include <boost/geometry/algorithms/difference.hpp>
+#include <boost/geometry/algorithms/intersection.hpp>
+#include <boost/geometry/algorithms/sym_difference.hpp>
+
+#include <boost/geometry/algorithms/detail/overlay/overlay_type.hpp>
+
+
+//==================================================================
+//==================================================================
+// svg output
+//==================================================================
+//==================================================================
+
+template <typename Output, typename G1, typename G2>
+void set_operation_output(std::string const& set_op_id,
+                          std::string const& caseid,
+                          G1 const& g1, G2 const& g2,
+                          Output const& output)
+{
+#if defined(TEST_WITH_SVG)
+    typedef typename bg::coordinate_type<G1>::type coordinate_type;
+    typedef typename bg::point_type<G1>::type point_type;
+
+    std::ostringstream filename;
+    filename << "svgs/" << set_op_id << "_" << caseid << ".svg";
+
+    std::ofstream svg(filename.str().c_str());
+
+    bg::svg_mapper<point_type> mapper(svg, 500, 500);
+
+    mapper.add(g1);
+    mapper.add(g2);
+
+    mapper.map(g2, "stroke-opacity:1;stroke:rgb(153,204,0);stroke-width:4");
+    mapper.map(g1, "stroke-opacity:1;stroke:rgb(51,51,153);stroke-width:2");
+
+    BOOST_AUTO_TPL(it, output.begin());
+    for (; it != output.end(); ++it)
+    {
+        mapper.map(*it,
+                   "fill:rgb(255,0,255);stroke:rgb(0,0,0);stroke-width:1",
+                   4);
+    }
+#endif
+}
+
+
+//==================================================================
+//==================================================================
+// testing equality of multi-points
+//==================================================================
+//==================================================================
+
+
+struct equals
+{
+    template <typename MultiPoint1, typename MultiPoint2>
+    static inline bool apply(MultiPoint1 const& multipoint1,
+                             MultiPoint2 const& multipoint2)
+    {
+        MultiPoint1 mp1(multipoint1);
+        MultiPoint2 mp2(multipoint2);
+
+        std::sort(mp1.begin(), mp1.end(),
+                  bg::less<typename bg::point_type<MultiPoint1>::type>());
+        std::sort(mp2.begin(), mp2.end(),
+                  bg::less<typename bg::point_type<MultiPoint2>::type>());
+
+        if ( boost::size(mp1) != boost::size(mp2) )
+        {
+            return false;
+        }
+
+        BOOST_AUTO_TPL(it1, boost::begin(mp1));
+        BOOST_AUTO_TPL(it2, boost::begin(mp2));
+        for (; it1 != boost::end(mp1); ++it1, ++it2)
+        {
+            if ( !bg::equals(*it1, *it2) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+};
+
+
+
+//==================================================================
+//==================================================================
+// struct for calling the appropriate set op function
+//==================================================================
+//==================================================================
+
+template <bg::overlay_type OverlayType> struct set_op;
+
+
+template<>
+struct set_op<bg::overlay_difference>
+{
+    static inline std::string name() { return "difference"; }
+
+    template <typename Geometry1, typename Geometry2, typename GeometryOut>
+    static inline void apply(Geometry1 const& g1,
+                             Geometry2 const& g2,
+                             GeometryOut& gout)
+    {
+        bg::difference(g1, g2, gout);
+    }
+};
+
+
+template<>
+struct set_op<bg::overlay_union>
+{
+    static inline std::string name() { return "union"; }
+
+    template <typename Geometry1, typename Geometry2, typename GeometryOut>
+    static inline void apply(Geometry1 const& g1,
+                             Geometry2 const& g2,
+                             GeometryOut& gout)
+    {
+        bg::union_(g1, g2, gout);
+    }
+};
+
+
+template<>
+struct set_op<bg::overlay_intersection>
+{
+    static inline std::string name() { return "intersection"; }
+
+    template <typename Geometry1, typename Geometry2, typename GeometryOut>
+    static inline void apply(Geometry1 const& g1,
+                             Geometry2 const& g2,
+                             GeometryOut& gout)
+    {
+        bg::intersection(g1, g2, gout);
+    }
+};
+
+
+
+//==================================================================
+//==================================================================
+// test the set operation of (point-like) geometries
+//==================================================================
+//==================================================================
+
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename MultiPoint,
+    bg::overlay_type OverlayType
+>
+class test_set_op_of_pointlike_geometries
+{
+private:
+    template <typename G1, typename G2, typename MP>
+    static inline void base_test(G1 const& geometry1,
+                                 G2 const& geometry2,
+                                 MP const& mp_expected,
+                                 std::string const& case_id)
+    {
+        MultiPoint mp_output;
+
+        set_op<OverlayType>::apply(geometry1, geometry2, mp_output);
+
+        std::string op_name = set_op<OverlayType>::name();
+
+        BOOST_CHECK_MESSAGE( equals::apply(mp_expected, mp_output),
+                             op_name << " P/P: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mp_expected)
+                             << " computed: " << bg::wkt(mp_output) );
+
+        set_operation_output(op_name, case_id,
+                             geometry1, geometry2, mp_output);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "expected " << op_name << " : "
+                  << bg::wkt(mp_expected) << std::endl;
+        std::cout << op_name << " : " << bg::wkt(mp_output) << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+public:
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiPoint const& mp_expected12,
+                             MultiPoint const& mp_expected21,
+                             std::string const& case_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "test case: " << case_id << std::endl;
+#endif
+
+        base_test(geometry1, geometry2, mp_expected12, case_id);
+        base_test(geometry2, geometry1, mp_expected21, case_id);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiPoint const& mp_expected,
+                             std::string const& case_id)
+    {
+        apply(geometry1, geometry2, mp_expected, mp_expected, case_id);
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_SET_OPS_PL_PL_HPP
diff --git a/test/algorithms/test_simplify.hpp b/test/algorithms/test_simplify.hpp
index b5ed1d359..4f67cade3 100644
--- a/test/algorithms/test_simplify.hpp
+++ b/test/algorithms/test_simplify.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -11,12 +11,14 @@
 
 // Test-functionality, shared between single and multi tests
 
+#include <iomanip>
+#include <sstream>
 #include <geometry_test_common.hpp>
 #include <boost/geometry/algorithms/simplify.hpp>
 #include <boost/geometry/algorithms/distance.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/variant/variant.hpp>
 
 template <typename Tag, typename Geometry>
 struct test_inserter
@@ -35,35 +37,55 @@ struct test_inserter<bg::linestring_tag, Geometry>
             std::back_inserter(simplified), distance);
 
         std::ostringstream out;
-        out << bg::wkt(simplified);
+        // TODO: instead of comparing the full string (with more or less decimal digits),
+        // we should call something more robust to check the test for example geometry::equals
+        out << std::setprecision(12) << bg::wkt(simplified);
         BOOST_CHECK_EQUAL(out.str(), expected);
     }
 };
 
 
 template <typename Geometry>
-void test_geometry(std::string const& wkt, std::string const& expected, double distance)
+void check_geometry(Geometry const& geometry,
+                    std::string const& expected,
+                    double distance)
 {
-    Geometry geometry, simplified;
-
-    // Generate polygon using only integer coordinates and obvious results
-    // Polygon is a hexagon, having one extra point (2,1) on a line which should be filtered out.
-    bg::read_wkt(wkt, geometry);
+    Geometry simplified;
     bg::simplify(geometry, simplified, distance);
 
-    {
-        std::ostringstream out;
-        out << bg::wkt(simplified);
+    std::ostringstream out;
+    out << std::setprecision(12) << bg::wkt(simplified);
+    BOOST_CHECK_EQUAL(out.str(), expected);
+}
 
-        BOOST_CHECK_MESSAGE(out.str() == expected,
-            "simplify: " << bg::wkt(geometry)
-            << " expected " << expected
-            << " got " << bg::wkt(simplified));
-    }
+template <typename Geometry, typename Strategy>
+void check_geometry(Geometry const& geometry,
+                    std::string const& expected,
+                    double distance,
+                    Strategy const& strategy)
+{
+    Geometry simplified;
+    bg::simplify(geometry, simplified, distance, strategy);
+
+    std::ostringstream out;
+    out << std::setprecision(12) << bg::wkt(simplified);
+    BOOST_CHECK_EQUAL(out.str(), expected);
+}
+
+template <typename Geometry>
+void test_geometry(std::string const& wkt, std::string const& expected, double distance)
+{
+    // Generate polygon using only integer coordinates and obvious results
+    // Polygon is a hexagon, having one extra point (2,1) on a line which should be filtered out.
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
+    check_geometry(geometry, expected, distance);
+    check_geometry(v, expected, distance);
 
     // Check using user-specified strategy
     typedef typename bg::point_type<Geometry>::type point_type;
-    typedef typename bg::cs_tag<point_type>::type tag;
     typedef bg::strategy::distance::projected_point<double> strategy;
     typedef bg::strategy::simplify::douglas_peucker
         <
@@ -72,13 +94,9 @@ void test_geometry(std::string const& wkt, std::string const& expected, double d
         > simplify_strategy_type;
 
     BOOST_CONCEPT_ASSERT( (bg::concept::SimplifyStrategy<simplify_strategy_type, point_type>) );
-    bg::simplify(geometry, simplified, distance, simplify_strategy_type());
 
-    {
-        std::ostringstream out;
-        out << bg::wkt(simplified);
-        BOOST_CHECK_EQUAL(out.str(), expected);
-    }
+    check_geometry(geometry, expected, distance, simplify_strategy_type());
+    check_geometry(v, expected, distance, simplify_strategy_type());
 
     // Check inserter (if applicable)
     test_inserter
diff --git a/test/algorithms/test_sym_difference_linear_linear.hpp b/test/algorithms/test_sym_difference_linear_linear.hpp
new file mode 100644
index 000000000..d7b9d7f07
--- /dev/null
+++ b/test/algorithms/test_sym_difference_linear_linear.hpp
@@ -0,0 +1,163 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
+
+#include "from_wkt.hpp"
+#include <boost/geometry/geometry.hpp>
+#include "test_set_ops_linear_linear.hpp"
+#include "to_svg.hpp"
+
+
+//==================================================================
+//==================================================================
+// symmetric difference of (linear) geometries
+//==================================================================
+//==================================================================
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename MultiLineString
+>
+class test_sym_difference_of_geometries
+{
+private:
+    static inline void base_test(Geometry1 const& geometry1,
+                                 Geometry2 const& geometry2,
+                                 MultiLineString const& mls_sym_diff,
+                                 std::string const& case_id,
+                                 bool test_vector_and_deque = false)
+    {
+        static bool vector_deque_already_tested = false;
+
+        typedef typename boost::range_value<MultiLineString>::type LineString;
+        typedef std::vector<LineString> linestring_vector;
+        typedef std::deque<LineString> linestring_deque;
+
+        MultiLineString mls_output;
+
+        linestring_vector ls_vector_output;
+        linestring_deque ls_deque_output;
+
+        bg::sym_difference(geometry1, geometry2, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_sym_diff, mls_output),
+                             "sym diff L/L: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mls_sym_diff)
+                             << " computed: " << bg::wkt(mls_output) );
+
+
+        set_operation_output("sym_difference", case_id,
+                             geometry1, geometry2, mls_output);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "sym_difference : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected sym_difference : " << bg::wkt(mls_sym_diff)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+
+        if ( !vector_deque_already_tested && test_vector_and_deque )
+        {
+            vector_deque_already_tested = true;
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << std::endl;
+            std::cout << "Testing with vector and deque as output container..."
+                      << std::endl;
+#endif
+            bg::sym_difference(geometry1, geometry2, ls_vector_output);
+            bg::sym_difference(geometry1, geometry2, ls_deque_output);
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_sym_diff,
+                                                      ls_vector_output));
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_sym_diff, 
+                                                             ls_deque_output));
+
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "Done!" << std::endl << std::endl;
+#endif
+        }
+
+        // check the symmetric difference where the order of the two
+        // geometries is reversed
+        bg::clear(mls_output);
+        bg::sym_difference(geometry2, geometry1, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_sym_diff, mls_output),
+                             "sym diff L/L: " << bg::wkt(geometry2)
+                             << " " << bg::wkt(geometry1)
+                             << " -> Expected: " << bg::wkt(mls_sym_diff)
+                             << " computed: " << bg::wkt(mls_output) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "sym_difference : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected sym_difference : " << bg::wkt(mls_sym_diff)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+public:
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_sym_diff,
+                             std::string const& case_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "test case: " << case_id << std::endl;
+        std::stringstream sstr;
+        sstr << "svgs/" << case_id << ".svg";
+#ifdef TEST_WITH_SVG
+        to_svg(geometry1, geometry2, sstr.str());
+#endif
+#endif
+
+        Geometry1 rg1(geometry1);
+        bg::reverse<Geometry1>(rg1);
+
+        Geometry2 rg2(geometry2);
+        bg::reverse<Geometry2>(rg2);
+
+        test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl
+                  << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+                  << std::endl << std::endl;
+#endif
+        test_get_turns_ll_invariance<>::apply(rg1, geometry2);
+
+        base_test(geometry1, geometry2, mls_sym_diff, case_id, true);
+        //        base_test(geometry1, rg2, mls_sym_diff);
+        //        base_test(rg1, geometry2, mls_sym_diff);
+        base_test(rg1, rg2, mls_sym_diff, case_id);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_SYM_DIFFERENCE_LINEAR_LINEAR_HPP
diff --git a/test/algorithms/test_touches.hpp b/test/algorithms/test_touches.hpp
index aa88ea96d..60df672c5 100644
--- a/test/algorithms/test_touches.hpp
+++ b/test/algorithms/test_touches.hpp
@@ -1,7 +1,11 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013.
+// Modifications copyright (c) 2013, Oracle and/or its affiliates.
+
 // 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)
@@ -15,11 +19,35 @@
 #include <boost/geometry/core/ring_type.hpp>
 #include <boost/geometry/algorithms/touches.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
-#include <boost/geometry/geometries/ring.hpp>
-#include <boost/geometry/geometries/polygon.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
 
 #include <boost/geometry/io/wkt/read.hpp>
+#include <boost/variant/variant.hpp>
 
+template <typename Geometry1, typename Geometry2>
+void check_touches(Geometry1 const& geometry1,
+                   Geometry2 const& geometry2,
+                   std::string const& wkt1,
+                   std::string const& wkt2,
+                   bool expected)
+{
+    bool detected = bg::touches(geometry1, geometry2);
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "touches: " << wkt1
+        << " with " << wkt2
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+
+    detected = bg::touches(geometry2, geometry1);
+
+    BOOST_CHECK_MESSAGE(detected == expected,
+        "touches: " << wkt2
+        << " with " << wkt1
+        << " -> Expected: " << expected
+        << " detected: " << detected);
+}
 
 template <typename Geometry1, typename Geometry2>
 void test_touches(std::string const& wkt1,
@@ -31,23 +59,21 @@ void test_touches(std::string const& wkt1,
     bg::read_wkt(wkt1, geometry1);
     bg::read_wkt(wkt2, geometry2);
 
-    bool detected = bg::touches(geometry1, geometry2);
+    boost::variant<Geometry1> v1(geometry1);
+    boost::variant<Geometry2> v2(geometry2);
 
-    BOOST_CHECK_MESSAGE(detected == expected,
-        "touches: " << wkt1
-        << " with " << wkt2
-        << " -> Expected: " << expected
-        << " detected: " << detected);
+    check_touches(geometry1, geometry2, wkt1, wkt2, expected);
+    check_touches(v1, geometry2, wkt1, wkt2, expected);
+    check_touches(geometry1, v2, wkt1, wkt2, expected);
+    check_touches(v1, v2, wkt1, wkt2, expected);
 }
 
 
 template <typename Geometry>
-void test_self_touches(std::string const& wkt, bool expected)
+void check_self_touches(Geometry const& geometry,
+                        std::string const& wkt,
+                        bool expected)
 {
-    Geometry geometry;
-
-    bg::read_wkt(wkt, geometry);
-
     bool detected = bg::touches(geometry);
 
     BOOST_CHECK_MESSAGE(detected == expected,
@@ -56,6 +82,17 @@ void test_self_touches(std::string const& wkt, bool expected)
         << " detected: " << detected);
 }
 
+template <typename Geometry>
+void test_self_touches(std::string const& wkt, bool expected)
+{
+    Geometry geometry;
+    bg::read_wkt(wkt, geometry);
+    boost::variant<Geometry> v(geometry);
+
+    check_self_touches(geometry, wkt, expected);
+    check_self_touches(v, wkt, expected);
+}
+
 
 
 #endif
diff --git a/test/algorithms/test_union.hpp b/test/algorithms/test_union.hpp
index e05390629..2c1868ef2 100644
--- a/test/algorithms/test_union.hpp
+++ b/test/algorithms/test_union.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -13,6 +13,7 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/core/ignore_unused.hpp>
 #include <boost/range/algorithm/copy.hpp>
 
 #include <boost/geometry/algorithms/union.hpp>
@@ -37,15 +38,22 @@
 
 template <typename OutputType, typename G1, typename G2>
 void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
-        std::size_t expected_count, std::size_t expected_hole_count,
+        int expected_count, int expected_hole_count,
         int expected_point_count, double expected_area,
         double percentage)
 {
     typedef typename bg::coordinate_type<G1>::type coordinate_type;
+    boost::ignore_unused<coordinate_type>();
+
     std::vector<OutputType> clip;
+
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+    std::cout << "*** UNION " << caseid << std::endl;
+#endif
+
     bg::union_(g1, g2, clip);
 
-    typename bg::default_area_result<G1>::type area = 0;
+    typename bg::default_area_result<OutputType>::type area = 0;
     std::size_t n = 0;
     std::size_t holes = 0;
     for (typename std::vector<OutputType>::iterator it = clip.begin();
@@ -56,6 +64,7 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
         n += bg::num_points(*it, true);
     }
 
+#if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
     {
         // Test inserter functionality
         // Test if inserter returns output-iterator (using Boost.Range copy)
@@ -63,7 +72,7 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
         array_with_one_empty_geometry.push_back(OutputType());
         boost::copy(array_with_one_empty_geometry, bg::detail::union_::union_insert<OutputType>(g1, g2, std::back_inserter(inserted)));
 
-        typename bg::default_area_result<G1>::type area_inserted = 0;
+        typename bg::default_area_result<OutputType>::type area_inserted = 0;
         int index = 0;
         for (typename std::vector<OutputType>::iterator it = inserted.begin();
                 it != inserted.end();
@@ -78,30 +87,42 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
         BOOST_CHECK_EQUAL(boost::size(clip), boost::size(inserted) - 1);
         BOOST_CHECK_CLOSE(area_inserted, expected_area, percentage);
     }
+#endif
 
 
 
-    /***
-    std::cout << "case: " << caseid
-        << " n: " << n
+#if defined(BOOST_GEOMETRY_DEBUG_ROBUSTNESS)
+    std::cout << "*** case: " << caseid
         << " area: " << area
+        << " points: " << n
         << " polygons: " << boost::size(clip)
         << " holes: " << holes
         << std::endl;
-    ***/
+#endif
 
-    if (expected_point_count >= 0)
-    {
-        BOOST_CHECK_MESSAGE(n == std::size_t(expected_point_count),
-                "union: " << caseid
-                << " #points expected: " << expected_point_count
-                << " detected: " << n
-                << " type: " << (type_for_assert_message<G1, G2>())
-                );
-    }
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    BOOST_CHECK_MESSAGE(expected_point_count < 0 || std::abs(int(n) - expected_point_count) < 3,
+            "union: " << caseid
+            << " #points expected: " << expected_point_count
+            << " detected: " << n
+            << " type: " << (type_for_assert_message<G1, G2>())
+            );
+#endif
+
+    BOOST_CHECK_MESSAGE(expected_count < 0 || int(clip.size()) == expected_count,
+            "union: " << caseid
+            << " #clips expected: " << expected_count
+            << " detected: " << clip.size()
+            << " type: " << (type_for_assert_message<G1, G2>())
+            );
+
+    BOOST_CHECK_MESSAGE(expected_hole_count < 0 || int(holes) == expected_hole_count,
+            "union: " << caseid
+            << " #holes expected: " << expected_hole_count
+            << " detected: " << holes
+            << " type: " << (type_for_assert_message<G1, G2>())
+            );
 
-    BOOST_CHECK_EQUAL(clip.size(), expected_count);
-    BOOST_CHECK_EQUAL(holes, expected_hole_count);
     BOOST_CHECK_CLOSE(area, expected_area, percentage);
 
 #if defined(TEST_WITH_SVG)
@@ -119,6 +140,9 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
             << string_from_type<coordinate_type>::name()
             << (ccw ? "_ccw" : "")
             << (open ? "_open" : "")
+#if defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+            << "_no_rob"
+#endif
             << ".svg";
 
         std::ofstream svg(filename.str().c_str());
@@ -150,7 +174,7 @@ void test_union(std::string const& caseid, G1 const& g1, G2 const& g2,
 
 template <typename OutputType, typename G1, typename G2>
 void test_one(std::string const& caseid, std::string const& wkt1, std::string const& wkt2,
-        std::size_t expected_count, std::size_t expected_hole_count,
+        int expected_count, int expected_hole_count,
         int expected_point_count, double expected_area,
         double percentage = 0.001)
 {
diff --git a/test/algorithms/test_union_linear_linear.hpp b/test/algorithms/test_union_linear_linear.hpp
new file mode 100644
index 000000000..35f5eb791
--- /dev/null
+++ b/test/algorithms/test_union_linear_linear.hpp
@@ -0,0 +1,171 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_UNION_LINEAR_LINEAR_HPP
+#define BOOST_GEOMETRY_TEST_UNION_LINEAR_LINEAR_HPP
+
+#include "from_wkt.hpp"
+#include <boost/geometry/geometry.hpp>
+#include "test_set_ops_linear_linear.hpp"
+#include "to_svg.hpp"
+
+
+//==================================================================
+//==================================================================
+// union of (linear) geometries
+//==================================================================
+//==================================================================
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename MultiLineString
+>
+class test_union_of_geometries
+{
+private:
+    static inline void base_test(Geometry1 const& geometry1,
+                                 Geometry2 const& geometry2,
+                                 MultiLineString const& mls_union1,
+                                 MultiLineString const& mls_union2,
+                                 std::string const& case_id,
+                                 bool test_vector_and_deque = false)
+    {
+        static bool vector_deque_already_tested = false;
+
+        typedef typename boost::range_value<MultiLineString>::type LineString;
+        typedef std::vector<LineString> linestring_vector;
+        typedef std::deque<LineString> linestring_deque;
+
+        MultiLineString mls_output;
+
+        linestring_vector ls_vector_output;
+        linestring_deque ls_deque_output;
+
+        bg::union_(geometry1, geometry2, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_union1, mls_output),
+                             "union L/L: " << bg::wkt(geometry1)
+                             << " " << bg::wkt(geometry2)
+                             << " -> Expected: " << bg::wkt(mls_union1)
+                             << " computed: " << bg::wkt(mls_output) );
+
+        set_operation_output("union", case_id,
+                             geometry1, geometry2, mls_output);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "union : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected union : " << bg::wkt(mls_union1)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+
+        if ( !vector_deque_already_tested && test_vector_and_deque )
+        {
+            vector_deque_already_tested = true;
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << std::endl;
+            std::cout << "Testing with vector and deque as output container..."
+                      << std::endl;
+#endif
+            bg::union_(geometry1, geometry2, ls_vector_output);
+            bg::union_(geometry1, geometry2, ls_deque_output);
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_union1,
+                                                             ls_vector_output));
+
+            BOOST_CHECK(multilinestring_equals<false>::apply(mls_union1,
+                                                             ls_deque_output));
+
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "Done!" << std::endl << std::endl;
+#endif
+        }
+
+        // check the symmetric difference where the order of the two
+        // geometries is reversed
+        bg::clear(mls_output);
+        bg::union_(geometry2, geometry1, mls_output);
+
+        BOOST_CHECK_MESSAGE( equals::apply(mls_union2, mls_output),
+                             "union L/L: " << bg::wkt(geometry2)
+                             << " " << bg::wkt(geometry1)
+                             << " -> Expected: " << bg::wkt(mls_union2)
+                             << " computed: " << bg::wkt(mls_output) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "Geometry #1: " << bg::wkt(geometry2) << std::endl;
+        std::cout << "Geometry #2: " << bg::wkt(geometry1) << std::endl;
+        std::cout << "union : " << bg::wkt(mls_output) << std::endl;
+        std::cout << "expected union : " << bg::wkt(mls_union2)
+                  << std::endl;
+        std::cout << std::endl;
+        std::cout << "************************************" << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+public:
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_union1,
+                             MultiLineString const& mls_union2,
+                             std::string const& case_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "test case: " << case_id << std::endl;
+        std::stringstream sstr;
+        sstr << "svgs/" << case_id << ".svg";
+        to_svg(geometry1, geometry2, sstr.str());
+#endif
+
+        Geometry1 rg1(geometry1);
+        bg::reverse<Geometry1>(rg1);
+
+        Geometry2 rg2(geometry2);
+        bg::reverse<Geometry2>(rg2);
+
+        test_get_turns_ll_invariance<>::apply(geometry1, geometry2);
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl
+                  << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+                  << std::endl << std::endl;
+#endif
+        test_get_turns_ll_invariance<>::apply(rg1, geometry2);
+
+        base_test(geometry1, geometry2, mls_union1, mls_union2, case_id, true);
+        //        base_test(geometry1, rg2, mls_sym_diff);
+        //        base_test(rg1, geometry2, mls_sym_diff);
+        base_test(rg1, rg2, mls_union1, mls_union2, case_id);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+
+    static inline void apply(Geometry1 const& geometry1,
+                             Geometry2 const& geometry2,
+                             MultiLineString const& mls_union,
+                             std::string const& case_id)
+    {
+        apply(geometry1, geometry2, mls_union, mls_union, case_id);
+    }
+};
+
+
+#endif // BOOST_GEOMETRY_TEST_UNION1_HPP
diff --git a/test/algorithms/test_unique.hpp b/test/algorithms/test_unique.hpp
index 09d4981af..be9d23565 100644
--- a/test/algorithms/test_unique.hpp
+++ b/test/algorithms/test_unique.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/algorithms/test_within.hpp b/test/algorithms/test_within.hpp
index bc3f9958d..da402a07c 100644
--- a/test/algorithms/test_within.hpp
+++ b/test/algorithms/test_within.hpp
@@ -1,20 +1,28 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
 #ifndef BOOST_GEOMETRY_TEST_WITHIN_HPP
 #define BOOST_GEOMETRY_TEST_WITHIN_HPP
 
 
+#include <boost/variant/variant.hpp>
+
 #include <geometry_test_common.hpp>
 
 #include <boost/geometry/core/ring_type.hpp>
-#include <boost/geometry/algorithms/within.hpp>
+
 #include <boost/geometry/strategies/strategies.hpp>
 #include <boost/geometry/geometries/ring.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
@@ -23,19 +31,24 @@
 
 #include <boost/geometry/strategies/cartesian/point_in_box.hpp>
 #include <boost/geometry/strategies/cartesian/box_in_box.hpp>
+#include <boost/geometry/strategies/agnostic/point_in_point.hpp>
 #include <boost/geometry/strategies/agnostic/point_in_box_by_side.hpp>
+#include <boost/geometry/strategies/agnostic/point_in_poly_winding.hpp>
+#include <boost/geometry/strategies/agnostic/relate.hpp>
 
+#include <boost/geometry/algorithms/within.hpp>
+
+#include <boost/geometry/multi/algorithms/covered_by.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
 
 template <typename Geometry1, typename Geometry2>
-void test_geometry(std::string const& wkt1,
-        std::string const& wkt2, bool expected)
+void check_geometry(Geometry1 const& geometry1,
+                    Geometry2 const& geometry2,
+                    std::string const& wkt1,
+                    std::string const& wkt2,
+                    bool expected)
 {
-    Geometry1 geometry1;
-    Geometry2 geometry2;
-
-    bg::read_wkt(wkt1, geometry1);
-    bg::read_wkt(wkt2, geometry2);
-
     bool detected = bg::within(geometry1, geometry2);
 
     BOOST_CHECK_MESSAGE(detected == expected,
@@ -45,7 +58,22 @@ void test_geometry(std::string const& wkt1,
         << " detected: " << detected);
 }
 
+template <typename Geometry1, typename Geometry2>
+void test_geometry(std::string const& wkt1,
+        std::string const& wkt2, bool expected)
+{
+    Geometry1 geometry1;
+    Geometry2 geometry2;
+    bg::read_wkt(wkt1, geometry1);
+    bg::read_wkt(wkt2, geometry2);
+    boost::variant<Geometry1> v1(geometry1);
+    boost::variant<Geometry2> v2(geometry2);
 
+    check_geometry(geometry1, geometry2, wkt1, wkt2, expected);
+    check_geometry(v1, geometry2, wkt1, wkt2, expected);
+    check_geometry(geometry1, v2, wkt1, wkt2, expected);
+    check_geometry(v1, v2, wkt1, wkt2, expected);
+}
 
 template <typename Point, bool Clockwise, bool Closed>
 void test_ordered_ring(std::string const& wkt_point,
diff --git a/test/algorithms/touches.cpp b/test/algorithms/touches.cpp
index 84430d527..e4c2d5a3a 100644
--- a/test/algorithms/touches.cpp
+++ b/test/algorithms/touches.cpp
@@ -1,22 +1,27 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 //
 // Copyright (c) 2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2013, 2014.
+// Modifications copyright (c) 2013, 2014, Oracle and/or its affiliates.
+
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #include <algorithms/test_touches.hpp>
 
-
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/point_xy.hpp>
-
-
-
 template <typename P>
 void test_all()
 {
+    typedef bg::model::box<P> box;
+    typedef bg::model::ring<P> ring;
     typedef bg::model::polygon<P> polygon;
+    typedef bg::model::linestring<P> linestring;
+    typedef bg::model::multi_polygon<polygon> mpolygon;
+    typedef bg::model::multi_linestring<linestring> mlinestring;
 
     // Just a normal polygon
     test_self_touches<polygon>("POLYGON((0 0,0 4,1.5 2.5,2.5 1.5,4 0,0 0))", false);
@@ -33,7 +38,7 @@ void test_all()
     // Touching at corner
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((100 100,100 200,200 200, 200 100,100 100))",
             true
         );
@@ -41,7 +46,7 @@ void test_all()
     // Intersecting at corner
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,101 101,100 0,0 0))", 
+            "POLYGON((0 0,0 100,101 101,100 0,0 0))",
             "POLYGON((100 100,100 200,200 200, 200 100,100 100))",
             false
         );
@@ -49,7 +54,7 @@ void test_all()
     // Touching at side (interior of a segment)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((200 0,100 50,200 100,200 0))",
             true
         );
@@ -57,7 +62,7 @@ void test_all()
     // Touching at side (partly collinear)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((200 20,100 20,100 80,200 80,200 20))",
             true
         );
@@ -65,7 +70,7 @@ void test_all()
     // Completely equal
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             false
         );
@@ -73,7 +78,7 @@ void test_all()
     // Spatially equal
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((0 0,0 100,100 100,100 80,100 20,100 0,0 0))",
             false
         );
@@ -81,16 +86,16 @@ void test_all()
     // Spatially equal (without equal segments)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((0 0,0 50,0 100,50 100,100 100,100 50,100 0,50 0,0 0))",
             false
         );
-    
+
 
     // Touching at side (opposite equal)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((200 0,100 0,100 100,200 100,200 0))",
             true
         );
@@ -98,14 +103,14 @@ void test_all()
     // Touching at side (opposite equal - but with real "equal" turning point)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 80,100 20,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 80,100 20,100 0,0 0))",
             "POLYGON((200 0,100 0,100 20,100 80,100 100,200 100,200 0))",
             true
         );
     // First partly collinear to side, than overlapping
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((200 20,100 20,100 50,50 50,50 80,100 80,200 80,200 20))",
             false
         );
@@ -113,7 +118,7 @@ void test_all()
     // Touching interior (= no touch)
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0))",
             "POLYGON((20 20,20 80,100 50,20 20))",
             false
         );
@@ -121,20 +126,105 @@ void test_all()
     // Fitting in hole
     test_touches<polygon, polygon>
         (
-            "POLYGON((0 0,0 100,100 100,100 0,0 0),(40 40,60 40,60 60,40 60,40 40))", 
+            "POLYGON((0 0,0 100,100 100,100 0,0 0),(40 40,60 40,60 60,40 60,40 40))",
             "POLYGON((40 40,40 60,60 60,60 40,40 40))",
             true
         );
 
+    // Point-Polygon
+    test_touches<P, ring>("POINT(40 50)", "POLYGON((40 40,40 60,60 60,60 40,40 40))", true);
+    test_touches<P, polygon>("POINT(40 50)", "POLYGON((40 40,40 60,60 60,60 40,40 40))", true);
+    test_touches<P, polygon>("POINT(60 60)", "POLYGON((40 40,40 60,60 60,60 40,40 40))", true);
+    test_touches<P, polygon>("POINT(50 50)", "POLYGON((40 40,40 60,60 60,60 40,40 40))", false);
+    test_touches<P, polygon>("POINT(30 50)", "POLYGON((40 40,40 60,60 60,60 40,40 40))", false);
+
+    // Point-MultiPolygon
+    test_touches<P, mpolygon>("POINT(40 50)", "MULTIPOLYGON(((40 40,40 60,60 60,60 40,40 40)),((0 0,0 10,10 10,10 0)))", true);
+
+    // Point-Linestring
+    test_touches<P, linestring>("POINT(0 0)", "LINESTRING(0 0, 2 2, 10 2)", true);
+    test_touches<P, linestring>("POINT(2 2)", "LINESTRING(0 0, 2 2, 10 2)", false);
+    test_touches<P, linestring>("POINT(1 1)", "LINESTRING(0 0, 2 2, 10 2)", false);
+    test_touches<P, linestring>("POINT(5 5)", "LINESTRING(0 0, 2 2, 10 2)", false);
+
+    // Point-MultiLinestring
+    test_touches<P, mlinestring>("POINT(0 0)", "MULTILINESTRING((0 0, 2 2, 10 2),(5 5, 6 6))", true);
+    test_touches<P, mlinestring>("POINT(0 0)", "MULTILINESTRING((0 0, 2 2, 10 2),(0 0, 6 6))", false);
+
+    // Linestring-Linestring
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(0 0,0 2)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(2 0,2 2)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(0 2,0 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(2 2,2 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(0 0,0 2)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(2 0,2 2)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(0 2,0 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(2 2,2 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(1 0,1 1)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,2 0)", "LINESTRING(1 1,1 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(1 0,1 1)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 0,0 0)", "LINESTRING(1 1,1 0)", true);
+
+    test_touches<linestring, linestring>("LINESTRING(0 0,10 0)", "LINESTRING(0 0,5 5,10 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,10 10)", "LINESTRING(0 0,0 5,10 5)", false);
+
+    test_touches<linestring, linestring>("LINESTRING(0 5,5 6,10 5)", "LINESTRING(0 7,5 6,10 7)", false);
+    test_touches<linestring, linestring>("LINESTRING(0 5,5 6,10 5)", "LINESTRING(10 7,5 6,0 7)", false);
+    test_touches<linestring, linestring>("LINESTRING(10 5,5 6,0 5)", "LINESTRING(0 7,5 6,10 7)", false);
+    test_touches<linestring, linestring>("LINESTRING(10 5,5 6,0 5)", "LINESTRING(10 7,5 6,0 7)", false);
+
+    test_touches<linestring, linestring>("LINESTRING(0 0,1 1,2 2)", "LINESTRING(2 0,2 2,1 2,1 1)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 2,1 1,0 0)", "LINESTRING(2 0,2 2,1 2,1 1)", true);
+    test_touches<linestring, linestring>("LINESTRING(0 0,1 1,2 2)", "LINESTRING(1 1,1 2,2 2,2 0)", true);
+    test_touches<linestring, linestring>("LINESTRING(2 2,1 1,0 0)", "LINESTRING(1 1,1 2,2 2,2 0)", true);
+
+    test_touches<linestring, linestring>("LINESTRING(0 0,1 1,0 1)", "LINESTRING(1 1,2 2,1 2,1 1)", false);
+
+    test_touches<linestring, mlinestring>("LINESTRING(0 0,1 1,0 1)", "MULTILINESTRING((1 1,2 2),(1 2,1 1))", false);
+
+    //Linestring-Polygon
+    test_touches<linestring, polygon>("LINESTRING(10 0,15 5,10 10,5 15,5 10,0 10,5 15,5 10)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", true);
+    test_touches<linestring, polygon>("LINESTRING(5 10,5 15,0 10,5 10,5 15,10 10,15 5,10 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", true);
+    test_touches<linestring, polygon>("LINESTRING(5 10,5 15,0 10,5 10,5 15,10 10,5 5,10 0)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+    test_touches<linestring, ring>("LINESTRING(0 15,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+    test_touches<linestring, polygon>("LINESTRING(0 15,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+    test_touches<linestring, polygon>("LINESTRING(0 15,5 10,5 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+    test_touches<linestring, polygon>("LINESTRING(10 15,5 10,0 5)", "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+
+    test_touches<linestring, polygon>("LINESTRING(0 0,3 3)", "POLYGON((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0))", true);
+    
+    test_touches<linestring, mpolygon>("LINESTRING(-1 -1,3 3)", "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0)))", true);
+
+    test_touches<mlinestring, mpolygon>("MULTILINESTRING((0 0,11 11))", "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0),(0 0,9 1,9 9,1 9,0 0)))", false);
+
+    test_touches<box, box>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((5 1,5 2,6 2,6 1,5 1))", true);
+    test_touches<box, box>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((4 1,4 2,5 2,5 1,4 1))", false);
+    test_touches<box, box>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((4 1,4 2,6 2,6 1,4 1))", false);
+
+    // Point-size
+    test_touches<box, box>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((5 5,5 5,5 5,5 5,5 5))", true);
+    // TODO: should it be TRUE?
+    test_touches<box, box>("POLYGON((5 5,5 5,5 5,5 5,5 5))", "POLYGON((5 5,5 5,5 5,5 5,5 5))", true);
 }
 
+template <typename P>
+void test_box_3d()
+{
+    typedef bg::model::box<P> box;
 
+    check_touches<box, box>(box(P(0,0,0),P(5,5,5)), box(P(5,1,2),P(6,6,6)),
+                            "box(P(0,0,0),P(5,5,5))", "box(P(5,1,2),P(6,6,6))",
+                            true);
 
+    check_touches<box, box>(box(P(0,0,0),P(5,5,5)), box(P(5,5,5),P(6,6,6)),
+                            "box(P(0,0,0),P(5,5,5))", "box(P(5,5,5),P(6,6,6))",
+                            true);
+}
 
 int test_main( int , char* [] )
 {
     test_all<bg::model::d2::point_xy<double> >();
-
+    test_box_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
 
 #if defined(HAVE_TTMATH)
     test_all<bg::model::d2::point_xy<ttmath_big> >();
@@ -151,4 +241,4 @@ select geometry::STGeomFromText('POLYGON((0 0,0 100,100 100,100 0,0 0))',0) as p
 )
 -- select p from viewy union all select q from viewy
 select p.STTouches(q) from viewy
-*/
\ No newline at end of file
+*/
diff --git a/test/algorithms/transform.cpp b/test/algorithms/transform.cpp
index 7a9c1c32a..1746c7d23 100644
--- a/test/algorithms/transform.cpp
+++ b/test/algorithms/transform.cpp
@@ -18,57 +18,76 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/geometry/algorithms/equals.hpp>
 #include <boost/geometry/algorithms/make.hpp>
 #include <boost/geometry/algorithms/transform.hpp>
-#include <boost/geometry/strategies/strategies.hpp>
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-
-#include <boost/geometry/io/dsv/write.hpp>
 #include <boost/geometry/io/wkt/wkt.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/variant/variant.hpp>
 
 #include <test_common/test_point.hpp>
 
-template <typename P1, typename P2>
-void test_transform_point(
-        typename bg::select_most_precise
-            <
-                typename bg::coordinate_type<P1>::type,
-                double
-            >::type value)
+template <typename Geometry1, typename Geometry2>
+void check_transform(Geometry1 const& geometry1,
+                     Geometry2 const& expected)
+{
+    Geometry2 geometry2;
+    BOOST_CHECK(bg::transform(geometry1, geometry2));
+
+    std::ostringstream result_wkt, expected_wkt;
+    result_wkt << bg::wkt(geometry2);
+    expected_wkt << bg::wkt(expected);
+    BOOST_CHECK_EQUAL(result_wkt.str(), expected_wkt.str());
+}
+
+template <typename P1, typename P2, typename Value>
+void test_transform_point(Value value)
 {
     P1 p1;
     bg::set<0>(p1, 1);
     bg::set<1>(p1, 2);
-    P2 p2;
-    BOOST_CHECK(bg::transform(p1, p2));
+    boost::variant<P1> v(p1);
 
-    BOOST_CHECK_CLOSE(value * bg::get<0>(p1), bg::get<0>(p2), 0.001);
-    BOOST_CHECK_CLOSE(value * bg::get<1>(p1), bg::get<1>(p2), 0.001);
+    P2 expected;
+    bg::assign(expected, p1);
+    bg::multiply_value(expected, value);
+
+    check_transform(p1, expected);
+    check_transform(v, expected);
 }
 
-template <typename P1, typename P2>
-void test_transform_linestring()
+template <typename P1, typename P2, typename Value>
+void test_transform_linestring(Value value)
 {
-    bg::model::linestring<P1> line1;
+    typedef bg::model::linestring<P1> line1_type;
+    typedef bg::model::linestring<P2> line2_type;
+
+    line1_type line1;
     line1.push_back(bg::make<P1>(1, 1));
     line1.push_back(bg::make<P1>(2, 2));
-    bg::model::linestring<P2> line2;
-    BOOST_CHECK(bg::transform(line1, line2));
-    BOOST_CHECK_EQUAL(line1.size(), line2.size());
+    boost::variant<line1_type> v(line1);
 
-    std::ostringstream out1, out2;
-    out1 << bg::wkt(line1);
-    out2 << bg::wkt(line2);
-    BOOST_CHECK_EQUAL(out1.str(), out1.str());
+    line2_type expected;
+    for (BOOST_AUTO(p, line1.begin()); p != line1.end(); ++p)
+    {
+        P2 new_point;
+        bg::assign(new_point, *p);
+        bg::multiply_value(new_point, value);
+        expected.push_back(new_point);
+    }
+
+    check_transform(line1, expected);
+    check_transform(v, expected);
 }
 
 
-template <typename P1, typename P2>
-void test_all(double value = 1.0)
+template <typename P1, typename P2, typename Value>
+void test_all(Value value)
 {
     test_transform_point<P1, P2>(value);
-    test_transform_linestring<P1, P2>();
+    test_transform_linestring<P1, P2>(value);
 }
 
 template <typename T, typename DegreeOrRadian>
@@ -89,9 +108,6 @@ void test_transformations(double phi, double theta, double r)
 
         BOOST_CHECK_CLOSE(bg::get<0>(sph1), bg::get<0>(sph2), 0.001);
         BOOST_CHECK_CLOSE(bg::get<1>(sph1), bg::get<1>(sph2), 0.001);
-
-        //std::cout << dsv(p) << std::endl;
-        //std::cout << dsv(sph2) << std::endl;
     }
 
     // 2: using spherical coordinates on unit sphere
@@ -104,16 +120,14 @@ void test_transformations(double phi, double theta, double r)
 
         BOOST_CHECK_CLOSE(bg::get<0>(sph1), bg::get<0>(sph2), 0.001);
         BOOST_CHECK_CLOSE(bg::get<1>(sph1), bg::get<1>(sph2), 0.001);
-
-        //std::cout << dsv(sph1) << " " << dsv(p) << " " << dsv(sph2) << std::endl;
     }
 }
 
 int test_main(int, char* [])
 {
     typedef bg::model::d2::point_xy<double > P;
-    test_all<P, P>();
-    test_all<bg::model::d2::point_xy<int>, bg::model::d2::point_xy<float> >();
+    test_all<P, P>(1.0);
+    test_all<bg::model::d2::point_xy<int>, bg::model::d2::point_xy<float> >(1.0);
 
     test_all<bg::model::point<double, 2, bg::cs::spherical<bg::degree> >,
         bg::model::point<double, 2, bg::cs::spherical<bg::radian> > >(bg::math::d2r);
diff --git a/test/algorithms/union.cpp b/test/algorithms/union.cpp
index 1ac747d83..a806e5221 100644
--- a/test/algorithms/union.cpp
+++ b/test/algorithms/union.cpp
@@ -15,7 +15,9 @@
 #include <iostream>
 #include <string>
 
-#define TEST_ISOVIST
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// Test which would fail then are disabled automatically
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
 
 #include <algorithms/test_union.hpp>
 #include <algorithms/test_overlay.hpp>
@@ -216,48 +218,37 @@ void test_areal()
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110306_javier",
         ggl_list_20110306_javier[0], ggl_list_20110306_javier[1],
         1, 1, 16, 80456.4904910401);
-        
+
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110307_javier",
         ggl_list_20110307_javier[0], ggl_list_20110307_javier[1],
         1, 1, 13, 20016.4);
 
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110627_phillip",
         ggl_list_20110627_phillip[0], ggl_list_20110627_phillip[1],
-        1, 0, 
-        if_typed<ct, double>(5, if_typed_tt<ct>(8, 8)), 
-        14729.07145);
-        
+        1, 0, 8, 14729.07145);
 
-    // Float gives sometimes 14, sometimes 14 points
     test_one<Polygon, Polygon, Polygon>("ggl_list_20110716_enrico",
         ggl_list_20110716_enrico[0], ggl_list_20110716_enrico[1],
-        1, 1, 
-        if_typed<ct, double>(18, if_typed<ct, float>(-1, 17)), 
-        129904.197692871);
+        1, 1, 15, 129904.197692871);
 
-    test_one<Polygon, Polygon, Polygon>("ggl_list_20110820_christophe", 
+    test_one<Polygon, Polygon, Polygon>("ggl_list_20110820_christophe",
         ggl_list_20110820_christophe[0], ggl_list_20110820_christophe[1],
-        if_typed<ct, float>(2, 1), 
-        0, 
-        if_typed_tt<ct>(9, 8), 
+        -1, // Either 1 or 2, depending if the intersection/turn point (eps.region) is missed
+        0,
+        if_typed_tt<ct>(9, 8),
         67.3550722317627);
 
 
-#ifdef TEST_ISOVIST
-#ifdef _MSC_VER
     test_one<Polygon, Polygon, Polygon>("isovist",
         isovist1[0], isovist1[1],
         1,
         0,
-        if_typed<ct, float>(72, if_typed<ct, double>(70, 73)),
-        313.36036462, 0.1);
+        -1,
+        313.36036462, 0.01);
 
     // SQL Server gives: 313.360374193241
     // PostGIS gives:    313.360364623393
 
-#endif
-#endif
-
     // Ticket 5103 https://svn.boost.org/trac/boost/ticket/5103
     // This ticket was actually reported for Boost.Polygon
     // We check it for Boost.Geometry as well.
@@ -272,14 +263,44 @@ void test_areal()
     test_one<Polygon, Polygon, Polygon>("ticket_5103", ticket_5103[0], ticket_5103[1],
                 1, 0, 25, 2515271327070.5);
 
+    test_one<Polygon, Polygon, Polygon>("ticket_8310a", ticket_8310a[0], ticket_8310a[1],
+            1, 0, 5, 10.5000019595);
+    test_one<Polygon, Polygon, Polygon>("ticket_8310b", ticket_8310b[0], ticket_8310b[1],
+            1, 0, 5, 10.5000019595);
+    test_one<Polygon, Polygon, Polygon>("ticket_8310c", ticket_8310c[0], ticket_8310c[1],
+            1, 0, 5, 10.5000019595);
+
+    test_one<Polygon, Polygon, Polygon>("ticket_9081_15",
+            ticket_9081_15[0], ticket_9081_15[1],
+            1, 0, 7, 0.0403425433);
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
+    test_one<Polygon, Polygon, Polygon>("ticket_9563", ticket_9563[0], ticket_9563[1],
+            1, 0, 13, 150.0);
+#endif
+
+    test_one<Polygon, Polygon, Polygon>("ticket_9756", ticket_9756[0], ticket_9756[1],
+            1, 0, 10, 1289.08374);
+
+    test_one<Polygon, Polygon, Polygon>("geos_1", geos_1[0], geos_1[1],
+            1, 0, -1, 3461.3203125);
+    test_one<Polygon, Polygon, Polygon>("geos_2", geos_2[0], geos_2[1],
+            1, 0, -1, 350.55102539);
+    test_one<Polygon, Polygon, Polygon>("geos_3", geos_3[0], geos_3[1],
+            1, 0, -1, 29391548.4998779);
+    test_one<Polygon, Polygon, Polygon>("geos_4", geos_4[0], geos_4[1],
+            1, 0, -1, 2304.4163115);
+
     test_one<Polygon, Polygon, Polygon>("buffer_rt_a", buffer_rt_a[0], buffer_rt_a[1],
                 1, 0, 265, 19.280667);
 
     // Robustness issues, followed out buffer-robustness-tests, test them also reverse
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_rt_f", buffer_rt_f[0], buffer_rt_f[1],
                 1, 0, if_typed<ct, double>(21, 23), 4.60853);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_f_rev", buffer_rt_f[1], buffer_rt_f[0],
                 1, 0, if_typed<ct, double>(21, 23), 4.60853);
+#endif
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_g", buffer_rt_g[0], buffer_rt_g[1],
                 1, 0, if_typed<ct, float>(18, 17), 16.571);
@@ -288,31 +309,20 @@ void test_areal()
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_i", buffer_rt_i[0], buffer_rt_i[1],
                 1, 0, if_typed<ct, float>(14, 13), 13.6569);
-
-    bool test_rt_i_rev = true;
-#ifndef _MSC_VER
-    if (boost::is_same<ct, float>::type::value)
-    {
-        // TODO: this case has to be fixed for gcc/float on non-Windows
-        test_rt_i_rev = false;
-    }
-    
-#endif
-    if (test_rt_i_rev)
-    {
-        test_one<Polygon, Polygon, Polygon>("buffer_rt_i_rev", buffer_rt_i[1], buffer_rt_i[0],
-                1, 0, 13, 13.6569);
-    }
+    test_one<Polygon, Polygon, Polygon>("buffer_rt_i_rev", buffer_rt_i[1], buffer_rt_i[0],
+                    1, 0, 13, 13.6569);
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_j", buffer_rt_j[0], buffer_rt_j[1],
                 1, 0, -1, 16.5711);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_j_rev", buffer_rt_j[1], buffer_rt_j[0],
                 1, 0, -1, 16.5711);
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_rt_l", buffer_rt_l[0], buffer_rt_l[1],
                 1, 0, -1, 19.3995);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_l_rev", buffer_rt_l[1], buffer_rt_l[0],
                 1, 0, -1, 19.3995);
+#endif
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_m1", buffer_rt_m1[0], buffer_rt_m1[1],
                 1, 0, if_typed_tt<ct>(14, 13), 19.4852);
@@ -325,36 +335,31 @@ void test_areal()
                 1, 0, if_typed_tt<ct>(20, 19), 21.4853);
 
     test_one<Polygon, Polygon, Polygon>("buffer_rt_q", buffer_rt_q[0], buffer_rt_q[1],
-                1, 0, if_typed<ct, float>(18, 17), 18.5710);
+                1, 0, 18, 18.5710);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_q_rev", buffer_rt_q[1], buffer_rt_q[0],
-                1, 0, if_typed<ct, float>(18, 17), 18.5710);
+                1, 0, 18, 18.5710);
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_rt_r", buffer_rt_r[0], buffer_rt_r[1],
-                1, 0, if_typed<ct, float>(19, 20), 21.07612);
+                1, 0, 19, 21.07612);
     test_one<Polygon, Polygon, Polygon>("buffer_rt_r_rev", buffer_rt_r[1], buffer_rt_r[0],
                 1, 0, if_typed_tt<ct>(20, 19), 21.07612);
+#endif
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_rt_t", buffer_rt_t[0], buffer_rt_t[1],
                 1, 0, if_typed_tt<ct>(16, 14), 15.6569);
+#endif
     test_one<Polygon, Polygon, Polygon>("buffer_rt_t_ref", buffer_rt_t[1], buffer_rt_t[0],
                 1, 0, if_typed_tt<ct>(16, if_typed<ct, float>(15, 14)), 15.6569);
 
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_one<Polygon, Polygon, Polygon>("buffer_mp1", buffer_mp1[0], buffer_mp1[1],
                 1, 0, if_typed_tt<ct>(93, 91), 22.815);
+#endif
 
-    if (boost::is_same<ct, double>::type::value)
-    {
-        // Contains robustness issue for collinear-opposite. 
-        // In double it delivers a polygon and a hole
-        test_one<Polygon, Polygon, Polygon>("buffer_mp2", buffer_mp2[0], buffer_mp2[1],
-                    1, 1, 217, 36.7535642);
-    }
-    else if (boost::is_same<ct, float>::type::value)
-    {
-        // In float (and ttmath) it delivers one polygon
-        test_one<Polygon, Polygon, Polygon>("buffer_mp2", buffer_mp2[0], buffer_mp2[1],
-                    1, 0, 217, 36.7528377);
-    }
+    test_one<Polygon, Polygon, Polygon>("buffer_mp2", buffer_mp2[0], buffer_mp2[1],
+                1, 0, 217, 36.752837);
 }
 
 template <typename P>
@@ -420,7 +425,10 @@ int test_main(int, char* [])
     test_all<bg::model::d2::point_xy<double> >();
 
 #if ! defined(BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE)
+
+#if ! defined(BOOST_GEOMETRY_NO_ROBUSTNESS)
     test_all<bg::model::d2::point_xy<float> >();
+#endif
     //test_all<bg::model::d2::point_xy<long double> >();
 
 #if defined(HAVE_TTMATH)
diff --git a/test/algorithms/union_linear_linear.cpp b/test/algorithms/union_linear_linear.cpp
new file mode 100644
index 000000000..c454564f0
--- /dev/null
+++ b/test/algorithms/union_linear_linear.cpp
@@ -0,0 +1,1062 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_union_linear_linear
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_union_linear_linear.hpp"
+
+#include <boost/geometry/geometries/linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/algorithms/union.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::segment<point_type>                segment_type;
+typedef bg::model::linestring<point_type>             linestring_type;
+typedef bg::model::multi_linestring<linestring_type>  multi_linestring_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_union_linestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / LINESTRING UNION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_union_of_geometries<L, L, ML> tester;
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 1,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0 2,1 1,2 1,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,2 1,3 2),\
+                      (0 2,1 1),(2 1,3 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 2,1 1,2 1,3 0),\
+                      (0 0,1 1),(2 1,3 2))"),
+         "llu00");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0),(0 0,3 0),(4 0,5 0))"),
+         "llu01");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(3 0,4 0)"),
+         from_wkt<L>("LINESTRING(0 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0),(0 0,3 0),(4 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,5 0))"),
+         "llu01-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0),(4 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((3 0,6 0),(0 0,3 0))"),
+         "llu01-2");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(3 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((3 0,6 0),(0 0,3 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0),(4 0,6 0))"),
+         "llu01-3");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0),(4 0,6 0))"),
+         "llu01-4");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),\
+                      (0 0,1 1,2 0,3 1,4 0),\
+                      (5 0,6 1,7 -1,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0),\
+                      (0 0,4 0),(5 0,20 0))"),
+         "llu01-6");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-20 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0)"),
+         from_wkt<ML>("MULTILINESTRING((-20 0,20 0),\
+                      (0 0,1 1,2 0,3 1,4 0),\
+                      (5 0,6 1,7 -1,8 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,2 0,3 1,4 0,5 0,6 1,7 -1,8 0),\
+                      (-20 0,4 0),(5 0,20 0))"),
+         "llu01-7");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,4 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0),(0 0,2 0))"),
+         "llu01-8");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(4 0,5 0))"),
+         "llu01-10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0)"),
+         from_wkt<L>("LINESTRING(2 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0),(2 0,5 0))"),
+         "llu01-11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,4 0),(4 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((3 0,5 0),(0 0,1 0,3 0))"),
+         "llu01-11a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,4 0)"),
+         from_wkt<L>("LINESTRING(3 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,4 0),(4 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((3 0,4 0,5 0),(0 0,1 0,3 0))"),
+         "llu01-11b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,6 0)"),
+         from_wkt<L>("LINESTRING(2 0,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 0,4 0,5 0),(0 0,2 0),(5 0,6 0))"),
+         "llu01-12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0)"),
+         from_wkt<L>("LINESTRING(-1 6,0 5,15 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,5 5,10 5,15 0),\
+                      (-1 6,0 5,5 5),(10 5,15 5))"),
+         from_wkt<ML>("MULTILINESTRING((-1 6,0 5,15 5),\
+                      (0 0,1 0,5 5),(10 5,15 0))"),
+         "llu02");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0),\
+                      (-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0))"),
+         "llu03");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,5 5,10 5,15 0,20 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,5 5,10 5,15 0,20 0),\
+                      (-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(1 0,5 5,10 5,15 0))"),
+         "llu04");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,25 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,25 1),\
+                      (-1 0,0 0),(1 0,15 0),(20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0),(20 0,25 1))"),
+         "llu05");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0),\
+                      (-1 0,0 0),(1 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0))"),
+         "llu05-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0),\
+                      (-1 0,0 0),(1 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0),(30 0,31 0))"),
+         "llu06");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,25 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0),\
+                      (-1 0,0 0),(1 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,25 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0),(30 0,31 0))"),
+         "llu07");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,31 0),\
+                      (-1 0,0 0),(1 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,19 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0),(30 0,31 0))"),
+         "llu08");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,\
+                      30 0,31 1),(-1 0,0 0),(1 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 0,30 0),(-1 1,0 0),\
+                      (1 0,5 5,10 5,15 0),(30 0,31 1))"),
+         "llu09");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,5 5,10 5,15 0,20 0,30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,5 5,10 5,15 0,20 0,\
+                      30 0,31 1),(-1 -1,0 0),(1 0,2 1,3 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,1 0,2 1,3 0,30 0),\
+                      (-1 1,0 0),(1 0,5 5,10 5,15 0),(30 0,31 1))"),
+         "llu10");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,\
+                                 30 0,31 1)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,4 0,5 5,10 5,15 0,20 0,\
+                      30 0,31 1),(-1 -1,0 0),(2 0,2.5 1,3 0),(4 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0),\
+                      (-1 1,0 0),(2 0,3 0),(4 0,5 5,10 5,15 0),(30 0,31 1))"),
+         "llu11");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0)"),
+         from_wkt<L>("LINESTRING(-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,1 0,4 0,5 5,10 5,15 0,31 0),\
+                      (-1 -1,0 0),(2 0,2.5 1,3 0),(4 0,15 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,1 0,2 0,2.5 1,3 0,30 0),\
+                      (-1 1,0 0),(2 0,3 0),(4 0,5 5,10 5,15 0),(30 0,31 0))"),
+         "llu11-1");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,3 1))"),
+         "llu12");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,2 0,3 1)"),
+         from_wkt<L>("LINESTRING(3 1,2 0,0 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((3 1,2 0,0 0))"),
+         "llu12-1");
+
+   tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5,4 0,5 10)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 1,3 5,4 0),(4 0,5 10))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,2 1,3 5,4 0,5 10),(0 0,1 0))"),
+         "llu13");
+
+   tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0,2.5 0,3 1)"),
+         from_wkt<L>("LINESTRING(0 0,2 0,2.5 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0,2.5 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,2 0,2.5 0,3 1))"),
+         "llu14");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 5,4 0)"),
+         from_wkt<L>("LINESTRING(1 0,2 1,3 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 1,3 5,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,2 1,3 5),(0 0,1 0),(3 5,4 0))"),
+         "llu15");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(0.5 0,1 0,3 2,4 5)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 1,3 2),(3 2,4 5))"),
+         from_wkt<ML>("MULTILINESTRING((0.5 0,1 0,3 2,4 5),(0 0,0.5 0))"),
+         "llu16");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 1,3 2)"),
+         from_wkt<L>("LINESTRING(4 5,3 2,1 0,0.5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 1,3 2),(4 5,3 2))"),
+         from_wkt<ML>("MULTILINESTRING((4 5,3 2,1 0,0.5 0),(0 0,0.5 0))"),
+         "llu16-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,30 1)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1,30 1),(1 1,2 0,3 1,20 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,3 1,20 1,25 1),\
+                      (0 0,10 0,20 1),(25 1,30 1))"),
+         "llu17");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1,21 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 1,2 0,3 1,20 1,25 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1,21 0,30 0),\
+                       (1 1,2 0,3 1,20 1,25 0))"),
+         "llu18");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0,5 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,5 1),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 1,4 0,4 1,20 1,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 1,4 0,4 1,20 1,5 0,1 0),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0),(0 0,1 0),\
+                      (5 0,30 0))"),
+         "llu19a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(4 0,4 1,20 1,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((4 0,4 1,20 1,5 0,1 0),(0 0,1 0),\
+                      (5 0,30 0))"),
+         "llu19a-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,5 0),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19b");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,6 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0),(5 0,6 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,5 0,6 1),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19c");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,3 0),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19d");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,3 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0),(3 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,3 0,3 1),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19e");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,4 0,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,4 0),(5 0,5 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,4 0,5 0,5 1),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19f");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 1,5 0),\
+                      (4 0,4 1,20 1,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 1,5 0,4 0,4 1,20 1,5 0,1 0),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19f-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(1 0,5 0,20 1,4 1,5 0,5 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 0,20 1,4 1,5 0,5 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,5 0,20 1,4 1,5 0,5 1),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19g");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<L>("LINESTRING(5 1,5 0,4 1,20 1,5 0,1 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(5 1,5 0,4 1,20 1,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 1,5 0,4 1,20 1,5 0,1 0),\
+                      (0 0,1 0),(5 0,30 0))"),
+         "llu19g-r");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,35 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0,30 30,10 30,10 -10,15 0,40 0),\
+                      (5 5,10 0),(10 30,20 0),(25 0,25 25,50 0,40 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 5,10 0,10 30,20 0,25 0,25 25,50 0,35 0),\
+                      (0 0,20 0),(25 0,30 0,30 30,10 30),\
+                      (10 0,10 -10,15 0,20 0),(25 0,35 0))"),
+         "llu20");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0,30 30,10 30,10 -10,15 0,40 0)"),
+         from_wkt<L>("LINESTRING(5 5,10 0,10 30,20 0,25 0,25 25,50 0,15 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0,30 30,10 30,10 -10,15 0,40 0),\
+                      (5 5,10 0),(10 30,20 0),(25 0,25 25,50 0,40 0))"),
+         from_wkt<ML>("MULTILINESTRING((5 5,10 0,10 30,20 0,25 0,25 25,50 0,15 0),\
+                      (0 0,15 0),(30 0,30 30,10 30),(10 0,10 -10,15 0))"),
+         "llu20a");
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),\
+                      (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((2 2,5 -1,15 2,18 0,20 0),\
+                      (0 0,18 0),(20 0,30 0))"),
+         "llu21"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(2 2,5 -1,15 2,18 0,20 0)"),
+         from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((2 2,5 -1,15 2,18 0,20 0),\
+                      (0 0,18 0),(20 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),\
+                      (2 2,5 -1,15 2,18 0))"),
+         "llu21a"
+         );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( test_union_linestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** LINESTRING / MULTILINESTRING UNION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_union_of_geometries<L, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 1,2 2,4 3),\
+                      (1 1,2 2,5 3))"),
+         "lmlu01"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 1,2 0),(1 1,3 0))"),
+         "lmlu02"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 1,2 0),(1 1,3 0))"),
+         "lmlu03"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,10 0,20 1)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 1,2 0))"),
+         "lmlu04"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(-1 -1,1 0),(101 0,200 -1))"),
+         "lmlu07"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(-1 1,0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         "lmlu07a"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         "lmlu07b"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(0 1,1 1,2 0),\
+                      (-1 -1,1 0),(101 0,200 -1))"),
+         "lmlu08"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                       (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0),\
+                      (0 1,1 1,2 0.5),(-1 -1,1 0,3 0),(101 0,200 -1))"),
+         "lmlu09"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,1 0,1.5 0,2 0.5,3 0,101 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0),\
+                      (0 1,1 1,1 0,2 0.5),(-1 -1,1 0),(1.5 0,3 0),\
+                      (101 0,200 -1))"),
+         "lmlu10"
+        );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (1 1,2 0),(18 0,19 1),(2 1,3 0),(17 0,18 1),\
+                      (3 1,4 0),(16 0,17 1))"),
+         "lmlu12"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(19 0,20 1),(18 0,19 1),\
+                      (17 0,18 1),(16 0,17 1))"),
+         "lmlu13"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),\
+                      (19 0,20 1,19 1,18 0),(2 0,1 1,2 1,3 0),\
+                      (17 0,18 1,17 1,16 0),(4 0,3 1))"),
+         "lmlu14"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 2,6 0))"),
+         "lmlu15"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (6 0,4 2,2 2))"),
+         "lmlu15a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 2,5 0))"),
+         "lmlu16"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,20 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (5 0,4 2,2 2))"),
+         "lmlu16a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0))"),
+         "lmlu17"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         "lmlu17a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0))"),
+         "lmlu18"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),(0 1,1 0),\
+                      (19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "lmlu18a"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,18 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),(0 1,1 0),\
+                      (19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         "lmlu18b"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,26 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),(0 1,1 0),\
+                      (19 0,20 1),(2 2,5 -1,15 2,25 0))"),
+         "lmlu18c"
+         );
+
+    tester::apply
+        (from_wkt<L>("LINESTRING(0 0,18 0,19 0,30 0)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,5 -1,15 2,25 0,21 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),(0 1,1 0),\
+                      (19 0,20 1),(2 2,5 -1,15 2,25 0))"),
+         "lmlu18d"
+         );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( test_union_multilinestring_linestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / LINESTRING UNION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef linestring_type L;
+    typedef multi_linestring_type ML;
+
+    typedef test_union_of_geometries<ML, L, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 2,4 3)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(0 0,10 0,20 1),(1 0,7 0))"),
+         "mllu01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<L>("LINESTRING(1 1,2 0,4 0)"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0))"),
+         "mllu02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<L>("LINESTRING(-1 -1,1 0,101 0,200 -1)"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1),(0 0,1 0))"),
+         "mllu03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<L>("LINESTRING(0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1)"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1),\
+                       (0 0,1 0),(19 0,20 0))"),
+         "mllu04"
+         );
+}
+
+
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_union_multilinestring_multilinestring )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTILINESTRING / MULTILINESTRING UNION ***"
+              << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_linestring_type ML;
+
+    typedef test_union_of_geometries<ML, ML, ML> tester;
+
+    // disjoint linestrings
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (1 1,2 2,4 3),(1 1,2 2,5 3))"),
+         "mlmlu01"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (1 1,2 0),(1 1,3 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,4 0),\
+                      (0 0,2 0),(4 0,10 0,20 1),(1 0,2 0),(4 0,7 0))"),
+         "mlmlu02"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (1 1,2 0),(1 1,3 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(1 1,3 0,5 0),\
+                      (0 0,2 0),(5 0,10 0,20 1),(1 0,2 0),(5 0,7 0))"),
+         "mlmlu03"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (1 1,2 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),(0 0,2 0),\
+                      (4 0,10 0,20 1),(1 0,2 0),(4 0,7 0))"),
+         "mlmlu04"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 1),(1 0,7 0),\
+                      (10 10,20 10,30 20),(1 1,2 0),(10 20,15 10),\
+                      (20 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (10 20,15 10,25 10,30 15),(0 0,2 0),(4 0,10 0,20 1),\
+                      (1 0,2 0),(4 0,7 0),(10 10,15 10),(20 10,30 20))"),
+         "mlmlu05"
+        );
+
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                      (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                      (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                      (10 10,20 10,30 20),(1 1,2 0),\
+                      (-1 -1,0 0),(9 0,11 10),(12 10,13 3),(10 20,15 10),\
+                      (20 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                      (10 20,15 10,25 10,30 15),(9 0,10 0,13 3),\
+                      (15 5,20 10),(10 10,11 10),(12 10,15 10),(20 10,30 20))"),
+         "mlmlu06"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                      (10 20,15 10,25 10,30 15))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                      (10 10,20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((1 1,2 0,4 0),\
+                      (-1 -1,0 0,9 0,11 10,12 10,13 3,14 4,15 5),\
+                      (10 20,15 10,25 10,30 15),(9 0,10 0,13 3),\
+                      (15 5,20 10),(10 10,11 10),(12 10,15 10),\
+                      (20 10,30 20))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,10 0,20 10),(1 0,7 0),\
+                      (10 10,20 10,30 20),(1 1,2 0),(-1 -1,0 0),  \
+                      (9 0,11 10),(12 10,13 3),(10 20,15 10),\
+                      (20 10,25 10,30 15))"),
+         "mlmlu06a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(-1 -1,1 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,1 0,101 0,200 -1),(0 0,1 0))"),
+         "mlmlu07"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 1,0 0,101 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1),(-1 1,0 0))"),
+         "mlmlu07a"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(-1 -1,0 0),\
+                      (19 -1,20 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((-1 -1,0 0,50 0),\
+                      (19 -1,20 0,101 0,200 -1))"),
+         "mlmlu07b"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,101 0),(0 1,1 1,2 0),\
+                      (-1 -1,1 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0),\
+                      (-1 -1,1 0,101 0,200 -1),(0 0,1 0))"),
+         "mlmlu08"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,2 0.5,3 0,101 0),\
+                      (0 1,1 1,2 0.5),(-1 -1,1 0,3 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,2 0.5),\
+                      (-1 -1,1 0,101 0,200 -1),(0 0,1 0,2 0.5,3 0))"),
+         "mlmlu09"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 0,1.5 0,2 0.5,3 0,101 0),\
+                      (0 1,1 1,1 0,2 0.5),(-1 -1,1 0),(1.5 0,3 0),\
+                      (101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 1,1 0,2 0.5),\
+                      (-1 -1,1 0,101 0,200 -1),(0 0,1 0),(1.5 0,2 0.5,3 0))"),
+         "mlmlu10"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,1 1,100 1,101 0),\
+                      (0 0,101 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1,3 0,4 0,5 1,6 1,\
+                      7 0,8 0,9 1,10 1,11 0,12 0,13 1,14 1,15 0),\
+                      (-1 -1,1 0,101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,1 1,100 1,101 0),\
+                      (0 0,101 0),(1 0,1 1),(2 1,3 0),(4 0,5 1),(6 1,7 0),\
+                      (8 0,9 1),(10 1,11 0),(12 0,13 1),(14 1,15 0),\
+                      (-1 -1,1 0),(101 0,200 -1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,1 1,2 1,3 0,4 0,5 1,6 1,\
+                      7 0,8 0,9 1,10 1,11 0,12 0,13 1,14 1,15 0),\
+                      (-1 -1,1 0,101 0,200 -1),(0 0,1 1),(2 1,5 1),\
+                      (6 1,9 1),(10 1,13 1),(14 1,100 1,101 0),(0 0,1 0))"),
+         "mlmlu11"
+        );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (1 1,2 0),(18 0,19 1),(2 1,3 0),(17 0,18 1),\
+                      (3 1,4 0),(16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (1 1,2 0,18 0,19 1),(2 1,3 0,17 0,18 1),\
+                      (3 1,4 0,16 0,17 1),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu12"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(19 0,20 1),(18 0,19 1),\
+                      (17 0,18 1),(16 0,17 1))"),
+         from_wkt<ML>("MULTILINESTRING((1 0,19 0,20 1),\
+                      (2 0,18 0,19 1),(3 0,17 0,18 1),\
+                      (4 0,16 0,17 1),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu13"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),\
+                      (19 0,20 1,19 1,18 0),(2 0,1 1,2 1,3 0),\
+                      (17 0,18 1,17 1,16 0),(4 0,3 1))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1,19 1,18 0,2 0,\
+                       1 1,2 1,3 0,17 0,18 1,17 1,16 0,4 0,3 1),\
+                       (0 0,1 0),(19 0,20 0))"),
+         "mlmlu14"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                       (2 2,4 2,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                       (2 2,4 2,6 0),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu15"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (6 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (6 0,4 2,2 2),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu15a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 2,5 0,6 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 2,5 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 2,5 0,6 0),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu16"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,20 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (6 0,5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,20 0),(0 1,1 0),(19 0,20 1),\
+                      (5 0,4 2,2 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (6 0,5 0,4 2,2 2),(0 0,1 0),(19 0,20 0))"),
+         "mlmlu16a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0),(0 0,1 0),(19 0,30 0))"),
+         "mlmlu17"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0,26 2))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,4 0,5 2,20 2,25 0,26 2),(0 0,1 0),(19 0,30 0))"),
+         "mlmlu17a"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,30 0),(0 1,1 0),(19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0),(0 0,1 0),(19 0,30 0))"),
+         "mlmlu18"
+         );
+
+    tester::apply
+        (from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 0,18 0,19 0,30 0),(0 1,1 0),\
+                      (19 0,20 1),(2 2,5 -1,15 2,18 0))"),
+         from_wkt<ML>("MULTILINESTRING((0 1,1 0,19 0,20 1),\
+                      (2 2,5 -1,15 2,18 0),(0 0,1 0),(19 0,30 0))"),
+         "mlmlu18a"
+         );
+}
diff --git a/test/algorithms/union_pl_pl.cpp b/test/algorithms/union_pl_pl.cpp
new file mode 100644
index 000000000..f458d9fba
--- /dev/null
+++ b/test/algorithms/union_pl_pl.cpp
@@ -0,0 +1,187 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+#include <iostream>
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_union_pointlike_pointlike
+#endif
+
+#ifdef GEOMETRY_TEST_DEBUG
+#define BOOST_GEOMETRY_DEBUG_TURNS
+#define BOOST_GEOMETRY_DEBUG_SEGMENT_IDENTIFIER
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include "test_set_ops_pl_pl.hpp"
+
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+
+typedef bg::model::point<double,2,bg::cs::cartesian>  point_type;
+typedef bg::model::multi_point<point_type>  multi_point_type;
+
+
+
+//===========================================================================
+//===========================================================================
+//===========================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_union_point_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** POINT / POINT UNION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            P, P, MP, bg::overlay_union
+        > tester;
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+         "ppu01");
+
+    tester::apply
+        (from_wkt<P>("POINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "ppu02");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_union_multipoint_point )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / POINT UNION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef point_type P;
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, P, MP, bg::overlay_union
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1)"),
+         "mppu01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppu02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0,1 1)"),
+         "mppu03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppu04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 1)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0,1 1)"),
+         "mppu05");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(1 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         "mppu06");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,0 0,1 0)"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 0)"),
+         "mppu07");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<P>("POINT(0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0)"),
+         "mppu08");
+}
+
+
+BOOST_AUTO_TEST_CASE( test_union_multipoint_multipoint )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+    std::cout << "*** MULTIPOINT / MULTIPOINT UNION ***" << std::endl;
+    std::cout << std::endl;
+#endif
+
+    typedef multi_point_type MP;
+
+    typedef test_set_op_of_pointlike_geometries
+        <
+            MP, MP, MP, bg::overlay_union
+        > tester;
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(2 2,3 3,0 0,0 0,2 2,1 1,1 1,1 0,1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1,1 1)"),
+         from_wkt<MP>("MULTIPOINT(2 2,3 3,0 0,0 0,2 2,1 1,1 1,1 0,1 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,1 1,1 1,1 1,2 2,3 3,0 0,0 0,2 2)"),
+         "mpmpu01");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         "mpmpu02");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         from_wkt<MP>("MULTIPOINT(1 0,0 0,1 1,0 0)"),
+         "mpmpu03");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 1,1 0,1 1)"),
+         "mpmpu04");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         from_wkt<MP>("MULTIPOINT()"),
+         "mpmpu05");
+
+    tester::apply
+        (from_wkt<MP>("MULTIPOINT(0 0,1 0,2 0,3 0,0 0,1 0,2 0)"),
+         from_wkt<MP>("MULTIPOINT(0 1,0 2,1 0,0 0,2 0)"),
+         from_wkt<MP>("MULTIPOINT(0 0,1 0,2 0,3 0,0 0,1 0,2 0,0 1,0 2)"),
+         from_wkt<MP>("MULTIPOINT(0 1,0 2,1 0,0 0,2 0,3 0)"),
+         "mpmpu06");
+}
+
diff --git a/test/algorithms/within.cpp b/test/algorithms/within.cpp
index ccf75c673..6abdce19b 100644
--- a/test/algorithms/within.cpp
+++ b/test/algorithms/within.cpp
@@ -1,39 +1,30 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
-//
+
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
 // 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)
 
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
 #include <algorithms/test_within.hpp>
 
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
-
+#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
 
 template <typename P>
 void test_all()
 {
-    // trivial case
-    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", true, false);
-
-    // on border/corner
-    test_ring<P>("POINT(0 0)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", false, true);
-    test_ring<P>("POINT(0 1)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", false, true);
-
-    // aligned to segment/vertex
-    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 3,3 3,3 1,2 1,2 0,0 0))", true, false);
-    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 3,4 3,3 1,2 2,2 0,0 0))", true, false);
-
-    // same polygon, but point on border
-    test_ring<P>("POINT(3 3)", "POLYGON((0 0,0 3,3 3,3 1,2 1,2 0,0 0))", false, true);
-    test_ring<P>("POINT(3 3)", "POLYGON((0 0,0 3,4 3,3 1,2 2,2 0,0 0))", false, true);
-
-    // holes
-    test_geometry<P, bg::model::polygon<P> >("POINT(2 2)",
-        "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,3 1,3 3,1 3,1 1))", false);
-
     typedef bg::model::box<P> box_type;
 
     test_geometry<P, box_type>("POINT(1 1)", "BOX(0 0,2 2)", true);
@@ -45,6 +36,9 @@ void test_all()
     test_geometry<box_type, box_type>("BOX(1 1,2 2)", "BOX(0 0,3 3)", true);
     test_geometry<box_type, box_type>("BOX(0 0,3 3)", "BOX(1 1,2 2)", false);
 
+    test_geometry<box_type, box_type>("BOX(1 1,3 3)", "BOX(0 0,3 3)", true);
+    test_geometry<box_type, box_type>("BOX(3 1,3 3)", "BOX(0 0,3 3)", false);
+
     /*
     test_within_code<P, box_type>("POINT(1 1)", "BOX(0 0,2 2)", 1);
     test_within_code<P, box_type>("POINT(1 0)", "BOX(0 0,2 2)", 0);
@@ -59,64 +53,11 @@ void test_all()
     test_within_code<box_type, box_type>("BOX(1 1,3 2)", "BOX(0 0,3 3)", 0);
     test_within_code<box_type, box_type>("BOX(1 1,3 4)", "BOX(0 0,3 3)", -1);
     */
-
-    // Real-life problem (solved now), point is in the middle, 409623 is also a coordinate
-    // on the border, has been wrong in the past (2009)
-    test_ring<P>("POINT(146383 409623)",
-        "POLYGON((146351 410597,146521 410659,147906 410363,148088 410420"
-        ",148175 410296,148281 409750,148215 409623,148154 409666,148154 409666"
-        ",148130 409625,148035 409626,148035 409626,148008 409544,147963 409510"
-        ",147993 409457,147961 409352,147261 408687,147008 408586,145714 408840"
-        ",145001 409033,144486 409066,144616 409308,145023 410286,145254 410488"
-        ",145618 410612,145618 410612,146015 410565,146190 410545,146351 410597))",
-        true, false);
 }
 
 template <typename Point>
 void test_spherical()
 {
-    typedef typename bg::coordinate_type<Point>::type ct;
-    bg::model::polygon<Point> wrangel;
-
-    // SQL Server check (no geography::STWithin, so check with intersection trick)
-    /*
-
-    with q as (
-    select geography::STGeomFromText('POLYGON((-178.569 71.5641,-179.034 71.5977,-179.305 71.5514,-179.629 71.5772,-180 71.5358,179.53 71.4383,178.872 71.2175,178.618 71.0355,178.791 70.7964,179.273 70.8886,179.678 70.8955,-180 70.9972,-179.274 70.9078,-178.819 70.98,-177.939 71.0375,-177.62 71.1166,-177.439 71.2269,-177.503 71.2775,-177.833 71.3461,-178.018 71.4497,-178.569 71.5641))',4326) as wrangel
-    )
-
-    select wrangel.STArea()/1000000.0
-    ,geography::STGeomFromText('POINT(-179.3 71.27)',4326).STIntersection(wrangel).STAsText() as workaround_within_1
-    ,geography::STGeomFromText('POINT(-179.9 70.95)',4326).STIntersection(wrangel).STAsText() as workaround_within_2
-    ,geography::STGeomFromText('POINT(179.9 70.95)',4326).STIntersection(wrangel).STAsText() as workaround_within_3
-    from q
-
-    -> 7669.10402181435 POINT (-179.3 71.27) GEOMETRYCOLLECTION EMPTY GEOMETRYCOLLECTION EMPTY
-
-    PostGIS knows Within for Geography neither, and the intersection trick gives the same result
-
-    */
-
-    bg::read_wkt("POLYGON((-178.568604 71.564148,-178.017548 71.449692,-177.833313 71.3461,-177.502838 71.277466 ,-177.439453 71.226929,-177.620026 71.116638,-177.9389 71.037491,-178.8186 70.979965,-179.274445 70.907761,-180 70.9972,179.678314 70.895538,179.272766 70.888596,178.791016 70.7964,178.617737 71.035538,178.872192 71.217484,179.530273 71.4383 ,-180 71.535843 ,-179.628601 71.577194,-179.305298 71.551361,-179.03421 71.597748,-178.568604 71.564148))", wrangel);
-
-    bool within = bg::within(Point(-179.3, 71.27), wrangel);
-    BOOST_CHECK_EQUAL(within, true);
-
-    within = bg::within(Point(-179.9, 70.95), wrangel);
-    BOOST_CHECK_EQUAL(within, false);
-
-    within = bg::within(Point(179.9, 70.95), wrangel);
-    BOOST_CHECK_EQUAL(within, false);
-
-    // Test using great circle mapper
-    // http://www.gcmap.com/mapui?P=5E52N-9E53N-7E50N-5E52N,7E52.5N,8E51.5N,6E51N
-
-    bg::model::polygon<Point> triangle;
-    bg::read_wkt("POLYGON((5 52,9 53,7 50,5 52))", triangle);
-    BOOST_CHECK_EQUAL(bg::within(Point(7, 52.5), triangle), true);
-    BOOST_CHECK_EQUAL(bg::within(Point(8.0, 51.5), triangle), false);
-    BOOST_CHECK_EQUAL(bg::within(Point(6.0, 51.0), triangle), false);
-
     // Test spherical boxes
     // See also http://www.gcmap.com/mapui?P=1E45N-19E45N-19E55N-1E55N-1E45N,10E55.1N,10E45.1N
     bg::model::box<Point> box;
@@ -165,7 +106,8 @@ void test_mixed_of()
     typedef boost::geometry::model::box<P1> box_type1;
     typedef boost::geometry::model::box<P2> box_type2;
 
-    polygon_type1 poly1, poly2;
+    polygon_type1 poly1;
+    polygon_type2 poly2;
     boost::geometry::read_wkt("POLYGON((0 0,0 5,5 5,5 0,0 0))", poly1);
     boost::geometry::read_wkt("POLYGON((0 0,0 5,5 5,5 0,0 0))", poly2);
 
@@ -210,48 +152,28 @@ void test_strategy()
     typedef bg::model::box<point_type> box_type;
     point_type p(3, 3);
     box_type b(point_type(0, 0), point_type(5, 5));
+    box_type b0(point_type(0, 0), point_type(5, 0));
 
-    bool r = bg::within(p, b, 
+    bool r = bg::within(p, b,
         bg::strategy::within::point_in_box<point_type, box_type>());
     BOOST_CHECK_EQUAL(r, true);
 
-    r = bg::within(b, b, 
+    r = bg::within(b, b,
+        bg::strategy::within::box_in_box<box_type, box_type>());
+    BOOST_CHECK_EQUAL(r, true);
+
+    r = bg::within(b0, b0,
         bg::strategy::within::box_in_box<box_type, box_type>());
     BOOST_CHECK_EQUAL(r, false);
 
-    r = bg::within(p, b, 
+    r = bg::within(p, b,
         bg::strategy::within::point_in_box_by_side<point_type, box_type>());
     BOOST_CHECK_EQUAL(r, true);
 }
 
 
-void test_large_integers()
-{
-    typedef bg::model::point<int, 2, bg::cs::cartesian> int_point_type;
-    typedef bg::model::point<double, 2, bg::cs::cartesian> double_point_type;
-
-    std::string const polygon_li = "POLYGON((1872000 528000,1872000 192000,1536119 192000,1536000 528000,1200000 528000,1200000 863880,1536000 863880,1872000 863880,1872000 528000))";
-    bg::model::polygon<int_point_type> int_poly;
-    bg::model::polygon<double_point_type> double_poly;
-    bg::read_wkt(polygon_li, int_poly);
-    bg::read_wkt(polygon_li, double_poly);
-
-    std::string const point_li = "POINT(1592000 583950)";
-    int_point_type int_point;
-    double_point_type double_point;
-    bg::read_wkt(point_li, int_point);
-    bg::read_wkt(point_li, double_point);
-
-    bool wi = bg::within(int_point, int_poly);
-    bool wd = bg::within(double_point, double_poly);
-
-    BOOST_CHECK_MESSAGE(wi == wd, "within<a double> different from within<an int>");
-}
-
 int test_main( int , char* [] )
 {
-    test_large_integers();
-
     test_all<bg::model::d2::point_xy<int> >();
     test_all<bg::model::d2::point_xy<double> >();
 
diff --git a/test/algorithms/within_areal_areal.cpp b/test/algorithms/within_areal_areal.cpp
new file mode 100644
index 000000000..57f417d95
--- /dev/null
+++ b/test/algorithms/within_areal_areal.cpp
@@ -0,0 +1,80 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_within.hpp>
+
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+template <typename P>
+void test_a_a()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::ring<P> ring;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    test_geometry<ring, ring>("POLYGON((0 0,0 2,2 2,2 0,0 0))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<ring, poly>("POLYGON((0 0,0 5,5 5,5 0,0 0))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    test_geometry<poly, ring>("POLYGON((0 0,0 6,6 6,6 0,0 0))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+
+    test_geometry<poly, poly>("POLYGON((0 0,0 9,9 9,9 0,0 0),(3 3,6 3,6 6,3 6,3 3))",
+                              "POLYGON((0 0,0 9,9 9,9 0,0 0),(3 3,6 3,6 6,3 6,3 3))", true);
+    test_geometry<poly, poly>("POLYGON((0 0,0 9,9 9,9 0,0 0),(3 3,6 3,6 6,3 6,3 3))",
+                              "POLYGON((0 0,0 9,9 9,9 0,0 0),(4 4,5 4,5 5,4 5,4 4))", true);
+    test_geometry<poly, poly>("POLYGON((1 1,1 8,8 8,8 1,1 1),(3 3,6 3,6 6,3 6,3 3))",
+                              "POLYGON((0 0,0 9,9 9,9 0,0 0),(3 3,6 3,6 6,3 6,3 3))", true);
+    test_geometry<poly, poly>("POLYGON((1 1,1 8,8 8,8 1,1 1),(3 3,6 3,6 6,3 6,3 3))",
+                              "POLYGON((0 0,0 9,9 9,9 0,0 0),(4 4,5 4,5 5,4 5,4 4))", true);
+    
+    test_geometry<ring, mpoly>("POLYGON((0 0,0 2,2 2,2 0,0 0))",
+                               "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))", true);
+    test_geometry<poly, mpoly>("POLYGON((0 0,0 2,2 2,2 0,0 0))",
+                               "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))", true);
+
+    test_geometry<mpoly, ring>("MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))",
+                               "POLYGON((0 0,0 10,10 10,10 0,0 0))", true);
+    test_geometry<mpoly, poly>("MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((15 15,15 110,110 110,110 15,15 15)))",
+                               "POLYGON((0 0,0 10,10 10,10 0,0 0))", false);
+
+    test_geometry<mpoly, poly>("MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((3 3,3 4,4 3,3 3)))",
+                               "POLYGON((0 0,0 10,10 10,10 0,0 0),(3 3,4 3,4 4,3 4,3 3))", false);
+
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((3 3,3 4,4 3,3 3)))",
+                                "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((3 3,3 4,4 3,3 3)))", true);
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((3 3,3 4,4 3,3 3)))",
+                                "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))", true);
+    test_geometry<mpoly, mpoly>("MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))",
+                                "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((3 3,3 4,4 3,3 3)))", false);
+}
+
+template <typename P>
+void test_all()
+{
+    test_a_a<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/within_linear_areal.cpp b/test/algorithms/within_linear_areal.cpp
new file mode 100644
index 000000000..68f9ce396
--- /dev/null
+++ b/test/algorithms/within_linear_areal.cpp
@@ -0,0 +1,85 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_within.hpp>
+
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+template <typename P>
+void test_l_a()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::ring<P> ring;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    // B,I
+    test_geometry<ls, ring>("LINESTRING(0 0, 2 2)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+
+    // B,I
+    test_geometry<ls, poly>("LINESTRING(0 0, 2 2)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    // I
+    test_geometry<ls, poly>("LINESTRING(1 1, 2 2)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    // I,E
+    test_geometry<ls, poly>("LINESTRING(1 1, 6 6)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+    // B
+    test_geometry<ls, poly>("LINESTRING(0 0, 5 0)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+    test_geometry<ls, poly>("LINESTRING(0 0, 0 5)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+    // E
+    test_geometry<ls, poly>("LINESTRING(6 0, 6 5)", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+
+    // BIBIB
+    test_geometry<ls, mpoly>("LINESTRING(0 0, 10 10)", "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))", true);
+    // BIBEBIB
+    test_geometry<ls, mpoly>("LINESTRING(0 0, 10 10)", "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((6 6,5 10,10 10,10 5,6 6)))", false);
+
+    // BI
+    test_geometry<mls, poly>("MULTILINESTRING((0 0,2 2),(2 2,3 3))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", true);
+    // I E
+    test_geometry<mls, poly>("MULTILINESTRING((1 1,2 2),(6 6,7 7))", "POLYGON((0 0,0 5,5 5,5 0,0 0))", false);
+
+    // I I
+    test_geometry<mls, mpoly>("MULTILINESTRING((1 1,5 5),(6 6,7 7))",
+                              "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))",
+                              true);
+    // I E
+    test_geometry<mls, mpoly>("MULTILINESTRING((1 1,5 5),(11 11,12 12))",
+                              "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)),((5 5,5 10,10 10,10 5,5 5)))",
+                              false);
+}
+
+template <typename P>
+void test_all()
+{
+    test_l_a<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/within_linear_linear.cpp b/test/algorithms/within_linear_linear.cpp
new file mode 100644
index 000000000..bf77d4cb8
--- /dev/null
+++ b/test/algorithms/within_linear_linear.cpp
@@ -0,0 +1,99 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_within.hpp>
+
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+
+template <typename P>
+void test_l_l()
+{
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<ls, ls>("LINESTRING(0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", true);
+
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 3 2)", true);
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(0 0, 2 2, 3 2)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0, 1 1, 2 2, 3 2)", "LINESTRING(3 2, 2 2, 0 0)", true);
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1, 0 0)", "LINESTRING(3 2, 2 2, 0 0)", true);
+
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(0 0, 2 2, 4 2)", true);
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2)", "LINESTRING(4 2, 2 2, 0 0)", true);
+    test_geometry<ls, ls>("LINESTRING(3 2, 2 2, 1 1)", "LINESTRING(4 2, 2 2, 0 0)", true);
+
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 3)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 3 2, 3 1)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+    test_geometry<ls, ls>("LINESTRING(0 1, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(0 1, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(1 0, 1 1, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+    test_geometry<ls, ls>("LINESTRING(1 0, 0 0, 2 2, 3 2)", "LINESTRING(0 0, 2 2, 4 2)", false);
+
+    // duplicated points
+    test_geometry<ls, ls>("LINESTRING(1 1, 2 2, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+    test_geometry<ls, ls>("LINESTRING(1 1, 1 1, 2 2)", "LINESTRING(0 0, 2 2, 4 2)", true);
+
+    test_geometry<ls, ls>("LINESTRING(0 0, 0 0, 0 0, 1 1, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 2 2, 3 3)",
+                          "LINESTRING(0 0, 2 2, 4 4)", true);
+
+    // invalid linestrings
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0)", false);
+//    test_geometry<ls, ls>("LINESTRING(1 1)", "LINESTRING(0 0, 2 2)", true);
+//    test_geometry<ls, ls>("LINESTRING(0 0)", "LINESTRING(0 0, 2 2)", false);
+//    test_geometry<ls, ls>("LINESTRING(0 0, 1 1)", "LINESTRING(0 0)", false);
+
+    // spikes
+    // FOR NOW DISABLED
+
+    /*test_geometry<ls, ls>("LINESTRING(0 0,5 0,3 0,6 0)", "LINESTRING(0 0,6 0)", true);
+
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,3 3,6 3)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,3 3,6 3)", "LINESTRING(0 0,2 2,3 3,1 1)", false);
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1)", "LINESTRING(0 0,4 4,6 3)", true);
+    test_geometry<ls, ls>("LINESTRING(0 0,4 4,6 3)", "LINESTRING(0 0,2 2,3 3,1 1)", false);
+    
+    test_geometry<ls, ls>("LINESTRING(0 0,2 2,3 3,1 1,5 3)", "LINESTRING(0 0,3 3,6 3)", false);*/
+
+    test_geometry<ls, mls>("LINESTRING(1 1, 2 2)", "MULTILINESTRING((0 0, 2 2),(3 3, 4 4))", true);
+
+    test_geometry<mls, ls>("MULTILINESTRING((0 0, 2 2),(3 3, 4 4))", "LINESTRING(0 0, 5 5)", true);
+
+    test_geometry<mls, mls>("MULTILINESTRING((1 1, 2 2),(3 3, 4 4))", "MULTILINESTRING((1 1, 2 2),(2 2, 5 5))", true);
+}
+
+template <typename P>
+void test_all()
+{
+    test_l_l<P>();
+}
+
+int test_main( int , char* [] )
+{
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+#endif
+
+    return 0;
+}
diff --git a/test/algorithms/within_pointlike_xxx.cpp b/test/algorithms/within_pointlike_xxx.cpp
new file mode 100644
index 000000000..db281aecf
--- /dev/null
+++ b/test/algorithms/within_pointlike_xxx.cpp
@@ -0,0 +1,199 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2013 Adam Wulkiewicz, Lodz, Poland.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#include <algorithms/test_within.hpp>
+
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/multi/multi.hpp>
+#include <boost/geometry/multi/geometries/multi_point.hpp>
+#include <boost/geometry/multi/geometries/multi_linestring.hpp>
+#include <boost/geometry/multi/geometries/multi_polygon.hpp>
+
+template <typename P>
+void test_p_p()
+{
+    typedef bg::model::multi_point<P> mpt;
+
+    test_geometry<P, P>("POINT(0 0)", "POINT(0 0)", true);
+    test_geometry<P, P>("POINT(0 0)", "POINT(1 1)", false);
+
+    test_geometry<P, mpt>("POINT(0 0)", "MULTIPOINT(0 0, 1 1)", true);
+    test_geometry<P, mpt>("POINT(0 0)", "MULTIPOINT(1 1, 2 2)", false);
+}
+
+template <typename P>
+void test_p_l()
+{
+    typedef bg::model::segment<P> seg;
+    typedef bg::model::linestring<P> ls;
+    typedef bg::model::multi_linestring<ls> mls;
+
+    test_geometry<P, seg>("POINT(1 1)", "LINESTRING(0 0, 2 2)", true);
+    test_geometry<P, seg>("POINT(0 0)", "LINESTRING(0 0, 1 1)", false);
+    test_geometry<P, seg>("POINT(1 0)", "LINESTRING(0 0, 1 1)", false);
+
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0,1 1,2 2)", false);
+    test_geometry<P, ls>("POINT(3 3)", "LINESTRING(0 0,1 1,2 2)", false);
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0,2 2,3 3)", true);
+
+    test_geometry<P, ls>("POINT(1 1)", "LINESTRING(0 0, 2 2)", true);
+    test_geometry<P, ls>("POINT(0 0)", "LINESTRING(0 0, 1 1)", false);
+
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,1 1,2 2),(0 0,0 1))", true);
+    test_geometry<P, mls>("POINT(0 0)", "MULTILINESTRING((0 0,1 1,2 2),(0 0,0 1),(0 0,1 0))", false);
+    
+    test_geometry<P, mls>("POINT(1 1)", "MULTILINESTRING((0 0, 1 1),(1 1, 2 2))", true);
+    test_geometry<P, mls>("POINT(1 1)", "MULTILINESTRING((0 0, 1 1),(2 2, 3 3))", false);
+}
+
+template <typename P>
+void test_p_a()
+{
+    typedef bg::model::polygon<P> poly;
+    typedef bg::model::multi_polygon<poly> mpoly;
+
+    // trivial case
+    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", true, false);
+
+    // on border/corner
+    test_ring<P>("POINT(0 0)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", false, true);
+    test_ring<P>("POINT(0 1)", "POLYGON((0 0,0 2,2 2,2 0,0 0))", false, true);
+
+    // aligned to segment/vertex
+    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 3,3 3,3 1,2 1,2 0,0 0))", true, false);
+    test_ring<P>("POINT(1 1)", "POLYGON((0 0,0 3,4 3,3 1,2 2,2 0,0 0))", true, false);
+
+    // same polygon, but point on border
+    test_ring<P>("POINT(3 3)", "POLYGON((0 0,0 3,3 3,3 1,2 1,2 0,0 0))", false, true);
+    test_ring<P>("POINT(3 3)", "POLYGON((0 0,0 3,4 3,3 1,2 2,2 0,0 0))", false, true);
+
+    // holes
+    test_geometry<P, poly>("POINT(2 2)",
+        "POLYGON((0 0,0 4,4 4,4 0,0 0),(1 1,3 1,3 3,1 3,1 1))", false);
+
+    // Real-life problem (solved now), point is in the middle, 409623 is also a coordinate
+    // on the border, has been wrong in the past (2009)
+    test_ring<P>("POINT(146383 409623)",
+        "POLYGON((146351 410597,146521 410659,147906 410363,148088 410420"
+        ",148175 410296,148281 409750,148215 409623,148154 409666,148154 409666"
+        ",148130 409625,148035 409626,148035 409626,148008 409544,147963 409510"
+        ",147993 409457,147961 409352,147261 408687,147008 408586,145714 408840"
+        ",145001 409033,144486 409066,144616 409308,145023 410286,145254 410488"
+        ",145618 410612,145618 410612,146015 410565,146190 410545,146351 410597))",
+        true, false);
+
+    test_geometry<P, mpoly>("POINT(2 2)",
+        "MULTIPOLYGON(((0 0,0 4,4 4,4 0,0 0),(1 1,3 1,3 3,1 3,1 1)),((5 5,5 9,9 9,9 5,5 5)))", false);
+    test_geometry<P, mpoly>("POINT(1 1)",
+        "MULTIPOLYGON(((0 0,0 4,4 4,4 0,0 0),(1 1,3 1,3 3,1 3,1 1)),((5 5,5 9,9 9,9 5,5 5)))", false);
+    test_geometry<P, mpoly>("POINT(1 1)",
+        "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,4 2,4 4,2 4,2 2)),((5 5,5 9,9 9,9 5,5 5)))", true);
+    test_geometry<P, mpoly>("POINT(6 6)",
+        "MULTIPOLYGON(((0 0,0 4,4 4,4 0,0 0),(1 1,3 1,3 3,1 3,1 1)),((5 5,5 9,9 9,9 5,5 5)))", true);
+}
+
+template <typename P>
+void test_all()
+{
+    test_p_p<P>();
+    test_p_l<P>();
+    test_p_a<P>();
+}
+
+template <typename Point>
+void test_spherical()
+{
+    bg::model::polygon<Point> wrangel;
+
+    // SQL Server check (no geography::STWithin, so check with intersection trick)
+    /*
+
+    with q as (
+    select geography::STGeomFromText('POLYGON((-178.569 71.5641,-179.034 71.5977,-179.305 71.5514,-179.629 71.5772,-180 71.5358,179.53 71.4383,178.872 71.2175,178.618 71.0355,178.791 70.7964,179.273 70.8886,179.678 70.8955,-180 70.9972,-179.274 70.9078,-178.819 70.98,-177.939 71.0375,-177.62 71.1166,-177.439 71.2269,-177.503 71.2775,-177.833 71.3461,-178.018 71.4497,-178.569 71.5641))',4326) as wrangel
+    )
+
+    select wrangel.STArea()/1000000.0
+    ,geography::STGeomFromText('POINT(-179.3 71.27)',4326).STIntersection(wrangel).STAsText() as workaround_within_1
+    ,geography::STGeomFromText('POINT(-179.9 70.95)',4326).STIntersection(wrangel).STAsText() as workaround_within_2
+    ,geography::STGeomFromText('POINT(179.9 70.95)',4326).STIntersection(wrangel).STAsText() as workaround_within_3
+    from q
+
+    -> 7669.10402181435 POINT (-179.3 71.27) GEOMETRYCOLLECTION EMPTY GEOMETRYCOLLECTION EMPTY
+
+    PostGIS knows Within for Geography neither, and the intersection trick gives the same result
+
+    */
+
+    bg::read_wkt("POLYGON((-178.568604 71.564148,-178.017548 71.449692,-177.833313 71.3461,-177.502838 71.277466 ,-177.439453 71.226929,-177.620026 71.116638,-177.9389 71.037491,-178.8186 70.979965,-179.274445 70.907761,-180 70.9972,179.678314 70.895538,179.272766 70.888596,178.791016 70.7964,178.617737 71.035538,178.872192 71.217484,179.530273 71.4383 ,-180 71.535843 ,-179.628601 71.577194,-179.305298 71.551361,-179.03421 71.597748,-178.568604 71.564148))", wrangel);
+
+    bool within = bg::within(Point(-179.3, 71.27), wrangel);
+    BOOST_CHECK_EQUAL(within, true);
+
+    within = bg::within(Point(-179.9, 70.95), wrangel);
+    BOOST_CHECK_EQUAL(within, false);
+
+    within = bg::within(Point(179.9, 70.95), wrangel);
+    BOOST_CHECK_EQUAL(within, false);
+
+    // Test using great circle mapper
+    // http://www.gcmap.com/mapui?P=5E52N-9E53N-7E50N-5E52N,7E52.5N,8E51.5N,6E51N
+
+    bg::model::polygon<Point> triangle;
+    bg::read_wkt("POLYGON((5 52,9 53,7 50,5 52))", triangle);
+    BOOST_CHECK_EQUAL(bg::within(Point(7, 52.5), triangle), true);
+    BOOST_CHECK_EQUAL(bg::within(Point(8.0, 51.5), triangle), false);
+    BOOST_CHECK_EQUAL(bg::within(Point(6.0, 51.0), triangle), false);
+}
+
+void test_large_integers()
+{
+    typedef bg::model::point<int, 2, bg::cs::cartesian> int_point_type;
+    typedef bg::model::point<double, 2, bg::cs::cartesian> double_point_type;
+
+    std::string const polygon_li = "POLYGON((1872000 528000,1872000 192000,1536119 192000,1536000 528000,1200000 528000,1200000 863880,1536000 863880,1872000 863880,1872000 528000))";
+    bg::model::polygon<int_point_type> int_poly;
+    bg::model::polygon<double_point_type> double_poly;
+    bg::read_wkt(polygon_li, int_poly);
+    bg::read_wkt(polygon_li, double_poly);
+
+    std::string const point_li = "POINT(1592000 583950)";
+    int_point_type int_point;
+    double_point_type double_point;
+    bg::read_wkt(point_li, int_point);
+    bg::read_wkt(point_li, double_point);
+
+    bool wi = bg::within(int_point, int_poly);
+    bool wd = bg::within(double_point, double_poly);
+
+    BOOST_CHECK_MESSAGE(wi == wd, "within<a double> different from within<an int>");
+}
+
+int test_main( int , char* [] )
+{
+    test_large_integers();
+
+    test_all<bg::model::d2::point_xy<int> >();
+    test_all<bg::model::d2::point_xy<double> >();
+
+    test_spherical<bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> > >();
+
+#if defined(HAVE_TTMATH)
+    test_all<bg::model::d2::point_xy<ttmath_big> >();
+    test_spherical<bg::model::point<ttmath_big, 2, bg::cs::spherical_equatorial<bg::degree> > >();
+#endif
+
+    return 0;
+}
diff --git a/test/arithmetic/arithmetic.cpp b/test/arithmetic/arithmetic.cpp
index f7d2e3427..a329a6e52 100644
--- a/test/arithmetic/arithmetic.cpp
+++ b/test/arithmetic/arithmetic.cpp
@@ -29,7 +29,7 @@ BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
 BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
 
 
-template <typename P>
+template <typename P, typename P2>
 void test_addition()
 {
     P p1;
@@ -39,15 +39,14 @@ void test_addition()
     BOOST_CHECK(bg::get<1>(p1) == 12);
     BOOST_CHECK(bg::get<2>(p1) == 13);
 
-    P p2;
-    bg::assign_values(p2, 4, 5, 6);
+    P2 p2(4, 5, 6);
     bg::add_point(p1, p2);
     BOOST_CHECK(bg::get<0>(p1) == 15);
     BOOST_CHECK(bg::get<1>(p1) == 17);
     BOOST_CHECK(bg::get<2>(p1) == 19);
 }
 
-template <typename P>
+template <typename P, typename P2>
 void test_subtraction()
 {
     P p1;
@@ -57,15 +56,14 @@ void test_subtraction()
     BOOST_CHECK(bg::get<1>(p1) == -8);
     BOOST_CHECK(bg::get<2>(p1) == -7);
 
-    P p2;
-    bg::assign_values(p2, 4, 6, 8);
+    P2 p2(4, 6, 8);
     bg::subtract_point(p1, p2);
     BOOST_CHECK(bg::get<0>(p1) == -13);
     BOOST_CHECK(bg::get<1>(p1) == -14);
     BOOST_CHECK(bg::get<2>(p1) == -15);
 }
 
-template <typename P>
+template <typename P, typename P2>
 void test_multiplication()
 {
     P p1;
@@ -75,15 +73,14 @@ void test_multiplication()
     BOOST_CHECK(bg::get<1>(p1) == 10);
     BOOST_CHECK(bg::get<2>(p1) == 15);
 
-    P p2;
-    bg::assign_values(p2, 4, 5, 6);
+    P2 p2(4, 5, 6);
     bg::multiply_point(p1, p2);
     BOOST_CHECK(bg::get<0>(p1) == 20);
     BOOST_CHECK(bg::get<1>(p1) == 50);
     BOOST_CHECK(bg::get<2>(p1) == 90);
 }
 
-template <typename P>
+template <typename P, typename P2>
 void test_division()
 {
     P p1;
@@ -93,40 +90,41 @@ void test_division()
     BOOST_CHECK(bg::get<1>(p1) == 20);
     BOOST_CHECK(bg::get<2>(p1) == 30);
 
-    P p2;
-    bg::assign_values(p2, 2, 4, 6);
+    P2 p2(2, 4, 6);
     bg::divide_point(p1, p2);
     BOOST_CHECK(bg::get<0>(p1) == 5);
     BOOST_CHECK(bg::get<1>(p1) == 5);
     BOOST_CHECK(bg::get<2>(p1) == 5);
 }
 
-template <typename P>
+template <typename P, typename P2>
 void test_assign()
 {
     P p1;
-    P p2;
+    P2 p2(12, 34, 56);
     bg::assign_values(p1, 12, 34, 56);
-    bg::assign_point(p2, p1);
-    BOOST_CHECK(bg::get<0>(p2) == 12);
-    BOOST_CHECK(bg::get<1>(p2) == 34);
-    BOOST_CHECK(bg::get<2>(p2) == 56);
+    bg::assign_point(p1, p2);
+    BOOST_CHECK(bg::get<0>(p1) == 12);
+    BOOST_CHECK(bg::get<1>(p1) == 34);
+    BOOST_CHECK(bg::get<2>(p1) == 56);
 
-    bg::assign_value(p2, 78);
-    BOOST_CHECK(bg::get<0>(p2) == 78);
-    BOOST_CHECK(bg::get<1>(p2) == 78);
-    BOOST_CHECK(bg::get<2>(p2) == 78);
+    bg::assign_value(p1, 78);
+    BOOST_CHECK(bg::get<0>(p1) == 78);
+    BOOST_CHECK(bg::get<1>(p1) == 78);
+    BOOST_CHECK(bg::get<2>(p1) == 78);
 }
 
 
 template <typename P>
 void test_all()
 {
-    test_addition<P>();
-    test_subtraction<P>();
-    test_multiplication<P>();
-    test_division<P>();
-    test_assign<P>();
+    typedef test::test_const_point P2;
+
+    test_addition<P, P2>();
+    test_subtraction<P, P2>();
+    test_multiplication<P, P2>();
+    test_division<P, P2>();
+    test_assign<P, P2>();
 }
 
 
diff --git a/test/geometries/Jamfile.v2 b/test/geometries/Jamfile.v2
index 5b809bb12..763b9b6f0 100644
--- a/test/geometries/Jamfile.v2
+++ b/test/geometries/Jamfile.v2
@@ -13,7 +13,7 @@ test-suite boost-geometry-geometries
     [ run adapted.cpp ]
     [ run boost_array_as_point.cpp ]
     [ run boost_fusion.cpp ]
-    # [ run boost_polygon.cpp ] 
+    [ run boost_polygon.cpp ] 
     [ run boost_range.cpp ]
     [ run boost_tuple.cpp ]
     [ run box.cpp ]
diff --git a/test/geometries/adapted.cpp b/test/geometries/adapted.cpp
index 3ba47ef72..fd3bb6419 100644
--- a/test/geometries/adapted.cpp
+++ b/test/geometries/adapted.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <geometry_test_common.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/geometries/geometries.hpp>
 #include <boost/geometry/multi/multi.hpp>
@@ -31,7 +32,7 @@
 
     BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(std::vector)
     BOOST_GEOMETRY_REGISTER_RING_TEMPLATED(std::deque)
-  
+
 #elif defined(BOOST_GEOMETRY_TEST_MULTI_POINT)
 
     #include <boost/geometry/multi/geometries/register/multi_point.hpp>
@@ -39,7 +40,7 @@
 
     BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED(std::vector)
     BOOST_GEOMETRY_REGISTER_MULTI_POINT_TEMPLATED(std::deque)
-  
+
 #else
 
     #include <boost/geometry/geometries/register/linestring.hpp>
@@ -47,7 +48,7 @@
 
     BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::vector)
     BOOST_GEOMETRY_REGISTER_LINESTRING_TEMPLATED(std::deque)
-  
+
 #endif
 
 
@@ -70,10 +71,10 @@ void test_geometry(G const& geometry, std::size_t expected_size = 0)
 
     typedef typename bg::point_type<G>::type P;
     typedef typename bg::coordinate_type<P>::type C;
+    boost::ignore_unused<P, C>();
 
     // Check range-like behaviour
     BOOST_CHECK_EQUAL(boost::size(geometry), expected_size);
-
 }
 
 template <typename P>
diff --git a/test/geometries/boost_array_as_point.cpp b/test/geometries/boost_array_as_point.cpp
index c1ffe0bf5..6fc7cac73 100644
--- a/test/geometries/boost_array_as_point.cpp
+++ b/test/geometries/boost_array_as_point.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2010 Alfredo Correa 
+// Copyright (c) 2010 Alfredo Correa
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
 // Use, modification and distribution is subject to the Boost Software License,
diff --git a/test/geometries/boost_range.cpp b/test/geometries/boost_range.cpp
index d80ca33c8..d2a2ff5d9 100644
--- a/test/geometries/boost_range.cpp
+++ b/test/geometries/boost_range.cpp
@@ -25,6 +25,7 @@
 
 #include <sstream>
 
+#ifdef BOOST_GEOMETRY_TEST_QUARANTINED
 struct not_two
 {
     template <typename P>
@@ -42,6 +43,7 @@ struct sum_not_five
         return boost::geometry::get<0>(p1) + boost::geometry::get<0>(p2) != 5.0;
     }
 };
+#endif
 
 
 template <typename P>
@@ -74,6 +76,10 @@ void test_range_adaptor()
         BOOST_CHECK_EQUAL(out.str(), "LINESTRING(2 2,3 3)");
     }
 
+#ifdef BOOST_GEOMETRY_TEST_QUARANTINED
+// range filter adaptor does not support boost::size()
+// This makes it in practice not applicable, boost::geometry calls boost::size
+// in most if not all algorithms
     {
         std::ostringstream out;
         out << bg::wkt(ls | boost::adaptors::filtered(not_two()));
@@ -96,6 +102,7 @@ void test_range_adaptor()
         //out << bg::wkt(ls | boost::adaptors::uniqued);
         //BOOST_CHECK_EQUAL(out.str(), "LINESTRING(1 1,2 2,3 3,4 4)");
     }
+#endif
 }
 
 template <typename P>
diff --git a/test/geometries/custom_linestring.cpp b/test/geometries/custom_linestring.cpp
index ef2bad43a..35315503a 100644
--- a/test/geometries/custom_linestring.cpp
+++ b/test/geometries/custom_linestring.cpp
@@ -56,7 +56,7 @@ namespace boost { namespace geometry { namespace traits {
 // by specializing the "use_std" traits to false.
 // It should therefore implement the traits:: clear / append_point
 template <typename P>
-struct custom_linestring2 : std::deque<P> // std::pair<typename std::vector<P>::const_iterator, typename std::vector<P>::const_iterator> 
+struct custom_linestring2 : std::deque<P> // std::pair<typename std::vector<P>::const_iterator, typename std::vector<P>::const_iterator>
 {
 };
 
diff --git a/test/geometries/segment.cpp b/test/geometries/segment.cpp
index 49d68d9f6..25165b6b7 100644
--- a/test/geometries/segment.cpp
+++ b/test/geometries/segment.cpp
@@ -16,6 +16,8 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/core/ignore_unused.hpp>
+
 #include <boost/geometry/geometries/concepts/segment_concept.hpp>
 
 #include <boost/geometry/geometries/point.hpp>
@@ -52,7 +54,7 @@ void test_all()
 
     typedef typename bg::coordinate_type<S>::type T;
     typedef typename bg::point_type<S>::type SP;
-
+    boost::ignore_unused<T, SP>();
 
     //std::cout << sizeof(typename coordinate_type<S>::type) << std::endl;
 
@@ -63,6 +65,7 @@ void test_all()
 
     typedef typename bg::coordinate_type<CS>::type CT;
     typedef typename bg::point_type<CS>::type CSP;
+    boost::ignore_unused<CT, CSP>();
 }
 
 
diff --git a/test/geometry_test_common.hpp b/test/geometry_test_common.hpp
index 0b05135be..37b8d053d 100644
--- a/test/geometry_test_common.hpp
+++ b/test/geometry_test_common.hpp
@@ -34,6 +34,7 @@
 
 #include <boost/foreach.hpp>
 
+#include <string_from_type.hpp>
 
 // Include some always-included-for-testing files
 #if ! defined(BOOST_GEOMETRY_NO_BOOST_TEST)
@@ -83,52 +84,13 @@
 namespace bg = boost::geometry;
 
 
-template <typename T>
-struct string_from_type {};
-
-template <> struct string_from_type<void>
-{ static std::string name() { return "v"; }  };
-
-template <> struct string_from_type<float>
-{ static std::string name() { return "f"; }  };
-
-template <> struct string_from_type<double>
-{ static std::string name() { return "d"; }  };
-
-template <> struct string_from_type<long double>
-{ static std::string name() { return "e"; }  };
-
-template <> struct string_from_type<int>
-{ static std::string name() { return "i"; }  };
-
-#if defined(HAVE_TTMATH)
-    template <> struct string_from_type<ttmath_big>
-    { static std::string name() { return "t"; }  };
-#endif
-
-#if defined(BOOST_RATIONAL_HPP) 
-template <typename T> struct string_from_type<boost::rational<T> >
-{ static std::string name() { return "r"; }  };
-#endif
-
-
-#if defined(HAVE_GMP)
-    template <> struct string_from_type<boost::numeric_adaptor::gmp_value_type>
-    { static std::string name() { return "g"; }  };
-#endif
-
-#if defined(HAVE_CLN)
-    template <> struct string_from_type<boost::numeric_adaptor::cln_value_type>
-    { static std::string name() { return "c"; }  };
-#endif
-
-
 template <typename CoordinateType, typename T1, typename T2>
 inline T1 if_typed_tt(T1 value_tt, T2 value)
 {
 #if defined(HAVE_TTMATH)
     return boost::is_same<CoordinateType, ttmath_big>::type::value ? value_tt : value;
 #else
+    boost::ignore_unused_variable_warning(value_tt);
     return value;
 #endif
 }
@@ -172,7 +134,7 @@ struct mathematical_policy
     {
         return 90 - value;
     }
-    
+
 };
 
 
diff --git a/test/iterators/Jamfile.v2 b/test/iterators/Jamfile.v2
index 72091f21f..40273145d 100644
--- a/test/iterators/Jamfile.v2
+++ b/test/iterators/Jamfile.v2
@@ -1,8 +1,13 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,4 +17,7 @@ test-suite boost-geometry-iterators
     :
     [ run closing_iterator.cpp ] 
     [ run ever_circling_iterator.cpp ]
+    [ run point_iterator.cpp ]
+    [ run concatenate_iterator.cpp ]
+    [ run flatten_iterator.cpp ]
     ;
diff --git a/test/iterators/concatenate_iterator.cpp b/test/iterators/concatenate_iterator.cpp
new file mode 100644
index 000000000..2def4040c
--- /dev/null
+++ b/test/iterators/concatenate_iterator.cpp
@@ -0,0 +1,255 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_concatenate_iterator
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <cstddef>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <algorithm>
+#include <iterator>
+
+#include <vector>
+#include <list>
+
+#include <boost/assign/std/vector.hpp>
+#include <boost/assign/std/list.hpp>
+
+#include "test_iterator_common.hpp"
+
+#include <boost/geometry/iterators/concatenate_iterator.hpp>
+
+using namespace boost::assign;
+
+
+struct test_concatenate_iterator
+{
+    template
+    <
+        typename ConcatenateIterator,
+        typename ConstConcatenateIterator,
+        typename Container
+    >
+    static inline
+    void test_using_max_element(ConcatenateIterator first,
+                                ConcatenateIterator beyond,
+                                ConstConcatenateIterator const_first,
+                                ConstConcatenateIterator const_beyond,
+                                Container const& c,
+                                std::size_t other_size,
+                                bool second_container)
+    {
+        typedef typename std::iterator_traits
+            <
+                ConcatenateIterator
+            >::value_type value_type;
+
+        if ( c.size() == 0 )
+        {
+            return;
+        }
+        
+        ConcatenateIterator c_first = first;
+        if ( second_container )
+        {
+            std::size_t counter(0);
+            while ( counter != other_size )
+            {
+                ++counter;
+                c_first++;
+            }
+        }
+
+        ConcatenateIterator it_max = std::max_element(first, beyond);
+        ConstConcatenateIterator const_it_max =
+            std::max_element(const_first, const_beyond);
+
+        BOOST_CHECK( it_max == const_it_max );
+        BOOST_CHECK( *it_max == *const_it_max );
+
+        value_type old_value = *c_first;
+        value_type new_value = *it_max + 1;
+
+        *c_first = *it_max + 1;
+        BOOST_CHECK( *c.begin() == new_value );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << "modified element of ";
+        std::cout << (second_container ? "2nd" : "1st");
+        std::cout << " container:" << std::endl;
+        print_container(std::cout, c.begin(), c.end(),
+                        (second_container ? "second  :" : "first  :"))
+            << std::endl;
+        print_container(std::cout, first, beyond, "combined:") << std::endl;
+#endif
+
+        *c_first = old_value;
+        BOOST_CHECK( *c.begin() == old_value );
+    }
+
+
+    template <typename Container1, typename Container2>
+    static inline void apply(Container1& c1, Container2& c2,
+                             std::string const& case_id,
+                             std::string const& containers_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::stringstream sstream;
+        sstream << case_id << " [" << containers_id << "]";
+
+        std::cout << "case id: " << sstream.str() << std::endl;
+#endif
+        typedef typename Container1::const_iterator const_iterator1;
+        typedef typename Container2::const_iterator const_iterator2;
+        typedef typename Container1::iterator iterator1;
+        typedef typename Container2::iterator iterator2;
+
+        typedef boost::geometry::concatenate_iterator
+            <
+                const_iterator1, const_iterator2,
+                typename Container1::value_type const
+            > const_concat_iterator;
+
+        typedef boost::geometry::concatenate_iterator
+            <
+                iterator1, iterator2, typename Container1::value_type
+            > concat_iterator;
+
+        typedef typename std::iterator_traits
+            <
+                concat_iterator
+            >::value_type value_type;
+
+        // test constructors/assignment operators
+        concat_iterator begin(c1.begin(), c1.end(), c2.begin(), c2.begin());
+        concat_iterator end(c1.end(), c2.begin(), c2.end());
+        const_concat_iterator const_begin(begin);
+        const_concat_iterator const_end(end);
+        const_begin = begin;
+        const_end = end;
+
+        concat_iterator begin2(c1.end(), c1.end(), c2.begin(), c2.begin());
+        const_concat_iterator const_begin2(c1.end(), c1.end(),
+                                           c2.begin(), c2.begin());
+
+        BOOST_CHECK( c1.empty() || *begin == *c1.begin() );
+        BOOST_CHECK( c1.empty() || *const_begin == *c1.begin() );
+
+        BOOST_CHECK( c2.empty() || *begin2 == *c2.begin() );
+        BOOST_CHECK( c2.empty() || *const_begin2 == *c2.begin() );
+
+
+        // test copying, dereferencing and element equality
+        std::vector<value_type> combined;
+        std::copy(c1.begin(), c1.end(), std::back_inserter(combined));
+        std::copy(c2.begin(), c2.end(), std::back_inserter(combined));
+        test_equality(begin, end, combined);
+
+        combined.clear();
+        std::copy(begin, end, std::back_inserter(combined));
+        test_equality(begin, end, combined);
+        test_equality(const_begin, const_end, combined);
+
+        combined.clear();
+        std::copy(const_begin, const_end, std::back_inserter(combined));
+        test_equality(begin, end, combined);
+        test_equality(const_begin, const_end, combined);
+
+        // test sizes (and std::distance)
+        test_size(begin, end, combined);
+        test_size(const_begin, const_end, combined);
+
+
+#ifdef GEOMETRY_TEST_DEBUG
+        print_container(std::cout, c1.begin(), c1.end(), "first   :")
+            << std::endl;
+        print_container(std::cout, c2.begin(), c2.end(), "second  :")
+            << std::endl;
+        print_container(std::cout, begin, end,           "combined:")
+            << std::endl;
+
+        if ( begin != end )
+        {
+            std::cout << "min element: "
+                      << *std::min_element(begin, end)
+                      << std::endl;
+            std::cout << "max element: "
+                      << *std::max_element(const_begin, const_end)
+                      << std::endl;
+        }
+#endif
+
+        // perform reversals (std::reverse)
+        test_using_reverse(begin, end, combined);
+
+        // test std::max_element, dereferencing and value assigment
+        test_using_max_element(begin, end, const_begin, const_end,
+                               c1, c2.size(), false);
+        test_using_max_element(begin, end, const_begin, const_end,
+                               c2, c1.size(), true);
+
+        // test std::count_if / std::remove_if
+        test_using_remove_if(begin, end, combined);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "====================" << std::endl << std::endl;
+#endif
+    }
+};
+
+
+template <typename Container1, typename Container2>
+inline void test_concatenation_of_containers(Container1& c1, Container2& c2,
+                                             std::string const& containers_id)
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+    std::cout << "************************************" << std::endl
+              << " TESTING CONTAINERS COMBINATION: "
+              << containers_id << std::endl
+              << "************************************" << std::endl
+              << std::endl;
+#endif
+
+    c1.clear();
+    c2.clear();    
+    test_concatenate_iterator::apply(c1, c2, "empty_both", containers_id);
+
+    c2 += 10,11,12,13,14,15,16,17,18,19,20;
+    test_concatenate_iterator::apply(c1, c2, "empty_first", containers_id);
+
+    c2.clear();
+    c1 += 0,1,2,3,4,5,6;
+    test_concatenate_iterator::apply(c1, c2, "empty_second", containers_id);
+
+    c1.clear();
+    c2.clear();
+    c1 += 0,1,2,3,4,5,6;
+    c2 += 10,11,12,13,14,15,16,17,18,19,20;
+    test_concatenate_iterator::apply(c1, c2, "non_empty", containers_id);
+}
+
+
+BOOST_AUTO_TEST_CASE( test_concatenate_iterator_all )
+{
+    std::vector<int> v, vv;
+    std::list<int> l, ll;
+        
+    test_concatenation_of_containers(v, vv, "VV");
+    test_concatenation_of_containers(v, l, "VL");
+    test_concatenation_of_containers(l, v, "LV");
+    test_concatenation_of_containers(l, ll, "LL");
+}
diff --git a/test/iterators/flatten_iterator.cpp b/test/iterators/flatten_iterator.cpp
new file mode 100644
index 000000000..d94e6c2b7
--- /dev/null
+++ b/test/iterators/flatten_iterator.cpp
@@ -0,0 +1,365 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_flatten_iterator
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <cstddef>
+#include <iostream>
+#include <string>
+#include <sstream>
+#include <algorithm>
+#include <iterator>
+
+#include <vector>
+#include <list>
+
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_const.hpp>
+#include <boost/assign/std/vector.hpp>
+#include <boost/assign/std/list.hpp>
+#include <boost/assign/std/set.hpp>
+
+#include "test_iterator_common.hpp"
+
+#include <boost/geometry/iterators/flatten_iterator.hpp>
+
+using namespace boost::assign;
+
+
+template <typename InnerContainer>
+struct access_begin
+{
+    typedef typename boost::mpl::if_
+    <
+        typename boost::is_const<InnerContainer>::type,
+        typename InnerContainer::const_iterator,
+        typename InnerContainer::iterator
+    >::type return_type;
+
+    static inline return_type apply(InnerContainer& inner)
+    {
+        return inner.begin();
+    }
+};
+
+
+template <typename InnerContainer>
+struct access_end
+{
+    typedef typename boost::mpl::if_
+    <
+        typename boost::is_const<InnerContainer>::type,
+        typename InnerContainer::const_iterator,
+        typename InnerContainer::iterator
+    >::type return_type;
+
+    static inline return_type apply(InnerContainer& inner)
+    {
+        return inner.end();
+    }
+};
+
+
+template <typename NestedContainer>
+inline std::size_t number_of_elements(NestedContainer const& c)
+{
+    std::size_t num_elements(0);
+    for (typename NestedContainer::const_iterator outer = c.begin();
+         outer != c.end(); ++outer)
+    {
+        num_elements += outer->size();
+    }
+    return num_elements;
+}
+
+
+struct test_flatten_iterator
+{
+    template
+    <
+        typename FlattenIterator,
+        typename ConstFlattenIterator,
+        typename NestedContainer
+    >
+    static inline
+    void test_using_max_element(FlattenIterator first,
+                                FlattenIterator beyond,
+                                ConstFlattenIterator const_first,
+                                ConstFlattenIterator const_beyond,
+                                NestedContainer const& c)
+    {
+        typedef typename std::iterator_traits
+            <
+                FlattenIterator
+            >::value_type value_type;
+
+        typedef typename NestedContainer::const_iterator const_outer_iterator;
+        typedef typename NestedContainer::value_type inner_container;
+        typedef typename inner_container::const_iterator const_inner_iterator;
+
+        if ( first == beyond )
+        {
+            return;
+        }
+
+        FlattenIterator it_max = std::max_element(first, beyond);
+        ConstFlattenIterator const_it_max =
+            std::max_element(const_first, const_beyond);
+
+        BOOST_CHECK( it_max == const_it_max );
+        BOOST_CHECK( *it_max == *const_it_max );
+
+        value_type old_value = *const_first;
+        value_type new_value = *it_max + 1;
+
+        *first = *it_max + 1;
+        const_outer_iterator outer = c.begin();
+        while ( outer->begin() == outer->end() )
+        {
+            ++outer;
+        }
+        const_inner_iterator inner = outer->begin();
+            
+        BOOST_CHECK( *inner == new_value );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << "modified 1st element of 1st non-empty "
+                  << "inner container:" << std::endl;
+        print_nested_container(std::cout, c.begin(), c.end(), "nested   :")
+            << std::endl;
+        print_container(std::cout, first, beyond, "flattened:") << std::endl;
+#endif
+
+        *first = old_value;
+        BOOST_CHECK( *inner == old_value );
+    }
+
+    template <typename NestedContainer>
+    static inline void apply(NestedContainer& c,
+                             std::string const& case_id,
+                             std::string const& container_id)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::stringstream sstream;
+        sstream << case_id << " [" << container_id << "]";
+
+        std::cout << "case id: " << sstream.str() << std::endl;
+#endif
+        typedef typename NestedContainer::const_iterator const_outer_iterator;
+        typedef typename NestedContainer::iterator outer_iterator;
+        typedef typename NestedContainer::value_type inner_container;
+
+        typedef typename inner_container::const_iterator const_inner_iterator;
+        typedef typename inner_container::iterator inner_iterator;
+
+        typedef boost::geometry::flatten_iterator
+            <
+                const_outer_iterator,
+                const_inner_iterator,
+                typename inner_container::value_type const,
+                access_begin<inner_container const>,
+                access_end<inner_container const>
+            > const_flatten_iterator;
+
+        typedef boost::geometry::flatten_iterator
+            <
+                outer_iterator,
+                inner_iterator,
+                typename inner_container::value_type,
+                access_begin<inner_container>,
+                access_end<inner_container>
+            > flatten_iterator;
+
+        typedef typename std::iterator_traits
+            <
+                flatten_iterator
+            >::value_type value_type;
+
+        flatten_iterator begin(c.begin(), c.end());
+        flatten_iterator end(c.end());
+        const_flatten_iterator const_begin(begin);
+        const_flatten_iterator const_end(end);
+        const_begin = begin;
+        const_end = end;
+
+        // test copying, dereferencing and element equality
+        std::vector<value_type> combined;
+        for (const_outer_iterator outer = c.begin();
+             outer != c.end(); ++outer)
+        {
+            std::copy(outer->begin(), outer->end(),
+                      std::back_inserter(combined));
+        }
+        test_equality(begin, end, combined);
+        test_equality(const_begin, const_end, combined);        
+
+        combined.clear();
+        std::copy(begin, end, std::back_inserter(combined));
+        test_equality(begin, end, combined);
+        test_equality(const_begin, const_end, combined);
+
+        combined.clear();
+        std::copy(const_begin, const_end, std::back_inserter(combined));
+        test_equality(begin, end, combined);
+        test_equality(const_begin, const_end, combined);
+
+        // test sizes (and std::distance)
+        test_size(begin, end, combined);
+        test_size(const_begin, const_end, combined);
+
+#ifdef GEOMETRY_TEST_DEBUG
+        print_nested_container(std::cout, c.begin(), c.end(), "nested    :")
+            << std::endl;
+        print_container(std::cout, begin, end, "flattened :")
+            << std::endl;
+
+        if ( begin != end )
+        {
+            std::cout << "min element: "
+                      << *std::min_element(begin, end)
+                      << std::endl;
+            std::cout << "max element: "
+                      << *std::max_element(const_begin, const_end)
+                      << std::endl;
+        }
+#endif
+
+        // perform reversals (std::reverse)
+        test_using_reverse(begin, end, combined);
+
+        // test std::max_element, dereferencing and value assigment
+        test_using_max_element(begin, end, const_begin, const_end, c);
+
+        // test std::count_if / std::remove_if
+        test_using_remove_if(begin, end, combined);
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "====================" << std::endl << std::endl;
+#endif
+    }
+};
+
+
+
+// the actual test cases -- START
+template <int CaseNumber>
+struct test_case_per_container;
+
+template<>
+struct test_case_per_container<0>
+{
+    template <typename NestedContainer>
+    static inline void apply(std::string const& case_id,
+                             std::string const& container_id)
+    {
+        NestedContainer c;
+        test_flatten_iterator::apply(c, case_id, container_id);
+    }
+};
+
+template<>
+struct test_case_per_container<1>
+{
+    template <typename NestedContainer>
+    static inline void apply(std::string const& case_id,
+                             std::string const& container_id)
+    {
+        NestedContainer c;
+        for (int i = 0; i < 5; ++i)
+        {
+            c += typename NestedContainer::value_type();
+        }
+        test_flatten_iterator::apply(c, case_id, container_id);
+    }
+};
+
+template<>
+struct test_case_per_container<2>
+{
+    template <typename NestedContainer>
+    static inline void apply(std::string const& case_id,
+                             std::string const& container_id)
+    {
+        NestedContainer c;
+        typename NestedContainer::value_type ic[4];
+
+        ic[0] += 5,4,3,2,1;
+        ic[1] += 6,7,8;
+        ic[2] += 9;
+        ic[3] += 9,8,7,6,5;
+        c += ic[0],ic[1],ic[2],ic[3];
+
+        test_flatten_iterator::apply(c, case_id, container_id);
+    }
+};
+
+template<>
+struct test_case_per_container<3>
+{
+    template <typename NestedContainer>
+    static inline void apply(std::string const& case_id,
+                             std::string const& container_id)
+    {
+        NestedContainer c;
+        typename NestedContainer::value_type ic[20];
+
+        ic[2] += 5,4,3,2,1;
+        ic[3] += 6,7,8;
+        ic[8] += 9;
+        ic[9] += 9,8,7,6,5;
+        ic[14] += 4,3,2,1;
+        for (std::size_t i = 0; i < 20; ++i)
+        {
+            c += ic[i];
+        }
+
+        test_flatten_iterator::apply(c, case_id, container_id);
+    }
+};
+// the actual test cases -- END
+
+
+
+template <int CaseNumber>
+inline void test_case_all_containers(std::string const& case_id)
+{
+    typedef typename std::vector<std::vector<int> > VV;
+    typedef typename std::vector<std::list<int> > VL;
+    typedef typename std::list<std::vector<int> > LV;
+    typedef typename std::list<std::list<int> > LL;
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+#endif
+    test_case_per_container<CaseNumber>::template apply<VV>(case_id, "VV");
+    test_case_per_container<CaseNumber>::template apply<VL>(case_id, "VL");
+    test_case_per_container<CaseNumber>::template apply<LV>(case_id, "LV");
+    test_case_per_container<CaseNumber>::template apply<LL>(case_id, "LL");
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "********************************************************"
+              << std::endl << std::endl;
+#endif
+}
+
+
+
+BOOST_AUTO_TEST_CASE( test_flatten_iterator_all )
+{
+    test_case_all_containers<0>("empty");
+    test_case_all_containers<1>("case1");
+    test_case_all_containers<2>("case2");
+    test_case_all_containers<3>("case3");
+}
diff --git a/test/iterators/point_iterator.cpp b/test/iterators/point_iterator.cpp
new file mode 100644
index 000000000..c0ef01189
--- /dev/null
+++ b/test/iterators/point_iterator.cpp
@@ -0,0 +1,621 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_point_iterator
+#endif
+
+#include <cstddef>
+#include <iostream>
+#include <string>
+#include <iterator>
+#include <algorithm>
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/assign/list_of.hpp>
+
+#include <boost/geometry/core/point_type.hpp>
+#include <boost/geometry/multi/core/point_type.hpp>
+
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+#include <boost/geometry/multi/geometries/multi_geometries.hpp>
+#include <boost/geometry/multi/geometries/register/multi_point.hpp>
+
+#include <boost/geometry/algorithms/equals.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
+
+#include <boost/geometry/policies/compare.hpp>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/wkt/write.hpp>
+#include <boost/geometry/io/dsv/write.hpp>
+#include <boost/geometry/multi/io/dsv/write.hpp>
+#include <boost/geometry/multi/io/wkt/write.hpp>
+#include <boost/geometry/multi/io/wkt/read.hpp>
+
+#include <boost/geometry/iterators/point_iterator.hpp>
+#include <boost/geometry/iterators/point_reverse_iterator.hpp>
+
+namespace bg = ::boost::geometry;
+namespace ba = ::boost::assign;
+
+typedef bg::model::point<double, 2, bg::cs::cartesian> point_type;
+typedef bg::model::point<double, 3, bg::cs::cartesian> point_type_3d;
+typedef bg::model::linestring<point_type> linestring_type;
+typedef bg::model::polygon<point_type, false, false> polygon_type; //ccw, open
+
+// multi geometries
+typedef bg::model::multi_point<point_type> multi_point_type;
+typedef bg::model::multi_point<point_type_3d> multi_point_type_3d;
+typedef bg::model::multi_linestring<linestring_type> multi_linestring_type;
+typedef bg::model::multi_polygon<polygon_type> multi_polygon_type;
+
+typedef boost::tuple<double, double> tuple_point_type;
+typedef boost::tuple<double, double, double> tuple_point_type_3d;
+typedef std::vector<tuple_point_type> tuple_multi_point_type;
+typedef std::vector<tuple_point_type_3d> tuple_multi_point_type_3d;
+
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_MULTI_POINT(tuple_multi_point_type)
+BOOST_GEOMETRY_REGISTER_MULTI_POINT(tuple_multi_point_type_3d)
+
+
+template <typename Geometry>
+inline Geometry from_wkt(std::string const& wkt)
+{
+    Geometry geometry;
+    boost::geometry::read_wkt(wkt, geometry);
+    return geometry;
+}
+
+
+template <typename Iterator>
+inline std::ostream& print_point_range(std::ostream& os,
+                                       Iterator first,
+                                       Iterator beyond,
+                                       std::string const& header)
+{
+    os << header << "(";
+    for (Iterator it = first; it != beyond; ++it)
+    {
+        os << " " << bg::dsv(*it);
+    }
+    os << " )";
+    return os;
+}
+
+struct equals
+{
+    template <typename Iterator>
+    static inline std::size_t number_of_elements(Iterator begin,
+                                                 Iterator end)
+    {
+        std::size_t size = std::distance(begin, end);
+
+        std::size_t num_elems(0);
+        for (Iterator it = begin; it != end; ++it)
+        {
+            ++num_elems;
+        }
+        BOOST_CHECK( size == num_elems );
+
+        num_elems = 0;
+        for (Iterator it = end; it != begin; --it)
+        {
+            ++num_elems;
+        }
+        BOOST_CHECK( size == num_elems );
+
+        return num_elems;
+    }
+
+    template <typename Iterator1, typename Iterator2>
+    static inline bool apply(Iterator1 begin1, Iterator1 end1,
+                             Iterator2 begin2, Iterator2 end2)
+    {
+        std::size_t num_points1 = number_of_elements(begin1, end1);
+        std::size_t num_points2 = number_of_elements(begin2, end2);
+
+        if ( num_points1 != num_points2 )
+        {
+            return false;
+        }
+
+        Iterator1 it1 = begin1;
+        Iterator2 it2 = begin2;
+        for (; it1 != end1; ++it1, ++it2)
+        {
+            if ( !bg::equals(*it1, *it2) )
+            {
+                return false;
+            }
+        }
+        return true;
+    }
+};
+
+
+struct test_assignment
+{
+    template <typename Iterator, typename ConstIterator, typename Value>
+    static inline void apply(Iterator it, ConstIterator cit,
+                             Value const& value1, Value const& value2)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "== before assignment ==" << std::endl;
+        std::cout << "value1: " << bg::wkt(value1) << std::endl;
+        std::cout << "value2: " << bg::wkt(value2) << std::endl;
+        std::cout << "*it   : " << bg::wkt(*it) << std::endl;
+        std::cout << "*cit  : " << bg::wkt(*cit) << std::endl;
+#endif
+
+        BOOST_CHECK( bg::equals(*it, value1) );
+        BOOST_CHECK( !bg::equals(*it, value2) );
+        BOOST_CHECK( bg::equals(*cit, value1) );
+        BOOST_CHECK( !bg::equals(*cit, value2) );
+
+        *it = value2;
+        BOOST_CHECK( bg::equals(*it, value2) );
+        BOOST_CHECK( !bg::equals(*it, value1) );
+        BOOST_CHECK( bg::equals(*cit, value2) );
+        BOOST_CHECK( !bg::equals(*cit, value1) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "== after 1st assignment ==" << std::endl;
+        std::cout << "value1: " << bg::wkt(value1) << std::endl;
+        std::cout << "value2: " << bg::wkt(value2) << std::endl;
+        std::cout << "*it   : " << bg::wkt(*it) << std::endl;
+        std::cout << "*cit  : " << bg::wkt(*cit) << std::endl;
+#endif
+
+        *it = value1;
+        BOOST_CHECK( bg::equals(*it, value1) );
+        BOOST_CHECK( !bg::equals(*it, value2) );
+        BOOST_CHECK( bg::equals(*cit, value1) );
+        BOOST_CHECK( !bg::equals(*cit, value2) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "== after 2nd assignment ==" << std::endl;
+        std::cout << "value1: " << bg::wkt(value1) << std::endl;
+        std::cout << "value2: " << bg::wkt(value2) << std::endl;
+        std::cout << "*it   : " << bg::wkt(*it) << std::endl;
+        std::cout << "*cit  : " << bg::wkt(*cit) << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+};
+
+
+template <typename Geometry, typename PointRange>
+struct test_point_iterator_of_geometry
+{
+    template <typename G, typename Point>
+    static inline void test_front_and_back(G& geometry,
+                                           Point const& front,
+                                           Point const& back)
+    {
+        BOOST_CHECK( bg::equals(bg::points_front(geometry), front) );
+        BOOST_CHECK( bg::equals(bg::points_back(geometry), back) );
+
+        BOOST_CHECK( bg::equals(front, *--bg::points_rend(geometry)) );
+        BOOST_CHECK( bg::equals(back, *bg::points_rbegin(geometry)) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "front: " << bg::dsv(bg::points_front(geometry))
+                  << std::endl;
+        std::cout << "back : " << bg::dsv(bg::points_back(geometry))
+                  << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+
+    template <typename G>
+    static inline void base_test(G& geometry,
+                                 PointRange const& point_range,
+                                 std::string const& header)
+    {
+        typedef bg::point_iterator<G> point_iterator;
+
+        point_iterator begin = bg::points_begin(geometry);
+        point_iterator end = bg::points_end(geometry);
+
+        BOOST_CHECK( std::distance(begin, end) == bg::num_points(geometry) );
+
+        BOOST_CHECK( equals::apply(begin, end,
+                                   bg::points_begin(point_range),
+                                   bg::points_end(point_range))
+                     );
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << header << " geometry: " << bg::wkt(geometry) << std::endl;
+        print_point_range(std::cout, begin, end, "point range: ");
+        std::cout << std::endl;
+
+        typedef bg::point_iterator<PointRange const> point_range_iterator;
+
+        print_point_range(std::cout,
+                          bg::points_begin(point_range),
+                          bg::points_end(point_range),
+                          "expected point range: ");
+        std::cout << std::endl;
+#endif
+
+        // test points_front and points_back
+        if ( bg::points_begin(point_range) != bg::points_end(point_range) )
+        {
+            test_front_and_back(geometry,
+                                bg::points_front(point_range),
+                                bg::points_back(point_range));
+        }
+    }
+
+    static inline void apply(Geometry geometry, PointRange const& point_range)
+    {
+        base_test<Geometry>(geometry, point_range, "non-const");
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+#endif
+
+        base_test<Geometry const>(geometry, point_range, "const");
+
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl << std::endl;
+#endif
+
+        // testing construction of const and non-const iterator
+        typedef bg::point_iterator<Geometry> point_iterator;
+        typedef bg::point_iterator<Geometry const> const_point_iterator;
+
+        point_iterator begin = bg::points_begin(geometry);
+        point_iterator end = bg::points_end(geometry);
+
+        const_point_iterator const_begin = bg::points_begin(geometry);
+        const_point_iterator const_end = bg::points_end(geometry);
+
+        // same for reverse iterator
+        typedef bg::point_reverse_iterator<Geometry> point_reverse_iterator;
+        typedef bg::point_reverse_iterator
+            <
+                Geometry const
+            > const_point_reverse_iterator;
+
+        point_reverse_iterator rbegin = bg::points_rbegin(geometry);
+        point_reverse_iterator rend = bg::points_rend(geometry);
+
+        const_point_reverse_iterator const_rbegin = bg::points_rbegin(geometry);
+        const_point_reverse_iterator const_rend = bg::points_rend(geometry);
+
+        // testing assignment of non-const to const iterator
+        const_begin = begin;
+        const_end = end;
+
+        // testing assignment of non-const to const reverse_iterator
+        const_rbegin = rbegin;
+        const_rend = rend;
+
+        // testing equality/inequality comparison
+        BOOST_CHECK ( begin == const_begin );
+        BOOST_CHECK ( end == const_end );
+        if ( begin != end )
+        {
+            BOOST_CHECK ( begin != const_end );
+            BOOST_CHECK ( const_begin != end );
+        }
+
+        // testing equality/inequality comparison for reverse_iterator
+        BOOST_CHECK ( rbegin == const_rbegin );
+        BOOST_CHECK ( rend == const_rend );
+        if ( rbegin != rend )
+        {
+            BOOST_CHECK ( rbegin != const_rend );
+            BOOST_CHECK ( const_rbegin != rend );
+        }
+
+        if ( begin != end )
+        {
+            BOOST_CHECK( rbegin != rend );
+
+            point_reverse_iterator rlast(rend);
+            --rlast;
+            BOOST_CHECK( bg::equals(*begin, *rlast) );
+
+            point_iterator last(end);
+            --last;
+            BOOST_CHECK( bg::equals(*rbegin, *last) );
+        }
+        
+        // testing dereferencing/assignment
+        if ( begin != end )
+        {
+            typedef typename bg::point_type<Geometry>::type point;
+
+            point p = *begin;
+            point q = bg::make_zero<point>();
+
+            test_assignment::apply(begin, const_begin, p, q);
+
+            *begin = q;
+            test_assignment::apply(begin, const_begin, q, p);
+
+            *begin = p;
+        }
+
+        // test with algorithms
+#ifdef GEOMETRY_TEST_DEBUG
+        print_point_range(std::cout, begin, end, "original:\n") << std::endl;
+        print_point_range(std::cout, rbegin, rend, "reverse traversal:\n")
+            << std::endl;
+        std::cout << bg::wkt(geometry) << std::endl;
+        std::cout << std::endl;
+#endif
+
+        std::reverse(begin, end);
+#ifdef GEOMETRY_TEST_DEBUG
+        print_point_range(std::cout, begin, end, "reversed:\n") << std::endl;
+        std::cout << bg::wkt(geometry) << std::endl;
+        std::cout << std::endl;
+#endif
+
+        std::reverse(begin, end);
+#ifdef GEOMETRY_TEST_DEBUG
+        print_point_range(std::cout, begin, end, "re-reversed:\n") << std::endl;
+        std::cout << bg::wkt(geometry) << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+
+        typedef typename std::iterator_traits
+            <
+                point_iterator
+            >::value_type point;
+        if ( const_begin != const_end )
+        {
+            const_point_iterator pit_max = std::max_element(const_begin,
+                                                            const_end,
+                                                            bg::less<point>());
+
+            BOOST_CHECK( pit_max != const_end ); // to avoid warnings
+#ifdef GEOMETRY_TEST_DEBUG
+            std::cout << "max point: " << bg::dsv(*pit_max) << std::endl;
+#endif
+        }
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << std::endl;
+        std::cout << std::endl;
+        std::cout << std::endl;
+#endif
+    }
+};
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_linestring_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** LINESTRING ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type TMP;
+    typedef linestring_type L;
+
+    typedef test_point_iterator_of_geometry<L, TMP> tester;
+
+    tester::apply(from_wkt<L>("LINESTRING()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<L>("LINESTRING(3 3,4 4,5 5)"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+#endif
+}
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_polygon_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** POLYGON ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type TMP;
+    typedef polygon_type P;
+
+    typedef test_point_iterator_of_geometry<P, TMP> tester;
+
+    tester::apply(from_wkt<P>("POLYGON()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<P>("POLYGON(())"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<P>("POLYGON((1 1,9 1,9 9,1 9),(5 5,6 5,6 6,5 6))"),
+                  ba::tuple_list_of(1,1)(9,1)(9,9)(1,9)(5,5)(6,5)(6,6)(5,6)
+                  );
+
+    tester::apply(from_wkt<P>("POLYGON((3 3,4 4,5 5),(),(),(),(6 6,7 7,8 8),(),(),(9 9),())"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)(6,6)(7,7)(8,8)(9,9)
+                  );
+
+    tester::apply(from_wkt<P>("POLYGON((),(3 3,4 4,5 5),(),(),(6 6,7 7,8 8),(),(),(9 9),())"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)(6,6)(7,7)(8,8)(9,9)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+#endif
+}
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_multipoint_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** MULTIPOINT ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type TMP;
+    typedef multi_point_type MP;
+
+    typedef test_point_iterator_of_geometry<MP, TMP> tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(3 3,4 4,5 5)"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+#endif
+}
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_multipoint_3d_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** MULTIPOINT 3D ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type_3d TMP;
+    typedef multi_point_type_3d MP;
+
+    typedef test_point_iterator_of_geometry<MP, TMP> tester;
+
+    tester::apply(from_wkt<MP>("MULTIPOINT()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MP>("MULTIPOINT(3 3 3,4 4 4,5 5 5)"),
+                  ba::tuple_list_of(3,3,3)(4,4,4)(5,5,5)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl << std::endl;
+#endif
+}
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_multilinestring_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** MULTILINESTRING ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type TMP;
+    typedef multi_linestring_type ML;
+
+    typedef test_point_iterator_of_geometry<ML, TMP> tester;
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING(())"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((),(),())"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((1 1,2 2,3 3),(3 3,4 4,5 5),(6 6))"),
+                  ba::tuple_list_of(1,1)(2,2)(3,3)(3,3)(4,4)(5,5)(6,6)
+                  );
+
+    tester::apply(from_wkt<ML>("MULTILINESTRING((),(),(1 1,2 2,3 3),(),(),(3 3,4 4,5 5),(),(6 6),(),(),())"),
+                  ba::tuple_list_of(1,1)(2,2)(3,3)(3,3)(4,4)(5,5)(6,6)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+#endif
+}
+
+
+//======================================================================
+//======================================================================
+
+
+BOOST_AUTO_TEST_CASE( test_multipolygon_point_iterator )
+{
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << "*** MULTIPOLYGON ***" << std::endl;
+#endif
+
+    typedef tuple_multi_point_type TMP;
+    typedef multi_polygon_type MPL;
+
+    typedef test_point_iterator_of_geometry<MPL, TMP> tester;
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON()"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON( () )"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON( (()) )"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON( ((),()) )"),
+                  TMP()
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((3 3,4 4,5 5),(6 6,7 7,8 8),(9 9)),((1 1,2 2,10 10),(11 11,12 12)))"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)(6,6)(7,7)(8,8)(9,9)\
+                  (1,1)(2,2)(10,10)(11,11)(12,12)
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((3 3,4 4,5 5),(),(),(),(6 6,7 7,8 8),(),(),(9 9),()),((),(1 1,2 2,10 10),(),(),(),(11 11,12 12),(),(),(13 13),()))"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)(6,6)(7,7)(8,8)(9,9)\
+                  (1,1)(2,2)(10,10)(11,11)(12,12)(13,13)
+                  );
+
+    tester::apply(from_wkt<MPL>("MULTIPOLYGON(((3 3,4 4,5 5),(),(),(),(6 6,7 7,8 8),(),(),(9 9),()),((),(1 1,2 2,10 10),(),(),(),(11 11,12 12),(),(),(13 13),()),((),(),()))"),
+                  ba::tuple_list_of(3,3)(4,4)(5,5)(6,6)(7,7)(8,8)(9,9)\
+                  (1,1)(2,2)(10,10)(11,11)(12,12)(13,13)
+                  );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl << std::endl;
+#endif
+}
diff --git a/test/iterators/test_iterator_common.hpp b/test/iterators/test_iterator_common.hpp
new file mode 100644
index 000000000..b1b36c451
--- /dev/null
+++ b/test/iterators/test_iterator_common.hpp
@@ -0,0 +1,206 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef GEOMETRY_TEST_ITERATORS_TEST_ITERATOR_COMMON_HPP
+#define GEOMETRY_TEST_ITERATORS_TEST_ITERATOR_COMMON_HPP
+
+#include <cstddef>
+#include <iostream>
+#include <iterator>
+#include <string>
+#include <algorithm>
+
+#include <boost/test/included/unit_test.hpp>
+
+// helper functions for testing the concatenate and flatten iterators
+
+template <typename Iterator>
+inline std::ostream& print_container(std::ostream& os,
+                                     Iterator begin, Iterator end,
+                                     std::string const& header)
+{
+    std::cout << header;
+    for (Iterator it = begin; it != end; ++it)
+    {
+        os << " " << *it;
+    }
+    return os;
+}
+
+
+template <typename Iterator>
+inline std::ostream& print_nested_container(std::ostream& os,
+                                            Iterator begin, Iterator end,
+                                            std::string const& header)
+{
+    typedef typename std::iterator_traits<Iterator>::value_type inner_container;
+    typedef typename inner_container::const_iterator inner_iterator;
+
+    std::cout << header;
+    for (Iterator outer = begin; outer != end; ++outer)
+    {
+        os << " (";
+        for (inner_iterator inner = outer->begin();
+             inner != outer->end(); ++inner)
+        {
+            if ( inner != outer->begin() )
+            {
+                os << " ";
+            }
+            os << *inner;
+        }
+        os << ") ";
+    }
+    return os;
+}
+
+
+template <typename T>
+struct is_odd
+{
+    inline bool operator()(T const& t) const
+    {
+        return t % 2 != 0;
+    }
+};
+
+
+template <typename T>
+struct is_even
+{
+    inline bool operator()(T const& t) const
+    {
+        return !is_odd<T>()(t);
+    }
+};
+
+
+
+
+template <typename CombinedIterator, typename CombinedContainer>
+inline void test_size(CombinedIterator first, CombinedIterator beyond,
+                      CombinedContainer const& combined)
+{
+    std::size_t size = std::distance(first, beyond);
+    BOOST_CHECK( combined.size() == std::distance(first, beyond) );
+
+    size = 0;
+    for (CombinedIterator it = first; it != beyond; ++it)
+    {
+        ++size;
+    }
+    BOOST_CHECK( combined.size() == size );
+
+    size = 0;
+    for (CombinedIterator it = beyond; it != first; --it)
+    {
+        ++size;
+    }
+    BOOST_CHECK( combined.size() == size );
+}
+
+
+
+template <typename CombinedIterator, typename CombinedContainer>
+inline void test_equality(CombinedIterator first, CombinedIterator beyond,
+                          CombinedContainer const& combined)
+{
+    typedef typename CombinedContainer::const_iterator iterator;
+
+    iterator it = combined.begin();
+    for (CombinedIterator cit = first; cit != beyond; ++cit, ++it)
+    {
+        BOOST_CHECK( *cit == *it );
+    }
+
+    if ( combined.begin() != combined.end() )
+    {
+        BOOST_CHECK( first != beyond );
+        iterator it = combined.end();
+        CombinedIterator cit = beyond;
+        for (--cit, --it; cit != first; --cit, --it)
+        {
+            BOOST_CHECK( *cit == *it );
+        }
+        BOOST_CHECK( cit == first && it == combined.begin() );
+        BOOST_CHECK( *cit == *it );
+    }
+    else
+    {
+        BOOST_CHECK( first == beyond );
+    }
+}
+
+
+
+template <typename CombinedIterator, typename CombinedContainer>
+inline void test_using_remove_if(CombinedIterator first,
+                                 CombinedIterator beyond,
+                                 CombinedContainer& combined)
+{
+    typedef typename std::iterator_traits
+        <
+            CombinedIterator
+        >::value_type value_type;
+    
+#ifdef GEOMETRY_TEST_DEBUG
+    std::cout << std::endl;
+    std::cout << "odd elements removed:" << std::endl;
+    print_container(std::cout, first, beyond, "before:") << std::endl;
+#endif
+    typename std::iterator_traits<CombinedIterator>::difference_type
+        num_even = std::count_if(first, beyond, is_even<value_type>());
+
+    CombinedIterator new_beyond =
+        std::remove_if(first, beyond, is_odd<value_type>());
+
+    std::size_t new_size = std::distance(first, new_beyond);
+
+    for (CombinedIterator it = first; it != new_beyond; ++it)
+    {
+        BOOST_CHECK( !is_odd<value_type>()(*it) );
+    }
+    BOOST_CHECK( new_size == static_cast<std::size_t>(num_even) );
+
+#ifdef GEOMETRY_TEST_DEBUG
+    print_container(std::cout, first, new_beyond, "after :") << std::endl;
+#endif
+
+    combined.erase(std::remove_if(combined.begin(), combined.end(),
+                                  is_odd<value_type>()),
+                   combined.end());
+    test_equality(first, new_beyond, combined);
+}
+
+
+template <typename CombinedIterator, typename CombinedContainer>
+inline void test_using_reverse(CombinedIterator first,
+                               CombinedIterator beyond,
+                               CombinedContainer& combined)
+{
+    std::reverse(first, beyond);
+    std::reverse(combined.begin(), combined.end());
+    test_equality(first, beyond, combined);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    print_container(std::cout, first, beyond, "reversed:") << std::endl;
+#endif
+
+    std::reverse(first, beyond);
+    std::reverse(combined.begin(), combined.end());
+    test_equality(first, beyond, combined);
+
+#ifdef GEOMETRY_TEST_DEBUG
+    print_container(std::cout, first, beyond, "re-reversed:") << std::endl;
+#endif
+}
+
+
+#endif // GEOMETRY_TEST_ITERATORS_TEST_ITERATOR_COMMON_HPP
diff --git a/test/multi/algorithms/Jamfile.v2 b/test/multi/algorithms/Jamfile.v2
index 1945fe36a..ef1d6b2c8 100644
--- a/test/multi/algorithms/Jamfile.v2
+++ b/test/multi/algorithms/Jamfile.v2
@@ -1,8 +1,8 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -16,14 +16,13 @@ test-suite boost-geometry-multi-algorithms
     [ run multi_convex_hull.cpp ]
     [ run multi_correct.cpp ]
     [ run multi_covered_by.cpp ]
-    [ run multi_difference.cpp  : : : <toolset>msvc:<cxxflags>/bigobj ]
-    [ run multi_difference_spike.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_difference.cpp  : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_difference_spike.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run multi_disjoint.cpp ]
-    [ run multi_distance.cpp ]
     [ run multi_envelope.cpp ]
     [ run multi_equals.cpp ]
     [ run multi_for_each.cpp ]
-    [ run multi_intersection.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_intersection.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run multi_intersects.cpp ]
     [ run multi_length.cpp ]
     [ run multi_num_geometries.cpp ]
@@ -34,7 +33,7 @@ test-suite boost-geometry-multi-algorithms
     [ run multi_simplify.cpp ]
     [ run multi_touches.cpp ]
     [ run multi_transform.cpp ]
-    [ run multi_union.cpp : : : <toolset>msvc:<cxxflags>/bigobj ]
+    [ run multi_union.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <toolset>msvc:<cxxflags>/bigobj ]
     [ run multi_unique.cpp ]
     [ run multi_within.cpp ]
     ;
diff --git a/test/multi/algorithms/multi_centroid.cpp b/test/multi/algorithms/multi_centroid.cpp
index 25c66c085..aec62c2b7 100644
--- a/test/multi/algorithms/multi_centroid.cpp
+++ b/test/multi/algorithms/multi_centroid.cpp
@@ -15,6 +15,8 @@
 
 #include <algorithms/test_centroid.hpp>
 
+#include <boost/core/ignore_unused.hpp>
+
 #include <boost/geometry/multi/core/point_order.hpp>
 #include <boost/geometry/multi/algorithms/centroid.hpp>
 #include <boost/geometry/multi/strategies/cartesian/centroid_average.hpp>
@@ -35,6 +37,8 @@ template <typename P>
 void test_2d(bool is_integer = false)
 {
     typedef typename bg::coordinate_type<P>::type ct;
+    boost::ignore_unused<ct>();
+
 #ifdef REPORT_RESULTS
     std::cout << std::endl << "type: " << typeid(ct).name() << " size: " << sizeof(ct) << std::endl;
 #endif
diff --git a/test/multi/algorithms/multi_convert.cpp b/test/multi/algorithms/multi_convert.cpp
index 840fa2e26..0bfdf6ea6 100644
--- a/test/multi/algorithms/multi_convert.cpp
+++ b/test/multi/algorithms/multi_convert.cpp
@@ -8,6 +8,7 @@
 #include <algorithms/test_convert.hpp>
 
 #include <boost/geometry/multi/algorithms/convert.hpp>
+#include <boost/geometry/multi/algorithms/num_points.hpp>
 
 #include <boost/geometry/multi/geometries/multi_point.hpp>
 #include <boost/geometry/multi/geometries/multi_linestring.hpp>
@@ -22,62 +23,67 @@ void test_mixed_point_types()
 {
     test_mixed_identical_result
         <
-            bg::model::multi_point<Point1>, 
-            bg::model::multi_point<Point2> 
+            bg::model::multi_point<Point1>,
+            bg::model::multi_point<Point2>
         >
         ("MULTIPOINT((1 1),(2 2),(3 3))");
 
     test_mixed_identical_result
         <
-            bg::model::multi_linestring<bg::model::linestring<Point1> >, 
-            bg::model::multi_linestring<bg::model::linestring<Point2> > 
+            bg::model::multi_linestring<bg::model::linestring<Point1> >,
+            bg::model::multi_linestring<bg::model::linestring<Point2> >
         >
         ("MULTILINESTRING((1 1,2 2),(3 3,4 4))");
 
     // Single -> multi (always possible)
     test_mixed
         <
-            Point1, bg::model::multi_point<Point2> 
+            Point1, bg::model::multi_point<Point2>
         >
         (
-            "POINT(1 1)", 
-            "MULTIPOINT((1 1))"
+            "POINT(1 1)",
+            "MULTIPOINT((1 1))",
+            1
         );
     test_mixed
         <
-            bg::model::linestring<Point1>, 
-            bg::model::multi_linestring<bg::model::linestring<Point2> > 
+            bg::model::linestring<Point1>,
+            bg::model::multi_linestring<bg::model::linestring<Point2> >
         >
         (
-            "LINESTRING(1 1,2 2)", 
-            "MULTILINESTRING((1 1,2 2))"
+            "LINESTRING(1 1,2 2)",
+            "MULTILINESTRING((1 1,2 2))",
+            2
         );
     test_mixed
         <
-            bg::model::segment<Point1>, 
-            bg::model::multi_linestring<bg::model::linestring<Point2> > 
+            bg::model::segment<Point1>,
+            bg::model::multi_linestring<bg::model::linestring<Point2> >
         >
         (
-            "LINESTRING(1 1,2 2)", 
-            "MULTILINESTRING((1 1,2 2))"
+            "LINESTRING(1 1,2 2)",
+            "MULTILINESTRING((1 1,2 2))",
+            2
         );
     test_mixed
         <
-            bg::model::box<Point1>, 
-            bg::model::multi_polygon<bg::model::polygon<Point2> > 
+            bg::model::box<Point1>,
+            bg::model::multi_polygon<bg::model::polygon<Point2> >
         >
         (
-            "BOX(0 0,1 1)", 
-            "MULTIPOLYGON(((0 0,0 1,1 1,1 0,0 0)))"
+            "BOX(0 0,1 1)",
+            "MULTIPOLYGON(((0 0,0 1,1 1,1 0,0 0)))",
+            5
         );
     test_mixed
         <
-            bg::model::ring<Point1, true>, 
-            bg::model::multi_polygon<bg::model::polygon<Point2, false> > 
+            bg::model::ring<Point1, true>,
+            bg::model::multi_polygon<bg::model::polygon<Point2, false> >
         >
         (
-            "POLYGON((0 0,0 1,1 1,1 0,0 0))", 
-            "MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))"
+            "POLYGON((0 0,0 1,1 1,1 0,0 0))",
+            "MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))",
+            5
         );
 
     // Multi -> single: should not compile (because multi often have 0 or >1 elements)
diff --git a/test/multi/algorithms/multi_convex_hull.cpp b/test/multi/algorithms/multi_convex_hull.cpp
index 0da8d0ecf..f27396529 100644
--- a/test/multi/algorithms/multi_convex_hull.cpp
+++ b/test/multi/algorithms/multi_convex_hull.cpp
@@ -59,11 +59,11 @@ void test_all()
     test_geometry<mp>("MULTIPOINT((1 0))", -1, 3, 0.0);
 
     // Problem of 6019, reproduced by the convex hull robustness test:
-    test_geometry<mp>("MULTIPOINT((2 9),(1 3),(9 4),(1 1),(1 0),(7 9),(2 5),(3 7),(3 6),(2 4))", 
+    test_geometry<mp>("MULTIPOINT((2 9),(1 3),(9 4),(1 1),(1 0),(7 9),(2 5),(3 7),(3 6),(2 4))",
             -1, 6, 48.0);
 
     // Ticket 6019:
-    test_geometry<mp>("MULTIPOINT((0 53),(0 103),(0 53),(0 3),(0 3),(0 0),(1 0),(1 1),(2 1),(2 0),(2 0),(2 0),(3 0),(3 1),(4 1),(4 0),(5 0),(0 3),(10 3),(10 2),(10 2),(10 2),(5 2),(5 0),(5 0),(55 0),(105 0))", 
+    test_geometry<mp>("MULTIPOINT((0 53),(0 103),(0 53),(0 3),(0 3),(0 0),(1 0),(1 1),(2 1),(2 0),(2 0),(2 0),(3 0),(3 1),(4 1),(4 0),(5 0),(0 3),(10 3),(10 2),(10 2),(10 2),(5 2),(5 0),(5 0),(55 0),(105 0))",
             -1, 4, 5407.5);
     // Ticket 6021:
     test_geometry<mp>("multipoint((0 53), (0 103), (1 53))", 3, 4, 25);
diff --git a/test/multi/algorithms/multi_difference.cpp b/test/multi/algorithms/multi_difference.cpp
index 35160437d..8c6b0dbbb 100644
--- a/test/multi/algorithms/multi_difference.cpp
+++ b/test/multi/algorithms/multi_difference.cpp
@@ -10,6 +10,10 @@
 #include <iostream>
 #include <string>
 
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// This multi_difference currently contains no tests for double which then fail
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
+
 //#define HAVE_TTMATH
 //#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
 //#define BOOST_GEOMETRY_CHECK_WITH_SQLSERVER
@@ -109,7 +113,7 @@ void test_areal()
             'POLYGON((5 0,5 4,8 4,8 0,5 0))',0) as  p,
       geometry::STGeomFromText(
             'MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0)),((4 0,4 2,6 2,6 0,4 0)))',0) as q)
-    select 
+    select
         p.STDifference(q).STArea(),p.STDifference(q).STNumGeometries(),p.STDifference(q) as p_min_q,
         q.STDifference(p).STArea(),q.STDifference(p).STNumGeometries(),q.STDifference(p) as q_min_p,
         p.STSymDifference(q).STArea(),q.STSymDifference(p) as p_xor_q
@@ -132,9 +136,13 @@ void test_areal()
 
     test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120221_volker",
         ggl_list_20120221_volker[0], ggl_list_20120221_volker[1],
-            2, 12, 7962.66, 1, 18, 2775258.93, 
+            2, 12, 7962.66, 1, 18, 2775258.93,
             0.001);
 
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ticket_9081",
+        ticket_9081[0], ticket_9081[1],
+            2, 28, 0.0907392476356186, 4, 25, 0.126018011439877,
+            0.001);
 
     /* TODO: fix
     test_one<Polygon, MultiPolygon, MultiPolygon>("case_101_multi",
@@ -178,15 +186,15 @@ void test_areal_linear()
     test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_2a", "LINESTRING(1 0,1 1,2 1,2 0)", "MULTIPOLYGON(((0 0,0 1,1 1,1 0,0 0)),((1 1,1 2,2 2,2 1,1 1)))", 1, 2, 1.0);
     test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_2b", "LINESTRING(1 0,1 1,2 1,2 0)", "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((0 0,0 1,1 1,1 0,0 0)))", 1, 2, 1.0);
 
-    test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_3", 
-            "LINESTRING(6 6,6 7,7 7,7 6,8 6,8 7,9 7,9 6)", 
+    test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_3",
+            "LINESTRING(6 6,6 7,7 7,7 6,8 6,8 7,9 7,9 6)",
             "MULTIPOLYGON(((5 7,5 8,6 8,6 7,5 7)),((6 6,6 7,7 7,7 6,6 6)),((8 8,9 8,9 7,8 7,7 7,7 8,8 8)))", 2, 5, 3.0);
 
     return;
 
     // TODO: this case contains collinearities and should still be solved
-    test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_4", 
-            "LINESTRING(0 5,0 6,1 6,1 5,2 5,2 6,3 6,3 5,3 4,3 3,2 3,2 4,1 4,1 3,0 3,0 4)", 
+    test_one_lp<LineString, LineString, MultiPolygon>("case_mp_ls_4",
+            "LINESTRING(0 5,0 6,1 6,1 5,2 5,2 6,3 6,3 5,3 4,3 3,2 3,2 4,1 4,1 3,0 3,0 4)",
             "MULTIPOLYGON(((0 2,0 3,1 2,0 2)),((2 5,3 6,3 5,2 5)),((1 5,1 6,2 6,2 5,1 5)),((2 3,2 4,3 4,2 3)),((0 3,1 4,1 3,0 3)),((4 3,3 3,3 5,4 5,4 4,4 3)))", 5, 11, 6.0);
 }
 
@@ -194,7 +202,7 @@ void test_areal_linear()
 template <typename P>
 void test_all()
 {
-    typedef bg::model::box<P> box;
+    //typedef bg::model::box<P> box;
     typedef bg::model::ring<P> ring;
     typedef bg::model::polygon<P> polygon;
     typedef bg::model::multi_polygon<polygon> multi_polygon;
diff --git a/test/multi/algorithms/multi_difference_spike.cpp b/test/multi/algorithms/multi_difference_spike.cpp
index 07bf65ea5..6753a2380 100644
--- a/test/multi/algorithms/multi_difference_spike.cpp
+++ b/test/multi/algorithms/multi_difference_spike.cpp
@@ -39,22 +39,22 @@ void test_spikes_in_ticket_8364()
     test_one<polygon, multi_polygon, multi_polygon>("ticket_8364_step3",
         "MULTIPOLYGON(((3232 2532,2136 2790,1032 1764,1032 1458,1032 1212,2136 2328,3232 2220,3232 1056,1031 1056,1031 2856,3232 2856,3232 2532)))",
         "MULTIPOLYGON(((1032 2130,2052 2712,1032 1764,1032 2130)),((3234 2580,3234 2532,2558 2690,3234 2580)),((2558 2690,2136 2760,2052 2712,2136 2790,2558 2690)))",
-        if_typed<ct, int>(1, 2),
-        if_typed<ct, int>(15, 22),
-        if_typed<ct, int>(2775561.0, 2775256.487954), // SQL Server: 2775256.47588724
+        2,
+        if_typed<ct, int>(19, 22),
+        if_typed<ct, int>(2775595.5, 2775256.487954), // SQL Server: 2775256.47588724
         3,
-        14,
-        if_typed<ct, int>(7710.5, 7810.487954)); // SQL Server: 7810.48711165739
+        -1, // don't check point-count
+        if_typed<ct, int>(7907.0, 7810.487954)); // SQL Server: 7810.48711165739
 
     test_one<polygon, multi_polygon, multi_polygon>("ticket_8364_step4",
         "MULTIPOLYGON(((2567 2688,2136 2790,2052 2712,1032 2130,1032 1764,1032 1458,1032 1212,2136 2328,3232 2220,3232 1056,1031 1056,1031 2856,3232 2856,3232 2580,2567 2688)))",
         "MULTIPOLYGON(((1032 2556,1778 2556,1032 2130,1032 2556)),((3234 2580,3234 2556,1778 2556,2136 2760,3234 2580)))",
         1,
         if_typed<ct, int>(17, 20),
-        if_typed<ct, int>(2616292.0, 2616029.559567), // SQL Server: 2616029.55616044
+        if_typed<ct, int>(2616125.0, 2616029.559567), // SQL Server: 2616029.55616044
         1,
         if_typed<ct, int>(9, 11),
-        if_typed<ct, int>(160996.0, 161054.559567)); // SQL Server: 161054.560110092
+        if_typed<ct, int>(161211.5, 161054.559567)); // SQL Server: 161054.560110092
 }
 
 template <typename P, bool ClockWise, bool Closed>
@@ -72,10 +72,10 @@ void test_spikes_in_ticket_8365()
         "MULTIPOLYGON(((5388 1560,4650 1722,3912 1884,4650 1398)),((2442 3186,1704 3348,966 2700,1704 3024)))",
         if_typed<ct, int>(1, 2),
         if_typed<ct, int>(17, 21),
-        if_typed<ct, int>(7974930.5, 7975207.6047877), // SQL Server: 
+        if_typed<ct, int>(7974930.5, 7975207.6047877), // SQL Server:
         2,
-        9,
-        if_typed<ct, int>(199.0, 197.1047877)); // SQL Server: 
+        -1,
+        if_typed<ct, int>(196.5, 197.1047877)); // SQL Server:
 }
 
 
@@ -85,13 +85,13 @@ void test_spikes_in_ticket_8365()
 int test_main(int, char* [])
 {
     test_spikes_in_ticket_8364<bg::model::d2::point_xy<double>, true, true>();
-    test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, true, true>();
     test_spikes_in_ticket_8364<bg::model::d2::point_xy<double>, false, false>();
-    test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, false, false>();
-
     test_spikes_in_ticket_8365<bg::model::d2::point_xy<double>, true, true>();
-    test_spikes_in_ticket_8365<bg::model::d2::point_xy<int>, true, true >();
     test_spikes_in_ticket_8365<bg::model::d2::point_xy<double>, false, false>();
+
+    test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, true, true>();
+    test_spikes_in_ticket_8364<bg::model::d2::point_xy<int>, false, false>();
+    test_spikes_in_ticket_8365<bg::model::d2::point_xy<int>, true, true >();
     test_spikes_in_ticket_8365<bg::model::d2::point_xy<int>, false, false >();
 
 #ifdef HAVE_TTMATH
diff --git a/test/multi/algorithms/multi_disjoint.cpp b/test/multi/algorithms/multi_disjoint.cpp
index 9d374f7c7..070bfbb6e 100644
--- a/test/multi/algorithms/multi_disjoint.cpp
+++ b/test/multi/algorithms/multi_disjoint.cpp
@@ -7,22 +7,15 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-#include <iostream>
-#include <string>
 
+#include <algorithms/test_disjoint.hpp>
 
-#include <geometry_test_common.hpp>
-
-#include <boost/geometry/algorithms/disjoint.hpp>
-#include <boost/geometry/io/wkt/read.hpp>
-#include <boost/geometry/multi/io/wkt/read.hpp>
 #include <boost/geometry/strategies/strategies.hpp>
 
 #include <boost/geometry/multi/algorithms/detail/sections/range_by_section.hpp>
 #include <boost/geometry/multi/algorithms/detail/sections/sectionalize.hpp>
 #include <boost/geometry/multi/algorithms/detail/point_on_border.hpp>
 #include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
-#include <boost/geometry/multi/algorithms/disjoint.hpp>
 #include <boost/geometry/multi/algorithms/within.hpp>
 #include <boost/geometry/multi/core/closure.hpp>
 #include <boost/geometry/multi/core/geometry_id.hpp>
@@ -36,27 +29,7 @@
 
 #include <test_common/test_point.hpp>
 
-#include <algorithms/test_relate.hpp>
-
-
-template <typename G1, typename G2>
-void test_disjoint(std::string const& id,
-            std::string const& wkt1,
-            std::string const& wkt2, bool expected)
-{
-    G1 g1;
-    bg::read_wkt(wkt1, g1);
-
-    G2 g2;
-    bg::read_wkt(wkt2, g2);
-
-    bool detected = bg::disjoint(g1, g2);
-    BOOST_CHECK_MESSAGE(detected == expected,
-        "disjoint: " << id
-        << " -> Expected: " << expected
-        << " detected: " << detected);
-}
-
+#include <algorithms/predef_relop.hpp>
 
 
 template <typename P>
@@ -65,68 +38,68 @@ void test_all()
     typedef bg::model::polygon<P> polygon;
     typedef bg::model::multi_polygon<polygon> mp;
 
-    test_disjoint<mp, mp>("", 
+    test_disjoint<mp, mp>("",
         "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
         false);
 
     // True disjoint
-    test_disjoint<mp, mp>("", 
+    test_disjoint<mp, mp>("",
         "MULTIPOLYGON(((0 0,0 4,4 4,4 0,0 0)))",
             "MULTIPOLYGON(((6 6,6 10,10 10,10 6,6 6)))",
         true);
 
     // Touch -> not disjoint
-    test_disjoint<mp, mp>("", 
+    test_disjoint<mp, mp>("",
         "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0)))",
             "MULTIPOLYGON(((5 5,5 10,10 10,10 5,5 5)))",
         false);
 
     // Not disjoint but no IP's
-    test_disjoint<mp, mp>("no_ips", 
+    test_disjoint<mp, mp>("no_ips",
         "MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2)),((20 0,20 10,30 10,30 0,20 0)))",
             "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((22 2,28 2,28 8,22 8,22 2)))",
         false);
 
     // Not disjoint and not inside each other (in first ring) but wrapped (in second rings)
-    test_disjoint<mp, mp>("no_ips2", 
+    test_disjoint<mp, mp>("no_ips2",
         "MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2)),((20 0,20 10,30 10,30 0,20 0)))",
             "MULTIPOLYGON(((2 12,2 18,8 18,8 12,2 12)),((22 2,28 2,28 8,22 8,22 2)))",
         false);
 
-    test_disjoint<mp, mp>("no_ips2_rev", 
+    test_disjoint<mp, mp>("no_ips2_rev",
         "MULTIPOLYGON(((2 12,2 18,8 18,8 12,2 12)),((22 2,28 2,28 8,22 8,22 2)))",
         "MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2)),((20 0,20 10,30 10,30 0,20 0)))",
         false);
 
 
-    test_disjoint<P, mp>("point_mp1", 
+    test_disjoint<P, mp>("point_mp1",
         "POINT(0 0)",
         "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
         false);
 
-    test_disjoint<P, mp>("point_mp2", 
+    test_disjoint<P, mp>("point_mp2",
         "POINT(5 5)",
         "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
         false);
 
-    test_disjoint<P, mp>("point_mp1", 
+    test_disjoint<P, mp>("point_mp1",
         "POINT(11 11)",
         "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
         true);
 
     std::string polygon_inside_hole("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0), (2 2,8 2,8 8,2 8,2 2)),((4 4,4 6,6 6,6 4,4 4)))");
-    test_disjoint<P, mp>("point_mp_pih1", 
+    test_disjoint<P, mp>("point_mp_pih1",
         "POINT(5 5)",
         polygon_inside_hole,
         false);
 
-    test_disjoint<P, mp>("point_mp_pih2", 
+    test_disjoint<P, mp>("point_mp_pih2",
         "POINT(3 3)",
         polygon_inside_hole,
         true);
 
-    test_disjoint<mp, P>("point_mp1rev", 
+    test_disjoint<mp, P>("point_mp1rev",
         "MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)))",
         "POINT(0 0)",
         false);
@@ -154,4 +127,4 @@ select geometry::STGeomFromText('MULTIPOLYGON(((2 2,2 8,8 8,8 2,2 2)),((20 0,20
 )
  select p from viewy union all select q from viewy
 -- select p.STDisjoint(q) from viewy
-*/
\ No newline at end of file
+*/
diff --git a/test/multi/algorithms/multi_distance.cpp b/test/multi/algorithms/multi_distance.cpp
deleted file mode 100644
index 0c932474a..000000000
--- a/test/multi/algorithms/multi_distance.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library)
-//
-// Copyright (c) 2007-2012 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)
-
-#include <string>
-
-
-#include <geometry_test_common.hpp>
-
-#include <algorithms/test_distance.hpp>
-
-#include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/io/wkt/read.hpp>
-
-#include <boost/geometry/strategies/strategies.hpp>
-
-
-#include <boost/geometry/multi/algorithms/distance.hpp>
-#include <boost/geometry/multi/geometries/multi_point.hpp>
-#include <boost/geometry/multi/geometries/multi_linestring.hpp>
-#include <boost/geometry/multi/geometries/multi_polygon.hpp>
-#include <boost/geometry/multi/io/wkt/read.hpp>
-
-#include <boost/geometry/geometries/geometries.hpp>
-#include <boost/geometry/geometries/point_xy.hpp>
-#include <boost/geometry/geometries/adapted/c_array.hpp>
-#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
-#include <test_common/test_point.hpp>
-
-BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
-BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
-
-
-template <typename Geometry1, typename Geometry2>
-void test_distance(std::string const& wkt1, std::string const& wkt2, double expected)
-{
-    Geometry1 g1;
-    Geometry2 g2;
-    bg::read_wkt(wkt1, g1);
-    bg::read_wkt(wkt2, g2);
-    typename bg::default_distance_result<Geometry1, Geometry2>::type d = bg::distance(g1, g2);
-
-    BOOST_CHECK_CLOSE(d, expected, 0.0001);
-}
-
-template <typename Geometry1, typename Geometry2, typename Strategy>
-void test_distance(Strategy const& strategy, std::string const& wkt1,
-                   std::string const& wkt2, double expected)
-{
-    Geometry1 g1;
-    Geometry2 g2;
-    bg::read_wkt(wkt1, g1);
-    bg::read_wkt(wkt2, g2);
-    typename bg::default_distance_result<Geometry1, Geometry2>::type d = bg::distance(g1, g2, strategy);
-
-    BOOST_CHECK_CLOSE(d, expected, 0.0001);
-}
-
-
-template <typename P>
-void test_2d()
-{
-    typedef bg::model::multi_point<P> mp;
-    typedef bg::model::multi_linestring<bg::model::linestring<P> > ml;
-    test_distance<P, P>("POINT(0 0)", "POINT(1 1)", sqrt(2.0));
-    test_distance<P, mp>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<mp, P>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp, mp>("MULTIPOINT((1 1),(1 0),(0 2))", "MULTIPOINT((2 2),(2 3))", sqrt(2.0));
-    test_distance<P, ml>("POINT(0 0)", "MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", 1.0);
-    test_distance<ml, P>("MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", "POINT(0 0)", 1.0);
-    test_distance<ml, mp>("MULTILINESTRING((1 1,2 2),(1 0,2 0),(0 2,0 3))", "MULTIPOINT((0 0),(1 1))", 0.0);
-
-    // Test with a strategy
-    bg::strategy::distance::pythagoras<> pyth;
-    test_distance<P, P>(pyth, "POINT(0 0)", "POINT(1 1)", sqrt(2.0));
-    test_distance<P, mp>(pyth, "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<mp, P>(pyth, "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-}
-
-
-template <typename P>
-void test_3d()
-{
-    typedef bg::model::multi_point<P> mp;
-    test_distance<P, P>("POINT(0 0 0)", "POINT(1 1 1)", sqrt(3.0));
-    test_distance<P, mp>("POINT(0 0 0)", "MULTIPOINT((1 1 1),(1 0 0),(0 1 2))", 1.0);
-    test_distance<mp, mp>("MULTIPOINT((1 1 1),(1 0 0),(0 0 2))", "MULTIPOINT((2 2 2),(2 3 4))", sqrt(3.0));
-}
-
-
-template <typename P1, typename P2>
-void test_mixed()
-{
-    typedef bg::model::multi_point<P1> mp1;
-    typedef bg::model::multi_point<P2> mp2;
-
-    test_distance<P1, P2>("POINT(0 0)", "POINT(1 1)", sqrt(2.0));
-
-    test_distance<P1, mp1>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P1, mp2>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P2, mp1>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P2, mp2>("POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-
-    // Test automatic reversal
-    test_distance<mp1, P1>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp1, P2>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp2, P1>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp2, P2>("MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-
-    // Test multi-multi using different point types for each
-    test_distance<mp1, mp2>("MULTIPOINT((1 1),(1 0),(0 2))", "MULTIPOINT((2 2),(2 3))", sqrt(2.0));
-
-    // Test with a strategy
-    using namespace bg::strategy::distance;
-
-    test_distance<P1, P2>(pythagoras<>(), "POINT(0 0)", "POINT(1 1)", sqrt(2.0));
-
-    test_distance<P1, mp1>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P1, mp2>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P2, mp1>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-    test_distance<P2, mp2>(pythagoras<>(), "POINT(0 0)", "MULTIPOINT((1 1),(1 0),(0 2))", 1.0);
-
-    // Most interesting: reversal AND a strategy (note that the stategy must be reversed automatically
-    test_distance<mp1, P1>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp1, P2>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp2, P1>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-    test_distance<mp2, P2>(pythagoras<>(), "MULTIPOINT((1 1),(1 0),(0 2))", "POINT(0 0)", 1.0);
-}
-
-template <typename P>
-void test_empty_input()
-{
-    P p;
-    bg::model::multi_point<P> mp_empty;
-    bg::model::multi_linestring<bg::model::linestring<P> > ml_empty;
-
-    test_empty_input(p, mp_empty);
-    test_empty_input(p, ml_empty);
-    test_empty_input(mp_empty, mp_empty);
-
-    // Test behaviour if one of the inputs is empty
-    bg::model::multi_point<P> mp;
-    mp.push_back(p);
-    test_empty_input(mp_empty, mp);
-    test_empty_input(mp, mp_empty);
-}
-
-
-int test_main( int , char* [] )
-{
-    test_2d<boost::tuple<float, float> >();
-    test_2d<bg::model::d2::point_xy<float> >();
-    test_2d<bg::model::d2::point_xy<double> >();
-
-    test_3d<boost::tuple<float, float, float> >();
-    test_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
-
-    test_mixed<bg::model::d2::point_xy<float>, bg::model::d2::point_xy<double> >();
-
-#ifdef HAVE_TTMATH
-    test_2d<bg::model::d2::point_xy<ttmath_big> >();
-    test_mixed<bg::model::d2::point_xy<ttmath_big>, bg::model::d2::point_xy<double> >();
-#endif
-
-    test_empty_input<bg::model::d2::point_xy<int> >();
-
-    return 0;
-}
diff --git a/test/multi/algorithms/multi_envelope.cpp b/test/multi/algorithms/multi_envelope.cpp
index dad5d0bc2..bafa5dc25 100644
--- a/test/multi/algorithms/multi_envelope.cpp
+++ b/test/multi/algorithms/multi_envelope.cpp
@@ -49,7 +49,7 @@ void test_2d()
 template <typename P>
 void test_3d()
 {
-    typedef bg::model::multi_point<P> mp;
+    //typedef bg::model::multi_point<P> mp;
 }
 
 
diff --git a/test/multi/algorithms/multi_for_each.cpp b/test/multi/algorithms/multi_for_each.cpp
index 846abdda5..b16930dba 100644
--- a/test/multi/algorithms/multi_for_each.cpp
+++ b/test/multi/algorithms/multi_for_each.cpp
@@ -68,7 +68,7 @@ void test_all()
 
             , "((1, 1), (1, 4)) ((1, 4), (4, 4)) ((4, 4), (4, 1)) ((4, 1), (1, 1))"
             , 4 * 3.0
-            , "MULTIPOLYGON(((10 1,10 4,4 4,4 1,1 1)))"
+            , "MULTIPOLYGON(((10 1,10 4,4 4,4 1,1 1,10 1)))"
         );
 }
 
diff --git a/test/multi/algorithms/multi_intersection.cpp b/test/multi/algorithms/multi_intersection.cpp
index 4df030253..8dea0da23 100644
--- a/test/multi/algorithms/multi_intersection.cpp
+++ b/test/multi/algorithms/multi_intersection.cpp
@@ -10,6 +10,10 @@
 #include <iostream>
 #include <string>
 
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// This multi_intersection currently contains no tests for double then failing
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
+
 // #define BOOST_GEOMETRY_DEBUG_ASSEMBLE
 
 #include <algorithms/test_intersection.hpp>
@@ -93,20 +97,24 @@ void test_areal()
         case_recursive_boxes_2[0], case_recursive_boxes_2[1],
         1, 47, 90.0); // Area from SQL Server
 
-     test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_3",
-         case_recursive_boxes_3[0], case_recursive_boxes_3[1],
-         19, 87, 12.5); // Area from SQL Server
+    test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_3",
+        case_recursive_boxes_3[0], case_recursive_boxes_3[1],
+        19, 87, 12.5); // Area from SQL Server
 
-     test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_4",
-         case_recursive_boxes_4[0], case_recursive_boxes_4[1],
-         13, 157, 67.0); // Area from SQL Server
+    test_one<Polygon, MultiPolygon, MultiPolygon>("case_recursive_boxes_4",
+        case_recursive_boxes_4[0], case_recursive_boxes_4[1],
+        13, 157, 67.0); // Area from SQL Server
 
-     test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_a",
-         ggl_list_20120915_h2[0], ggl_list_20120915_h2[1],
-         2, 10, 6.0); // Area from SQL Server
-     test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_b",
-         ggl_list_20120915_h2[0], ggl_list_20120915_h2[2],
-         2, 10, 6.0); // Area from SQL Server
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_a",
+        ggl_list_20120915_h2[0], ggl_list_20120915_h2[1],
+        2, 10, 6.0); // Area from SQL Server
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_b",
+        ggl_list_20120915_h2[0], ggl_list_20120915_h2[2],
+        2, 10, 6.0); // Area from SQL Server
+
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ticket_9081",
+        ticket_9081[0], ticket_9081[1],
+        2, 10, 0.0019812556);
 }
 
 template <typename Polygon, typename MultiPolygon, typename Box>
@@ -175,7 +183,7 @@ void test_areal_linear()
 template <typename P>
 void test_all()
 {
-    typedef bg::model::box<P> box;
+    //typedef bg::model::box<P> box;
     typedef bg::model::ring<P> ring;
     typedef bg::model::polygon<P> polygon;
     typedef bg::model::multi_polygon<polygon> multi_polygon;
diff --git a/test/multi/algorithms/multi_touches.cpp b/test/multi/algorithms/multi_touches.cpp
index 0186c62e3..8774beaf2 100644
--- a/test/multi/algorithms/multi_touches.cpp
+++ b/test/multi/algorithms/multi_touches.cpp
@@ -16,6 +16,7 @@
 #include <boost/geometry/multi/algorithms/detail/for_each_range.hpp>
 #include <boost/geometry/multi/core/closure.hpp>
 #include <boost/geometry/multi/core/geometry_id.hpp>
+#include <boost/geometry/multi/core/topological_dimension.hpp>
 #include <boost/geometry/multi/core/ring_type.hpp>
 #include <boost/geometry/multi/views/detail/range_type.hpp>
 
@@ -32,6 +33,8 @@ void test_all()
 {
     typedef bg::model::polygon<P> polygon;
     typedef bg::model::multi_polygon<polygon> mp;
+    typedef bg::model::linestring<P> linestring;
+    typedef bg::model::multi_linestring<linestring> ml;
 
     test_self_touches<mp>("MULTIPOLYGON(((0 0,0 100,100 100,100 0,0 0)))",
             false);
@@ -62,10 +65,22 @@ void test_all()
             true);
 
     // Touch plus inside
-    // TODO fix this
     test_touches<mp, mp>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((20 0,20 10,30 10,30 0,20 0)))",
             "MULTIPOLYGON(((10 10,10 20,20 20,20 10,10 10)),((22 2,28 2,28 8,22 8,22 2)))",
             false);
+
+
+    test_touches<mp, ml>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((20 0,20 10,30 10,30 0,20 0)))",
+            "MULTILINESTRING((10 10,10 20,20 20,20 10,10 10),(30 10,30 20,40 20,40 10,30 10))",
+            true);
+
+    test_touches<mp, ml>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((20 0,20 10,30 10,30 0,20 0)))",
+            "MULTILINESTRING((10 10,10 20,20 20,20 10,10 10),(22 2,28 2,28 8,22 8,22 2))",
+            false);
+
+    test_touches<mp, ml>("MULTIPOLYGON(((0 0,0 10,10 10,10 0,0 0)),((20 0,20 10,30 10,30 0,20 0)))",
+            "MULTILINESTRING((10 10,10 20,20 20,20 10,10 10),(50 2,60 2,60 8,50 8,50 2))",
+            true);
 }
 
 int test_main( int , char* [] )
diff --git a/test/multi/algorithms/multi_union.cpp b/test/multi/algorithms/multi_union.cpp
index e97e9fb43..2e1e309a6 100644
--- a/test/multi/algorithms/multi_union.cpp
+++ b/test/multi/algorithms/multi_union.cpp
@@ -10,6 +10,9 @@
 #include <iostream>
 #include <string>
 
+// If defined, tests are run without rescaling-to-integer or robustness policy
+// This multi_union currently contains no tests for double which then fail
+// #define BOOST_GEOMETRY_NO_ROBUSTNESS
 
 #include <algorithms/test_union.hpp>
 #include <algorithms/test_overlay.hpp>
@@ -107,12 +110,20 @@ void test_areal()
         case_recursive_boxes_3[0], case_recursive_boxes_3[1],
         17, 0, 159, 56.5); // Area from SQL Server
 
-     test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_a",
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_a",
          ggl_list_20120915_h2[0], ggl_list_20120915_h2[1],
          1, 0, 12, 23.0); // Area from SQL Server
-     test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_b",
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20120915_h2_b",
          ggl_list_20120915_h2[0], ggl_list_20120915_h2[2],
          1, 0, 12, 23.0); // Area from SQL Server
+
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ggl_list_20140212_sybren",
+         ggl_list_20140212_sybren[0], ggl_list_20140212_sybren[1],
+         2, 0, 16, 0.002471626);
+
+    test_one<Polygon, MultiPolygon, MultiPolygon>("ticket_9081",
+        ticket_9081[0], ticket_9081[1],
+        3, 0, 31, 0.2187385);
 }
 
 template <typename P>
diff --git a/test/multi/algorithms/overlay/Jamfile.v2 b/test/multi/algorithms/overlay/Jamfile.v2
index a2e9a0ce5..2ea7594e1 100644
--- a/test/multi/algorithms/overlay/Jamfile.v2
+++ b/test/multi/algorithms/overlay/Jamfile.v2
@@ -10,5 +10,5 @@
 
 test-suite boost-geometry-multi-algorithms-overlay
     : 
-    [ run multi_traverse.cpp ]
+    [ run multi_traverse.cpp : : : <define>BOOST_GEOMETRY_TEST_ONLY_ONE_TYPE <define>BOOST_GEOMETRY_RESCALE_TO_ROBUST ]
      ;
diff --git a/test/multi/algorithms/overlay/multi_overlay_cases.hpp b/test/multi/algorithms/overlay/multi_overlay_cases.hpp
index 0ddd3a0a7..c44b17adb 100644
--- a/test/multi/algorithms/overlay/multi_overlay_cases.hpp
+++ b/test/multi/algorithms/overlay/multi_overlay_cases.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -17,397 +17,397 @@ static std::string case_multi_simplex[2] = {
         "MULTIPOLYGON(((0 1,2 5,5 3,0 1)),((1 1,5 2,5 0,1 1)))",
         "MULTIPOLYGON(((3 0,0 3,4 5,3 0)))" };
 
-// To mix multi/single 
+// To mix multi/single
 static std::string case_single_simplex = "POLYGON((3 0,0 3,4 5,3 0))";
 
-static std::string case_multi_no_ip[2] = 
+static std::string case_multi_no_ip[2] =
 {
     "MULTIPOLYGON(((4 1,0 7,7 9,4 1)),((8 1,6 3,10 4,8 1)),((12 6,10 7,13 8,12 6)))",
-    "MULTIPOLYGON(((14 4,8 8,15 10,14 4)),((15 3,18 9,20 2,15 3)),((3 4,1 7,5 7,3 4)))" 
+    "MULTIPOLYGON(((14 4,8 8,15 10,14 4)),((15 3,18 9,20 2,15 3)),((3 4,1 7,5 7,3 4)))"
 };
 
-static std::string case_multi_2[2] = 
+static std::string case_multi_2[2] =
 {
     "MULTIPOLYGON(((4 3,2 7,10 9,4 3)),((8 1,6 3,10 4,8 1)),((12 6,10 7,13 8,12 6)))",
-    "MULTIPOLYGON(((14 4,8 8,15 10,14 4)),((15 3,18 9,20 2,15 3)),((5 5,4 7,7 7,5 5)))" 
+    "MULTIPOLYGON(((14 4,8 8,15 10,14 4)),((15 3,18 9,20 2,15 3)),((5 5,4 7,7 7,5 5)))"
 };
 
-static std::string case_61_multi[2] = 
+static std::string case_61_multi[2] =
 {
     // extracted from recursive boxes
     "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((2 2,2 3,3 3,3 2,2 2)))",
-    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 3,2 4,3 4,3 3,2 3)))" 
+    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 3,2 4,3 4,3 3,2 3)))"
 };
 
-static std::string case_62_multi[2] = 
+static std::string case_62_multi[2] =
 {
     // extracted from recursive boxes
     "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)))",
-    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 3,2 4,3 4,3 3,2 3)))" 
+    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 3,2 4,3 4,3 3,2 3)))"
 };
 
-static std::string case_63_multi[2] = 
+static std::string case_63_multi[2] =
 {
     // extracted from recursive boxes
     "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)))",
-    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 1,2 2,3 2,3 1,2 1)))" 
+    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 1,2 2,3 2,3 1,2 1)))"
 };
 
-static std::string case_64_multi[3] = 
+static std::string case_64_multi[3] =
 {
     // extracted from recursive boxes
     "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((2 2,2 3,3 3,3 2,2 2)))",
     "MULTIPOLYGON(((1 1,1 2,2 2,3 2,3 1,2 1,1 1)))" ,
     // same but omitting not-necessary form-points at x=2 (==simplified)
-    "MULTIPOLYGON(((1 1,1 2,3 2,3 1,1 1)))" 
+    "MULTIPOLYGON(((1 1,1 2,3 2,3 1,1 1)))"
 };
 
-static std::string case_65_multi[2] = 
+static std::string case_65_multi[2] =
 {
     "MULTIPOLYGON(((2 2,2 3,3 3,3 2,2 2)))",
-    "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((2 2,2 3,3 3,3 2,2 2)),((3 1,3 2,5 2,5 1,3 1)))" 
+    "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((2 2,2 3,3 3,3 2,2 2)),((3 1,3 2,5 2,5 1,3 1)))"
 };
 
-static std::string case_66_multi[2] = 
+static std::string case_66_multi[2] =
 {
     "MULTIPOLYGON(((3 5,2 5,2 6,3 6,4 6,4 5,3 5)),((1 6,0 6,0 7,1 7,2 7,2 6,1 6)))",
-    "MULTIPOLYGON(((1 4,1 5,2 5,2 4,1 4)),((1 7,2 7,2 6,1 6,1 7)),((0 8,0 9,1 9,1 8,1 7,0 7,0 8)))" 
+    "MULTIPOLYGON(((1 4,1 5,2 5,2 4,1 4)),((1 7,2 7,2 6,1 6,1 7)),((0 8,0 9,1 9,1 8,1 7,0 7,0 8)))"
 };
 
-static std::string case_67_multi[2] = 
+static std::string case_67_multi[2] =
 {
     "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 1,2 2,3 2,3 1,2 1)))",
-    "MULTIPOLYGON(((1 1,1 2,3 2,3 1,1 1)))" 
+    "MULTIPOLYGON(((1 1,1 2,3 2,3 1,1 1)))"
 };
 
-static std::string case_68_multi[2] = 
+static std::string case_68_multi[2] =
 {
     "MULTIPOLYGON(((2 1,2 2,4 2,4 1,2 1)),((4 2,4 3,5 3,5 2,4 2)))",
-    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 1,2 2,3 2,3 1,2 1)),((3 2,3 3,5 3,5 2,3 2)))" 
+    "MULTIPOLYGON(((1 2,1 3,2 3,2 2,1 2)),((2 1,2 2,3 2,3 1,2 1)),((3 2,3 3,5 3,5 2,3 2)))"
 };
 
-static std::string case_69_multi[2] = 
+static std::string case_69_multi[2] =
 {
     "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((3 2,3 3,4 3,4 2,3 2)))",
-    "MULTIPOLYGON(((2 0,2 1,3 1,3 0,2 0)),((1 1,1 3,2 3,2 1,1 1)),((2 3,2 4,3 4,3 3,2 3)))" 
+    "MULTIPOLYGON(((2 0,2 1,3 1,3 0,2 0)),((1 1,1 3,2 3,2 1,1 1)),((2 3,2 4,3 4,3 3,2 3)))"
 };
 
-static std::string case_71_multi[2] = 
+static std::string case_71_multi[2] =
 {
     "MULTIPOLYGON(((0 0,0 3,1 3,1 1,3 1,3 2,4 2,4 0,0 0)),((2 2,2 3,3 3,3 2,2 2)))",
-    "MULTIPOLYGON(((0 2,0 3,3 3,3 2,0 2)))" 
+    "MULTIPOLYGON(((0 2,0 3,3 3,3 2,0 2)))"
 };
 
-static std::string case_72_multi[2] = 
+static std::string case_72_multi[2] =
 {
     // cluster with ii, done by both traverse and assemble
     "MULTIPOLYGON(((0 3,4 4,3 0,3 3,0 3)),((3 3,2 1,1 2,3 3)))",
-    "MULTIPOLYGON(((0 0,1 4,3 3,4 1,0 0)))" 
+    "MULTIPOLYGON(((0 0,1 4,3 3,4 1,0 0)))"
 };
 
-static std::string case_73_multi[2] = 
+static std::string case_73_multi[2] =
 {
     "MULTIPOLYGON(((2 2,2 3,3 3,3 2,2 2)),((1 1,1 2,2 2,2 1,1 1)))",
-    "MULTIPOLYGON(((1 1,1 2,2 2,2 3,3 3,3 1,1 1)))" 
+    "MULTIPOLYGON(((1 1,1 2,2 2,2 3,3 3,3 1,1 1)))"
 };
 
-static std::string case_74_multi[2] = 
+static std::string case_74_multi[2] =
 {
     "MULTIPOLYGON(((3 0,2 0,2 1,3 1,3 3,1 3,1 2,2 2,2 1,0 1,0 5,4 5,4 0,3 0)))",
     "MULTIPOLYGON(((0 2,0 3,1 3,1 1,2 1,2 0,0 0,0 2)),((2 3,1 3,1 4,2 4,2 3)))"
 };
- 
-static std::string case_75_multi[2] = 
+
+static std::string case_75_multi[2] =
 {
     // cc/uu turns on all corners of second box
     "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((1 3,1 4,2 4,2 3,1 3)),((2 2,2 3,3 3,3 2,2 2)),((3 1,3 2,4 2,4 1,3 1)),((3 3,3 4,4 4,4 3,3 3)))",
     "MULTIPOLYGON(((2 2,2 3,3 3,3 2,2 2)))"
 };
 
-static std::string case_76_multi[2] = 
+static std::string case_76_multi[2] =
 {
     // cc/uu turns on all corners of second box, might generate TWO OVERLAPPING union polygons!
     // therefore, don't follow uu.
     "MULTIPOLYGON(((1 0,1 1,2 1,2 0,1 0)),((3 2,4 2,4 1,3 1,3 2)),((2 2,2 3,3 3,3 2,2 2)),((2 3,1 3,1 4,2 4,2 3)),((3 3,3 4,4 4,4 3,3 3)))",
-    "MULTIPOLYGON(((0 2,0 3,1 3,1 2,2 2,2 0,1 0,1 1,0 1,0 2)),((2 2,2 3,3 3,3 2,2 2)))" 
+    "MULTIPOLYGON(((0 2,0 3,1 3,1 2,2 2,2 0,1 0,1 1,0 1,0 2)),((2 2,2 3,3 3,3 2,2 2)))"
 };
 
-static std::string case_77_multi[2] = 
+static std::string case_77_multi[2] =
 {
-    // with a point on interior-ring-border of enclosing 
+    // with a point on interior-ring-border of enclosing
     // -> went wrong in the assemble phase for intersection (traversal is OK)
     // -> fixed
     "MULTIPOLYGON(((3 3,3 4,4 4,4 3,3 3)),((5 3,5 4,4 4,4 5,3 5,3 6,5 6,5 5,7 5,7 6,8 6,8 5,9 5,9 2,8 2,8 1,7 1,7 2,5 2,5 3),(6 3,8 3,8 4,6 4,6 3)))",
-    "MULTIPOLYGON(((6 3,6 4,7 4,7 3,6 3)),((2 3,1 3,1 4,3 4,3 5,4 5,4 6,5 6,5 7,9 7,9 4,7 4,7 5,8 5,8 6,7 6,7 5,6 5,6 4,4 4,4 3,3 3,3 2,2 2,2 3)),((5 2,4 2,4 3,6 3,6 2,5 2)),((7 2,7 3,8 3,8 2,8 1,7 1,7 2)))" 
+    "MULTIPOLYGON(((6 3,6 4,7 4,7 3,6 3)),((2 3,1 3,1 4,3 4,3 5,4 5,4 6,5 6,5 7,9 7,9 4,7 4,7 5,8 5,8 6,7 6,7 5,6 5,6 4,4 4,4 3,3 3,3 2,2 2,2 3)),((5 2,4 2,4 3,6 3,6 2,5 2)),((7 2,7 3,8 3,8 2,8 1,7 1,7 2)))"
 };
 
-static std::string case_78_multi[2] = 
+static std::string case_78_multi[2] =
 {
     "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,4 2,4 3,2 3,2 2)))",
-    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(3 2,4 2,4 3,3 3,3 2),(1 1,2 1,2 2,1 2,1 1)))" 
+    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(3 2,4 2,4 3,3 3,3 2),(1 1,2 1,2 2,1 2,1 1)))"
 
 };
 
-static std::string case_80_multi[2] = 
+static std::string case_80_multi[2] =
 {
     // Many ux-clusters -> needs correct cluster-sorting
     // Fixed now
     "MULTIPOLYGON(((3 1,3 2,4 2,3 1)),((1 5,0 4,0 5,1 6,1 5)),((3 3,4 3,3 2,2 2,2 3,3 3)),((4 5,5 6,5 5,4 5)),((4 2,4 3,5 3,4 2)),((2.5 5.5,3 5,2 5,2 7,3 6,2.5 5.5)),((1 6,0 6,0 7,1 7,2 6,1 6)))",
-    "MULTIPOLYGON(((3 5,3 6,4 6,4 5,3 5)),((4 4,5 5,5 4,4 4)),((3 3,4 4,4 3,3 3)),((1 5,1 6,2 6,2 5,1 5)),((0 6,1 7,1 6,0 6)),((1 4,1 3,0 3,0 4,1 4)),((3 5,4 4,3 4,3 3,2 3,2 5,3 5)))" 
+    "MULTIPOLYGON(((3 5,3 6,4 6,4 5,3 5)),((4 4,5 5,5 4,4 4)),((3 3,4 4,4 3,3 3)),((1 5,1 6,2 6,2 5,1 5)),((0 6,1 7,1 6,0 6)),((1 4,1 3,0 3,0 4,1 4)),((3 5,4 4,3 4,3 3,2 3,2 5,3 5)))"
 };
 
-static std::string case_81_multi[2] = 
+static std::string case_81_multi[2] =
 {
     "MULTIPOLYGON(((1 1,2 2,2 1,1 1)),((2 2,2 3,3 2,2 2)),((3 1,4 2,4 1,3 1)))",
-    "MULTIPOLYGON(((2 1,2 2,3 3,3 2,4 2,3 1,2 1)))" 
+    "MULTIPOLYGON(((2 1,2 2,3 3,3 2,4 2,3 1,2 1)))"
 };
 
-static std::string case_82_multi[2] = 
+static std::string case_82_multi[2] =
 {
     "MULTIPOLYGON(((4 0,5 1,5 0,4 0)),((2 1,3 2,3 1,2 1)),((3 0,4 1,4 0,3 0)),((1 0,1 1,2 1,2 0,1 0)))",
-    "MULTIPOLYGON(((3 2,4 3,4 2,3 2)),((3 1,3 2,4 1,3 1)),((0 0,1 1,1 0,0 0)),((5 1,5 0,4 0,4 1,5 1)))" 
+    "MULTIPOLYGON(((3 2,4 3,4 2,3 2)),((3 1,3 2,4 1,3 1)),((0 0,1 1,1 0,0 0)),((5 1,5 0,4 0,4 1,5 1)))"
 };
 
-static std::string case_83_multi[2] = 
+static std::string case_83_multi[2] =
 {
     // iu/iu
     "MULTIPOLYGON(((1 0,1 1,2 1,1 0)),((0 1,0 4,1 4,1 1,0 1)),((2 1,2 2,3 2,3 1,2 1)),((2 3,3 4,3 3,2 3)))",
-    "MULTIPOLYGON(((1 0,2 1,2 0,1 0)),((0 3,1 4,1 3,0 3)),((2 3,2 4,3 3,2 3)),((1 3,2 3,2 2,0 2,1 3)))" 
+    "MULTIPOLYGON(((1 0,2 1,2 0,1 0)),((0 3,1 4,1 3,0 3)),((2 3,2 4,3 3,2 3)),((1 3,2 3,2 2,0 2,1 3)))"
 };
 
-static std::string case_84_multi[2] = 
+static std::string case_84_multi[2] =
 {
     // iu/ux
     "MULTIPOLYGON(((2 2,3 3,3 2,2 2)),((2 1,2 2,3 1,2 1)),((2 3,3 4,3 3,2 3)),((1 3,2 4,2 2,1 2,1 3)))",
-    "MULTIPOLYGON(((2 3,3 3,3 1,2 1,2 2,1 2,1 3,2 3)))" 
+    "MULTIPOLYGON(((2 3,3 3,3 1,2 1,2 2,1 2,1 3,2 3)))"
 };
 
-static std::string case_85_multi[2] = 
+static std::string case_85_multi[2] =
 {
     // iu/ux (and ux/ux)
     "MULTIPOLYGON(((0 1,0 2,1 2,0 1)),((1 1,1 2,2 1,1 1)),((0 3,1 3,0 2,0 3)))",
-    "MULTIPOLYGON(((1 3,2 3,2 1,1 1,1 2,0 2,1 3)))" 
+    "MULTIPOLYGON(((1 3,2 3,2 1,1 1,1 2,0 2,1 3)))"
 };
 
-static std::string case_86_multi[2] = 
+static std::string case_86_multi[2] =
 {
     // iu/ux
     "MULTIPOLYGON(((4 2,4 3,5 3,4 2)),((5 2,6 3,6 2,5 2)),((5 1,4 1,4 2,5 2,6 1,5 1)))",
-    "MULTIPOLYGON(((5 1,5 2,6 2,6 1,5 1)),((4 2,5 3,5 2,4 2)),((3 2,4 3,4 2,3 2)))" 
+    "MULTIPOLYGON(((5 1,5 2,6 2,6 1,5 1)),((4 2,5 3,5 2,4 2)),((3 2,4 3,4 2,3 2)))"
 };
 
-static std::string case_87_multi[2] = 
+static std::string case_87_multi[2] =
 {
     // iu/ux where iu crosses, no touch
     "MULTIPOLYGON(((5 0,5 1,6 0,5 0)),((6 2,7 3,7 2,6 2)),((5 1,5 3,6 3,6 1,5 1)))",
-    "MULTIPOLYGON(((5 1,5 2,7 2,7 1,6 1,6 0,5 0,5 1)),((4 3,5 3,5 2,3 2,4 3)))" 
+    "MULTIPOLYGON(((5 1,5 2,7 2,7 1,6 1,6 0,5 0,5 1)),((4 3,5 3,5 2,3 2,4 3)))"
 };
 
 
-static std::string case_88_multi[2] = 
+static std::string case_88_multi[2] =
 {
     "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((1 1,1 2,2 1,1 1)),((0 2,0 3,1 3,2 3,2 2,1 2,0 1,0 2)))",
-    "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((0 1,1 2,1 1,0 1)),((0 2,0 3,1 3,1 2,0 2)))" 
+    "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((0 1,1 2,1 1,0 1)),((0 2,0 3,1 3,1 2,0 2)))"
 };
 
-static std::string case_89_multi[2] = 
+static std::string case_89_multi[2] =
 {
     // Extract from rec.boxes_3
     "MULTIPOLYGON(((8 1,7 1,8 2,8 3,9 4,9 2,8.5 1.5,9 1,8 0,8 1)),((9 1,9 2,10 2,10 1,9 0,9 1)))",
-    "MULTIPOLYGON(((8 3,9 4,9 3,8 3)),((7 0,7 1,8 1,8 0,7 0)),((9 2,9 1,8 1,8 3,8.5 2.5,9 3,9 2)))" 
+    "MULTIPOLYGON(((8 3,9 4,9 3,8 3)),((7 0,7 1,8 1,8 0,7 0)),((9 2,9 1,8 1,8 3,8.5 2.5,9 3,9 2)))"
 };
 
-static std::string case_90_multi[2] = 
+static std::string case_90_multi[2] =
 {
     // iu/iu for Union; see ppt
     "MULTIPOLYGON(((1 8,0 8,0 10,1 10,1 9,2 8,2 7,1 7,1 8)),((2 9,2 10,4 10,4 9,3 9,3 8,2 8,2 9)))",
-    "MULTIPOLYGON(((2 8,1 8,1 9,2 9,2 10,3 10,3 8,2 8)),((0 10,2 10,0 8,0 10)))" 
+    "MULTIPOLYGON(((2 8,1 8,1 9,2 9,2 10,3 10,3 8,2 8)),((0 10,2 10,0 8,0 10)))"
 };
 
-static std::string case_91_multi[2] = 
+static std::string case_91_multi[2] =
 {
     // iu/xi for Intersection
     "MULTIPOLYGON(((3 3,3 4,4 4,3 3)),((2 2,1 2,1 4,2 4,2 3,3 3,2 2)))",
-    "MULTIPOLYGON(((2 2,2 3,3 2,2 2)),((2 3,1 3,1 4,1.5 3.5,2 4,2.5 3.5,3 4,3 3,2 3)))" 
+    "MULTIPOLYGON(((2 2,2 3,3 2,2 2)),((2 3,1 3,1 4,1.5 3.5,2 4,2.5 3.5,3 4,3 3,2 3)))"
 };
 
-static std::string case_92_multi[2] = 
+static std::string case_92_multi[2] =
 {
     // iu/iu all aligned (for union)
     "MULTIPOLYGON(((7 2,7 3,8 2,7 2)),((8 4,9 5,9 4,8 4)),((8 2,8 3,9 2,8 2)),((7 3,7 4,8 4,8 3,7 3)),((9 3,9 4,10 4,10 3,9 3)))",
-    "MULTIPOLYGON(((9 2,8 2,8 3,9 3,10 2,9 2)),((7 5,8 5,9 6,9 4,8 4,7 3,6 3,6 4,6.5 3.5,7 4,6 4,7 5)))" 
+    "MULTIPOLYGON(((9 2,8 2,8 3,9 3,10 2,9 2)),((7 5,8 5,9 6,9 4,8 4,7 3,6 3,6 4,6.5 3.5,7 4,6 4,7 5)))"
 };
 
-static std::string case_93_multi[2] = 
+static std::string case_93_multi[2] =
 {
     // iu/xi for intersection
     "MULTIPOLYGON(((6 2,7 2,7 1,5 1,6 2)),((7 3,8 3,7.5 2.5,8 2,7 2,7 3)))",
-    "MULTIPOLYGON(((7 1,6 0,6 2,7 3,7 2,8 3,8 2,7 1)))" 
+    "MULTIPOLYGON(((7 1,6 0,6 2,7 3,7 2,8 3,8 2,7 1)))"
 };
 
 
-static std::string case_94_multi[2] = 
+static std::string case_94_multi[2] =
 {
     // iu/iu for union
     "MULTIPOLYGON(((9 2,9 3,10 3,10 2,9 2)),((7 3,8 4,9 3,8 3,9 2,7 2,7 3)),((8 6,9 5,9 4,8 4,8 6)))",
-    "MULTIPOLYGON(((6 2,6 3,7 3,8 2,6 2)),((9 3,10 3,9 2,9 1,8 0,7 0,8 1,8 3,8.5 2.5,9 3)),((7 4,7 5,8 5,9 6,9 4,8 4,8 3,7 3,7 4)))" 
+    "MULTIPOLYGON(((6 2,6 3,7 3,8 2,6 2)),((9 3,10 3,9 2,9 1,8 0,7 0,8 1,8 3,8.5 2.5,9 3)),((7 4,7 5,8 5,9 6,9 4,8 4,8 3,7 3,7 4)))"
 };
 
-static std::string case_95_multi[2] = 
+static std::string case_95_multi[2] =
 {
     // iu/iu for union
     "MULTIPOLYGON(((0 8,1 8,1 7,0 7,0 8)),((2 8,2 9,2.5 8.5,3 9,3 7,2 7,2 8)),((1 9,1 10,2 9,1 8,1 9)))",
-    "MULTIPOLYGON(((1 7,0 7,0 8,1 8,2 7,1 7)),((2 9,1 9,1 10,2 10,3 9,4 9,4 8,2 8,2 9)))" 
+    "MULTIPOLYGON(((1 7,0 7,0 8,1 8,2 7,1 7)),((2 9,1 9,1 10,2 10,3 9,4 9,4 8,2 8,2 9)))"
 };
- 
-static std::string case_96_multi[2] = 
+
+static std::string case_96_multi[2] =
 {
     // iu/iu all collinear, for intersection/union
     "MULTIPOLYGON(((8 2,9 3,9 2,8 2)),((8 1,9 2,9 1,10 1,10 0,8 0,8 1)))",
-    "MULTIPOLYGON(((9 0,9 1,10 0,9 0)),((8 1,8 2,9 2,9 1,8 1)))" 
+    "MULTIPOLYGON(((9 0,9 1,10 0,9 0)),((8 1,8 2,9 2,9 1,8 1)))"
 };
 
-static std::string case_97_multi[2] = 
+static std::string case_97_multi[2] =
 {
     // ux/ux for union
     "MULTIPOLYGON(((4 4,4 5,4.5 4.5,5 5,6 5,5 4,5 3,4 3,4 4)))",
-    "MULTIPOLYGON(((5 3,5 4,6 3,5 3)),((6 5,7 5,6 4,5 4,6 5)))" 
+    "MULTIPOLYGON(((5 3,5 4,6 3,5 3)),((6 5,7 5,6 4,5 4,6 5)))"
 };
- 
 
-static std::string case_98_multi[2] = 
+
+static std::string case_98_multi[2] =
 {
     // ii/iu for intersection, solved by discarding iu (ordering not possible)
     "MULTIPOLYGON(((2 0,3 1,3 0,2 0)),((2 2,2 3,1 3,1 4,2 4,3 3,3 4,5 2,4 2,4 1,3 1,3 2,2.5 1.5,3 1,2 1,2 2)))",
-    "MULTIPOLYGON(((4 2,4 3,5 2,4 2)),((1 0,0 0,0 2,4 2,4 1,2 1,2 0,1 0)),((3 3,4 4,4 3,3 2,3 3)))" 
+    "MULTIPOLYGON(((4 2,4 3,5 2,4 2)),((1 0,0 0,0 2,4 2,4 1,2 1,2 0,1 0)),((3 3,4 4,4 3,3 2,3 3)))"
 };
 
-static std::string case_99_multi[2] = 
+static std::string case_99_multi[2] =
 {
     // iu/iu for intersection
     "MULTIPOLYGON(((1 0,2 1,2 0,1 0)),((1 2,2 2,1.5 1.5,2 1,1 1,1 0,0 0,0 1,1 2)))",
-    "MULTIPOLYGON(((1 1,2 0,0 0,1 1)),((1 1,0 1,0 2,1 2,2 3,2 2,1 1)))" 
+    "MULTIPOLYGON(((1 1,2 0,0 0,1 1)),((1 1,0 1,0 2,1 2,2 3,2 2,1 1)))"
 };
 
-static std::string case_100_multi[2] = 
+static std::string case_100_multi[2] =
 {
     // for intersection
     "MULTIPOLYGON(((0 0,0 1,1 0,0 0)),((2 2,2 1,0 1,0 2,1 2,2 3,2 2)))",
-    "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((1 2,0 1,0 3,1 4,1 2)))" 
+    "MULTIPOLYGON(((1 1,1 2,2 2,2 1,1 1)),((1 2,0 1,0 3,1 4,1 2)))"
 };
 
-static std::string case_101_multi[2] = 
+static std::string case_101_multi[2] =
 {
     // interior ring / union
     "MULTIPOLYGON(((7 2,7 3,8 2,7 2)),((9 3,9 4,10 3,9 3)),((10 1,10 0,8 0,8 1,9 2,10 2,10 1)),((9 3,9 2,8 2,8 3,7 3,7 4,8 4,9 3)),((8 4,8 7,9 6,9 4,8 4)))",
-    "MULTIPOLYGON(((6 1,5 1,5 2,6 3,6 4,7 5,6 5,7 6,8 6,8 5,9 5,8 4,9 4,9 5,10 5,10 1,8 1,8 3,7 3,7 2,6 2,7 1,8 1,7 0,5 0,5 1,5.5 0.5,6 1),(8.5 2.5,9 2,9 3,8.5 2.5)))" 
+    "MULTIPOLYGON(((6 1,5 1,5 2,6 3,6 4,7 5,6 5,7 6,8 6,8 5,9 5,8 4,9 4,9 5,10 5,10 1,8 1,8 3,7 3,7 2,6 2,7 1,8 1,7 0,5 0,5 1,5.5 0.5,6 1),(8.5 2.5,9 2,9 3,8.5 2.5)))"
 };
 
-static std::string case_102_multi[2] = 
+static std::string case_102_multi[2] =
 {
     // interior ring 'fit' / union
     "MULTIPOLYGON(((0 2,0 7,5 7,5 2,0 2),(4 3,4 6,1 6,2 5,1 5,1 4,3 4,4 3)),((3 4,3 5,4 5,3 4)),((2 5,3 6,3 5,2 4,2 5)))",
-    "MULTIPOLYGON(((0 2,0 7,5 7,5 2,0 2),(2 4,3 5,2 5,2 4),(4 4,3 4,3 3,4 4),(4 5,4 6,3 6,4 5)))" 
+    "MULTIPOLYGON(((0 2,0 7,5 7,5 2,0 2),(2 4,3 5,2 5,2 4),(4 4,3 4,3 3,4 4),(4 5,4 6,3 6,4 5)))"
 };
 
-static std::string case_103_multi[2] = 
+static std::string case_103_multi[2] =
 {
-    // interior ring 'fit' (ix) / union / assemble 
+    // interior ring 'fit' (ix) / union / assemble
     "MULTIPOLYGON(((0 0,0 5,5 5,5 0,2 0,2 1,3 1,3 2,2 2,2 3,1 2,2 2,2 1,1 0,0 0)))",
-    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 1,2 2,1 1,2 1)))" 
+    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 1,2 2,1 1,2 1)))"
 };
 
-static std::string case_104_multi[2] = 
+static std::string case_104_multi[2] =
 {
-    // interior ring 'fit' (ii) / union / assemble 
+    // interior ring 'fit' (ii) / union / assemble
     "MULTIPOLYGON(((1 0,1 1,0 1,0 5,5 5,5 0,2 0,2 1,1 0),(2 2,3 3,2 3,2 2)))",
-    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(1 1,3 1,3 2,1 2,1 1)))" 
+    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(1 1,3 1,3 2,1 2,1 1)))"
 };
 
-static std::string case_105_multi[2] = 
+static std::string case_105_multi[2] =
 {
-    // interior ring 'fit' () / union / assemble 
+    // interior ring 'fit' () / union / assemble
     "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(2 2,3 2,3 3,1 3,2 2)))",
-    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(1 1,2 1,2 2,1 1),(2 1,3 1,3 2,2 1),(1 3,3 3,3 4,2 3,2 4,1 4,1 3)))" 
+    "MULTIPOLYGON(((0 0,0 5,5 5,5 0,0 0),(1 1,2 1,2 2,1 1),(2 1,3 1,3 2,2 1),(1 3,3 3,3 4,2 3,2 4,1 4,1 3)))"
 };
 
-static std::string case_106_multi[2] = 
+static std::string case_106_multi[2] =
 {
-    // interior ring 'fit' () / union / assemble 
+    // interior ring 'fit' () / union / assemble
     "MULTIPOLYGON(((0 0,0 3,1 2,1 3,2 3,2 1,3 2,2 2,3 3,2 3,3 4,1 4,1 3,0 3,0 5,5 5,5 0,0 0)))",
-    "MULTIPOLYGON(((0 0,0 5,1 5,1 4,2 4,2 5,3 5,3 3,4 4,5 4,5 0,2 0,3 1,2 1,2 3,1 3,2 2,1.5 1.5,2 1,1 1,0 0)),((1 0,2 1,2 0,1 0)))" 
+    "MULTIPOLYGON(((0 0,0 5,1 5,1 4,2 4,2 5,3 5,3 3,4 4,5 4,5 0,2 0,3 1,2 1,2 3,1 3,2 2,1.5 1.5,2 1,1 1,0 0)),((1 0,2 1,2 0,1 0)))"
 };
 
-static std::string case_107_multi[2] = 
+static std::string case_107_multi[2] =
 {
     // For CCW polygon reports a iu/iu problem.
     "MULTIPOLYGON(((6 8,7 9,7 7,8 7,7 6,6 6,6 8)),((6.5 9.5,7 10,7 9,6 9,6 10,6.5 9.5)))",
-    "MULTIPOLYGON(((5 7,6 8,6 10,7 9,8 10,8 8,7 8,6 7,6 6,5 7)))" 
+    "MULTIPOLYGON(((5 7,6 8,6 10,7 9,8 10,8 8,7 8,6 7,6 6,5 7)))"
 };
 
 
-static std::string case_recursive_boxes_1[2] = 
+static std::string case_recursive_boxes_1[2] =
 {
     // == 70
     // Used in blog. KEEP
     "MULTIPOLYGON(((1 0,0 0,0 1,1 1,1 2,0 2,0 4,2 4,2 5,3 5,3 6,1 6,1 5,0 5,0 10,9 10,9 9,7 9,7 8,6 8,6 7,8 7,8 6,9 6,9 4,8 4,8 5,7 5,7 6,6 6,6 5,5 5,5 4,4 4,4 3,5 3,5 2,7 2,7 3,6 3,6 4,8 4,8 3,10 3,10 0,6 0,6 1,5 1,5 0,1 0),(4 7,4 9,3 9,3 7,4 7),(8 1,9 1,9 2,8 2,8 1)),((10 7,10 6,9 6,9 7,8 7,8 8,9 8,9 9,10 9,10 7)))",
-    "MULTIPOLYGON(((1 0,0 0,0 7,2 7,2 6,5 6,5 5,4 5,4 4,5 4,5 3,7 3,7 2,6 2,6 0,1 0),(2 1,2 2,3 2,3 3,1 3,1 1,2 1)),((7 0,7 2,10 2,10 0,9 0,9 1,8 1,8 0,7 0)),((6 4,6 6,5 6,5 7,6 7,6 8,5 8,5 7,3 7,3 9,2 9,2 8,1 8,1 10,4 10,4 9,6 9,6 10,10 10,10 9,9 9,9 8,10 8,10 6,9 6,9 5,10 5,10 3,7 3,7 4,6 4),(7 7,7 6,8 6,8 7,7 7)))" 
+    "MULTIPOLYGON(((1 0,0 0,0 7,2 7,2 6,5 6,5 5,4 5,4 4,5 4,5 3,7 3,7 2,6 2,6 0,1 0),(2 1,2 2,3 2,3 3,1 3,1 1,2 1)),((7 0,7 2,10 2,10 0,9 0,9 1,8 1,8 0,7 0)),((6 4,6 6,5 6,5 7,6 7,6 8,5 8,5 7,3 7,3 9,2 9,2 8,1 8,1 10,4 10,4 9,6 9,6 10,10 10,10 9,9 9,9 8,10 8,10 6,9 6,9 5,10 5,10 3,7 3,7 4,6 4),(7 7,7 6,8 6,8 7,7 7)))"
 };
 
-static std::string case_recursive_boxes_2[2] = 
+static std::string case_recursive_boxes_2[2] =
 {
-    // Traversal problem; Many ii-cases -> formerly caused "Endless loop" 
+    // Traversal problem; Many ii-cases -> formerly caused "Endless loop"
     // So it appears that there might be more decisions than intersection points
     "MULTIPOLYGON(((1 0,0 0,0 4,1 4,1 5,0 5,0 10,3 10,3 9,4 9,4 10,6 10,6 9,5 9,5 8,6 8,6 9,7 9,7 10,10 10,10 0,1 0),(7 6,8 6,8 7,9 7,9 8,8 8,8 7,7 7,7 6),(9 1,9 2,8 2,8 1,9 1)))",
-    "MULTIPOLYGON(((0 0,0 10,10 10,10 0,8 0,8 1,7 1,7 0,0 0),(7 3,6 3,6 2,7 2,7 3),(6 7,7 7,7 8,6 8,6 7)))" 
+    "MULTIPOLYGON(((0 0,0 10,10 10,10 0,8 0,8 1,7 1,7 0,0 0),(7 3,6 3,6 2,7 2,7 3),(6 7,7 7,7 8,6 8,6 7)))"
 };
 
 
-static std::string case_recursive_boxes_3[2] = 
+static std::string case_recursive_boxes_3[2] =
 {
-    // Previously a iu/ux problem causing union to fail. 
+    // Previously a iu/ux problem causing union to fail.
     // For CCW polygon it also reports a iu/iu problem.
     // KEEP
     "MULTIPOLYGON(((8 3,9 4,9 3,8 3)),((5 9,5 10,6 10,5 9)),((2 0,2 1,3 0,2 0)),((2 5,2 6,3 6,3 5,2 5)),((2 2,1 2,1 3,2 3,3 2,3 1,2 1,2 2)),((6 8,7 9,7 7,8 7,7 6,6 6,6 8)),((4 6,5 7,5 6,4 6)),((4 8,4 9,5 9,5 8,4 8)),((0 3,1 4,1 3,0 3)),((8 7,9 8,9 7,8 7)),((9 6,9 7,10 7,9 6)),((7 0,8 1,8 0,7 0)),((0 4,0 5,1 5,1 4,0 4)),((4 2,5 3,5 2,4 1,4 2)),((4 10,4 9,2 9,3 10,4 10)),((5 2,6 3,7 3,7 2,6 2,6 1,5 0,5 2)),((5 3,4 3,4 4,2 4,4 6,4 5,4.5 4.5,6 6,6 5,7 4,5 4,5 3)),((10 2,9 1,9 3,10 2)),((8 4,7 4,8 5,7 5,7 6,9 6,9 5,10 5,10 4,8 4)),((1 7,0 7,0 8,1 8,1 7)),((1 10,2 10,1 9,0 9,0 10,1 10)),((6.5 9.5,7 10,7 9,6 9,6 10,6.5 9.5)),((8 8,8 9,10 9,9 8,8 8)))",
-    "MULTIPOLYGON(((0 7,0 8,1 8,1 7,0 7)),((5 3,4 3,4 4,6 4,6 3,7 3,6 2,5 2,5 3)),((8 2,8 3,9 2,8 2)),((1 1,2 2,2 1,1 1)),((2 1,3 1,2 0,1 0,2 1)),((2 3,3 4,3 3,2 3)),((1 9,2 8,1 8,1 9)),((2 10,2 9,1 9,1 10,2 10)),((9 7,9 8,10 8,10 7,9 7)),((6 0,6 1,7 1,7 0,6 0)),((8 0,9 1,9 0,8 0)),((1 6,1 5,0 5,1 6)),((0 2,1 1,0 1,0 2)),((1 3,2 3,2 2,1 2,1 3)),((5 1,5 0,4 0,4 1,3 1,4 2,5 2,6 1,5 1)),((1 3,0 3,0 4,1 4,1 3)),((3 6,4 5,2 5,3 6)),((9 2,10 2,10 1,9 1,9 2)),((7 5,6 4,6 5,7 6,8 6,8 5,7 5)),((7 4,8 5,8.5 4.5,9 5,9 4,8 4,8.5 3.5,9 4,10 3,7 3,7 4)),((1 6,1 7,3 7,3 8,4 7,5 7,6 8,6 10,7 9,8 10,9 10,9 9,8 9,8 8,7 8,6 7,6 6,1 6)))" 
+    "MULTIPOLYGON(((0 7,0 8,1 8,1 7,0 7)),((5 3,4 3,4 4,6 4,6 3,7 3,6 2,5 2,5 3)),((8 2,8 3,9 2,8 2)),((1 1,2 2,2 1,1 1)),((2 1,3 1,2 0,1 0,2 1)),((2 3,3 4,3 3,2 3)),((1 9,2 8,1 8,1 9)),((2 10,2 9,1 9,1 10,2 10)),((9 7,9 8,10 8,10 7,9 7)),((6 0,6 1,7 1,7 0,6 0)),((8 0,9 1,9 0,8 0)),((1 6,1 5,0 5,1 6)),((0 2,1 1,0 1,0 2)),((1 3,2 3,2 2,1 2,1 3)),((5 1,5 0,4 0,4 1,3 1,4 2,5 2,6 1,5 1)),((1 3,0 3,0 4,1 4,1 3)),((3 6,4 5,2 5,3 6)),((9 2,10 2,10 1,9 1,9 2)),((7 5,6 4,6 5,7 6,8 6,8 5,7 5)),((7 4,8 5,8.5 4.5,9 5,9 4,8 4,8.5 3.5,9 4,10 3,7 3,7 4)),((1 6,1 7,3 7,3 8,4 7,5 7,6 8,6 10,7 9,8 10,9 10,9 9,8 9,8 8,7 8,6 7,6 6,1 6)))"
 };
 
 
-static std::string case_recursive_boxes_4[2] = 
+static std::string case_recursive_boxes_4[2] =
 {
     // Occurred after refactoring assemble
     "MULTIPOLYGON(((9 3,10 4,10 3,9 3)),((9 9,10 10,10 9,9 9)),((0 1,0 3,1 4,0 4,0 5,1 6,0 6,0 8,1 9,1 8,2 9,2 7,1.5 6.5,2.5 5.5,3 6,3 5,4 6,2 6,2 7,3 8,2 8,3 9,0 9,0 10,6 10,5.5 9.5,6 9,6 10,7 10,7.5 9.5,8 10,8 9,7 9,7 8,6 8,6.5 7.5,7 8,8 8,8 9,9 9,9.5 8.5,10 9,10 8,9.5 7.5,10 7,10 5,8 5,8 4,7 3,7 2,8 3,8 4,9 5,9 3,10 2,10 1,8 1,8.5 0.5,9 1,10 0,4 0,4 1,3 1,3 0,1 0,1 1,0 0,0 1),(4 2,4.5 1.5,5 2,5 4,4.5 3.5,5 3,4 3,4 2),(3 3,4 4,2 4,2.5 3.5,3 4,3 3),(6 4,6.5 3.5,7 4,6 4),(5 7,5 9,4 9,4 8,5 7)))",
-    "MULTIPOLYGON(((1 0,2 1,2 0,1 0)),((7 9,7 10,8 10,7 9)),((1 0,0 0,0 3,1 3,2 2,2 3,1 3,1 4,2 4,2 5,1 4,0 4,0 8,1 7,1 6,2 7,1 7,1 9,0 9,0 10,7 10,6 9,6.5 8.5,7 9,8 9,9 8,8 8,9 7,9 6,10 7,10 5,9 5,9 4,10 5,10 0,7 0,8 1,7 1,6 0,3 0,3 1,1 1,1 0),(5 1,5.5 0.5,6 1,6 2,6.5 1.5,7 2,8 2,8 4,7 3,6 3,6 2,5 2,6 1,5 1),(4 4,5 4,5 5,4 4),(4 6,4 7,3 7,2 6,3 6,3 7,4 6),(6 5,6.5 4.5,7 5,6 5,7 6,7 7,6 7,6 5),(3.5 7.5,4 8,4 9,3 8,3.5 7.5)),((9 8,9 9,8 9,9 10,10 10,10 8,9 8)))" 
+    "MULTIPOLYGON(((1 0,2 1,2 0,1 0)),((7 9,7 10,8 10,7 9)),((1 0,0 0,0 3,1 3,2 2,2 3,1 3,1 4,2 4,2 5,1 4,0 4,0 8,1 7,1 6,2 7,1 7,1 9,0 9,0 10,7 10,6 9,6.5 8.5,7 9,8 9,9 8,8 8,9 7,9 6,10 7,10 5,9 5,9 4,10 5,10 0,7 0,8 1,7 1,6 0,3 0,3 1,1 1,1 0),(5 1,5.5 0.5,6 1,6 2,6.5 1.5,7 2,8 2,8 4,7 3,6 3,6 2,5 2,6 1,5 1),(4 4,5 4,5 5,4 4),(4 6,4 7,3 7,2 6,3 6,3 7,4 6),(6 5,6.5 4.5,7 5,6 5,7 6,7 7,6 7,6 5),(3.5 7.5,4 8,4 9,3 8,3.5 7.5)),((9 8,9 9,8 9,9 10,10 10,10 8,9 8)))"
 };
 
-static std::string pie_21_7_21_0_3[2] = 
+static std::string pie_21_7_21_0_3[2] =
 {
     "MULTIPOLYGON(((2500 2500,2500 3875,2855 3828,3187 3690,3472 3472,3690 3187,3828 2855,3875 2500,3828 2144,3690 1812,3472 1527,3187 1309,2855 1171,2499 1125,2144 1171,1812 1309,1527 1527,1309 1812,1171 2144,1125 2499,1171 2855,1309 3187,2500 2500)))",
-    "MULTIPOLYGON(((2500 2500,1704 3295,1937 3474,2208 3586,2499 3625,2791 3586,3062 3474,3295 3295,2500 2500)),((2500 2500,3586 2791,3625 2500,3586 2208,2500 2500)))" 
+    "MULTIPOLYGON(((2500 2500,1704 3295,1937 3474,2208 3586,2499 3625,2791 3586,3062 3474,3295 3295,2500 2500)),((2500 2500,3586 2791,3625 2500,3586 2208,2500 2500)))"
 };
 
-static std::string pie_23_19_5_0_2[2] = 
+static std::string pie_23_19_5_0_2[2] =
 {
     "MULTIPOLYGON(((2500 2500,2500 3875,2855 3828,3187 3690,3472 3472,3690 3187,3828 2855,3875 2500,3828 2144,3690 1812,3472 1527,3187 1309,2855 1171,2499 1125,2144 1171,1812 1309,1527 1527,1309 1812,1171 2144,1125 2499,1171 2855,1309 3187,1527 3472,1812 3690,2500 2500)))",
-    "MULTIPOLYGON(((2500 2500,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,1413 2791,1525 3062,1704 3295,1937 3474,2208 3586,2500 2500)),((2500 2500,2791 3586,3062 3474,2500 2500)))" 
+    "MULTIPOLYGON(((2500 2500,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,1413 2791,1525 3062,1704 3295,1937 3474,2208 3586,2500 2500)),((2500 2500,2791 3586,3062 3474,2500 2500)))"
 };
 
-static std::string pie_7_14_5_0_7[2] = 
+static std::string pie_7_14_5_0_7[2] =
 {
     "MULTIPOLYGON(((2500 2500,2500 3875,2855 3828,3187 3690,3472 3472,3690 3187,3828 2855,3875 2500,2500 2500)))",
-    "MULTIPOLYGON(((2500 2500,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,2500 2500)),((2500 2500,1525 3062,1704 3295,1937 3474,2208 3586,2499 3625,2791 3586,3062 3474,2500 2500)))" 
+    "MULTIPOLYGON(((2500 2500,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,2500 2500)),((2500 2500,1525 3062,1704 3295,1937 3474,2208 3586,2499 3625,2791 3586,3062 3474,2500 2500)))"
 };
 
-static std::string pie_16_16_9_0_2[2] = 
+static std::string pie_16_16_9_0_2[2] =
 {
     "MULTIPOLYGON(((2500 2500,2500 3875,2855 3828,3187 3690,3472 3472,3690 3187,3828 2855,3875 2500,3828 2144,3690 1812,3472 1527,3187 1309,2855 1171,2499 1125,2144 1171,1812 1309,1527 1527,2500 2500)))",
-    "MULTIPOLYGON(((2500 2500,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,1413 2791,1525 3062,1704 3295,1937 3474,2208 3586,2499 3625,2500 2500)),((2500 2500,3062 3474,3295 3295,2500 2500)))" 
+    "MULTIPOLYGON(((2500 2500,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,1413 2791,1525 3062,1704 3295,1937 3474,2208 3586,2499 3625,2500 2500)),((2500 2500,3062 3474,3295 3295,2500 2500)))"
 };
 
-static std::string pie_7_2_1_0_15[2] = 
+static std::string pie_7_2_1_0_15[2] =
 {
     "MULTIPOLYGON(((2500 2500,2500 3875,2855 3828,3187 3690,3472 3472,3690 3187,3828 2855,3875 2500,2500 2500)))",
-    "MULTIPOLYGON(((2500 2500,2791 3586,3062 3474,2500 2500)),((2500 2500,3474 3062,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,2500 2500)))" 
+    "MULTIPOLYGON(((2500 2500,2791 3586,3062 3474,2500 2500)),((2500 2500,3474 3062,3586 2791,3625 2500,3586 2208,3474 1937,3295 1704,3062 1525,2791 1413,2499 1375,2208 1413,1937 1525,1704 1704,1525 1937,1413 2208,1375 2500,2500 2500)))"
 };
 
 // Case, not literally on this list but derived, to mix polygon/multipolygon in call to difference
@@ -419,17 +419,17 @@ static std::string ggl_list_20111025_vd[4] =
     "MULTIPOLYGON(((10 0,10 5,15 0,10 0)))"
     };
 
-// Same, mail with other case with text "Say the MP is the 2 squares below and P is the blue-ish rectangle."    
+// Same, mail with other case with text "Say the MP is the 2 squares below and P is the blue-ish rectangle."
 static std::string ggl_list_20111025_vd_2[2] =
     {
     "POLYGON((5 0,5 4,8 4,8 0,5 0))",
     "MULTIPOLYGON(((0 0,0 2,2 2,2 0,0 0)),((4 0,4 2,6 2,6 0,4 0)))"
     };
-    
+
 // Mail of h2 indicating that reversed order (in second polygon) has ix/ix problems
 static std::string ggl_list_20120915_h2[3] =
     {
-        "MULTIPOLYGON(((-2 5, -1 5, 0 5, 2 5, 2 -2, 1 -2, 1 -1, 0 -1,0 0, -1 0, -2 0, -2 5)))", 
+        "MULTIPOLYGON(((-2 5, -1 5, 0 5, 2 5, 2 -2, 1 -2, 1 -1, 0 -1,0 0, -1 0, -2 0, -2 5)))",
         "MULTIPOLYGON(((0 0, 1 0, 1 -1, 0 -1, 0 0)), ((-1 5, 0 5, 0 0, -1 0, -1 5)))",
         "MULTIPOLYGON(((-1 5, 0 5, 0 0, -1 0, -1 5)), ((0 0, 1 0, 1 -1, 0 -1, 0 0)))"
     };
@@ -442,5 +442,17 @@ static std::string ggl_list_20120221_volker[2] =
         "MULTIPOLYGON(((3232 2532.469945355191,2136 2790,1032 1764,1032 1458,1032 1212,2136 2328,3232 2220.196721311475,3232 1056,1031 1056,1031 2856,3232 2856,3232 2532.469945355191),(3232 2412.426229508197,2136 2646,3232 2412.426229508197)))"
     };
 
+static std::string ggl_list_20140212_sybren[2] =
+    {
+        "MULTIPOLYGON(((0.494062 0.659354,0.471383 0.64654,0.446639 0.616561,0.47291 0.61171,0.495396 0.625263,0.494964 0.679709,0.494062 0.659354)))",
+        "MULTIPOLYGON(((0.4951091661995328 0.6614133543986973,0.495396 0.625263,0.50092 0.6492750000000001,0.494964 0.679709,0.477258 0.698703,0.4951091661995328 0.6614133543986973)),((0.452167 0.706562,0.433379 0.696888,0.442673 0.65792,0.464729 0.671387,0.452167 0.706562)))"
+    };
+
+static std::string ticket_9081[2] =
+    {
+        "MULTIPOLYGON(((0.5489109414010371 0.5774835110050927,0.4099611282054447 0.4644351568071598,0.4294011278595494 0.4843224236729239,0.4205359995313906 0.5115225580860201,0.4441572412013468 0.5184999851878852,0.5489109414010371 0.5774835110050927)),((0.562085028126843 0.5882018328808966,0.5644349663154944 0.591180348361206,0.568218114394707 0.5970364466647042,0.5838690879677763 0.6212632646137447,0.5873787029417971 0.6412877041753083,0.468699602592386 0.5866280231830688,0.4171010902425981 0.5220616039851281,0.4059124592966251 0.5563907478354578,0.3909547828925878 0.6022841397455458,0.520859401226844 0.9508041627246925,0.8595233008819849 0.8301950132755517,0.562085028126843 0.5882018328808966)))",
+        "MULTIPOLYGON(((0.2099392122251989 0.492066865490789,0.1124301889095737 0.5124668111209448,0.3306914939102383 0.6126684490171914,0.2099392122251989 0.492066865490789)),((0.5885369465145437 0.6478961722242873,0.5342320718598281 0.6686303269145104,0.5619623880692838 0.7033299168703926,0.5945761233023867 0.6823532655194001,0.5885369465145437 0.6478961722242873)),((0.5570738195183501 0.6001870087680015,0.5429714753344335 0.6231021858940831,0.5880357506342242 0.6450365518134291,0.5838690879677763 0.6212632646137447,0.568218114394707 0.5970364466647042,0.5570738195183501 0.6001870087680015)),((0.5498478321815098 0.5029279381860542,0.608691671498764 0.5163121433149205,0.5636607291345047 0.5894838094559455,0.8595233008819849 0.8301950132755517,0.8285440738598029 0.8412277162756114,0.9591357158116398 0.9011810663167211,0.8572649311807611 0.3566393017365032,0.5965816668471951 0.4111770689940296,0.5498478321815098 0.5029279381860542)),((0.3984249865018206 0.4526335964808558,0.3621206996557855 0.4602288471829723,0.4183516736935784 0.4730187483833363,0.4099611282054451 0.4644351568071601,0.3984249865018206 0.4526335964808558)))"
+    };
+
 
 #endif // BOOST_GEOMETRY_TEST_MULTI_OVERLAY_CASES_HPP
diff --git a/test/multi/algorithms/overlay/multi_overlay_common.hpp b/test/multi/algorithms/overlay/multi_overlay_common.hpp
index 5f24f3e82..6a49c300d 100644
--- a/test/multi/algorithms/overlay/multi_overlay_common.hpp
+++ b/test/multi/algorithms/overlay/multi_overlay_common.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/multi/algorithms/overlay/multi_traverse.cpp b/test/multi/algorithms/overlay/multi_traverse.cpp
index faacd3615..7cab06c96 100644
--- a/test/multi/algorithms/overlay/multi_traverse.cpp
+++ b/test/multi/algorithms/overlay/multi_traverse.cpp
@@ -23,6 +23,7 @@
 #include <boost/geometry/multi/core/ring_type.hpp>
 
 #include <boost/geometry/multi/algorithms/correct.hpp>
+#include <boost/geometry/multi/algorithms/envelope.hpp>
 #include <boost/geometry/multi/algorithms/num_points.hpp>
 #include <boost/geometry/multi/algorithms/detail/overlay/copy_segments.hpp>
 #include <boost/geometry/multi/algorithms/detail/overlay/copy_segment_point.hpp>
@@ -159,7 +160,7 @@ void test_geometries()
         );
     test_traverse_intersection::apply
         (
-            "case_96_multi", 2, 1.0,
+            "case_96_multi", 1, 0.5,
             case_96_multi[0], case_96_multi[1]
         );
     test_traverse_intersection::apply
diff --git a/test/multi/io/dsv/dsv.cpp b/test/multi/io/dsv/dsv.cpp
index 7f565906f..0af8f10e9 100644
--- a/test/multi/io/dsv/dsv.cpp
+++ b/test/multi/io/dsv/dsv.cpp
@@ -48,7 +48,7 @@ void test_all()
 
     test_dsv<mpoint>
         (
-            "multipoint((1 2),(3 4))", 
+            "multipoint((1 2),(3 4))",
             "((1, 2), (3, 4))"
         );
     test_dsv<mline>
@@ -66,7 +66,7 @@ void test_all()
     // http://geojson.org/geojson-spec.html#id5
     test_dsv<mpoint>
         (
-            "multipoint((1 2),(3 4))", 
+            "multipoint((1 2),(3 4))",
             "[ [1, 2], [3, 4] ]",
             true
         );
diff --git a/test/multi/io/wkt/wkt.cpp b/test/multi/io/wkt/wkt.cpp
index a149946cf..317f0578c 100644
--- a/test/multi/io/wkt/wkt.cpp
+++ b/test/multi/io/wkt/wkt.cpp
@@ -55,7 +55,7 @@ void test_all()
     test_wkt<bg::model::multi_linestring<bg::model::linestring<P> > >("multilinestring((1 1,2 2,3 3),(4 4,5 5,6 6))", 6, 4 * sqrt(2.0));
     test_wkt<bg::model::multi_polygon<bg::model::polygon<P> > >("multipolygon(((0 0,0 2,2 2,2 0,0 0),(1 1,1 2,2 2,2 1,1 1)),((0 0,0 4,4 4,4 0,0 0)))", 15, 0, 21, 28);
 
-    // Support for the official alternative syntax for multipoint 
+    // Support for the official alternative syntax for multipoint
     // (provided by Aleksey Tulinov):
     test_relaxed_wkt<bg::model::multi_point<P> >("multipoint(1 2,3 4)", "multipoint((1 2),(3 4))");
 
@@ -64,7 +64,7 @@ void test_all()
         "expected '('");
 
     test_wrong_wkt<bg::model::multi_linestring<bg::model::linestring<P> > >(
-        "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10)), (0 0, 1 1)", 
+        "MULTILINESTRING ((10 10, 20 20, 10 40), (40 40, 30 30, 40 20, 30 10)), (0 0, 1 1)",
         "too much tokens at ','");
 
     test_wrong_wkt<bg::model::multi_point<P> >(
diff --git a/test/policies/Jamfile.v2 b/test/policies/Jamfile.v2
index 741c4d1bc..22c58c89c 100644
--- a/test/policies/Jamfile.v2
+++ b/test/policies/Jamfile.v2
@@ -11,4 +11,5 @@
 test-suite boost-geometry-policies
     :
     [ run compare.cpp ]
+    [ run rescale_policy.cpp ]
     ;
diff --git a/test/policies/compare.cpp b/test/policies/compare.cpp
index adb9f0309..3e4b1b021 100644
--- a/test/policies/compare.cpp
+++ b/test/policies/compare.cpp
@@ -32,7 +32,6 @@ template <typename Container>
 inline std::string coordinates(Container const& points)
 {
     std::ostringstream out;
-    typedef typename boost::range_value<Container>::type point_type;
     for (typename boost::range_const_iterator<Container>::type it = boost::begin(points);
         it != boost::end(points);
         ++it)
@@ -132,8 +131,6 @@ void test_2d_compare()
 template <typename P>
 void test_2d_sort()
 {
-    typedef typename bg::coordinate_type<P>::type ct;
-
     std::vector<P> v;
     v.push_back(bg::make<P>(3, 1));
     v.push_back(bg::make<P>(2, 3));
diff --git a/test/policies/rescale_policy.cpp b/test/policies/rescale_policy.cpp
new file mode 100644
index 000000000..c91f31988
--- /dev/null
+++ b/test/policies/rescale_policy.cpp
@@ -0,0 +1,133 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#include <iostream>
+#include <string>
+
+#include <boost/foreach.hpp>
+
+#include <boost/geometry/algorithms/correct.hpp>
+#include <boost/geometry/algorithms/detail/recalculate.hpp>
+#include <boost/geometry/algorithms/length.hpp>
+#include <boost/geometry/algorithms/num_points.hpp>
+#include <boost/geometry/geometries/geometries.hpp>
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/iterators/point_iterator.hpp>
+#include <boost/geometry/policies/robustness/get_rescale_policy.hpp>
+
+#include <boost/geometry/io/wkt/wkt.hpp>
+
+
+
+#include <geometry_test_common.hpp>
+
+
+template
+<
+    typename RescalePolicy,
+    typename Geometry1,
+    typename Geometry2
+>
+void test_one(std::string const& wkt1, std::string const& wkt2,
+        std::string const& expected_coordinates)
+{
+    Geometry1 geometry1;
+    bg::read_wkt(wkt1, geometry1);
+
+    Geometry2 geometry2;
+    bg::read_wkt(wkt2, geometry2);
+
+    RescalePolicy rescale_policy
+            = bg::get_rescale_policy<RescalePolicy>(geometry1, geometry2);
+
+    typedef typename bg::point_type<Geometry1>::type point_type;
+    typedef typename bg::robust_point_type
+        <
+            point_type, RescalePolicy
+        >::type robust_point_type;
+
+    {
+        robust_point_type robust_point;
+        bg::recalculate(robust_point, *bg::points_begin(geometry1), rescale_policy);
+
+        std::ostringstream out;
+        out << bg::get<0>(robust_point) << " " << bg::get<1>(robust_point);
+        BOOST_CHECK_EQUAL(expected_coordinates, out.str());
+    }
+
+    {
+        // Assuming Geometry1 is a polygon:
+        typedef bg::model::polygon<robust_point_type> polygon_type;
+        polygon_type geometry_out;
+        bg::recalculate(geometry_out, geometry1, rescale_policy);
+        robust_point_type p = *bg::points_begin(geometry_out);
+
+        std::ostringstream out;
+        out << bg::get<0>(p) << " " << bg::get<1>(p);
+        BOOST_CHECK_EQUAL(expected_coordinates, out.str());
+    }
+}
+
+
+
+static std::string simplex_normal[2] =
+    {"POLYGON((0 1,2 5,5 3,0 1))",
+    "POLYGON((3 0,0 3,4 5,3 0))"};
+
+static std::string simplex_large[2] =
+    {"POLYGON((0 1000,2000 5000,5000 3000,0 1000))",
+    "POLYGON((3000 0,0 3000,4000 5000,3000 0))"};
+
+
+template <bool Rescale, typename P>
+void test_rescale(std::string const& expected_normal, std::string const& expected_large)
+{
+    typedef bg::model::polygon<P> polygon;
+
+    typedef typename boost::mpl::if_c
+        <
+            Rescale,
+            typename bg::rescale_policy_type<P>::type ,
+            bg::detail::no_rescale_policy
+        >::type rescale_policy_type;
+
+    test_one<rescale_policy_type, polygon, polygon>(
+        simplex_normal[0], simplex_normal[1],
+        expected_normal);
+    test_one<rescale_policy_type, polygon, polygon>(
+        simplex_large[0], simplex_large[1],
+        expected_large);
+}
+
+template <typename T>
+void test_all(std::string const& expected_normal, std::string const& expected_large)
+{
+    typedef bg::model::d2::point_xy<T> point_type;
+    test_rescale<true, point_type>(expected_normal, expected_large);
+    //test_rescale<false, point_type>();
+}
+
+
+int test_main(int, char* [])
+{
+    test_all<double>("-5000000 -3000000", "-5000000 -3000000");
+    test_all<long double>("-5000000 -3000000", "-5000000 -3000000");
+    test_all<int>("0 1", "0 1000");
+    test_all<boost::long_long_type>("0 1", "0 1000");
+    //    test_all<short int>(); // compiles but overflows
+
+    return 0;
+}
+
diff --git a/test/robustness/common/common_settings.hpp b/test/robustness/common/common_settings.hpp
index 050f5367f..2d4153a47 100644
--- a/test/robustness/common/common_settings.hpp
+++ b/test/robustness/common/common_settings.hpp
@@ -15,7 +15,7 @@ struct common_settings
     bool wkt;
     bool also_difference;
     double tolerance;
-    
+
     int field_size;
     bool triangular;
 
diff --git a/test/robustness/common/make_square_polygon.hpp b/test/robustness/common/make_square_polygon.hpp
index 764fc4bb8..a40eda790 100644
--- a/test/robustness/common/make_square_polygon.hpp
+++ b/test/robustness/common/make_square_polygon.hpp
@@ -15,7 +15,7 @@ template <typename Polygon, typename Generator, typename Settings>
 inline void make_square_polygon(Polygon& polygon, Generator& generator, Settings const& settings)
 {
     using namespace boost::geometry;
-    
+
     typedef typename point_type<Polygon>::type point_type;
     typedef typename coordinate_type<Polygon>::type coordinate_type;
 
diff --git a/test/robustness/convex_hull/random_multi_points.cpp b/test/robustness/convex_hull/random_multi_points.cpp
index a0d3efb54..c7b146681 100644
--- a/test/robustness/convex_hull/random_multi_points.cpp
+++ b/test/robustness/convex_hull/random_multi_points.cpp
@@ -124,7 +124,7 @@ void test_random_multi_points(MultiPoint& result, int& index,
     }
     if (settings.wkt)
     {
-        std::cout 
+        std::cout
             << "input: " << bg::wkt(mp) << std::endl
             << "output: " << bg::wkt(hull) << std::endl
             << std::endl;
diff --git a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
index 5dc2be518..5d9c54580 100644
--- a/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
+++ b/test/robustness/overlay/buffer/recursive_polygons_buffer.cpp
@@ -213,12 +213,12 @@ bool test_buffer(MultiPolygon& result, int& index,
 		{
 			case 1 :
 				bg::buffer_inserter<polygon_type>(mp, std::back_inserter(buffered),
-								distance_strategy, 
+								distance_strategy,
 								bg::strategy::buffer::join_round<point_type, point_type>());
 				break;
 			case 2 :
 				bg::buffer_inserter<polygon_type>(mp, std::back_inserter(buffered),
-								distance_strategy, 
+								distance_strategy,
 								bg::strategy::buffer::join_miter<point_type, point_type>());
 				break;
 			default :
diff --git a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
index 6585a227e..8e057471d 100644
--- a/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
+++ b/test/robustness/overlay/linear_areal/recursive_polygons_linear_areal.cpp
@@ -277,7 +277,7 @@ bool verify(std::string const& caseid, MultiPolygon const& mp, Linestring const&
     length_type len_intersection = bg::length(intersection);
     if (! bg::math::equals(len_input, len_difference + len_intersection))
     {
-        std::cout << "Input: " << len_input 
+        std::cout << "Input: " << len_input
             << " difference: " << len_difference
             << " intersection: " << len_intersection
             << std::endl;
diff --git a/test/strategies/Jamfile.v2 b/test/strategies/Jamfile.v2
index 889ce66a9..567aca453 100644
--- a/test/strategies/Jamfile.v2
+++ b/test/strategies/Jamfile.v2
@@ -1,8 +1,13 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -11,10 +16,13 @@
 test-suite boost-geometry-strategies
     :
     [ run cross_track.cpp ]
+    [ run distance_default_result.cpp ]
     [ run haversine.cpp ]
     [ run projected_point.cpp ]
     [ run pythagoras.cpp ]
+    [ run pythagoras_point_box.cpp ]
     [ run spherical_side.cpp ]
+    [ run segment_intersection_collinear.cpp ]
     [ run transform_cs.cpp ]
     [ run transformer.cpp ]
     [ run within.cpp ]
diff --git a/test/strategies/cross_track.cpp b/test/strategies/cross_track.cpp
index 2d3b031de..1b02c8835 100644
--- a/test/strategies/cross_track.cpp
+++ b/test/strategies/cross_track.cpp
@@ -1,9 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -15,6 +20,8 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/core/ignore_unused.hpp>
+
 #include <boost/geometry/io/wkt/read.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
@@ -29,19 +36,19 @@
 #include <boost/geometry/geometries/segment.hpp>
 
 
-// This test is GIS oriented. 
+// This test is GIS oriented.
 
 
 template <typename Point, typename LatitudePolicy>
 void test_distance(
-            typename bg::coordinate_type<Point>::type const& lon1, 
+            typename bg::coordinate_type<Point>::type const& lon1,
             typename bg::coordinate_type<Point>::type const& lat1,
-            typename bg::coordinate_type<Point>::type const& lon2, 
+            typename bg::coordinate_type<Point>::type const& lon2,
             typename bg::coordinate_type<Point>::type const& lat2,
-            typename bg::coordinate_type<Point>::type const& lon3, 
+            typename bg::coordinate_type<Point>::type const& lon3,
             typename bg::coordinate_type<Point>::type const& lat3,
-            typename bg::coordinate_type<Point>::type const& radius, 
-            typename bg::coordinate_type<Point>::type const& expected, 
+            typename bg::coordinate_type<Point>::type const& radius,
+            typename bg::coordinate_type<Point>::type const& expected,
             typename bg::coordinate_type<Point>::type const& tolerance)
 {
     typedef bg::strategy::distance::cross_track
@@ -57,6 +64,23 @@ void test_distance(
         >::type return_type;
 
 
+    {
+        // compile-check if there is a strategy for this type
+        typedef typename bg::strategy::distance::services::default_strategy
+            <
+                bg::point_tag, bg::segment_tag, Point, Point
+            >::type cross_track_strategy_type;
+
+        typedef typename bg::strategy::distance::services::default_strategy
+            <
+                bg::segment_tag, bg::point_tag, Point, Point
+            >::type reversed_tags_cross_track_strategy_type;
+
+        boost::ignore_unused<cross_track_strategy_type,
+                             reversed_tags_cross_track_strategy_type>();
+    }
+
+
     BOOST_CONCEPT_ASSERT
         (
             (bg::concept::PointSegmentDistanceStrategy<strategy_type, Point, Point>)
@@ -130,7 +154,7 @@ void test_all()
 {
     typename bg::coordinate_type<Point>::type const average_earth_radius = 6372795.0;
 
-    // distance (Paris <-> Amsterdam/Barcelona), 
+    // distance (Paris <-> Amsterdam/Barcelona),
     // with coordinates rounded as below ~87 km
     // is equal to distance (Paris <-> Barcelona/Amsterdam)
     typename bg::coordinate_type<Point>::type const p_to_ab = 86.798321 * 1000.0;
diff --git a/test/strategies/distance_default_result.cpp b/test/strategies/distance_default_result.cpp
new file mode 100644
index 000000000..40315d207
--- /dev/null
+++ b/test/strategies/distance_default_result.cpp
@@ -0,0 +1,270 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_distance_default_result
+#endif
+
+#include <cstddef>
+#include <iostream>
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/geometry/util/calculation_type.hpp>
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/segment.hpp>
+#include <boost/geometry/geometries/box.hpp>
+
+#include <boost/geometry/strategies/strategies.hpp>
+#include <boost/geometry/strategies/default_distance_result.hpp>
+#include <boost/geometry/strategies/default_comparable_distance_result.hpp>
+
+#if defined(HAVE_TTMATH)
+#include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#endif
+
+namespace bg = ::boost::geometry;
+
+
+template <typename DefaultResult, typename ExpectedResult>
+struct assert_equal_types
+{
+    assert_equal_types()
+    {
+        static const bool are_same =
+            boost::is_same<DefaultResult, ExpectedResult>::type::value;
+
+        BOOST_MPL_ASSERT_MSG((are_same),
+                             WRONG_DEFAULT_DISTANCE_RESULT,
+                             (types<DefaultResult, ExpectedResult>));
+    }
+};
+
+//=========================================================================
+
+template
+<
+    typename Geometry1,
+    typename Geometry2,
+    typename ExpectedResult,
+    typename ExpectedComparableResult
+>
+inline void test_distance_result()
+{
+    typedef typename bg::default_distance_result
+        <
+            Geometry1, Geometry2
+        >::type result12;
+
+    typedef typename bg::default_distance_result
+        <
+            Geometry2, Geometry1
+        >::type result21;
+
+    typedef typename bg::default_comparable_distance_result
+        <
+            Geometry1, Geometry2
+        >::type comparable_result12;
+
+    typedef typename bg::default_comparable_distance_result
+        <
+            Geometry2, Geometry1
+        >::type comparable_result21;
+
+    assert_equal_types<result12, ExpectedResult>();
+    assert_equal_types<result21, ExpectedResult>();
+    assert_equal_types<comparable_result12, ExpectedComparableResult>();
+    assert_equal_types<comparable_result21, ExpectedComparableResult>();
+}
+
+//=========================================================================
+
+template
+<
+    typename CoordinateType1,
+    typename CoordinateType2,
+    std::size_t Dimension,
+    typename CoordinateSystem,
+    typename ExpectedResult,
+    typename ExpectedComparableResult = ExpectedResult
+>
+struct test_distance_result_segment
+{
+    test_distance_result_segment()
+    {
+        typedef typename bg::model::point
+            <
+                CoordinateType1, Dimension, CoordinateSystem
+            > point1;
+
+        typedef typename bg::model::point
+            <
+                CoordinateType2, Dimension, CoordinateSystem
+            > point2;
+
+        typedef typename bg::model::segment<point1> segment1;
+        typedef typename bg::model::segment<point2> segment2;
+
+        test_distance_result
+            <
+                point1, point2, ExpectedResult, ExpectedComparableResult
+            >();
+
+        test_distance_result
+            <
+                point1, segment2, ExpectedResult, ExpectedComparableResult
+            >();
+
+        test_distance_result
+            <
+                point2, segment1, ExpectedResult, ExpectedComparableResult
+            >();
+    }
+};
+
+//=========================================================================
+
+template
+<
+    typename CoordinateType1,
+    typename CoordinateType2,
+    std::size_t Dimension,
+    typename ExpectedResult,
+    typename ExpectedComparableResult = ExpectedResult
+>
+struct test_distance_result_box
+{
+    test_distance_result_box()
+    {
+        typedef typename bg::model::point
+            <
+                CoordinateType1, Dimension, bg::cs::cartesian
+            > point1;
+
+        typedef typename bg::model::point
+            <
+                CoordinateType2, Dimension, bg::cs::cartesian
+            > point2;
+
+        typedef typename bg::model::box<point1> box1;
+        typedef typename bg::model::box<point2> box2;
+
+        test_distance_result
+            <
+                point1, box2, ExpectedResult, ExpectedComparableResult
+            >();
+
+        test_distance_result
+            <
+                point2, box1, ExpectedResult, ExpectedComparableResult
+            >();
+
+        test_distance_result
+            <
+                box1, box2, ExpectedResult, ExpectedComparableResult
+            >();
+    }
+};
+
+//=========================================================================
+
+template <std::size_t D, typename CS>
+inline void test_segment_all()
+{
+#if defined(HAVE_TTMATH)
+    typedef ttmath_big tt;
+    typedef bg::util::detail::default_integral::type default_integral;
+#endif
+    typedef typename boost::mpl::if_
+        <
+            typename boost::is_same<CS, bg::cs::cartesian>::type,
+            double,
+            float
+        >::type float_return_type;
+
+    test_distance_result_segment<short, short, D, CS, double>();
+    test_distance_result_segment<int, int, D, CS, double>();
+    test_distance_result_segment<int, long, D, CS, double>();
+    test_distance_result_segment<long, long, D, CS, double>();
+
+    test_distance_result_segment<int, float, D, CS, float_return_type>();
+    test_distance_result_segment<float, float, D, CS, float_return_type>();
+
+    test_distance_result_segment<int, double, D, CS, double>();
+    test_distance_result_segment<double, int, D, CS, double>();
+    test_distance_result_segment<float, double, D, CS, double>();
+    test_distance_result_segment<double, float, D, CS, double>();
+    test_distance_result_segment<double, double, D, CS, double>();
+
+#if defined(HAVE_TTMATH)
+    test_distance_result_segment<tt, int, D, CS, tt>();
+    test_distance_result_segment<tt, default_integral, D, CS, tt>();
+
+    test_distance_result_segment<tt, float, D, CS, tt>();
+    test_distance_result_segment<tt, double, D, CS, tt>();
+    test_distance_result_segment<tt, tt, D, CS, tt>();
+#endif
+}
+
+//=========================================================================
+
+template <std::size_t D>
+inline void test_box_all()
+{
+#if defined(HAVE_TTMATH)
+    typedef ttmath_big tt;
+#endif
+    typedef bg::util::detail::default_integral::type default_integral;
+
+    test_distance_result_box<short, short, D, double, default_integral>();
+    test_distance_result_box<int, int, D, double, default_integral>();
+    test_distance_result_box<int, long, D, double, default_integral>();
+    test_distance_result_box<long, long, D, double, default_integral>();
+
+    test_distance_result_box<int, float, D, double>();
+    test_distance_result_box<float, float, D, double>();
+
+    test_distance_result_box<int, double, D, double>();
+    test_distance_result_box<double, int, D, double>();
+    test_distance_result_box<float, double, D, double>();
+    test_distance_result_box<double, float, D, double>();
+    test_distance_result_box<double, double, D, double>();
+
+#if defined(HAVE_TTMATH)
+    test_distance_result_box<tt, int, D, tt>();
+    test_distance_result_box<tt, default_integral, D, tt>();
+
+    test_distance_result_box<tt, float, D, tt>();
+    test_distance_result_box<tt, double, D, tt>();
+    test_distance_result_box<tt, tt, D, tt>();
+#endif
+}
+
+//=========================================================================
+
+BOOST_AUTO_TEST_CASE( test_point_point_or_point_segment )
+{
+    test_segment_all<2, bg::cs::cartesian>();
+    test_segment_all<3, bg::cs::cartesian>();
+    test_segment_all<4, bg::cs::cartesian>();
+    test_segment_all<2, bg::cs::spherical_equatorial<bg::degree> >();
+}
+
+BOOST_AUTO_TEST_CASE( test_point_box_or_box )
+{
+    test_box_all<2>();
+    test_box_all<3>();
+    test_box_all<4>();
+}
diff --git a/test/strategies/haversine.cpp b/test/strategies/haversine.cpp
index b95ed9a0f..9aaae3386 100644
--- a/test/strategies/haversine.cpp
+++ b/test/strategies/haversine.cpp
@@ -17,6 +17,7 @@
 
 #include <boost/concept/requires.hpp>
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/strategies/spherical/distance_haversine.hpp>
@@ -90,7 +91,12 @@ void test_services()
     {
 
         // Compile-check if there is a strategy for this type
-        typedef typename services::default_strategy<bg::point_tag, P1, P2>::type haversine_strategy_type;
+        typedef typename services::default_strategy
+            <
+                bg::point_tag, bg::point_tag, P1, P2
+            >::type haversine_strategy_type;
+
+        boost::ignore_unused<haversine_strategy_type>();
     }
 
     P1 p1;
@@ -252,8 +258,8 @@ int test_main(int, char* [])
         <
             bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> >,
             bg::model::point<double, 2, bg::cs::spherical_equatorial<bg::degree> >,
-            double, 
-            geographic_policy 
+            double,
+            geographic_policy
         >();
 
     return 0;
diff --git a/test/strategies/projected_point.cpp b/test/strategies/projected_point.cpp
index fde126a20..701c1a347 100644
--- a/test/strategies/projected_point.cpp
+++ b/test/strategies/projected_point.cpp
@@ -1,9 +1,14 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -15,6 +20,8 @@
 
 #include <geometry_test_common.hpp>
 
+#include <boost/core/ignore_unused.hpp>
+
 #include <boost/geometry/strategies/cartesian/distance_projected_point.hpp>
 #include <boost/geometry/strategies/concepts/distance_concept.hpp>
 
@@ -50,6 +57,23 @@ void test_services()
 
     namespace bgsd = bg::strategy::distance;
     namespace services = bg::strategy::distance::services;
+
+    {
+        // compile-check if there is a strategy for this type
+        typedef typename services::default_strategy
+            <
+                bg::point_tag, bg::segment_tag, P, PS
+            >::type projected_point_strategy_type;
+
+        typedef typename services::default_strategy
+            <
+                bg::segment_tag, bg::point_tag, PS, P
+            >::type reversed_tags_projected_point_strategy_type;
+
+        boost::ignore_unused<projected_point_strategy_type,
+                             reversed_tags_projected_point_strategy_type>();
+    }
+
     // 1: normal, calculate distance:
 
     typedef bgsd::projected_point<CalculationType> strategy_type;
diff --git a/test/strategies/pythagoras.cpp b/test/strategies/pythagoras.cpp
index c250d88c0..b8bcfed3c 100644
--- a/test/strategies/pythagoras.cpp
+++ b/test/strategies/pythagoras.cpp
@@ -20,9 +20,11 @@
 #endif
 
 #include <boost/timer.hpp>
+#include <boost/typeof/typeof.hpp>
 
 #include <boost/concept/requires.hpp>
 #include <boost/concept_check.hpp>
+#include <boost/core/ignore_unused.hpp>
 
 #include <boost/geometry/algorithms/assign.hpp>
 #include <boost/geometry/strategies/cartesian/distance_pythagoras.hpp>
@@ -122,7 +124,12 @@ void test_services()
     {
 
         // Compile-check if there is a strategy for this type
-        typedef typename services::default_strategy<bg::point_tag, P1, P2>::type pythagoras_strategy_type;
+        typedef typename services::default_strategy
+            <
+                bg::point_tag, bg::point_tag, P1, P2
+            >::type pythagoras_strategy_type;
+
+        boost::ignore_unused<pythagoras_strategy_type>();
     }
 
 
@@ -253,7 +260,9 @@ void test_integer(bool check_types)
     if (check_types)
     {
         BOOST_CHECK((boost::is_same<distance_type, double>::type::value));
-        BOOST_CHECK((boost::is_same<cdistance_type, boost::long_long_type>::type::value));
+        // comparable_distance results in now double too, obviously because
+        // comp.distance point-segment can be fraction, even for integer input
+        BOOST_CHECK((boost::is_same<cdistance_type, double>::type::value));
     }
 }
 
diff --git a/test/strategies/pythagoras_point_box.cpp b/test/strategies/pythagoras_point_box.cpp
new file mode 100644
index 000000000..d11e96e1c
--- /dev/null
+++ b/test/strategies/pythagoras_point_box.cpp
@@ -0,0 +1,499 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_pythagoras_point_box
+#endif
+
+#include <boost/test/included/unit_test.hpp>
+
+#if defined(_MSC_VER)
+#  pragma warning( disable : 4101 )
+#endif
+
+#include <boost/core/ignore_unused.hpp>
+#include <boost/timer.hpp>
+#include <boost/typeof/typeof.hpp>
+
+#include <boost/concept/requires.hpp>
+#include <boost/concept_check.hpp>
+
+#include <boost/geometry/algorithms/assign.hpp>
+#include <boost/geometry/algorithms/expand.hpp>
+#include <boost/geometry/strategies/cartesian/distance_pythagoras_point_box.hpp>
+#include <boost/geometry/strategies/concepts/distance_concept.hpp>
+
+
+#include <boost/geometry/geometries/point.hpp>
+#include <boost/geometry/geometries/box.hpp>
+#include <boost/geometry/geometries/adapted/c_array.hpp>
+#include <boost/geometry/geometries/adapted/boost_tuple.hpp>
+
+#include <test_common/test_point.hpp>
+
+#ifdef HAVE_TTMATH
+#  include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#endif
+
+
+namespace bg = boost::geometry;
+
+
+BOOST_GEOMETRY_REGISTER_C_ARRAY_CS(cs::cartesian)
+BOOST_GEOMETRY_REGISTER_BOOST_TUPLE_CS(cs::cartesian)
+
+
+template <typename Box, typename Coordinate>
+inline void assign_values(Box& box,
+                          Coordinate const& x1,
+                          Coordinate const& y1,
+                          Coordinate const& z1,
+                          Coordinate const& x2,
+                          Coordinate const& y2,
+                          Coordinate const& z2)
+{
+    typename bg::point_type<Box>::type p1, p2;
+    bg::assign_values(p1, x1, y1, z1);
+    bg::assign_values(p2, x2, y2, z2);
+    bg::assign(box, p1);
+    bg::expand(box, p2);
+}
+
+template <typename Point, typename Box>
+inline void test_null_distance_3d()
+{
+    Point p;
+    bg::assign_values(p, 1, 2, 4);
+    Box b;
+    assign_values(b, 1, 2, 3, 4, 5, 6);
+
+    typedef bg::strategy::distance::pythagoras_point_box<> pythagoras_pb_type;
+    typedef typename bg::strategy::distance::services::return_type
+        <
+            pythagoras_pb_type, Point, Box
+        >::type return_type;
+
+    pythagoras_pb_type pythagoras_pb;
+    return_type result = pythagoras_pb.apply(p, b);
+
+    BOOST_CHECK_EQUAL(result, return_type(0));
+
+    bg::assign_values(p, 1, 3, 4);
+    result = pythagoras_pb.apply(p, b);
+    BOOST_CHECK_EQUAL(result, return_type(0));
+
+    bg::assign_values(p, 2, 3, 4);
+    result = pythagoras_pb.apply(p, b);
+    BOOST_CHECK_EQUAL(result, return_type(0));
+}
+
+template <typename Point, typename Box>
+inline void test_axis_3d()
+{
+    Box b;
+    assign_values(b, 0, 0, 0, 1, 1, 1);
+    Point p;
+    bg::assign_values(p, 2, 0, 0);
+
+    typedef bg::strategy::distance::pythagoras_point_box<> pythagoras_pb_type;
+    typedef typename bg::strategy::distance::services::return_type
+        <
+            pythagoras_pb_type, Point, Box
+        >::type return_type;
+
+    pythagoras_pb_type pythagoras_pb;
+
+    return_type result = pythagoras_pb.apply(p, b);
+    BOOST_CHECK_EQUAL(result, return_type(1));
+
+    bg::assign_values(p, 0, 2, 0);
+    result = pythagoras_pb.apply(p, b);
+    BOOST_CHECK_EQUAL(result, return_type(1));
+
+    bg::assign_values(p, 0, 0, 2);
+    result = pythagoras_pb.apply(p, b);
+    BOOST_CHECK_CLOSE(result, return_type(1), 0.001);
+}
+
+template <typename Point, typename Box>
+inline void test_arbitrary_3d()
+{
+    Box b;
+    assign_values(b, 0, 0, 0, 1, 2, 3);
+    Point p;
+    bg::assign_values(p, 9, 8, 7);
+
+    {
+        typedef bg::strategy::distance::pythagoras_point_box<> strategy_type;
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                strategy_type, Point, Box
+            >::type return_type;
+
+        strategy_type strategy;
+        return_type result = strategy.apply(p, b);
+        BOOST_CHECK_CLOSE(result, return_type(10.77032961427), 0.001);
+    }
+
+    {
+        // Check comparable distance
+        typedef bg::strategy::distance::comparable::pythagoras_point_box<>
+            strategy_type;
+
+        typedef typename bg::strategy::distance::services::return_type
+            <
+                strategy_type, Point, Box
+            >::type return_type;
+
+        strategy_type strategy;
+        return_type result = strategy.apply(p, b);
+        BOOST_CHECK_EQUAL(result, return_type(116));
+    }
+}
+
+template <typename Point, typename Box, typename CalculationType>
+inline void test_services()
+{
+    namespace bgsd = bg::strategy::distance;
+    namespace services = bg::strategy::distance::services;
+
+    {
+        // Compile-check if there is a strategy for this type
+        typedef typename services::default_strategy
+            <
+                bg::point_tag, bg::box_tag, Point, Box
+            >::type pythagoras_pb_strategy_type;
+
+        // reverse geometry tags
+        typedef typename services::default_strategy
+            <
+                bg::box_tag, bg::point_tag, Box, Point
+            >::type reversed_pythagoras_pb_strategy_type;
+
+        boost::ignore_unused
+            <
+                pythagoras_pb_strategy_type,
+                reversed_pythagoras_pb_strategy_type
+            >();
+    }
+
+    Point p;
+    bg::assign_values(p, 1, 2, 3);
+
+    Box b;
+    assign_values(b, 4, 5, 6, 14, 15, 16);
+
+    double const sqr_expected = 3*3 + 3*3 + 3*3; // 27
+    double const expected = sqrt(sqr_expected); // sqrt(27)=5.1961524227
+
+    // 1: normal, calculate distance:
+
+    typedef bgsd::pythagoras_point_box<CalculationType> strategy_type;
+
+    BOOST_CONCEPT_ASSERT
+        ( (bg::concept::PointDistanceStrategy<strategy_type, Point, Box>) );
+
+    typedef typename bgsd::services::return_type
+        <
+            strategy_type, Point, Box
+        >::type return_type;
+
+    strategy_type strategy;
+    return_type result = strategy.apply(p, b);
+    BOOST_CHECK_CLOSE(result, return_type(expected), 0.001);
+
+    // 2: the strategy should return the same result if we reverse parameters
+    //    result = strategy.apply(p2, p1);
+    //    BOOST_CHECK_CLOSE(result, return_type(expected), 0.001);
+
+
+    // 3: "comparable" to construct a "comparable strategy" for Point/Box
+    //    a "comparable strategy" is a strategy which does not calculate the exact distance, but
+    //    which returns results which can be mutually compared (e.g. avoid sqrt)
+
+    // 3a: "comparable_type"
+    typedef typename services::comparable_type
+        <
+            strategy_type
+        >::type comparable_type;
+
+    // 3b: "get_comparable"
+    comparable_type comparable = bgsd::services::get_comparable
+        <
+            strategy_type
+        >::apply(strategy);
+
+    typedef typename bgsd::services::return_type
+        <
+            comparable_type, Point, Box
+        >::type comparable_return_type;
+
+    comparable_return_type c_result = comparable.apply(p, b);
+    BOOST_CHECK_CLOSE(c_result, return_type(sqr_expected), 0.001);
+
+    // 4: the comparable_type should have a distance_strategy_constructor as well,
+    //    knowing how to compare something with a fixed distance
+    comparable_return_type c_dist5 = services::result_from_distance
+        <
+            comparable_type, Point, Box
+        >::apply(comparable, 5.0);
+
+    comparable_return_type c_dist6 = services::result_from_distance
+        <
+            comparable_type, Point, Box
+        >::apply(comparable, 6.0);
+
+    // If this is the case:
+    BOOST_CHECK(c_dist5 < c_result && c_result < c_dist6);
+
+    // This should also be the case
+    return_type dist5 = services::result_from_distance
+        <
+            strategy_type, Point, Box
+        >::apply(strategy, 5.0);
+    return_type dist6 = services::result_from_distance
+        <
+            strategy_type, Point, Box
+        >::apply(strategy, 6.0);
+    BOOST_CHECK(dist5 < result && result < dist6);
+}
+
+template
+<
+    typename CoordinateType,
+    typename CalculationType,
+    typename AssignType
+>
+inline void test_big_2d_with(AssignType const& x1, AssignType const& y1,
+                             AssignType const& x2, AssignType const& y2,
+                             AssignType const& zero)
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+    typedef bg::model::box<point_type> box_type;
+    typedef bg::strategy::distance::pythagoras_point_box
+        <
+            CalculationType
+        > pythagoras_pb_type;
+
+    pythagoras_pb_type pythagoras_pb;
+    typedef typename bg::strategy::distance::services::return_type
+        <
+            pythagoras_pb_type, point_type, box_type
+        >::type return_type;
+
+
+    point_type p;
+    box_type b;
+    bg::assign_values(b, zero, zero, x1, y1);
+    bg::assign_values(p, x2, y2);
+    return_type d = pythagoras_pb.apply(p, b);
+
+    BOOST_CHECK_CLOSE(d, return_type(1076554.5485833955678294387789057), 0.001);
+}
+
+template <typename CoordinateType, typename CalculationType>
+inline void test_big_2d()
+{
+    test_big_2d_with<CoordinateType, CalculationType>
+        (123456.78900001, 234567.89100001,
+         987654.32100001, 876543.21900001,
+         0.0);
+}
+
+template <typename CoordinateType, typename CalculationType>
+inline void test_big_2d_string()
+{
+    test_big_2d_with<CoordinateType, CalculationType>
+        ("123456.78900001", "234567.89100001",
+         "987654.32100001", "876543.21900001",
+         "0.0000000000000");
+}
+
+template <typename CoordinateType>
+inline void test_integer(bool check_types)
+{
+    typedef bg::model::point<CoordinateType, 2, bg::cs::cartesian> point_type;
+    typedef bg::model::box<point_type> box_type;
+
+    point_type p;
+    box_type b;
+    bg::assign_values(b, 0, 0, 12345678, 23456789);
+    bg::assign_values(p, 98765432, 87654321);
+
+    typedef bg::strategy::distance::pythagoras_point_box<> pythagoras_pb_type;
+    pythagoras_pb_type pythagoras_pb;
+    BOOST_AUTO(distance, pythagoras_pb.apply(p, b));
+    BOOST_CHECK_CLOSE(distance, 107655455.02347542, 0.001);
+
+    typedef typename bg::strategy::distance::services::comparable_type
+        <
+            pythagoras_pb_type
+        >::type comparable_type;
+    comparable_type comparable;
+    BOOST_AUTO(cdistance, comparable.apply(p, b));
+    BOOST_CHECK_EQUAL(cdistance, 11589696996311540);
+
+    typedef BOOST_TYPEOF(cdistance) cdistance_type;
+    typedef BOOST_TYPEOF(distance) distance_type;
+
+    distance_type distance2 = sqrt(distance_type(cdistance));
+    BOOST_CHECK_CLOSE(distance, distance2, 0.001);
+
+    if (check_types)
+    {
+        BOOST_CHECK((boost::is_same<distance_type, double>::type::value));
+        BOOST_CHECK((boost::is_same<cdistance_type, boost::long_long_type>::type::value));
+    }
+}
+
+template <typename P1, typename P2>
+void test_all_3d()
+{
+    test_null_distance_3d<P1, bg::model::box<P2> >();
+    test_axis_3d<P1, bg::model::box<P2> >();
+    test_arbitrary_3d<P1, bg::model::box<P2> >();
+
+    test_null_distance_3d<P2, bg::model::box<P1> >();
+    test_axis_3d<P2, bg::model::box<P1> >();
+    test_arbitrary_3d<P2, bg::model::box<P1> >();
+}
+
+template <typename P>
+void test_all_3d()
+{
+    test_all_3d<P, int[3]>();
+    test_all_3d<P, float[3]>();
+    test_all_3d<P, double[3]>();
+    test_all_3d<P, test::test_point>();
+    test_all_3d<P, bg::model::point<int, 3, bg::cs::cartesian> >();
+    test_all_3d<P, bg::model::point<float, 3, bg::cs::cartesian> >();
+    test_all_3d<P, bg::model::point<double, 3, bg::cs::cartesian> >();
+}
+
+template <typename P, typename Strategy>
+void time_compare_s(int const n)
+{
+    typedef bg::model::box<P> box_type;
+
+    boost::timer t;
+    P p;
+    box_type b;
+    bg::assign_values(b, 0, 0, 1, 1);
+    bg::assign_values(p, 2, 2);
+    Strategy strategy;
+    typename bg::strategy::distance::services::return_type
+        <
+            Strategy, P, box_type
+        >::type s = 0;
+    for (int i = 0; i < n; i++)
+    {
+        for (int j = 0; j < n; j++)
+        {
+            bg::set<0>(p, bg::get<0>(p) + 0.001);
+            s += strategy.apply(p, b);
+        }
+    }
+    std::cout << "s: " << s << " t: " << t.elapsed() << std::endl;
+}
+
+template <typename P>
+inline void time_compare(int const n)
+{
+    time_compare_s<P, bg::strategy::distance::pythagoras_point_box<> >(n);
+    time_compare_s
+        <
+            P, bg::strategy::distance::comparable::pythagoras_point_box<>
+        >(n);
+}
+
+
+
+
+BOOST_AUTO_TEST_CASE( test_integer_all )
+{
+    test_integer<int>(true);
+    test_integer<boost::long_long_type>(true);
+    test_integer<double>(false);
+}
+
+
+BOOST_AUTO_TEST_CASE( test_3d_all )
+{
+    test_all_3d<int[3]>();
+    test_all_3d<float[3]>();
+    test_all_3d<double[3]>();
+
+    test_all_3d<test::test_point>();
+
+    test_all_3d<bg::model::point<int, 3, bg::cs::cartesian> >();
+    test_all_3d<bg::model::point<float, 3, bg::cs::cartesian> >();
+    test_all_3d<bg::model::point<double, 3, bg::cs::cartesian> >();
+}
+
+
+BOOST_AUTO_TEST_CASE( test_big_2d_all )
+{
+    test_big_2d<float, float>();
+    test_big_2d<double, double>();
+    test_big_2d<long double, long double>();
+    test_big_2d<float, long double>();
+}
+
+
+BOOST_AUTO_TEST_CASE( test_services_all )
+{
+    test_services
+        <
+            bg::model::point<float, 3, bg::cs::cartesian>,
+            bg::model::box<double[3]>,
+            long double
+        >();
+    test_services<double[3], bg::model::box<test::test_point>, float>();
+
+    // reverse the point and box types
+    test_services
+        <
+            double[3],
+            bg::model::box<bg::model::point<float, 3, bg::cs::cartesian> >,
+            long double
+        >();
+    test_services<test::test_point, bg::model::box<double[3]>, float>();
+}
+
+
+BOOST_AUTO_TEST_CASE( test_time_compare )
+{
+    // TODO move this to another non-unit test
+    //    time_compare<bg::model::point<double, 2, bg::cs::cartesian> >(10000);
+}
+
+
+#if defined(HAVE_TTMATH)
+BOOST_AUTO_TEST_CASE( test_ttmath_all )
+{
+    typedef ttmath::Big<1,4> tt;
+    typedef bg::model::point<tt, 3, bg::cs::cartesian> tt_point;
+
+    //test_all_3d<tt[3]>();
+    test_all_3d<tt_point>();
+    test_all_3d<tt_point, tt_point>();
+    test_big_2d<tt, tt>();
+    test_big_2d_string<tt, tt>();
+}
+#endif
diff --git a/test/strategies/segment_intersection.cpp b/test/strategies/segment_intersection.cpp
index c0191c18f..fdd66eeb9 100644
--- a/test/strategies/segment_intersection.cpp
+++ b/test/strategies/segment_intersection.cpp
@@ -103,16 +103,23 @@ static void test_segment_intersection(int caseno,
     segment_type s34(p3,p4);
 
     // Get the intersection point (or two points)
-    segment_intersection_points<P> is
-        = strategy::intersection::relate_cartesian_segments
+    typedef bg::detail::no_rescale_policy rescale_policy_type;
+    rescale_policy_type rescale_policy;
+
+    typedef bg::segment_intersection_points
+    <
+        P,
+        typename bg::segment_ratio_type
         <
-            policies::relate::segments_intersection_points
-                <
-                    segment_type,
-                    segment_type,
-                    segment_intersection_points<P>
-                >
-        >::apply(s12, s34);
+            P,
+            rescale_policy_type
+        >::type
+    > result_type;
+
+    result_type is = strategy::intersection::relate_cartesian_segments
+        <
+            bg::policies::relate::segments_intersection_points<result_type>
+        >::apply(s12, s34, rescale_policy);
 
     // Get the Dimension Extended 9 Intersection Matrix (de9im) for Segments
     // (this one is extended by GGL having opposite)
@@ -127,8 +134,8 @@ static void test_segment_intersection(int caseno,
     // Get just a character for Left/Right/intersects/etc, purpose is more for debugging
     policies::relate::direction_type dir = strategy::intersection::relate_cartesian_segments
         <
-            policies::relate::segments_direction<segment_type, segment_type>
-        >::apply(s12, s34);
+            policies::relate::segments_direction
+        >::apply(s12, s34, rescale_policy);
 
     int expected_count = 0;
 
diff --git a/test/strategies/segment_intersection_collinear.cpp b/test/strategies/segment_intersection_collinear.cpp
index 0466c0955..8c25d5fe6 100644
--- a/test/strategies/segment_intersection_collinear.cpp
+++ b/test/strategies/segment_intersection_collinear.cpp
@@ -12,6 +12,7 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
+#define BOOST_GEOMETRY_DEFINE_STREAM_OPERATOR_SEGMENT_RATIO
 
 #include <geometry_test_common.hpp>
 
@@ -31,6 +32,7 @@
 #include <boost/geometry/geometries/point.hpp>
 #include <boost/geometry/geometries/segment.hpp>
 
+
 template <typename IntersectionPoints>
 static int check(IntersectionPoints const& is,
                 std::size_t index, double expected_x, double expected_y)
@@ -58,7 +60,8 @@ static void test_segment_intersection(std::string const& case_id,
                 int expected_x2 = -99, int expected_y2 = -99)
 
 {
-    typedef typename bg::coordinate_type<P>::type coordinate_type;
+    boost::ignore_unused_variable_warning(case_id);
+
     typedef bg::model::referring_segment<const P> segment_type;
 
     P p1, p2, p3, p4;
@@ -70,30 +73,34 @@ static void test_segment_intersection(std::string const& case_id,
     segment_type s12(p1,p2);
     segment_type s34(p3,p4);
 
+    typedef bg::detail::no_rescale_policy rescale_policy_type;
+    rescale_policy_type rescale_policy;
+
+    typedef bg::segment_intersection_points
+    <
+        P,
+        typename bg::segment_ratio_type
+        <
+            P,
+            rescale_policy_type
+        >::type
+    > result_type;
+
     // Get the intersection point (or two points)
-    bg::segment_intersection_points<P> is
+    result_type is
         = bg::strategy::intersection::relate_cartesian_segments
         <
-            bg::policies::relate::segments_intersection_points
-                <
-                    segment_type,
-                    segment_type,
-                    bg::segment_intersection_points<P>
-                >
-        >::apply(s12, s34);
+            bg::policies::relate::segments_intersection_points<result_type>
+        >::apply(s12, s34, rescale_policy, p1, p2, p3, p4);
 
     // Get just a character for Left/Right/intersects/etc, purpose is more for debugging
     bg::policies::relate::direction_type dir
         = bg::strategy::intersection::relate_cartesian_segments
         <
             bg::policies::relate::segments_direction
-                <
-                    segment_type,
-                    segment_type
-                >
-        >::apply(s12, s34);
+        >::apply(s12, s34, rescale_policy, p1, p2, p3, p4);
 
-    int expected_count =
+    std::size_t expected_count =
         check(is, 0, expected_x1, expected_y1)
         + check(is, 1, expected_x2, expected_y2);
 
@@ -104,6 +111,67 @@ static void test_segment_intersection(std::string const& case_id,
     BOOST_CHECK_EQUAL(dir.arrival[1], expected_arrival2);
 }
 
+template <typename P, typename Pair>
+static void test_segment_ratio(std::string const& case_id,
+                int x1, int y1, int x2, int y2,
+                int x3, int y3, int x4, int y4,
+                Pair expected_pair_a1, Pair expected_pair_a2,
+                Pair expected_pair_b1, Pair expected_pair_b2,
+                int exp_ax1, int exp_ay1, int exp_ax2, int exp_ay2,
+                std::size_t expected_count = 2)
+
+{
+    boost::ignore_unused_variable_warning(case_id);
+
+    typedef bg::model::referring_segment<const P> segment_type;
+
+    P p1, p2, p3, p4;
+    bg::assign_values(p1, x1, y1);
+    bg::assign_values(p2, x2, y2);
+    bg::assign_values(p3, x3, y3);
+    bg::assign_values(p4, x4, y4);
+
+    segment_type s12(p1, p2);
+    segment_type s34(p3, p4);
+
+    typedef bg::detail::no_rescale_policy rescale_policy_type;
+    rescale_policy_type rescale_policy;
+
+    typedef typename bg::segment_ratio_type<P, rescale_policy_type>::type ratio_type;
+    typedef bg::segment_intersection_points
+    <
+        P,
+        ratio_type
+    > result_type;
+
+    // Get the intersection point (or two points)
+    result_type is
+        = bg::strategy::intersection::relate_cartesian_segments
+        <
+            bg::policies::relate::segments_intersection_points<result_type>
+        >::apply(s12, s34, rescale_policy, p1, p2, p3, p4);
+
+    ratio_type expected_a1(expected_pair_a1.first, expected_pair_a1.second);
+    ratio_type expected_a2(expected_pair_a2.first, expected_pair_a2.second);
+    ratio_type expected_b1(expected_pair_b1.first, expected_pair_b1.second);
+    ratio_type expected_b2(expected_pair_b2.first, expected_pair_b2.second);
+
+    BOOST_CHECK_EQUAL(is.count, expected_count);
+
+    BOOST_CHECK_EQUAL(is.fractions[0].robust_ra, expected_a1);
+    BOOST_CHECK_EQUAL(is.fractions[0].robust_rb, expected_b1);
+    BOOST_CHECK_EQUAL(bg::get<0>(is.intersections[0]), exp_ax1);
+    BOOST_CHECK_EQUAL(bg::get<1>(is.intersections[0]), exp_ay1);
+
+    if (expected_count == 2)
+    {
+        BOOST_CHECK_EQUAL(bg::get<0>(is.intersections[1]), exp_ax2);
+        BOOST_CHECK_EQUAL(bg::get<1>(is.intersections[1]), exp_ay2);
+        BOOST_CHECK_EQUAL(is.fractions[1].robust_ra, expected_a2);
+        BOOST_CHECK_EQUAL(is.fractions[1].robust_rb, expected_b2);
+    }
+}
+
 
 template <typename P>
 void test_all()
@@ -239,8 +307,9 @@ void test_all()
         'e', true, 0, 0,
         2, 0, 6, 0);
 
-    //   a1---------->a2
-    //   b2<----------b1
+    // Disjoint (in vertical direction, picture still horizontal)
+    //   a2<---a1
+    //                      b2<---b1
     test_segment_intersection<P>("case_recursive_boxes_1",
         10, 7, 10, 6,
         10, 10, 10, 9,
@@ -249,8 +318,215 @@ void test_all()
 
 }
 
+
+template <typename P>
+void test_ratios()
+{
+    // B inside A
+    //       a1------------>a2
+    //          b1--->b2
+    test_segment_ratio<P>("n4",
+        2, 0, 7, 0,
+        3, 0, 5, 0,
+        std::make_pair(1, 5), std::make_pair(3, 5), // IP located on 1/5, 3/5 w.r.t A
+        std::make_pair(0, 1), std::make_pair(1, 1), // IP located on 0, 1 w.r.t. B
+        // IP's are ordered as in A (currently)
+        3, 0, 5, 0);
+
+    //       a1------------>a2
+    //           b2<---b1
+    test_segment_ratio<P>("o4",
+        2, 0, 7, 0,
+        5, 0, 3, 0,
+        std::make_pair(1, 5), std::make_pair(3, 5),
+        std::make_pair(1, 1), std::make_pair(0, 1),
+        3, 0, 5, 0);
+
+    //       a2<------------a1
+    //           b2<---b1
+    test_segment_ratio<P>("o4b",
+        7, 0, 2, 0,
+        5, 0, 3, 0,
+        std::make_pair(2, 5), std::make_pair(4, 5),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        5, 0, 3, 0);
+
+    //       a2<------------a1
+    //          b1--->b2
+    test_segment_ratio<P>("o4c",
+        7, 0, 2, 0,
+        3, 0, 5, 0,
+        std::make_pair(2, 5), std::make_pair(4, 5),
+        std::make_pair(1, 1), std::make_pair(0, 1),
+        5, 0, 3, 0);
+
+    // Touch-interior
+    //       a1---------->a2
+    //       b1--->b2
+    test_segment_ratio<P>("n3",
+        2, 0, 7, 0,
+        2, 0, 4, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        2, 0, 4, 0);
+
+    //    a2<-------------a1
+    //             b2<----b1
+    test_segment_ratio<P>("n3b",
+        7, 0, 2, 0,
+        7, 0, 5, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        7, 0, 5, 0);
+
+
+    // A inside B
+    //          a1--->a2
+    //       b1------------>b2
+    test_segment_ratio<P>("rn4",
+        3, 0, 5, 0,
+        2, 0, 7, 0,
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        std::make_pair(1, 5), std::make_pair(3, 5),
+        3, 0, 5, 0);
+
+    //           a2<---a1
+    //       b1------------>b2
+    test_segment_ratio<P>("ro4",
+        5, 0, 3, 0,
+        2, 0, 7, 0,
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        std::make_pair(3, 5), std::make_pair(1, 5),
+        5, 0, 3, 0);
+
+    //           a2<---a1
+    //       b2<------------b1
+    test_segment_ratio<P>("ro4b",
+        5, 0, 3, 0,
+        7, 0, 2, 0,
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        std::make_pair(2, 5), std::make_pair(4, 5),
+        5, 0, 3, 0);
+
+    //          a1--->a2
+    //       b2<------------b1
+    test_segment_ratio<P>("ro4c",
+        3, 0, 5, 0,
+        7, 0, 2, 0,
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        std::make_pair(4, 5), std::make_pair(2, 5),
+        3, 0, 5, 0);
+
+    // B inside A, boundaries intersect
+    // We change the coordinates a bit (w.r.t. n3 above) to have it asymmetrical
+    //       a1---------->a2
+    //       b1--->b2
+    test_segment_ratio<P>("n3",
+        2, 0, 7, 0,
+        2, 0, 4, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        2, 0, 4, 0);
+
+    //       a1---------->a2
+    //       b2<---b1
+    test_segment_ratio<P>("o3",
+        2, 0, 7, 0,
+        4, 0, 2, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(1, 1), std::make_pair(0, 1),
+        2, 0, 4, 0);
+
+    //       a1---------->a2
+    //              b1--->b2
+    test_segment_ratio<P>("n5",
+        2, 0, 7, 0,
+        5, 0, 7, 0,
+        std::make_pair(3, 5), std::make_pair(1, 1),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        5, 0, 7, 0);
+
+    //       a1---------->a2
+    //              b2<---b1
+    test_segment_ratio<P>("o5",
+        2, 0, 7, 0,
+        7, 0, 5, 0,
+        std::make_pair(3, 5), std::make_pair(1, 1),
+        std::make_pair(1, 1), std::make_pair(0, 1),
+        5, 0, 7, 0);
+
+    // Generic (overlaps)
+    //       a1---------->a2
+    //    b1----->b2
+    test_segment_ratio<P>("n2",
+        2, 0, 7, 0,
+        1, 0, 4, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(1, 3), std::make_pair(1, 1),
+        2, 0, 4, 0);
+
+    // Same, b reversed
+    test_segment_ratio<P>("n2_b",
+        2, 0, 7, 0,
+        4, 0, 1, 0,
+        std::make_pair(0, 1), std::make_pair(2, 5),
+        std::make_pair(2, 3), std::make_pair(0, 1),
+        2, 0, 4, 0);
+
+    // Same, both reversed
+    test_segment_ratio<P>("n2_c",
+        7, 0, 2, 0,
+        4, 0, 1, 0,
+        std::make_pair(3, 5), std::make_pair(1, 1),
+        std::make_pair(0, 1), std::make_pair(2, 3),
+        4, 0, 2, 0);
+
+    //       a1---------->a2
+    //                 b1----->b2
+    test_segment_ratio<P>("n6",
+        2, 0, 6, 0,
+        5, 0, 8, 0,
+        std::make_pair(3, 4), std::make_pair(1, 1),
+        std::make_pair(0, 1), std::make_pair(1, 3),
+        5, 0, 6, 0);
+
+    // Degenerated one
+    //       a1---------->a2
+    //             b1/b2
+    const int ignored = 99;
+    test_segment_ratio<P>("degenerated1",
+        2, 0, 6, 0,
+        5, 0, 5, 0,
+        std::make_pair(3, 4), // IP located on 3/4 w.r.t A
+        std::make_pair(ignored, 1), // not checked
+        std::make_pair(0, 1), // IP located at any place w.r.t B, so 0
+        std::make_pair(ignored, 1), // not checked
+        5, 0,
+        ignored, ignored,
+        1);
+
+    test_segment_ratio<P>("degenerated2",
+        5, 0, 5, 0,
+        2, 0, 6, 0,
+        std::make_pair(0, 1), std::make_pair(ignored, 1),
+        std::make_pair(3, 4), std::make_pair(ignored, 1),
+        5, 0,
+        ignored, ignored,
+        1);
+
+    // Vertical one like in box_poly5 but in integer
+    test_segment_ratio<P>("box_poly5",
+        45, 25, 45, 15,
+        45, 22, 45, 19,
+        std::make_pair(3, 10), std::make_pair(6, 10),
+        std::make_pair(0, 1), std::make_pair(1, 1),
+        45, 22, 45, 19);
+}
+
 int test_main(int, char* [])
 {
-    test_all<bg::model::point<double, 2, bg::cs::cartesian> >();
+    // We don't rescale but use integer points as, by nature, robust points
+    test_all<bg::model::point<int, 2, bg::cs::cartesian> >();
+    test_ratios<bg::model::point<int, 2, bg::cs::cartesian> >();
     return 0;
 }
diff --git a/test/strategies/spherical_side.cpp b/test/strategies/spherical_side.cpp
index d2d114440..a183a141b 100644
--- a/test/strategies/spherical_side.cpp
+++ b/test/strategies/spherical_side.cpp
@@ -64,7 +64,7 @@ void test_side1(std::string const& case_id, Point const& p1, Point const& p2, Po
     BOOST_CHECK_EQUAL(side_ct, expected);
     BOOST_CHECK_EQUAL(side_cart, expected_cartesian);
     /*
-    std::cout 
+    std::cout
         << "exp: " << side_char(expected)
         << " ssf: " << side_char(side1)
         << " pln: " << side_char(side2)
@@ -91,8 +91,6 @@ void test_side(std::string const& case_id, Point const& p1, Point const& p2, Poi
 template <typename Point>
 void test_all()
 {
-    typedef std::pair<double, double> pair;
-
     Point amsterdam(5.9, 52.4);
     Point barcelona(2.0, 41.0);
     Point paris(2.0, 48.0);
diff --git a/test/strategies/transform_cs.cpp b/test/strategies/transform_cs.cpp
index 36b327e3e..777104eee 100644
--- a/test/strategies/transform_cs.cpp
+++ b/test/strategies/transform_cs.cpp
@@ -75,7 +75,7 @@ void test_transformations_spherical()
     // 2: Spherical-equatorial (lat=5, so it is near the equator)
     bg::model::point<T, 2, bg::cs::spherical_equatorial<bg::degree> > se(input_long, input_lat);
 
-    // 2a: to radian 
+    // 2a: to radian
     bg::model::point<T, 2, bg::cs::spherical_equatorial<bg::radian> > ser;
     bg::transform(se, ser);
     BOOST_CHECK_CLOSE(bg::get<0>(ser), expected_long, 0.001);
diff --git a/test/strategies/within.cpp b/test/strategies/within.cpp
index 17cf8a33f..390e5708c 100644
--- a/test/strategies/within.cpp
+++ b/test/strategies/within.cpp
@@ -74,7 +74,7 @@ void test_geometry(std::string const& case_id, std::string const& wkt_point
 }
 
 template <typename Point>
-void test_box_of(std::string const& wkt_point, std::string const& wkt_box, 
+void test_box_of(std::string const& wkt_point, std::string const& wkt_box,
               bool expected_within, bool expected_covered_by)
 {
     typedef bg::model::box<Point> box_type;
diff --git a/test/string_from_type.hpp b/test/string_from_type.hpp
new file mode 100644
index 000000000..178ff2ea0
--- /dev/null
+++ b/test/string_from_type.hpp
@@ -0,0 +1,83 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+#ifndef GEOMETRY_TEST_STRING_FROM_TYPE_HPP
+#define GEOMETRY_TEST_STRING_FROM_TYPE_HPP
+
+#include <string>
+
+#if defined(HAVE_TTMATH)
+#  include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#endif
+
+#if defined(HAVE_CLN) || defined(HAVE_GMP)
+#  include <boost/numeric_adaptor/numeric_adaptor.hpp>
+#endif
+
+
+#if defined(HAVE_GMP)
+#  include <boost/numeric_adaptor/gmp_value_type.hpp>
+#endif
+#if defined(HAVE_CLN)
+#  include <boost/numeric_adaptor/cln_value_type.hpp>
+#endif
+
+
+
+template <typename T>
+struct string_from_type {};
+
+template <> struct string_from_type<void>
+{ static std::string name() { return "v"; }  };
+
+template <> struct string_from_type<float>
+{ static std::string name() { return "f"; }  };
+
+template <> struct string_from_type<double>
+{ static std::string name() { return "d"; }  };
+
+template <> struct string_from_type<long double>
+{ static std::string name() { return "e"; }  };
+
+template <> struct string_from_type<short int>
+{ static std::string name() { return "s"; }  };
+
+template <> struct string_from_type<int>
+{ static std::string name() { return "i"; }  };
+
+template <> struct string_from_type<boost::long_long_type>
+{ static std::string name() { return "l"; }  };
+
+#if defined(HAVE_TTMATH)
+    template <> struct string_from_type<ttmath_big>
+    { static std::string name() { return "t"; }  };
+#endif
+
+#if defined(BOOST_RATIONAL_HPP)
+template <typename T> struct string_from_type<boost::rational<T> >
+{ static std::string name() { return "r"; }  };
+#endif
+
+
+#if defined(HAVE_GMP)
+template <> struct string_from_type<boost::numeric_adaptor::gmp_value_type>
+{ static std::string name() { return "g"; }  };
+#endif
+
+#if defined(HAVE_CLN)
+template <> struct string_from_type<boost::numeric_adaptor::cln_value_type>
+{ static std::string name() { return "c"; }  };
+#endif
+
+
+#endif // GEOMETRY_TEST_STRING_FROM_TYPE_HPP
diff --git a/test/test_common/test_point.hpp b/test/test_common/test_point.hpp
index 5a19d6c3c..54616f0db 100644
--- a/test/test_common/test_point.hpp
+++ b/test/test_common/test_point.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
@@ -17,6 +17,7 @@
 #include <boost/geometry/core/coordinate_dimension.hpp>
 #include <boost/geometry/core/cs.hpp>
 #include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/geometries/register/point.hpp>
 
 // NOTE: since Boost 1.51 the Point type may always be a pointer.
 // Therefore the traits class don't need to add a pointer.
@@ -32,10 +33,21 @@ struct test_point
     float c1, c2, c3;
 };
 
+struct test_const_point
+{
+    test_const_point()
+      : c1(0.0), c2(0.0), c3(0.0) { }
+
+    test_const_point(float c1, float c2, float c3)
+      : c1(c1), c2(c2), c3(c3) { }
+
+    const float c1, c2, c3;
+};
 
 } // namespace test
 
 
+
 namespace boost { namespace geometry { namespace traits {
 
 template<>
@@ -91,4 +103,9 @@ template<> struct access<test::test_point, 2>
 
 }}} // namespace bg::traits
 
+BOOST_GEOMETRY_REGISTER_POINT_3D_CONST(test::test_const_point,
+                                       float,
+                                       boost::geometry::cs::cartesian,
+                                       c1, c2, c3);
+
 #endif // GEOMETRY_TEST_TEST_COMMON_TEST_POINT_HPP
diff --git a/test/test_common/with_pointer.hpp b/test/test_common/with_pointer.hpp
index 22edbdef5..9c7b95db7 100644
--- a/test/test_common/with_pointer.hpp
+++ b/test/test_common/with_pointer.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/all_custom_container.hpp b/test/test_geometries/all_custom_container.hpp
index 7f4a83012..47d56e159 100644
--- a/test/test_geometries/all_custom_container.hpp
+++ b/test/test_geometries/all_custom_container.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/all_custom_linestring.hpp b/test/test_geometries/all_custom_linestring.hpp
index 01b5ae4b0..133fb29a2 100644
--- a/test/test_geometries/all_custom_linestring.hpp
+++ b/test/test_geometries/all_custom_linestring.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/all_custom_polygon.hpp b/test/test_geometries/all_custom_polygon.hpp
index 62da9ecf8..1ce9286eb 100644
--- a/test/test_geometries/all_custom_polygon.hpp
+++ b/test/test_geometries/all_custom_polygon.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/all_custom_ring.hpp b/test/test_geometries/all_custom_ring.hpp
index c7c2b78df..aa1d37cfe 100644
--- a/test/test_geometries/all_custom_ring.hpp
+++ b/test/test_geometries/all_custom_ring.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2011-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/custom_segment.hpp b/test/test_geometries/custom_segment.hpp
index 740377742..b4728c2b5 100644
--- a/test/test_geometries/custom_segment.hpp
+++ b/test/test_geometries/custom_segment.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/test_geometries/wrapped_boost_array.hpp b/test/test_geometries/wrapped_boost_array.hpp
index 961e593a4..cb4aadafa 100644
--- a/test/test_geometries/wrapped_boost_array.hpp
+++ b/test/test_geometries/wrapped_boost_array.hpp
@@ -1,4 +1,4 @@
-// Boost.Geometry (aka GGL, Generic Geometry Library) 
+// Boost.Geometry (aka GGL, Generic Geometry Library)
 // Unit Test
 
 // Copyright (c) 2010-2012 Barend Gehrels, Amsterdam, the Netherlands.
diff --git a/test/to_svg.hpp b/test/to_svg.hpp
new file mode 100644
index 000000000..529d265f0
--- /dev/null
+++ b/test/to_svg.hpp
@@ -0,0 +1,333 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014 Oracle and/or its affiliates.
+
+// 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)
+
+// Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
+
+#ifndef BOOST_GEOMETRY_TEST_TO_SVG_HPP
+#define BOOST_GEOMETRY_TEST_TO_SVG_HPP
+
+#include <fstream>
+
+#include <boost/geometry/io/wkt/read.hpp>
+#include <boost/geometry/io/svg/svg_mapper.hpp>
+#include <boost/geometry/algorithms/detail/overlay/get_turns.hpp>
+#include <boost/geometry/algorithms/detail/overlay/self_turn_points.hpp>
+#include <boost/geometry/algorithms/detail/overlay/traversal_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/debug_turn_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/enrichment_info.hpp>
+#include <boost/geometry/algorithms/detail/overlay/enrich_intersection_points.hpp>
+#include <boost/foreach.hpp>
+
+#include <boost/geometry/algorithms/detail/relate/turns.hpp>
+
+template <typename G, typename Turns, typename Mapper>
+inline void turns_to_svg(Turns const& turns, Mapper & mapper, bool /*enrich*/ = false)
+{
+    // turn points in orange, + enrichment/traversal info
+    typedef typename bg::coordinate_type<G>::type coordinate_type;
+    typedef typename boost::range_value<Turns>::type turn_info;
+
+    // Simple map to avoid two texts at same place (note that can still overlap!)
+    std::map<std::pair<int, int>, int> offsets;
+    int index = 0;
+    int const margin = 5;
+
+    BOOST_FOREACH(turn_info const& turn, turns)
+    {
+        int lineheight = 10;
+        mapper.map(turn.point, "fill:rgb(255,128,0);"
+                "stroke:rgb(0,0,0);stroke-width:1", 3);
+
+        {
+            coordinate_type half = 0.5;
+            coordinate_type ten = 10;
+            // Map characteristics
+            // Create a rounded off point
+            std::pair<int, int> p
+                = std::make_pair(
+                    boost::numeric_cast<int>(half
+                        + ten * bg::get<0>(turn.point)),
+                    boost::numeric_cast<int>(half
+                        + ten * bg::get<1>(turn.point))
+                    );
+        std::string style =  "fill:rgb(0,0,0);font-family:Arial;font-size:12px";
+
+        if (turn.discarded)
+        {
+            style =  "fill:rgb(92,92,92);font-family:Arial;font-size:10px";
+            lineheight = 6;
+        }
+
+        //if (! turn.is_discarded() && ! turn.blocked() && ! turn.both(bg::detail::overlay::operation_union))
+        //if (! turn.discarded)
+        {
+            std::ostringstream out;
+            out << index
+                << ": " << bg::method_char(turn.method);
+
+            if ( turn.is_discarded() )
+                out << " (discarded)\n";
+            else if ( turn.blocked() )
+                out << " (blocked)\n";
+            else
+                out << '\n';
+
+            out << bg::operation_char(turn.operations[0].operation)
+                <<": seg: " << turn.operations[0].seg_id.source_index
+                << ' ' << turn.operations[0].seg_id.multi_index
+                << ' ' << turn.operations[0].seg_id.ring_index
+                << ' ' << turn.operations[0].seg_id.segment_index << ", ";
+            out << "other: " << turn.operations[0].other_id.source_index
+                << ' ' << turn.operations[0].other_id.multi_index
+                << ' ' << turn.operations[0].other_id.ring_index
+                << ' ' << turn.operations[0].other_id.segment_index;
+
+            /*if ( enrich )
+            {
+            out << ", ";
+            if (turn.operations[0].enriched.next_ip_index != -1)
+            {
+            out << "ip: " << turn.operations[0].enriched.next_ip_index;
+            }
+            else
+            {
+            out << "vx: " << turn.operations[0].enriched.travels_to_vertex_index
+            << " -> ip: "  << turn.operations[0].enriched.travels_to_ip_index;
+            }
+            }*/
+
+            out << '\n';
+
+            out << bg::operation_char(turn.operations[1].operation)
+                << ": seg: " << turn.operations[1].seg_id.source_index
+                << ' ' << turn.operations[1].seg_id.multi_index
+                << ' ' << turn.operations[1].seg_id.ring_index
+                << ' ' << turn.operations[1].seg_id.segment_index << ", ";
+            out << "other: " << turn.operations[1].other_id.source_index
+                << ' ' << turn.operations[1].other_id.multi_index
+                << ' ' << turn.operations[1].other_id.ring_index
+                << ' ' << turn.operations[1].other_id.segment_index;
+
+            /*if ( enrich )
+            {
+                out << ", ";
+                if (turn.operations[1].enriched.next_ip_index != -1)
+                {
+                    out << "ip: " << turn.operations[1].enriched.next_ip_index;
+                }
+                else
+                {
+                    out << "vx: " << turn.operations[1].enriched.travels_to_vertex_index
+                        << " -> ip: " << turn.operations[1].enriched.travels_to_ip_index;
+                }
+            }*/
+
+            //out << std::endl;
+
+            /*out
+
+                << std::setprecision(3)
+                << "dist: " << boost::numeric_cast<double>(turn.operations[0].enriched.distance)
+                << " / "  << boost::numeric_cast<double>(turn.operations[1].enriched.distance)
+                << std::endl
+                << "vis: " << bg::visited_char(turn.operations[0].visited)
+                << " / "  << bg::visited_char(turn.operations[1].visited);
+            */
+
+            /*
+                out << index
+                    << ": " << bg::operation_char(turn.operations[0].operation)
+                    << " " << bg::operation_char(turn.operations[1].operation)
+                    << " (" << bg::method_char(turn.method) << ")"
+                    << (turn.ignore() ? " (ignore) " : " ")
+                    << std::endl
+
+                    << "ip: " << turn.operations[0].enriched.travels_to_ip_index
+                    << "/"  << turn.operations[1].enriched.travels_to_ip_index;
+
+                if (turn.operations[0].enriched.next_ip_index != -1
+                    || turn.operations[1].enriched.next_ip_index != -1)
+                {
+                    out << " [" << turn.operations[0].enriched.next_ip_index
+                        << "/"  << turn.operations[1].enriched.next_ip_index
+                        << "]"
+                        ;
+                }
+                out << std::endl;
+
+
+                out
+                    << "vx:" << turn.operations[0].enriched.travels_to_vertex_index
+                    << "/"  << turn.operations[1].enriched.travels_to_vertex_index
+                    << std::endl
+
+                    << std::setprecision(3)
+                    << "dist: " << turn.operations[0].enriched.distance
+                    << " / "  << turn.operations[1].enriched.distance
+                    << std::endl
+                    */
+
+
+
+                offsets[p] += lineheight;
+                int offset = offsets[p];
+                offsets[p] += lineheight * 3;
+                mapper.text(turn.point, out.str(), style, margin, offset, lineheight);
+            }
+            index++;
+        }
+    }
+}
+
+struct to_svg_assign_policy
+    : bg::detail::overlay::assign_null_policy
+{
+    static bool const include_no_turn = false;
+    static bool const include_degenerate = false;
+    static bool const include_opposite = false;
+};
+
+template <typename G>
+inline void to_svg(G const& g, std::string const& filename, bool /*sort*/ = true)
+{
+    namespace bg = boost::geometry;
+
+    typedef typename bg::point_type<G>::type P;
+
+    std::ofstream svg(filename.c_str(), std::ios::trunc);
+
+    bg::svg_mapper<P> mapper(svg, 500, 500);
+
+    mapper.add(g);
+
+    mapper.map(g, "fill-opacity:0.5;fill:rgb(153,204,0);"
+        "stroke:rgb(153,204,0);stroke-width:3");
+
+    // GET TURNS
+
+    typedef bg::segment_ratio<double> sr;
+    typedef bg::detail::overlay::traversal_turn_info<P, sr> turn_info;
+    typedef bg::detail::overlay::assign_null_policy AssignPolicy;
+    //typedef to_svg_assign_policy AssignPolicy;    
+
+    typedef std::deque<turn_info> Turns;
+    typedef bg::detail::self_get_turn_points::no_interrupt_policy InterruptPolicy;
+
+    Turns turns;
+    InterruptPolicy interrupt_policy;
+
+    typedef bg::detail::overlay::get_turn_info<AssignPolicy> TurnPolicy;
+
+    bg::detail::self_get_turn_points::get_turns
+        <
+            TurnPolicy
+        >::apply(g, bg::detail::no_rescale_policy(), turns, interrupt_policy);
+
+    turns_to_svg<G>(turns, mapper);
+}
+
+template <typename G1, typename G2>
+inline void to_svg(G1 const& g1, G2 const& g2, std::string const& filename, bool sort = true, bool use_old_turns_policy = false, bool enrich = false)
+{
+    namespace bg = boost::geometry;
+
+    typedef typename bg::point_type<G1>::type mapper_point_type;
+
+    std::ofstream svg(filename.c_str(), std::ios::trunc);
+
+    bg::svg_mapper<mapper_point_type> mapper(svg, 500, 500);
+
+    mapper.add(g1);
+    mapper.add(g2);
+
+    mapper.map(g1, "fill-opacity:0.5;fill:rgb(153,204,0);"
+        "stroke:rgb(153,204,0);stroke-width:3");
+    mapper.map(g2, "fill-opacity:0.3;fill:rgb(51,51,153);"
+        "stroke:rgb(51,51,153);stroke-width:3");
+
+    // GET TURNS
+    
+    typedef typename bg::detail::relate::turns::get_turns<G1, G2>::turn_info turn_info;
+    //typedef bg::detail::overlay::traversal_turn_info<P1> turn_info;
+    //typedef bg::detail::overlay::assign_null_policy AssignPolicy;
+    typedef to_svg_assign_policy AssignPolicy;
+
+    typedef std::deque<turn_info> Turns;
+    typedef bg::detail::get_turns::no_interrupt_policy InterruptPolicy;
+    static const bool Reverse1 = bg::detail::overlay::do_reverse<bg::point_order<G1>::value>::value;
+    static const bool Reverse2 = bg::detail::overlay::do_reverse<bg::point_order<G2>::value>::value;
+
+    Turns turns;
+    InterruptPolicy interrupt_policy;
+
+    if ( use_old_turns_policy )
+    {
+        boost::geometry::get_turns
+            <
+                Reverse1, Reverse2, AssignPolicy
+            >(g1, g2, bg::detail::no_rescale_policy(), turns, interrupt_policy);
+    }
+    else
+    {
+        typedef bg::detail::get_turns::get_turn_info_type
+            <
+                G1, G2, AssignPolicy
+            > TurnPolicy;
+
+        bg::detail::relate::turns::get_turns
+            <
+                G1, G2, TurnPolicy
+            >::apply(turns, g1, g2);
+    }
+
+    if ( sort )
+    {
+        typedef bg::detail::relate::turns::less<> less;
+        std::sort(boost::begin(turns), boost::end(turns), less());
+    }
+
+    /*if ( enrich )
+    {
+        typedef typename bg::strategy::side::services::default_strategy
+            <
+                typename bg::cs_tag<G1>::type
+            >::type side_strategy_type;
+
+        bg::enrich_intersection_points<bg::detail::overlay::do_reverse<bg::point_order<G1>::value>::value,
+                                       bg::detail::overlay::do_reverse<bg::point_order<G2>::value>::value>
+                (turns, bg::detail::overlay::operation_union,
+                 g1, g1,
+                 bg::detail::no_rescale_policy(),
+                 side_strategy_type());
+    }*/
+
+    turns_to_svg<G1>(turns, mapper, enrich);
+}
+
+template <typename G>
+inline void to_svg(std::string const& wkt, std::string const& filename)
+{
+    G g;
+    boost::geometry::read_wkt(wkt, g);
+    to_svg(g, filename);
+}
+
+template <typename G1, typename G2>
+inline void to_svg(std::string const& wkt1, std::string const& wkt2, std::string const& filename, bool sort = true, bool reverse_by_geometry_id = false, bool enrich = false)
+{
+    G1 g1;
+    G2 g2;
+    boost::geometry::read_wkt(wkt1, g1);
+    boost::geometry::read_wkt(wkt2, g2);
+    to_svg(g1, g2, filename, sort, reverse_by_geometry_id, enrich);
+}
+
+#endif // BOOST_GEOMETRY_TEST_TO_SVG_HPP
diff --git a/test/util/Jamfile.v2 b/test/util/Jamfile.v2
index bf706df73..7fbf827d0 100644
--- a/test/util/Jamfile.v2
+++ b/test/util/Jamfile.v2
@@ -1,8 +1,13 @@
 # Boost.Geometry (aka GGL, Generic Geometry Library)
 #
-# Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-# Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-# Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+# Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+# Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+# Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+#
+# This file was modified by Oracle on 2014.
+# Modifications copyright (c) 2014, Oracle and/or its affiliates.
+#
+# Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 #
 # Use, modification and distribution is subject to the Boost Software License,
 # Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@@ -12,6 +17,7 @@ test-suite boost-geometry-util
     :
     [ run calculation_type.cpp ]
     [ run for_each_coordinate.cpp ]
+    [ run math_sqrt.cpp ]
     [ run rational.cpp ]
     [ run select_most_precise.cpp ]
     [ run write_dsv.cpp ]
diff --git a/test/util/calculation_type.cpp b/test/util/calculation_type.cpp
index 34523e8af..6e026676f 100644
--- a/test/util/calculation_type.cpp
+++ b/test/util/calculation_type.cpp
@@ -172,15 +172,17 @@ int test_main(int, char* [])
     typedef model::point<boost::long_long_type, 2, cs::cartesian> ll;
     typedef model::point<user_defined, 2, cs::cartesian> u;
 
-    // Calculation type "void" so 
+    // Calculation type "void" so
     test<f, f, double, int, double>();
     test<d, d, double, int, double>();
     test<f, d, double, int, double>();
 
     // FP/int mixed
     test<i, f, double, int, double>();
+    test<s, f, double, short int, double>();
 
     // integers
+    test<s, s, double, short int, short int>();
     test<i, i, double, int, int>();
     test<c, i, double, int, int>();
     test<c, c, double, char, char>();
diff --git a/test/util/compress_variant.cpp b/test/util/compress_variant.cpp
new file mode 100644
index 000000000..ab7a61ca9
--- /dev/null
+++ b/test/util/compress_variant.cpp
@@ -0,0 +1,77 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/geometry/util/compress_variant.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/equal.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/type_traits/is_same.hpp>
+#include <boost/variant/variant.hpp>
+
+
+template <typename ExpectedTypes, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+void check_variant_types(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>)
+{
+    BOOST_MPL_ASSERT((
+        boost::mpl::equal<
+            typename boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+            ExpectedTypes
+        >
+    ));
+}
+
+template <typename Variant, typename ExpectedTypes>
+void test_variant_result()
+{
+    check_variant_types<ExpectedTypes>(typename boost::geometry::compress_variant<Variant>::type());
+}
+
+template <typename Variant, typename ExpectedType>
+void test_single_type_result()
+{
+    BOOST_MPL_ASSERT((
+        boost::is_same<
+            typename boost::geometry::compress_variant<Variant>::type,
+            ExpectedType
+        >
+    ));
+}
+
+
+int test_main(int, char* [])
+{
+    test_variant_result<
+        boost::variant<int, float, double>,
+        boost::mpl::vector<int, float, double>
+    >();
+
+    test_variant_result<
+        boost::variant<int, float, double, int, int, float, double, double, float>,
+        boost::mpl::vector<int, double, float>
+    >();
+
+    test_single_type_result<
+        boost::variant<int>,
+        int
+    >();
+
+    test_single_type_result<
+        boost::variant<double, double, double, double, double>,
+        double
+    >();
+
+    return 0;
+}
diff --git a/test/util/is_implemented.cpp b/test/util/is_implemented.cpp
new file mode 100644
index 000000000..3eed994b4
--- /dev/null
+++ b/test/util/is_implemented.cpp
@@ -0,0 +1,88 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014 Samuel Debionne, Grenoble, France.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#include <geometry_test_common.hpp>
+
+#include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
+
+#include <boost/geometry/geometries/point_xy.hpp>
+#include <boost/geometry/strategies/tags.hpp>
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/util/is_implemented.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/bool.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+namespace strategy { namespace services
+{
+
+
+template <typename Strategy> struct tag
+{
+
+    typedef not_implemented type;
+
+};
+
+}} // namespace strategy::services
+
+    
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename Strategy,
+    typename Tag1 = typename tag_cast<typename tag<Geometry1>::type, multi_tag>::type,
+    typename Tag2 = typename tag_cast<typename tag<Geometry2>::type, multi_tag>::type,
+    typename StrategyTag = typename strategy::services::tag<Strategy>::type,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct algorithm_archetype
+    : not_implemented<>
+{};
+
+
+struct strategy_archetype
+{
+    template <typename Geometry1, typename Geometry2>
+    static void apply(Geometry1, Geometry2) {}
+};
+
+
+}} // namespace boost::geometry
+
+
+int test_main(int, char* [])
+{
+    typedef bg::model::d2::point_xy<double> point_type;
+
+    BOOST_MPL_ASSERT((
+        boost::is_same<
+            bg::util::is_implemented2
+            <
+                point_type, point_type,
+                bg::algorithm_archetype<point_type, point_type, bg::strategy_archetype>
+            >::type,
+            boost::mpl::false_
+        >
+    ));
+
+    return 0;
+}
diff --git a/test/util/math_sqrt.cpp b/test/util/math_sqrt.cpp
new file mode 100644
index 000000000..9fd7afdf7
--- /dev/null
+++ b/test/util/math_sqrt.cpp
@@ -0,0 +1,153 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE test_math_sqrt
+#endif
+
+#include <cmath>
+#include <iostream>
+
+#include <boost/test/included/unit_test.hpp>
+
+#include <boost/config.hpp>
+#include <boost/type_traits/is_fundamental.hpp>
+
+#include "number_types.hpp"
+
+// important: the include above must precede the include below,
+// otherwise the test will fail for the custom number type:
+// custom_with_global_sqrt
+
+#include <boost/geometry/util/math.hpp>
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#ifdef HAVE_TTMATH
+#  include <boost/geometry/extensions/contrib/ttmath_stub.hpp>
+#endif
+
+namespace bg = boost::geometry;
+
+
+
+
+// call BOOST_CHECK
+template <typename Argument, bool IsFundamental /* true */>
+struct check
+{
+    template <typename Result>
+    static inline void apply(Argument const& arg, Result const& result)
+    {
+        BOOST_CHECK_CLOSE(static_cast<double>(bg::math::sqrt(arg)),
+                          static_cast<double>(result),
+                          0.00001);        
+    }
+};
+
+
+template <typename Argument>
+struct check<Argument, false>
+{
+    template <typename Result>
+    static inline void apply(Argument const& arg, Result const& result)
+    {
+        Result const tol(0.00001);
+        BOOST_CHECK( bg::math::abs(bg::math::sqrt(arg) - result) < tol );
+    }
+};
+
+
+
+
+
+
+// test sqrt return type and value
+template
+<
+    typename Argument,
+    typename ExpectedResult,
+    typename Result = typename bg::math::detail::square_root
+        <
+            Argument
+        >::return_type,
+    bool IsFundamental = boost::is_fundamental<Argument>::value
+>
+struct check_sqrt
+    : bg::not_implemented<Argument, Result, ExpectedResult>
+{};
+
+
+template <typename Argument, typename Result, bool IsFundamental>
+struct check_sqrt<Argument, Result, Result, IsFundamental>
+{
+    static inline void apply(Argument const& arg, Result const& result)
+    {
+#ifdef GEOMETRY_TEST_DEBUG
+        std::cout << "testing: " << typeid(Result).name()
+                  << " sqrt(" << typeid(Argument).name()
+                  << ")" << std::endl;
+#endif
+        check<Argument, IsFundamental>::apply(arg, result);
+    }
+};
+
+
+
+
+
+
+// test cases
+BOOST_AUTO_TEST_CASE( test_math_sqrt_fundamental )
+{
+    static const double sqrt2 = std::sqrt(2.0);
+    static const long double sqrt2L = std::sqrt(2.0L);
+    static const float sqrt2F = std::sqrt(2.0F);
+
+    check_sqrt<float, float>::apply(2.0F, sqrt2F);
+    check_sqrt<double, double>::apply(2.0, sqrt2);
+    check_sqrt<long double, long double>::apply(2.0L, sqrt2L);
+
+    check_sqrt<char, double>::apply(2, sqrt2);
+    check_sqrt<signed char, double>::apply(2, sqrt2);
+    check_sqrt<short, double>::apply(2, sqrt2);
+    check_sqrt<int, double>::apply(2, sqrt2);
+    check_sqrt<long, double>::apply(2L, sqrt2);
+#if !defined(BOOST_NO_LONG_LONG)
+    check_sqrt<long long, double>::apply(2LL, sqrt2);
+#endif
+#ifdef BOOST_HAS_LONG_LONG
+    check_sqrt
+        <
+            boost::long_long_type, double
+        >::apply(boost::long_long_type(2), sqrt2);
+#endif
+}
+
+
+BOOST_AUTO_TEST_CASE( test_math_sqrt_custom )
+{
+    typedef number_types::custom<double> custom1;
+    typedef custom_global<double> custom2;
+    typedef number_types::custom_with_global_sqrt<double> custom3;
+
+    static const double sqrt2 = std::sqrt(2.0);
+
+    check_sqrt<custom1, custom1>::apply(custom1(2.0), custom1(sqrt2));
+    check_sqrt<custom2, custom2>::apply(custom2(2.0), custom2(sqrt2));
+    check_sqrt<custom3, custom3>::apply(custom3(2.0), custom3(sqrt2));
+
+#ifdef HAVE_TTMATH
+    typedef ttmath_big custom4;
+    typedef ttmath::Big<1, 4> custom5;
+
+    check_sqrt<custom4, custom4>::apply(custom4(2.0), custom4(sqrt2));
+    check_sqrt<custom5, custom5>::apply(custom5(2.0), custom5(sqrt2));
+#endif
+}
diff --git a/test/util/number_types.hpp b/test/util/number_types.hpp
new file mode 100644
index 000000000..bec68bf93
--- /dev/null
+++ b/test/util/number_types.hpp
@@ -0,0 +1,139 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_TEST_UTIL_NUMBER_TYPES_HPP
+#define BOOST_GEOMETRY_TEST_UTIL_NUMBER_TYPES_HPP
+
+#include <cmath>
+
+
+// define a custom number type and its sqrt in own namespace
+namespace number_types
+{
+
+template <typename T>
+struct custom
+{
+    typedef custom<T> self;
+
+    T m_value;
+
+    custom() : m_value(0) {}
+    explicit custom(T const& value) : m_value(value) {}
+
+    bool operator<(self const& other) const
+    {
+        return m_value < other.m_value;
+    }
+
+    self operator-() const
+    {
+        return self(-m_value);
+    }
+
+    self operator-(self const& other) const
+    {
+        return self(m_value - other.m_value);
+    }
+};
+
+template <typename T>
+inline custom<T> sqrt(custom<T> const& c)
+{
+    return custom<T>(std::sqrt(c.m_value));
+}
+
+} // namespace number_types
+
+
+
+
+
+
+// define a custom number type with sqrt in global namespace
+namespace number_types
+{
+
+template <typename T>
+struct custom_with_global_sqrt
+{
+    typedef custom_with_global_sqrt<T> self;
+
+    T m_value;
+
+    custom_with_global_sqrt() : m_value(0) {}
+    explicit custom_with_global_sqrt(T const& value) : m_value(value) {}
+
+    bool operator<(self const& other) const
+    {
+        return m_value < other.m_value;
+    }
+
+    self operator-() const
+    {
+        return self(-m_value);
+    }
+
+    self operator-(self const& other) const
+    {
+        return self(m_value - other.m_value);
+    }
+};
+
+} // namespace number_types
+
+template <typename T>
+inline number_types::custom_with_global_sqrt<T>
+sqrt(number_types::custom_with_global_sqrt<T> const& c)
+{
+    return number_types::custom_with_global_sqrt<T>(std::sqrt(c.m_value));
+}
+
+
+
+
+
+
+
+
+// define a custom number type and its sqrt in global namespace
+template <typename T>
+struct custom_global
+{
+    typedef custom_global<T> self;
+
+    T m_value;
+
+    custom_global() : m_value(0) {}
+    explicit custom_global(T const& value) : m_value(value) {}
+
+    bool operator<(self const& other) const
+    {
+        return m_value < other.m_value;
+    }
+
+    self operator-() const
+    {
+        return self(-m_value);
+    }
+
+    self operator-(self const& other) const
+    {
+        return self(m_value - other.m_value);
+    }
+};
+
+template <typename T>
+inline custom_global<T> sqrt(custom_global<T> const& c)
+{
+    return custom_global<T>(std::sqrt(c.m_value));
+}
+
+#endif // BOOST_GEOMETRY_TEST_UTIL_NUMBER_TYPES_HPP
diff --git a/test/util/transform_variant.cpp b/test/util/transform_variant.cpp
new file mode 100644
index 000000000..4594e591a
--- /dev/null
+++ b/test/util/transform_variant.cpp
@@ -0,0 +1,68 @@
+// Boost.Geometry (aka GGL, Generic Geometry Library)
+// Unit Test
+
+// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+
+// Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
+// (geolib/GGL), copyright (c) 1995-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)
+
+
+#include <boost/test/included/test_exec_monitor.hpp>
+#include <boost/geometry/util/transform_variant.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/mpl/equal.hpp>
+#include <boost/mpl/placeholders.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/type_traits.hpp>
+#include <boost/variant/variant.hpp>
+
+using boost::mpl::placeholders::_;
+
+
+template <typename ExpectedTypes, BOOST_VARIANT_ENUM_PARAMS(typename T)>
+void check(boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>)
+{
+    BOOST_MPL_ASSERT((
+        boost::mpl::equal<
+            typename boost::variant<BOOST_VARIANT_ENUM_PARAMS(T)>::types,
+            ExpectedTypes
+        >
+    ));
+}
+
+
+int test_main(int, char* [])
+{
+    // Transform Variant to Variant
+    typedef boost::geometry::transform_variant<
+        boost::variant<int, float, long>,
+        boost::add_pointer<_>
+    >::type transformed1;
+
+    check<boost::mpl::vector<int*, float*, long*> >(transformed1());
+
+    // Transform Sequence to Variant (without inserter)
+    typedef boost::geometry::transform_variant<
+        boost::mpl::vector<int, float, long>,
+        boost::add_pointer<_>
+    >::type transformed2;
+
+    check<boost::mpl::vector<int*, float*, long*> >(transformed2());
+
+    // Transform Sequence to Variant (with inserter)
+    typedef boost::geometry::transform_variant<
+        boost::mpl::vector<int, float, long>,
+        boost::add_pointer<_>,
+        boost::mpl::back_inserter<boost::mpl::vector0<> >
+    >::type transformed3;
+
+    check<boost::mpl::vector<int*, float*, long*> >(transformed3());
+
+    return 0;
+}
diff --git a/test/views/box_view.cpp b/test/views/box_view.cpp
index e2eab5d21..ef511fefa 100644
--- a/test/views/box_view.cpp
+++ b/test/views/box_view.cpp
@@ -22,7 +22,7 @@
 
 
 template <typename Box, bool Reverse>
-void test_geometry(std::string const& wkt, std::string const& expected, 
+void test_geometry(std::string const& wkt, std::string const& expected,
             bg::order_selector expected_order)
 {
 
diff --git a/test/views/segment_view.cpp b/test/views/segment_view.cpp
index adc9535bd..8de5319c9 100644
--- a/test/views/segment_view.cpp
+++ b/test/views/segment_view.cpp
@@ -76,7 +76,7 @@ void test_all()
 
 int test_main(int, char* [])
 {
-    std::vector<int> a; 
+    std::vector<int> a;
     a.push_back(1);
     boost::range_iterator<std::vector<int> const>::type it = a.end();
     --it;