summaryrefslogtreecommitdiff
path: root/platform/macos
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-12 18:48:38 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-13 11:57:09 +0300
commit06af750d236861e32d047f8cfdb0b766bd174f67 (patch)
tree239c57101e80363b8cda7d750fe8374ba9cc26d5 /platform/macos
parent761c9d44b28f8d0f5fed3c476ce8b2636c4dafcc (diff)
downloadqtlocation-mapboxgl-06af750d236861e32d047f8cfdb0b766bd174f67.tar.gz
[ios,macos] Update {Line,Fill}Annotation properties setter
Diffstat (limited to 'platform/macos')
-rw-r--r--platform/macos/src/MGLMapView.mm8
-rw-r--r--platform/macos/src/MGLMapViewDelegate.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/platform/macos/src/MGLMapView.mm b/platform/macos/src/MGLMapView.mm
index 5785f56e01..91cd385638 100644
--- a/platform/macos/src/MGLMapView.mm
+++ b/platform/macos/src/MGLMapView.mm
@@ -2097,11 +2097,11 @@ public:
#pragma mark MGLMultiPointDelegate methods
-- (double)alphaForShapeAnnotation:(MGLShape *)annotation {
+- (float)alphaForShapeAnnotation:(MGLShape *)annotation {
if (_delegateHasAlphasForShapeAnnotations) {
return [self.delegate mapView:self alphaForShapeAnnotation:annotation];
}
- return 1.0;
+ return 1.0f;
}
- (mbgl::Color)strokeColorForShapeAnnotation:(MGLShape *)annotation {
@@ -2118,11 +2118,11 @@ public:
return MGLColorObjectFromNSColor(color);
}
-- (CGFloat)lineWidthForPolylineAnnotation:(MGLPolyline *)annotation {
+- (float)lineWidthForPolylineAnnotation:(MGLPolyline *)annotation {
if (_delegateHasLineWidthsForShapeAnnotations) {
return [self.delegate mapView:self lineWidthForPolylineAnnotation:(MGLPolyline *)annotation];
}
- return 3.0;
+ return 3.0f;
}
#pragma mark MGLPopoverDelegate methods
diff --git a/platform/macos/src/MGLMapViewDelegate.h b/platform/macos/src/MGLMapViewDelegate.h
index 6ea69f845a..048cd0b62d 100644
--- a/platform/macos/src/MGLMapViewDelegate.h
+++ b/platform/macos/src/MGLMapViewDelegate.h
@@ -174,7 +174,7 @@ NS_ASSUME_NONNULL_BEGIN
@param annotation The annotation being rendered.
@return A line width for the polyline, measured in points.
*/
-- (CGFloat)mapView:(MGLMapView *)mapView lineWidthForPolylineAnnotation:(MGLPolyline *)annotation;
+- (float)mapView:(MGLMapView *)mapView lineWidthForPolylineAnnotation:(MGLPolyline *)annotation;
#pragma mark Selecting Annotations