summaryrefslogtreecommitdiff
path: root/platform/ios
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-06-22 23:22:41 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-06-23 00:03:51 -0700
commitf5f39c8b3adfed4c4c102dca5d5be4d6cfc0b69f (patch)
treefe499dc49834240ffa5062688458aa308489768e /platform/ios
parent3995d6ff68a51dd4543ad71f424adf261e1e8baf (diff)
downloadqtlocation-mapboxgl-f5f39c8b3adfed4c4c102dca5d5be4d6cfc0b69f.tar.gz
[ios, macos] Renamed overdraw to overdraw visualization (#5416)
A verb doesn’t make sense in this enum value. Instead, use a descriptive word for this effect and describe it in detail in the documentation comment. Cherry-picked from 415c18294693166472785459f9d5bc8be31b7033.
Diffstat (limited to 'platform/ios')
-rw-r--r--platform/ios/CHANGELOG.md2
-rw-r--r--platform/ios/app/MBXViewController.m8
-rw-r--r--platform/ios/src/MGLMapView.h7
-rw-r--r--platform/ios/src/MGLMapView.mm4
4 files changed, 11 insertions, 10 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 60b3bad1dc..4f1d1b7374 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -33,7 +33,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CON
- 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))
-- Added a new option to `MGLMapDebugMaskOptions`, `MGLMapDebugWireframesMask`, that shows wireframes instead of the usual rendered output. ([#4359](https://github.com/mapbox/mapbox-gl-native/pull/4359))
+- Added a new option to `MGLMapDebugMaskOptions`, `MGLMapDebugOverdrawVisualizationMask`, that highlights overlapping drawing operations instead of the usual rendered output. ([#5403](https://github.com/mapbox/mapbox-gl-native/pull/5403))
## 3.2.3
diff --git a/platform/ios/app/MBXViewController.m b/platform/ios/app/MBXViewController.m
index 8317aee1d9..761644b29f 100644
--- a/platform/ios/app/MBXViewController.m
+++ b/platform/ios/app/MBXViewController.m
@@ -181,9 +181,9 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
((debugMask & MGLMapDebugCollisionBoxesMask)
? @"Hide Collision Boxes"
: @"Show Collision Boxes"),
- ((debugMask & MGLMapDebugWireframesMask)
- ? @"Hide Wireframes"
- : @"Show Wireframes"),
+ ((debugMask & MGLMapDebugOverdrawVisualizationMask)
+ ? @"Hide Overdraw Visualization"
+ : @"Show Overdraw Visualization"),
@"Add 100 Points",
@"Add 1,000 Points",
@"Add 10,000 Points",
@@ -226,7 +226,7 @@ static NSString * const MBXViewControllerAnnotationViewReuseIdentifer = @"MBXVie
}
else if (buttonIndex == actionSheet.firstOtherButtonIndex + 5)
{
- self.mapView.debugMask ^= MGLMapDebugWireframesMask;
+ self.mapView.debugMask ^= MGLMapDebugOverdrawVisualizationMask;
}
else if (buttonIndex == actionSheet.firstOtherButtonIndex + 6)
{
diff --git a/platform/ios/src/MGLMapView.h b/platform/ios/src/MGLMapView.h
index d6bc25f961..3f649e45d2 100644
--- a/platform/ios/src/MGLMapView.h
+++ b/platform/ios/src/MGLMapView.h
@@ -43,9 +43,10 @@ typedef NS_OPTIONS(NSUInteger, MGLMapDebugMaskOptions) {
/** Edges of glyphs and symbols are shown as faint, green lines to help
diagnose collision and label placement issues. */
MGLMapDebugCollisionBoxesMask = 1 << 4,
- /** Line widths, backgrounds, and fill colors are ignored to create a
- wireframe effect. */
- MGLMapDebugWireframesMask = 1 << 5,
+ /** Each drawing operation is replaced by a translucent fill. Overlapping
+ drawing operations appear more prominent to help diagnose overdrawing.
+ */
+ MGLMapDebugOverdrawVisualizationMask = 1 << 5,
};
/**
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 7f09113f5b..2c76f3b850 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1831,7 +1831,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
}
if (options & mbgl::MapDebugOptions::Wireframe)
{
- mask |= MGLMapDebugWireframesMask;
+ mask |= MGLMapDebugOverdrawVisualizationMask;
}
return mask;
}
@@ -1855,7 +1855,7 @@ mbgl::Duration MGLDurationInSeconds(NSTimeInterval duration)
{
options |= mbgl::MapDebugOptions::Collision;
}
- if (debugMask & MGLMapDebugWireframesMask)
+ if (debugMask & MGLMapDebugOverdrawVisualizationMask)
{
options |= mbgl::MapDebugOptions::Wireframe;
}