[ios, macos] Fail gracefully on invalid coordinates
Invalid coordinates no longer cause an exception to be raised immediately when used in conversion methods and model objects. Instead, the appropriate invalid values are used, consistent with MapKit. Exceptions are still raised when invalid model objects are used with the map.
This commit is contained in:
committed by
John Firebaugh
parent
ab6185fdc3
commit
8382420314
@@ -24,17 +24,21 @@ BOOL MGLEqualFloatWithAccuracy(CGFloat left, CGFloat right, CGFloat accuracy)
|
||||
fromEyeCoordinate:(CLLocationCoordinate2D)eyeCoordinate
|
||||
eyeAltitude:(CLLocationDistance)eyeAltitude
|
||||
{
|
||||
mbgl::LatLng centerLatLng = MGLLatLngFromLocationCoordinate2D(centerCoordinate);
|
||||
mbgl::LatLng eyeLatLng = MGLLatLngFromLocationCoordinate2D(eyeCoordinate);
|
||||
|
||||
mbgl::ProjectedMeters centerMeters = mbgl::Projection::projectedMetersForLatLng(centerLatLng);
|
||||
mbgl::ProjectedMeters eyeMeters = mbgl::Projection::projectedMetersForLatLng(eyeLatLng);
|
||||
CLLocationDirection heading = std::atan((centerMeters.northing - eyeMeters.northing) /
|
||||
(centerMeters.easting - eyeMeters.easting));
|
||||
|
||||
double groundDistance = std::hypot(centerMeters.northing - eyeMeters.northing,
|
||||
centerMeters.easting - eyeMeters.easting);
|
||||
CGFloat pitch = std::atan(eyeAltitude / groundDistance);
|
||||
CLLocationDirection heading = -1;
|
||||
CGFloat pitch = -1;
|
||||
if (CLLocationCoordinate2DIsValid(centerCoordinate) && CLLocationCoordinate2DIsValid(eyeCoordinate)) {
|
||||
mbgl::LatLng centerLatLng = MGLLatLngFromLocationCoordinate2D(centerCoordinate);
|
||||
mbgl::LatLng eyeLatLng = MGLLatLngFromLocationCoordinate2D(eyeCoordinate);
|
||||
|
||||
mbgl::ProjectedMeters centerMeters = mbgl::Projection::projectedMetersForLatLng(centerLatLng);
|
||||
mbgl::ProjectedMeters eyeMeters = mbgl::Projection::projectedMetersForLatLng(eyeLatLng);
|
||||
heading = std::atan((centerMeters.northing - eyeMeters.northing) /
|
||||
(centerMeters.easting - eyeMeters.easting));
|
||||
|
||||
double groundDistance = std::hypot(centerMeters.northing - eyeMeters.northing,
|
||||
centerMeters.easting - eyeMeters.easting);
|
||||
pitch = std::atan(eyeAltitude / groundDistance);
|
||||
}
|
||||
|
||||
return [[self alloc] initWithCenterCoordinate:centerCoordinate
|
||||
altitude:eyeAltitude
|
||||
|
||||
@@ -163,6 +163,10 @@
|
||||
if (!_bounds) {
|
||||
mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty();
|
||||
for (auto coordinate : _coordinates) {
|
||||
if (!CLLocationCoordinate2DIsValid(coordinate)) {
|
||||
bounds = mbgl::LatLngBounds::empty();
|
||||
break;
|
||||
}
|
||||
bounds.extend(MGLLatLngFromLocationCoordinate2D(coordinate));
|
||||
}
|
||||
_bounds = bounds;
|
||||
|
||||
@@ -54,6 +54,10 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
if (!_bounds) {
|
||||
mbgl::LatLngBounds bounds = mbgl::LatLngBounds::empty();
|
||||
for (auto coordinate : _coordinates) {
|
||||
if (!CLLocationCoordinate2DIsValid(coordinate)) {
|
||||
bounds = mbgl::LatLngBounds::empty();
|
||||
break;
|
||||
}
|
||||
bounds.extend(MGLLatLngFromLocationCoordinate2D(coordinate));
|
||||
}
|
||||
_bounds = bounds;
|
||||
@@ -119,8 +123,9 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (NSString *)description
|
||||
{
|
||||
return [NSString stringWithFormat:@"<%@: %p; count = %lu>",
|
||||
NSStringFromClass([self class]), (void *)self, (unsigned long)[self pointCount]];
|
||||
return [NSString stringWithFormat:@"<%@: %p; count = %lu; bounds = %@>",
|
||||
NSStringFromClass([self class]), (void *)self, (unsigned long)[self pointCount],
|
||||
MGLStringFromCoordinateBounds(self.overlayBounds)];
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -2843,6 +2843,10 @@ public:
|
||||
|
||||
- (CGPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate toPointToView:(nullable UIView *)view
|
||||
{
|
||||
if ( ! CLLocationCoordinate2DIsValid(coordinate))
|
||||
{
|
||||
return CGPointMake(NAN, NAN);
|
||||
}
|
||||
return [self convertLatLng:MGLLatLngFromLocationCoordinate2D(coordinate) toPointToView:view];
|
||||
}
|
||||
|
||||
@@ -2860,6 +2864,10 @@ public:
|
||||
|
||||
- (CGRect)convertCoordinateBounds:(MGLCoordinateBounds)bounds toRectToView:(nullable UIView *)view
|
||||
{
|
||||
if ( ! CLLocationCoordinate2DIsValid(bounds.sw) || ! CLLocationCoordinate2DIsValid(bounds.ne))
|
||||
{
|
||||
return CGRectNull;
|
||||
}
|
||||
return [self convertLatLngBounds:MGLLatLngBoundsFromCoordinateBounds(bounds) toRectToView:view];
|
||||
}
|
||||
|
||||
|
||||
@@ -2618,6 +2618,9 @@ public:
|
||||
#pragma mark Geometric methods
|
||||
|
||||
- (NSPoint)convertCoordinate:(CLLocationCoordinate2D)coordinate toPointToView:(nullable NSView *)view {
|
||||
if (!CLLocationCoordinate2DIsValid(coordinate)) {
|
||||
return NSMakePoint(NAN, NAN);
|
||||
}
|
||||
return [self convertLatLng:MGLLatLngFromLocationCoordinate2D(coordinate) toPointToView:view];
|
||||
}
|
||||
|
||||
@@ -2644,6 +2647,9 @@ public:
|
||||
}
|
||||
|
||||
- (NSRect)convertCoordinateBounds:(MGLCoordinateBounds)bounds toRectToView:(nullable NSView *)view {
|
||||
if (!CLLocationCoordinate2DIsValid(bounds.sw) || !CLLocationCoordinate2DIsValid(bounds.ne)) {
|
||||
return CGRectNull;
|
||||
}
|
||||
return [self convertLatLngBounds:MGLLatLngBoundsFromCoordinateBounds(bounds) toRectToView:view];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user