1 files changed, 10 insertions, 18 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index b4f60a19ba..2fdd72dcb8 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -12,6 +12,7 @@
 #include <mbgl/map/camera.hpp>
 #include <mbgl/util/geometry.hpp>
 #include <mbgl/map/projection_mode.hpp>
+#include <mbgl/storage/resource_options.hpp>
 
 #include <cstdint>
 #include <string>
@@ -21,7 +22,6 @@
 
 namespace mbgl {
 
-class FileSource;
 class Scheduler;
 class RendererFrontend;
 
@@ -34,11 +34,9 @@ class Map : private util::noncopyable {
 public:
     explicit Map(RendererFrontend&,
                  MapObserver&,
-                 Size size,
-                 float pixelRatio,
-                 FileSource&,
                  Scheduler&,
-                 const MapOptions&);
+                 const MapOptions&,
+                 const ResourceOptions&);
     ~Map();
 
     // Register a callback that will get called (on the render thread) when all resources have
@@ -87,26 +85,17 @@ public:
 
     /// @}
 
-    // North Orientation
+    // Map Options
     void setNorthOrientation(NorthOrientation);
-    NorthOrientation getNorthOrientation() const;
-
-    // Constrain mode
     void setConstrainMode(ConstrainMode);
-    ConstrainMode getConstrainMode() const;
-
-    // Viewport mode
     void setViewportMode(ViewportMode);
-    ViewportMode getViewportMode() const;
+    void setSize(Size);
+    MapOptions getMapOptions() const;
 
     //Projection Mode
     void setProjectionMode(const ProjectionMode&);
     ProjectionMode getProjectionMode() const;
 
-    // Size
-    void setSize(Size);
-    Size getSize() const;
-
     // Projection
     ScreenCoordinate pixelForLatLng(const LatLng&) const;
     LatLng latLngForPixel(const ScreenCoordinate&) const;
@@ -137,9 +126,12 @@ public:
     bool isFullyLoaded() const;
     void dumpDebugLogs() const;
 
-private:
+protected:
     class Impl;
     const std::unique_ptr<Impl> impl;
+
+    // For testing only.
+    Map(std::unique_ptr<Impl>);
 };
 
 } // namespace mbgl