From 7bd735220de0ee09e2bbe4f49185f8341e4b88b1 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 20 Apr 2015 13:59:04 -0700
Subject: [PATCH] Fix build

---
 platform/ios/MGLMapView.mm   | 5 +++--
 test/api/repeated_render.cpp | 2 +-
 test/api/set_style.cpp       | 2 +-
 test/headless/headless.cpp   | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index cac54355a..a0e2ccb24 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -14,6 +14,7 @@
 #include <mbgl/storage/sqlite_cache.hpp>
 #include <mbgl/storage/network_status.hpp>
 #include <mbgl/util/geo.hpp>
+#include <mbgl/util/constants.hpp>
 
 #import "MGLTypes.h"
 #import "NSString+MGLAdditions.h"
@@ -627,8 +628,8 @@ mbgl::DefaultFileSource *mbglFileSource = nullptr;
         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->getState().getWidth()  / mbgl::util::tileSize) *
-                               ((CGFloat)mbglMap->getState().getHeight() / mbgl::util::tileSize);
+        CGFloat sizeFactor   = ((CGFloat)mbglMap->getWidth()  / mbgl::util::tileSize) *
+                               ((CGFloat)mbglMap->getHeight() / mbgl::util::tileSize);
 
         NSUInteger cacheSize = zoomFactor * cpuFactor * memoryFactor * sizeFactor * 0.5;
 
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index 25a5d5d28..6dbc001ea 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -24,7 +24,7 @@ TEST(API, RepeatedRender) {
 
     Map map(view, fileSource);
 
-    map.start(Map::Mode::Still);
+    map.start(MapMode::Still);
 
     {
         view.resize(128, 512, 1);
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index 11921a43c..c918e665e 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -18,7 +18,7 @@ TEST(API, SetStyle) {
 
     Map map(view, fileSource);
 
-    map.start(Map::Mode::Still);
+    map.start(MapMode::Still);
 
     map.setStyleJSON("invalid", "test/suite");
 
diff --git a/test/headless/headless.cpp b/test/headless/headless.cpp
index aac5dda83..7e22f7621 100644
--- a/test/headless/headless.cpp
+++ b/test/headless/headless.cpp
@@ -145,7 +145,7 @@ TEST_P(HeadlessTest, render) {
         DefaultFileSource fileSource(nullptr);
         Map map(view, fileSource);
 
-        map.start(Map::Mode::Still);
+        map.start(MapMode::Still);
 
         map.setClasses(classes);
         map.setStyleJSON(style, "test/suite");