[macos] remove tile cache size customization

This commit is contained in:
Ivo van Dongen
2017-06-26 10:07:27 -07:00
committed by Ivo van Dongen
parent 20189db67f
commit d13d82571a

View File

@@ -271,7 +271,6 @@ public:
_mbglThreadPool = mbgl::sharedThreadPool();
_mbglMap = new mbgl::Map(*_mbglView, self.size, [NSScreen mainScreen].backingScaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::GLContextMode::Unique, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
[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.
@@ -687,9 +686,6 @@ public:
- (void)setFrame:(NSRect)frame {
super.frame = frame;
if (!NSEqualRects(frame, self.frame)) {
[self validateTileCacheSize];
}
if (!_isTargetingInterfaceBuilder) {
_mbglMap->setSize(self.size);
}
@@ -789,21 +785,6 @@ public:
}
}
- (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)setNeedsGLDisplay {
MGLAssertIsMainThread();
@@ -1061,13 +1042,11 @@ public:
- (void)setMinimumZoomLevel:(double)minimumZoomLevel
{
_mbglMap->setMinZoom(minimumZoomLevel);
[self validateTileCacheSize];
}
- (void)setMaximumZoomLevel:(double)maximumZoomLevel
{
_mbglMap->setMaxZoom(maximumZoomLevel);
[self validateTileCacheSize];
}
- (double)maximumZoomLevel {