tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ios] Make MGLCoordinateInCoordinateBounds() public (#5053)

Browse Source 
Bounds should always be in NE, SW order — any other coordinate order (e.g., NW, SE) will give false results.
This commit is contained in:
Jason Wray
2016-05-17 11:02:22 -04:00
parent 4434c0438a
commit 22447373ae
4 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/darwin/src/MGLGeometry.h
View File

@@ -64,6 +64,14 @@ NS_INLINE BOOL MGLCoordinateBoundsEqualToCoordinateBounds(MGLCoordinateBounds bo
bounds1.ne.longitude == bounds2.ne.longitude);
}
/** Returns `YES` if the coordinate is within the coordinate bounds. */
NS_INLINE BOOL MGLCoordinateInCoordinateBounds(CLLocationCoordinate2D coordinate, MGLCoordinateBounds bounds) {
return (coordinate.latitude >= bounds.sw.latitude &&
coordinate.latitude <= bounds.ne.latitude &&
coordinate.longitude >= bounds.sw.longitude &&
coordinate.longitude <= bounds.ne.longitude);
}
/** Returns the area spanned by the coordinate bounds. */
NS_INLINE MGLCoordinateSpan MGLCoordinateBoundsGetCoordinateSpan(MGLCoordinateBounds bounds) {
return MGLCoordinateSpanMake(bounds.ne.latitude - bounds.sw.latitude,

5
platform/darwin/src/MGLGeometry_Private.h
View File

@@ -29,11 +29,6 @@ NS_INLINE mbgl::LatLngBounds MGLLatLngBoundsFromCoordinateBounds(MGLCoordinateBo
MGLLatLngFromLocationCoordinate2D(coordinateBounds.ne));
}
NS_INLINE BOOL MGLCoordinateInCoordinateBounds(CLLocationCoordinate2D coordinate, MGLCoordinateBounds coordinateBounds) {
mbgl::LatLngBounds bounds = MGLLatLngBoundsFromCoordinateBounds(coordinateBounds);
return bounds.contains(MGLLatLngFromLocationCoordinate2D(coordinate));
}
#if TARGET_OS_IPHONE
NS_INLINE mbgl::EdgeInsets MGLEdgeInsetsFromNSEdgeInsets(UIEdgeInsets insets) {
return { insets.top, insets.left, insets.bottom, insets.right };

21
platform/darwin/test/MGLGeometryTests.mm
View File

@@ -78,4 +78,25 @@
@"Northeast should round-trip.");
}
- (void)testCoordinateInCoordinateBounds {
CLLocationCoordinate2D ne = CLLocationCoordinate2DMake(41, -111);
CLLocationCoordinate2D sw = CLLocationCoordinate2DMake(45, -104);
MGLCoordinateBounds wyoming = MGLCoordinateBoundsMake(ne, sw);
CLLocationCoordinate2D centerOfWyoming = CLLocationCoordinate2DMake(43, -107.5);
XCTAssertTrue(MGLCoordinateInCoordinateBounds(ne, wyoming));
XCTAssertTrue(MGLCoordinateInCoordinateBounds(sw, wyoming));
XCTAssertTrue(MGLCoordinateInCoordinateBounds(centerOfWyoming, wyoming));
CLLocationCoordinate2D australia = CLLocationCoordinate2DMake(-25, 135);
CLLocationCoordinate2D brazil = CLLocationCoordinate2DMake(-12, -50);
CLLocationCoordinate2D china = CLLocationCoordinate2DMake(35, 100);
XCTAssertFalse(MGLCoordinateInCoordinateBounds(australia, wyoming));
XCTAssertFalse(MGLCoordinateInCoordinateBounds(brazil, wyoming));
XCTAssertFalse(MGLCoordinateInCoordinateBounds(china, wyoming));
XCTAssertFalse(MGLCoordinateInCoordinateBounds(kCLLocationCoordinate2DInvalid, wyoming));
}
@end

1
platform/ios/CHANGELOG.md
View File

@@ -25,6 +25,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CON
- Suppressed “Unable to make space for entry” console spew. ([#4708](https://github.com/mapbox/mapbox-gl-native/pull/4708))
- Removed unused SVG files from the SDK’s resource bundle. ([#4641](https://github.com/mapbox/mapbox-gl-native/pull/4641))
- Deprecated `-[MGLMapView emptyMemoryCache]`. ([#4725](https://github.com/mapbox/mapbox-gl-native/pull/4725))
- Added `MGLCoordinateInCoordinateBounds()`, a function that tests whether or not a coordinate is in a given bounds. ([#5053](https://github.com/mapbox/mapbox-gl-native/pull/5053))
## 3.2.2