Authored by Thomas Rasch

o Fixed a typo

... ... @@ -134,7 +134,7 @@
{
if (self.hasBoundingBox) {
RMProjectedRect projectedScreenBounds = [[mapView mercatorToScreenProjection] projectedBounds];
return RMProjectedRectInterectsProjectedRect(projectedScreenBounds, projectedBoundingBox);
return RMProjectedRectIntersectsProjectedRect(projectedScreenBounds, projectedBoundingBox);
} else {
return CGRectContainsPoint(bounds, self.position);
}
... ...
... ... @@ -32,7 +32,7 @@ bool RMProjectedPointEqualToProjectedPoint(RMProjectedPoint point1, RMProjectedP
return point1.x == point2.x && point2.y == point2.y;
}
bool RMProjectedRectInterectsProjectedRect(RMProjectedRect rect1, RMProjectedRect rect2)
bool RMProjectedRectIntersectsProjectedRect(RMProjectedRect rect1, RMProjectedRect rect2)
{
double minX1 = rect1.origin.x;
double maxX1 = rect1.origin.x + rect1.size.width;
... ...
... ... @@ -57,7 +57,7 @@ RMProjectedRect RMTranslateProjectedRectBy(RMProjectedRect rect, RMProjectedSiz
/// \brief The function checks whether two passed projected points are equal.
bool RMProjectedPointEqualToProjectedPoint(RMProjectedPoint point1, RMProjectedPoint point2);
/// \brief The function returs true if the passed rects intersect each other.
bool RMProjectedRectInterectsProjectedRect(RMProjectedRect rect1, RMProjectedRect rect2);
bool RMProjectedRectIntersectsProjectedRect(RMProjectedRect rect1, RMProjectedRect rect2);
/// \brief The function returns true if rect1 contains rect2
bool RMProjectedRectContainsProjectedRect(RMProjectedRect rect1, RMProjectedRect rect2);
... ...
... ... @@ -280,19 +280,19 @@
}
}
if (RMProjectedRectInterectsProjectedRect(aBoundingBox, northWestBoundingBox))
if (RMProjectedRectIntersectsProjectedRect(aBoundingBox, northWestBoundingBox))
[northWest addAnnotationsInBoundingBox:aBoundingBox toMutableArray:someArray createClusterAnnotations:createClusterAnnotations withClusterSize:clusterSize findGravityCenter:findGravityCenter];
if (RMProjectedRectInterectsProjectedRect(aBoundingBox, northEastBoundingBox))
if (RMProjectedRectIntersectsProjectedRect(aBoundingBox, northEastBoundingBox))
[northEast addAnnotationsInBoundingBox:aBoundingBox toMutableArray:someArray createClusterAnnotations:createClusterAnnotations withClusterSize:clusterSize findGravityCenter:findGravityCenter];
if (RMProjectedRectInterectsProjectedRect(aBoundingBox, southWestBoundingBox))
if (RMProjectedRectIntersectsProjectedRect(aBoundingBox, southWestBoundingBox))
[southWest addAnnotationsInBoundingBox:aBoundingBox toMutableArray:someArray createClusterAnnotations:createClusterAnnotations withClusterSize:clusterSize findGravityCenter:findGravityCenter];
if (RMProjectedRectInterectsProjectedRect(aBoundingBox, southEastBoundingBox))
if (RMProjectedRectIntersectsProjectedRect(aBoundingBox, southEastBoundingBox))
[southEast addAnnotationsInBoundingBox:aBoundingBox toMutableArray:someArray createClusterAnnotations:createClusterAnnotations withClusterSize:clusterSize findGravityCenter:findGravityCenter];
@synchronized (annotations) {
for (RMAnnotation *annotation in annotations)
{
if (RMProjectedRectInterectsProjectedRect(aBoundingBox, annotation.projectedBoundingBox))
if (RMProjectedRectIntersectsProjectedRect(aBoundingBox, annotation.projectedBoundingBox))
[someArray addObject:annotation];
}
}
... ...