From 86336ed8383f408d8faf92b88267c8d7435394ce Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 21 Jul 2014 11:19:47 -0700
Subject: Flip name and units and sign of rotation API

Angle -> Bearing
Radians -> Degrees
Clockwise -> Counterclockwise
---
 common/settings_json.cpp           | 6 +++---
 common/settings_json.hpp           | 2 +-
 common/settings_nsuserdefaults.hpp | 2 +-
 common/settings_nsuserdefaults.mm  | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'common')

diff --git a/common/settings_json.cpp b/common/settings_json.cpp
index bceab50da6..f2f1248aa6 100644
--- a/common/settings_json.cpp
+++ b/common/settings_json.cpp
@@ -18,7 +18,7 @@ void Settings_JSON::load() {
             longitude = document[rapidjson::SizeType(0)].GetDouble();
             latitude = document[1].GetDouble();
             zoom = document[2].GetDouble();
-            angle = document[3].GetDouble();
+            bearing = document[3].GetDouble();
             debug = document[4].GetBool();
         }
     }
@@ -32,7 +32,7 @@ void Settings_JSON::save() {
     writer.Double(longitude);
     writer.Double(latitude);
     writer.Double(zoom);
-    writer.Double(angle);
+    writer.Double(bearing);
     writer.Bool(debug);
     writer.EndArray();
 }
@@ -41,6 +41,6 @@ void Settings_JSON::clear() {
     longitude = 0;
     latitude = 0;
     zoom = 0;
-    angle = 0;
+    bearing = 0;
     debug = false;
 }
diff --git a/common/settings_json.hpp b/common/settings_json.hpp
index 09f7841c91..25c2179ba0 100644
--- a/common/settings_json.hpp
+++ b/common/settings_json.hpp
@@ -14,7 +14,7 @@ public:
     double longitude = 0;
     double latitude = 0;
     double zoom = 0;
-    double angle = 0;
+    double bearing = 0;
 
     bool debug = false;
 };
diff --git a/common/settings_nsuserdefaults.hpp b/common/settings_nsuserdefaults.hpp
index dcc6ab46b9..3533e3da35 100644
--- a/common/settings_nsuserdefaults.hpp
+++ b/common/settings_nsuserdefaults.hpp
@@ -14,7 +14,7 @@ public:
     double longitude = 0;
     double latitude = 0;
     double zoom = 0;
-    double angle = 0;
+    double bearing = 0;
 
     bool debug = false;
 };
diff --git a/common/settings_nsuserdefaults.mm b/common/settings_nsuserdefaults.mm
index 24571677f4..dfc601bddb 100644
--- a/common/settings_nsuserdefaults.mm
+++ b/common/settings_nsuserdefaults.mm
@@ -9,7 +9,7 @@ Settings_NSUserDefaults::Settings_NSUserDefaults()
     [[NSUserDefaults standardUserDefaults] registerDefaults:@{ @"longitude" : @(longitude),
                                                                @"latitude"  : @(latitude),
                                                                @"zoom"      : @(zoom),
-                                                               @"angle"     : @(angle),
+                                                               @"bearing"   : @(bearing),
                                                                @"debug"     : @(debug) }];
     load();
 }
@@ -21,7 +21,7 @@ void Settings_NSUserDefaults::load()
     longitude = [settings[@"longitude"] doubleValue];
     latitude  = [settings[@"latitude"]  doubleValue];
     zoom      = [settings[@"zoom"]      doubleValue];
-    angle     = [settings[@"angle"]     doubleValue];
+    bearing   = [settings[@"bearing"]   doubleValue];
     debug     = [settings[@"debug"]     boolValue];
 }
 
@@ -29,8 +29,8 @@ void Settings_NSUserDefaults::save()
 {
     [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:@{ @"longitude" : @(longitude),
                                                                              @"latitude"  : @(latitude),
-                                                                             @"zoom"     : @(zoom),
-                                                                             @"angle"     : @(angle),
+                                                                             @"zoom"      : @(zoom),
+                                                                             @"bearing"   : @(bearing),
                                                                              @"debug"     : @(debug) }];
     [[NSUserDefaults standardUserDefaults] synchronize];
 }
-- 
cgit v1.2.1