Merge lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect into lp:ubuntu-weather-app

[Andrew Hayzen]

* Add auto detect location option in the settings
* Set auto detect location to false when running autopilot

* Add auto detect location option in the settings
* Set auto detect location to false when running autopilot

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:70
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/148/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/118/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/148/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/148/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

71. By Andrew Hayzen on 2015-07-26

* Fixes for PEP8

72. By Andrew Hayzen on 2015-07-26

* Add changelog

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:72
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/149/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/119
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/149

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/149/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

There's a few things we'll need to fix.

1. Currently you only hide the current location from the LocationsPage. However, the location is still in the horizontal listview.
2. Perhaps because of #1, when you click on a city from the LocationsPage you get the wrong one.
3. If PositionSource is inactive, do we still need to also check the settings.autoDetectLocation to prevent adding a new location? Won't we not get an update when it's inactive?
4. Let's change "Auto detect location" to "Detect current location"
5. I'm on the fence about this one, but would "Privacy" be better labeled as "Location"? I understand why we'd call it "Privacy", but perhaps "Location" would make it seem less likely to be malicious.
6. Do we need to explicitly refresh when we change the autoDetectLocation setting? Won't getting a new location from PositionSource do this for us?

review: Needs Fixing

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

73. By Andrew Hayzen on 2015-07-26

* Change to detectCurrentLocation and use lazy refresh

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:73
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/150/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/120
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/150

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/150/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

1) This is working for me please retest
2) As in response to #1
3) Not sure which case you are referring to?
4) Changed to "Detect current location"
5) Changed to "Location"
6) I've changed it to lazy refresh, but we need to call the refresh to ensure in the true->false case it is removed from the location list

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

74. By Andrew Hayzen on 2015-07-26

* Fix for wrong currentIndex when auto detect location is false and selecting from the LocationsPage

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:74
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/151/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/121
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/151

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/151/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Currently the swipe to remove and the reordering (and delete) of the locations in the LocationsPage seems to have broken with this MP.

review: Needs Fixing

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

75. By Andrew Hayzen on 2015-07-26

* Fixes for move and remove when without location

[Andrew Hayzen (ahayzen)]

I believe this has been fixed, please test both cases of with/without the auto location :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:75
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/152/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/122
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/152

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/152/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

When there are no locations and we have location detection off, using the bottom edge is a bit weird. This probably wasn't introduced by your MP, but in the future we should consider disabling the bottom edge hint when we show the button to manually add.

Things to fix:
1. IMO we should make the new setting checkbox toggle when the list item is pressed, rather than requiring the user tap the checkbox. If you have a different opinion let me know.
2. When I try to delete a location using the multiselect I get the following error and the location(s) are not removed:

file:///opt/click.ubuntu.com/com.ubuntu.weather/3.0.75/share/qml/ubuntu-weather-app.qml:288: TypeError: Cannot read
property 'db' of undefined^

review: Needs Fixing

[Victor Thompson (vthompson)]

For that last item, I think it only happens if you remove the last location--so it's probably the same offset issue as the others.

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

76. By Andrew Hayzen on 2015-07-26

* Selecting the listitem now flips the control

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:76
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/153/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/123
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/153

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/153/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

77. By Andrew Hayzen on 2015-07-26

* Fix for setting not being saved when selecting the listitem portion

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:77
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/154/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/124
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/154

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/154/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

78. By Andrew Hayzen on 2015-07-27

* Fix for multiselect breaking

[Andrew Hayzen (ahayzen)]

Multiselect delete has been fixed and the checkbox is not flipped when you click *anywhere* in the listitem, please retest :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:78
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/155/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/125
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/155

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/155/rebuild

review: Approve (continuous-integration)

[lp:~ahayzen/ubuntu-weather-app/reboot-fix-ap-location-detect]

79. By Andrew Hayzen on 2015-07-27

* Change to actually removing the old detected location from the db

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:79
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/156/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-utopic-amd64-ci/126
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-vivid-amd64-ci/156

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-reboot-ci/156/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

lgtm! AP passes locally and on the device.

review: Approve

=== modified file 'app/components/CurrentLocation.qml'
--- app/components/CurrentLocation.qml	2015-06-18 01:42:03 +0000
+++ app/components/CurrentLocation.qml	2015-07-27 00:58:09 +0000
@@ -41,7 +41,7 @@
     }
 
     function searchResponseHandler(msgObject) {
-        if (!msgObject.error) {
+        if (!msgObject.error && settings.detectCurrentLocation) {
             console.log("Loc to add:", JSON.stringify(msgObject.result.locations[0]))
             storage.updateCurrentLocation(msgObject.result.locations[0])
         }
@@ -51,7 +51,7 @@
     PositionSource {
         id: currentPosition
         updateInterval: 1000
-        active: true
+        active: settings.detectCurrentLocation
 
         onPositionChanged: {
             var coord = currentPosition.position.coordinate
@@ -75,9 +75,22 @@
         onCountChanged: {
             // Update the currentLocation if one is found and it does not match the stored location
             if (count > 0 && currentLocation.string !== geocodeModel.get(0).address.city) {
-                var loc = geocodeModel.get(0)
-                currentLocation.string = loc.address.city
-                searchForLocation(loc.coordinate.latitude, loc.coordinate.longitude)
+                search();
+            }
+        }
+
+        function search() {
+            var loc = geocodeModel.get(0)
+            currentLocation.string = loc.address.city
+            searchForLocation(loc.coordinate.latitude, loc.coordinate.longitude)
+        }
+    }
+
+    Connections {
+        target: settings
+        onDetectCurrentLocationChanged: {
+            if (settings.detectCurrentLocation) {
+                geocodeModel.search();
             }
         }
     }

=== modified file 'app/ubuntu-weather-app.qml'
--- app/ubuntu-weather-app.qml	2015-07-25 22:06:50 +0000
+++ app/ubuntu-weather-app.qml	2015-07-27 00:58:09 +0000
@@ -132,6 +132,7 @@
         */
         property int current: 0
 
+        property bool detectCurrentLocation: true
         property int refreshInterval: 1800
         property string precipUnits
         property string service
@@ -142,6 +143,17 @@
         property bool addedCurrentLocation: false
         property bool migrated: false
 
+        onDetectCurrentLocationChanged: {
+            if (!detectCurrentLocation) {
+                if (addedCurrentLocation) {
+                    storage.removeLocation(-1);  // indexes are increased by 1
+                    addedCurrentLocation = false;
+                }
+
+                refreshData();
+            }
+        }
+
         Component.onCompleted: {
             if (units === "") {  // No settings so load defaults
                 console.debug("No settings, using defaults")
@@ -233,8 +245,10 @@
 
         function moveLocation(from, to) {
             // Indexes are offset by 1 to account for current location
-            from += 1
-            to += 1
+            if (settings.addedCurrentLocation) {
+                from += 1
+                to += 1
+            }
 
             // Update settings to respect new changes
             if (from === settings.current) {
@@ -253,7 +267,10 @@
         // Remove a location from the list
         function removeLocation(index) {
             // Indexes are offset by 1 to account for current location
-            index += 1
+            if (settings.addedCurrentLocation) {
+                index += 1
+            }
+
             if (settings.current >= index) {  // Update settings to respect new changes
                 settings.current -= settings.current;
             }
@@ -279,7 +296,11 @@
             var locations = []
 
             for (i=0; i < indexes.length; i++) {
-                locations.push(locationsList[indexes[i] + 1].db.id)
+                if (settings.addedCurrentLocation) {
+                    locations.push(locationsList[indexes[i] + 1].db.id)
+                } else {
+                    locations.push(locationsList[indexes[i]].db.id)
+                }
             }
 
             storage.clearMultiLocation(locations);

=== modified file 'app/ui/LocationsPage.qml'
--- app/ui/LocationsPage.qml	2015-06-28 19:04:43 +0000
+++ app/ui/LocationsPage.qml	2015-07-27 00:58:09 +0000
@@ -50,7 +50,7 @@
             removable: true
             thisPage: locationsPage
 
-            onRemoved: storage.removeMultiLocations(selectedItems.slice())
+            onRemoved: storage.removeMultiLocations(selectedItems.slice());
         }
     ]
 
@@ -72,7 +72,7 @@
                 left: parent.left
                 right: parent.right
             }
-            height: settings.addedCurrentLocation ? units.gu(8) : units.gu(0)
+            height: settings.addedCurrentLocation && settings.detectCurrentLocation ? units.gu(8) : units.gu(0)
             interactive: false
             model: currentLocationModel
             delegate: WeatherListItem {
@@ -160,6 +160,7 @@
 
             onItemClicked: {
                 settings.current = index + 1;
+
                 pageStack.pop()
             }
             onReorder: {

=== modified file 'app/ui/SettingsPage.qml'
--- app/ui/SettingsPage.qml	2015-06-28 22:54:14 +0000
+++ app/ui/SettingsPage.qml	2015-07-27 00:58:09 +0000
@@ -42,5 +42,10 @@
             title: i18n.tr("Refresh Interval")
             onClicked: mainPageStack.push(Qt.resolvedUrl("settings/RefreshIntervalPage.qml"))
         }
+
+        StandardListItem {
+            title: i18n.tr("Location")
+            onClicked: mainPageStack.push(Qt.resolvedUrl("settings/LocationPage.qml"))
+        }
     }
 }

=== added file 'app/ui/settings/LocationPage.qml'
--- app/ui/settings/LocationPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/settings/LocationPage.qml	2015-07-27 00:58:09 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2015 Canonical Ltd
+ *
+ * This file is part of Ubuntu Weather App
+ *
+ * Ubuntu Weather App is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * Ubuntu Weather App is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.2
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    title: i18n.tr("Location")
+
+    ListItem.Standard {
+        control: CheckBox {
+            checked: settings.detectCurrentLocation
+
+            onCheckedChanged: settings.detectCurrentLocation = checked;
+        }
+        text: i18n.tr("Detect current location")
+
+        onClicked: control.checked = !control.checked
+    }
+}

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-25 21:53:40 +0000
+++ debian/changelog	2015-07-27 00:58:09 +0000
@@ -10,6 +10,8 @@
 
   [ Andrew Hayzen ]
   * Add mocked locations for autopilot and add a test using the data
+  * Add setting to disable auto detecting location
+  * When running under autopilot do not auto detect location
 
  -- Victor Thompson <[e-mail]>  Mon, 01 Jun 2015 20:11:23 -0500
 

=== modified file 'po/com.ubuntu.weather.pot'
--- po/com.ubuntu.weather.pot	2015-07-18 19:08:21 +0000
+++ po/com.ubuntu.weather.pot	2015-07-27 00:58:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-weather-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-18 18:04+0100\n"
+"POT-Creation-Date: 2015-07-27 01:55+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,31 +18,31 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/components/DayDelegate.qml:193
+#: ../app/components/DayDelegate.qml:199
 msgid "Chance of rain"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:202
+#: ../app/components/DayDelegate.qml:205
 msgid "Winds"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:209
+#: ../app/components/DayDelegate.qml:212
 msgid "UV Index"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:214
+#: ../app/components/DayDelegate.qml:217
 msgid "Pollen"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:220
+#: ../app/components/DayDelegate.qml:223
 msgid "Humidity"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:226
+#: ../app/components/DayDelegate.qml:229
 msgid "Sunrise"
 msgstr ""
 
-#: ../app/components/DayDelegate.qml:232
+#: ../app/components/DayDelegate.qml:235
 msgid "Sunset"
 msgstr ""
 
@@ -66,11 +66,11 @@
 msgid "Cancel selection"
 msgstr ""
 
-#: ../app/ubuntu-weather-app.qml:168
+#: ../app/ubuntu-weather-app.qml:184
 msgid "Searching for current location..."
 msgstr ""
 
-#: ../app/ubuntu-weather-app.qml:177
+#: ../app/ubuntu-weather-app.qml:193
 msgid "Add a manual location"
 msgstr ""
 
@@ -122,7 +122,7 @@
 msgid "Units"
 msgstr ""
 
-#: ../app/ui/SettingsPage.qml:37 ../app/ui/settings/DataProviderPage.qml:24
+#: ../app/ui/SettingsPage.qml:37 ../app/ui/settings/DataProviderPage.qml:25
 msgid "Data Provider"
 msgstr ""
 
@@ -130,10 +130,18 @@
 msgid "Refresh Interval"
 msgstr ""
 
+#: ../app/ui/SettingsPage.qml:47 ../app/ui/settings/LocationPage.qml:24
+msgid "Location"
+msgstr ""
+
 #: ../app/ui/settings/DataProviderPage.qml:37
 msgid "Provider"
 msgstr ""
 
+#: ../app/ui/settings/LocationPage.qml:32
+msgid "Detect current location"
+msgstr ""
+
 #: ../app/ui/settings/RefreshIntervalPage.qml:30
 #: ../app/ui/settings/RefreshIntervalPage.qml:31
 #: ../app/ui/settings/RefreshIntervalPage.qml:32

=== modified file 'tests/autopilot/ubuntu_weather_app/databases/CMakeLists.txt'
--- tests/autopilot/ubuntu_weather_app/databases/CMakeLists.txt	2015-07-25 13:52:18 +0000
+++ tests/autopilot/ubuntu_weather_app/databases/CMakeLists.txt	2015-07-27 00:58:09 +0000
@@ -1,6 +1,6 @@
 # make the database files visible on qtcreator
 file(GLOB PYTHON_TEST_DATABASE_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-     *.ini)
+     *.ini *.conf)
 
 add_custom_target(ubuntu-weather-app_PYTHONTestDatabaseFiles ALL SOURCES ${PYTHON_TEST_DATABASE_FILES})

=== added file 'tests/autopilot/ubuntu_weather_app/databases/location_added.conf'
--- tests/autopilot/ubuntu_weather_app/databases/location_added.conf	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntu_weather_app/databases/location_added.conf	2015-07-27 00:58:09 +0000
@@ -0,0 +1,3 @@
+[weatherSettings]
+detectCurrentLocation=false
+migrated=true

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2015-07-23 00:50:12 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2015-07-27 00:58:09 +0000
@@ -223,7 +223,7 @@
 
         return result
 
-    def load_vars(self):
+    def load_database_vars(self):
         self.app_dir = os.path.join(
             os.environ.get('HOME'),
             ".local/share/com.ubuntu.weather")
@@ -235,30 +235,68 @@
             os.path.join(os.path.dirname(__file__), '..', 'files'))
 
 
-class UbuntuWeatherAppTestCase(BaseTestCaseWithPatchedHome, DatabaseMixin):
+class SettingsMixin(object):
+
+    """
+    Helper functions for dealing with the settings file
+    """
+
+    def create_settings_with_location_added(self):
+        logger.debug("Creating settings with location added")
+
+        if not os.path.exists(self.settings_dir):
+            os.makedirs(self.settings_dir)
+
+        shutil.copyfile(self.settings_location_added, self.settings_filepath)
+
+        self.assertThat(
+            lambda: os.path.exists(self.settings_filepath),
+            Eventually(Equals(True)))
+
+    def load_settings_vars(self):
+        self.db_dir = os.path.abspath(
+            os.path.join(os.path.dirname(__file__), '..', 'databases'))
+        self.settings_dir = os.path.join(
+            os.environ.get('HOME'),
+            ".config/com.ubuntu.weather")
+        self.settings_filepath = os.path.join(self.settings_dir,
+                                              'com.ubuntu.weather.conf')
+        self.settings_location_added = os.path.join(self.db_dir,
+                                                    "location_added.conf")
+
+
+class UbuntuWeatherAppTestCase(BaseTestCaseWithPatchedHome, DatabaseMixin,
+                               SettingsMixin):
 
     """Base test case that launches the ubuntu-weather-app."""
 
     def setUp(self):
         super(UbuntuWeatherAppTestCase, self).setUp()
 
-        self.load_vars()
+        self.load_database_vars()
         self.create_blank_db()
 
+        self.load_settings_vars()
+        self.create_settings_with_location_added()
+
         self.app = UbuntuWeatherApp(self.launcher())
 
 
 class UbuntuWeatherAppTestCaseWithData(BaseTestCaseWithPatchedHome,
-                                       DatabaseMixin):
+                                       DatabaseMixin,
+                                       SettingsMixin):
 
     """Base test case that launches the ubuntu-weather-app with data."""
 
     def setUp(self):
         super(UbuntuWeatherAppTestCaseWithData, self).setUp()
 
-        self.load_vars()
+        self.load_database_vars()
         self.create_blank_db()
 
+        self.load_settings_vars()
+        self.create_settings_with_location_added()
+
         logger.debug("Adding fake data to new database")
         self.add_locations_to_database()