remove concept of settings object from library

1 files changed, 19 insertions, 8 deletions

diff --git a/macosx/main.mm b/macosx/main.mm
index 8d2b0d8ce9..4347a7ce86 100644
--- a/macosx/main.mm
+++ b/macosx/main.mm
@@ -1,14 +1,25 @@
-// #import <Foundation/Foundation.h>
-// #import <AppKit/AppKit.h>
-
-#include "settings.hpp"
+#include "../common/settings_nsuserdefaults.hpp"
 #include "../common/glfw_view.hpp"
 
 int main() {
-    llmr::Settings_MacOSX settings;
-    MapView view(settings);
-    view.init();
+    GLFWView view;
+    llmr::Map map(view);
+
+    // Load settings
+    llmr::Settings_NSUserDefaults settings;
+    map.setLonLatZoom(settings.longitude, settings.latitude, settings.zoom);
+    map.setAngle(settings.angle);
+    map.setDebug(settings.debug);
+
+    // fprintf(stderr, "lon: %f, lat: %f, zoom: %f, angle: %f, debug: %d\n", settings.l)
+
     int ret = view.run();
-    settings.sync();
+
+    // Save settings
+    map.getLonLatZoom(settings.longitude, settings.latitude, settings.zoom);
+    settings.angle = map.getAngle();
+    settings.debug = map.getDebug();
+    settings.save();
+
     return ret;
 }