Commit Graph

3401 Commits

Author SHA1 Message Date
Dane Springmeyer
eb7613e703 [algorithms][intersection] Fixes liang_barsky for integer coordinate types
- Fixes an integer division bug which caused incorrect clipping results when
   a geometry is clipped by a box and the coordinate type is integral
 - Refs https://github.com/mapbox/mapnik-vector-tile/pull/102
2015-10-06 13:58:18 -07:00
Menelaos Karavelas
b3be70aee2 [algorithms][overlay][exception] move inconsistent_turns_exception to a separate file 2015-10-05 14:06:58 +03:00
Menelaos Karavelas
7f5f894535 [algorithms][overlay][exception] move inconsistent_turns_exception to a separate file 2015-10-05 12:24:31 +03:00
Menelaos Karavelas
c8b1095eea [algorithms][is_valid] fix issue with use of std::cout only in debug mode:
originally reported by Jeremy Murphy (GitHub PR #326); the problem is that
when debug_print_complement_graph() is called, std::cout needs to be defined
which requires the inclusion of <iostream> even in non-debug mode; with this
commit the call to debug_print_complement_graph() is guarded by the appropriate
macro and the use inclusion of <iostream> is no longer needed in non-debug mode;
2015-09-17 09:28:55 +03:00
Adam Wulkiewicz
a71aaa3617 [core] Make geometry::exception::what() public. 2015-09-07 14:03:54 +02:00
Menelaos Karavelas
3b12d520ac [util][math] fix possible unused variable warning 2015-09-03 20:04:55 +03:00
Adam Wulkiewicz
3dd8d1e689 Merge pull request #320 from awulkiew/fix/box_eps
Different approach for handling Boxes WRT machine epsilon
2015-08-25 16:40:55 +02:00
Adam Wulkiewicz
0addcbb330 [math] In detail::scaled_epsilon call detail::abs instead of math::abs. 2015-08-22 17:36:54 +02:00
Adam Wulkiewicz
4a15918915 [extensions][nsphere][relops] Use raw comparison operators instead of math:: functions. 2015-08-21 20:00:13 +02:00
Adam Wulkiewicz
035a49d417 [extensions][sections] Use raw comparison operators instead of math:: functions. 2015-08-21 19:59:40 +02:00
Adam Wulkiewicz
3dcfb86cb9 [touches] For Box/Box use operators (e.g. < instead of math::smaller). 2015-08-21 19:54:57 +02:00
Adam Wulkiewicz
0d5c18ea56 [overlaps] For Box/Box use operators (e.g. < instead of math::smaller). 2015-08-21 19:54:28 +02:00
Adam Wulkiewicz
7636aa1a9e [intersection] For Box/Box use operators (e.g. < instead of math::smaller). 2015-08-21 19:54:02 +02:00
Adam Wulkiewicz
c8e65b5082 [within][strategies] For Point/Box and Box/Box use operators (e.g. < instead of math::smaller). 2015-08-21 19:53:18 +02:00
Adam Wulkiewicz
b3c9d963a3 [disjoint] For Point/Box and Box/Box use operators (e.g. < instead of math::smaller). 2015-08-21 19:52:11 +02:00
Adam Wulkiewicz
b22a3c0530 [sections] Enlarge section bounding Boxes WRT epsilon.
This allows the algorithms using sections to check spatial predicates
using raw operators < (e.g. in Box/Box disjoint). There is no need to
use less performant calls to math::smaller.

Replace math::smaller usage in section functions preceeding() and
exceeding() and therefore revert the change done recently.
2015-08-21 19:41:01 +02:00
Adam Wulkiewicz
d248323369 [math][algorithms] Add expand_by_epsilon()
Add math::scaled_epsilon().
Optimize math::smaller().
2015-08-21 19:38:51 +02:00
Adam Wulkiewicz
8f7af3cf63 Merge pull request #319 from awulkiew/fix/nan_coordinates
Take special care of NaN coordinates in relate for MultiLinestring
2015-08-20 14:05:15 +02:00
Adam Wulkiewicz
7aa3dd47f8 Merge pull request #318 from awulkiew/fix/box_eps
Take into account machine epsilon when handling Boxes in various algorithms.
2015-08-19 02:41:26 +02:00
Adam Wulkiewicz
12ba76ff70 [relate][util] Take special care about NaN coordinates in relate for MultiLinestring.
In places where a check must be performed, if a Point is one of the
endpoints of a Linestring contained in a MultiLinestring, std::sort() and
std::equal_range() algorithms are used. With MSVC the assertion in
std::equal_range() fails if the elements cannot be reliably compared, i.e.
in the case when Points has NaN coordinates.

Add has_nan_coordinate() utility and use it in boundary_checker and
topology_check in relate() implementation.
2015-08-14 17:50:31 +02:00
Adam Wulkiewicz
8ba5a7f02a [touches] Remove spaces according to coding guidelines. 2015-08-13 21:42:37 +02:00
Adam Wulkiewicz
8fcbb8e370 [index] Fix the removal of value from an empty rtree.
- Instead of assertion failure there is no effect and 0 is returned.
- Handle the NULL root in a similar way in insert, remove and count.
- Add runtime asserts.
2015-08-13 21:02:30 +02:00
Adam Wulkiewicz
098279e739 [index] Fix rtree removal for min elements == 1
Support 0-element range in elements_box() helper function.
Handle special case in remove visitor - root node containing 0 elements after underflow.
2015-08-13 00:44:33 +02:00
Adam Wulkiewicz
94b198e23f [extensions][iterators] In section_iterator take into account machine epsilon. 2015-08-05 01:02:17 +02:00
Adam Wulkiewicz
3a522f11f6 [extensions][nsphere][within][strategies] For NSphere/Box and Point/Nsphere take into account machine epsilon. 2015-08-05 00:59:48 +02:00
Adam Wulkiewicz
9d4c806994 [extensions][nsphere][disjoint] For Box/NSphere take into account machine epsilon. 2015-08-05 00:59:05 +02:00
Adam Wulkiewicz
fdc3a6870f [algorithms][sections] Take into account machine epsilon in preceding() and exceeding() functions. 2015-08-05 00:57:03 +02:00
Adam Wulkiewicz
36cdd25674 [intersection] For Box/Box take into account machine epsilon. 2015-08-05 00:55:21 +02:00
Adam Wulkiewicz
1449373a33 [strategies][within][covered_by] For Box/Box and Point/Box take into account machine epsilon. 2015-08-05 00:54:24 +02:00
Adam Wulkiewicz
121d4312d8 [touches] For Box/Box take into account machine epsilon. 2015-08-05 00:53:40 +02:00
Adam Wulkiewicz
172fff9f08 [overlaps] For Box/Box take into account machine epsilon. 2015-08-05 00:53:01 +02:00
Adam Wulkiewicz
cfbbbca0ee [disjoint] For Box/Box and Point/Box take into account machine epsilon. 2015-08-05 00:50:23 +02:00
Adam Wulkiewicz
74855a4951 [util] Add functions math::smaller_or_equals() and math::larger_or_equals(). 2015-08-05 00:33:26 +02:00
Barend Gehrels
49add55205 [buffer] Fix assertion for cases with extreme coordinates.
In case of numerical errors, the started ring should be aborted to avoid doing
calculations with them.
2015-07-31 12:40:01 +02:00
Menelaos Karavelas
21c143e226 [algorithms][relate] modify the less functor for turns in relate so that
equality (using math::equals) for turn fractions is called before operator<;
this is done for consistency with how turns are computed in L/L set operations
and also to make sure that turns in relate are computed in a consistent way;
2015-07-28 21:37:37 +03:00
Menelaos Karavelas
c9ad6530ae [algorithms][turns] minor change (coding style) 2015-07-28 21:36:56 +03:00
Menelaos Karavelas
6e4ea5f23f [algorithms][turns] fix problem with less functor for turns;
In the previous implementation the fractions of the two turns where
compared first using operator< and then tested for equality using
math::equals; the consequence of this implementation is that it could
be possible to have two turns t1 and t2 whose fractions satisfied both
operator< and math::equals, which lead to the possibility of having both
less(t1, t2) and less(t2, t1) true; this behavior for less is wrong and
has produced failures on various compilers (especially when sorting);

The solution is to rearrange the code in the less functor so that
math::equals for the two fractions is checked first, that is before
the operator< is called; this makes the outcomes of less(t1, t2) and
less(t2, t1) always consistent with each other;
2015-07-24 10:27:04 +03:00
Menelaos Karavelas
4ce94fb33e [algorithms][turns] polish code (remove unnecessary commas in print-out) 2015-07-23 09:41:22 +03:00
Adam Wulkiewicz
5a1e553c75 [math] In the impl. of abs() for FP types use std::fabs() if possible.
This fixes the function for long double on some compilers.

For all FP types non-std fabs() was called. This function is defined
only for double. On compilers supporting long double type more precise
than double (GCC, Clang, etc.) this resulted in truncation of the result.
2015-07-22 04:41:34 +02:00
Adam Wulkiewicz
a90f9dc769 [concepts] Suppress GCC4.4 warning (unused variable). 2015-07-21 19:20:03 +02:00
Adam Wulkiewicz
1500dc3644 [algorithms][io] Explicitly specify namespaces for apply_visitor and algorithms functions. 2015-07-21 16:27:48 +02:00
Adam Wulkiewicz
39859171ce [transform] Explicitly specify namespaces to avoid ambiguities. 2015-07-20 20:40:43 +02:00
Adam Wulkiewicz
275ae8f4db [views] Suppress signed/unsigned comparison warnings in two_dimensional_view. 2015-07-20 15:43:10 +02:00
Barend Gehrels
647fedb3e2 [turns] fix conventions: no _t, line length, spurious spaces between if, missing curly braces 2015-07-18 20:16:04 +02:00
Menelaos Karavelas
eb43220e5d Merge pull request #315 from mkaravel/fix/possible_infinite_loop_in_has_spikes
Fix: possible infinite loop in has_spikes
2015-07-14 20:44:19 +03:00
Menelaos Karavelas
4e5da910af [algorithms][is_valid] rename method find_not_equal to find_different_from_first (for clarity) 2015-07-14 20:42:16 +03:00
Menelaos Karavelas
cb02dd8e8d Merge pull request #302 from mkaravel/feature/envelope_and_expand_for_spherical_cs
Envelope and expand for spherical coordinate systems
2015-07-10 07:42:16 +03:00
Menelaos Karavelas
78296da4a2 [algorithms][is_valid] replace BOOST_ASSERT by BOOST_GEOMETRY_ASSERT 2015-07-10 07:32:51 +03:00
Adam Wulkiewicz
db2a7b0afb Merge pull request #314 from awulkiew/feature/optimize_cart_intersect
[get_turns][strategies] Optimize get_turns().
2015-07-09 13:21:47 +02:00
Menelaos Karavelas
ee906b2f40 [algorithms][is_valid] avoid potential infinite loop in has_spikes
(such an infinite loop can happen if the points in the range have NaN coordinates)
2015-07-09 11:50:59 +03:00