diff options
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
| -rw-r--r-- | platform/ios/src/MGLMapView.mm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 83904f168f..78ab235332 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -3,7 +3,7 @@ #import "MGLMapView+MGLCustomStyleLayerAdditions.h" #import <mbgl/platform/log.hpp> -#import <mbgl/platform/gl.hpp> +#import <mbgl/gl/gl.hpp> #import <GLKit/GLKit.h> #import <OpenGLES/EAGL.h> @@ -28,8 +28,8 @@ #include <mbgl/util/chrono.hpp> #import "Mapbox.h" -#import "../../darwin/MGLGeometry_Private.h" -#import "../../darwin/MGLMultiPoint_Private.h" +#import "../../darwin/src/MGLGeometry_Private.h" +#import "../../darwin/src/MGLMultiPoint_Private.h" #import "NSBundle+MGLAdditions.h" #import "NSString+MGLAdditions.h" @@ -1566,7 +1566,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) else if (buttonIndex == actionSheet.firstOtherButtonIndex + 2) { NSString *feedbackURL = [NSString stringWithFormat:@"https://www.mapbox.com/map-feedback/#/%.5f/%.5f/%i", - self.longitude, self.latitude, (int)round(self.zoomLevel)]; + self.longitude, self.latitude, (int)round(self.zoomLevel + 1)]; [[UIApplication sharedApplication] openURL: [NSURL URLWithString:feedbackURL]]; } @@ -2487,7 +2487,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) { UIColor *color = (_delegateHasStrokeColorsForShapeAnnotations ? [self.delegate mapView:self strokeColorForShapeAnnotation:annotation] - : [UIColor blackColor]); + : self.tintColor); return MGLColorObjectFromUIColor(color); } @@ -2495,7 +2495,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration) { UIColor *color = (_delegateHasFillColorsForShapeAnnotations ? [self.delegate mapView:self fillColorForPolygonAnnotation:annotation] - : [UIColor blueColor]); + : self.tintColor); return MGLColorObjectFromUIColor(color); } |