[ios, osx] Avoid recomputing tile cache size on every redraw

The tile cache size is only recomputed when an input changes. Fixes #4026.
mapbox · May 6, 2016 · d28b6f3 · d28b6f3
1 parent 8a7087a
commit d28b6f3
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 21 deletions.
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
@@ -381,6 +381,7 @@ - (void)commonInit
  // setup mbgl map
  mbgl::DefaultFileSource *mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
  _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None);
+ [self validateTileCacheSize];
 
  // start paused if in IB
  if (_isTargetingInterfaceBuilder || background) {
@@ -646,15 +647,37 @@ - (void)didReceiveMemoryWarning
 - (void)setFrame:(CGRect)frame
 {
  [super setFrame:frame];
-
- [self setNeedsLayout];
+ if ( ! CGRectEqualToRect(frame, self.frame))
+ {
+ [self validateTileCacheSize];
+ }
 }
 
 - (void)setBounds:(CGRect)bounds
 {
  [super setBounds:bounds];
+ if ( ! CGRectEqualToRect(bounds, self.bounds))
+ {
+ [self validateTileCacheSize];
+ }
+}
 
- [self setNeedsLayout];
+- (void)validateTileCacheSize
+{
+ if ( ! _mbglMap)
+ {
+ return;
+ }
+
+ CGFloat zoomFactor = self.maximumZoomLevel - self.minimumZoomLevel + 1;
+ CGFloat cpuFactor = [NSProcessInfo processInfo].processorCount;
+ CGFloat memoryFactor = (CGFloat)[NSProcessInfo processInfo].physicalMemory / 1000 / 1000 / 1000;
+ CGFloat sizeFactor = (CGRectGetWidth(self.bounds) / mbgl::util::tileSize) *
+ (CGRectGetHeight(self.bounds) / mbgl::util::tileSize);
+
+ NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
+
+ _mbglMap->setSourceTileCacheSize(cacheSize);
 }
 
 + (BOOL)requiresConstraintBasedLayout
@@ -830,15 +853,6 @@ - (void)glkView:(__unused GLKView *)view drawInRect:(__unused CGRect)rect
 {
  if ( ! self.dormant)
  {
- CGFloat zoomFactor = _mbglMap->getMaxZoom() - _mbglMap->getMinZoom() + 1;
- CGFloat cpuFactor = (CGFloat)[[NSProcessInfo processInfo] processorCount];
- CGFloat memoryFactor = (CGFloat)[[NSProcessInfo processInfo] physicalMemory] / 1000 / 1000 / 1000;
- CGFloat sizeFactor = ((CGFloat)_mbglMap->getWidth() / mbgl::util::tileSize) *
- ((CGFloat)_mbglMap->getHeight() / mbgl::util::tileSize);
-
- NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
-
- _mbglMap->setSourceTileCacheSize(cacheSize);
  _mbglMap->render();
 
  [self updateUserLocationAnnotationView];
@@ -2175,6 +2189,7 @@ - (void)setZoomLevel:(double)zoomLevel animated:(BOOL)animated
 - (void)setMinimumZoomLevel:(double)minimumZoomLevel
 {
  _mbglMap->setMinZoom(minimumZoomLevel);
+ [self validateTileCacheSize];
 }
 
 - (double)minimumZoomLevel
@@ -2185,6 +2200,7 @@ - (double)minimumZoomLevel
 - (void)setMaximumZoomLevel:(double)maximumZoomLevel
 {
  _mbglMap->setMaxZoom(maximumZoomLevel);
+ [self validateTileCacheSize];
 }
 
 - (double)maximumZoomLevel

diff --git a/platform/osx/src/MGLMapView.mm b/platform/osx/src/MGLMapView.mm
@@ -262,6 +262,7 @@ - (void)commonInit {
 
  mbgl::DefaultFileSource *mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
  _mbglMap = new mbgl::Map(*_mbglView, *mbglFileSource, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None);
+ [self validateTileCacheSize];
 
  // Install the OpenGL layer. Interface Builder’s synchronous drawing means
  // we can’t display a map, so don’t even bother to have a map layer.
@@ -607,6 +608,9 @@ - (BOOL)wantsBestResolutionOpenGLSurface {
 
 - (void)setFrame:(NSRect)frame {
  super.frame = frame;
+ if (!NSEqualRects(frame, self.frame)) {
+ [self validateTileCacheSize];
+ }
  if (!_isTargetingInterfaceBuilder) {
  _mbglMap->update(mbgl::Update::Dimensions);
  }
@@ -705,15 +709,6 @@ - (void)updateConstraints {
 
 - (void)renderSync {
  if (!self.dormant) {
- CGFloat zoomFactor = _mbglMap->getMaxZoom() - _mbglMap->getMinZoom() + 1;
- CGFloat cpuFactor = (CGFloat)[NSProcessInfo processInfo].processorCount;
- CGFloat memoryFactor = (CGFloat)[NSProcessInfo processInfo].physicalMemory / 1000 / 1000 / 1000;
- CGFloat sizeFactor = ((CGFloat)_mbglMap->getWidth() / mbgl::util::tileSize) * ((CGFloat)_mbglMap->getHeight() / mbgl::util::tileSize);
-
- NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
-
- _mbglMap->setSourceTileCacheSize(cacheSize);
-
  // Enable vertex buffer objects.
  mbgl::gl::InitializeExtensions([](const char *name) {
  static CFBundleRef framework = CFBundleGetBundleWithIdentifier(CFSTR("com.apple.opengl"));
@@ -742,6 +737,21 @@ - (void)renderSync {
  }
 }
 
+- (void)validateTileCacheSize {
+ if (!_mbglMap) {
+ return;
+ }
+
+ CGFloat zoomFactor = self.maximumZoomLevel - self.minimumZoomLevel + 1;
+ CGFloat cpuFactor = [NSProcessInfo processInfo].processorCount;
+ CGFloat memoryFactor = (CGFloat)[NSProcessInfo processInfo].physicalMemory / 1000 / 1000 / 1000;
+ CGFloat sizeFactor = (NSWidth(self.bounds) / mbgl::util::tileSize) * (NSHeight(self.bounds) / mbgl::util::tileSize);
+
+ NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
+
+ _mbglMap->setSourceTileCacheSize(cacheSize);
+}
+
 - (void)invalidate {
  MGLAssertIsMainThread();
 
@@ -947,11 +957,13 @@ - (void)scaleBy:(double)scaleFactor atPoint:(NSPoint)point animated:(BOOL)animat
 - (void)setMinimumZoomLevel:(double)minimumZoomLevel
 {
  _mbglMap->setMinZoom(minimumZoomLevel);
+ [self validateTileCacheSize];
 }
 
 - (void)setMaximumZoomLevel:(double)maximumZoomLevel
 {
  _mbglMap->setMaxZoom(maximumZoomLevel);
+ [self validateTileCacheSize];
 }
 
 - (double)maximumZoomLevel {