From 91f360aa3f59add862465439cd47058be129dd6c Mon Sep 17 00:00:00 2001
From: Klaus-Peter Bernschneider <peter@bernschneider.de>
Date: Tue, 15 Mar 2022 08:49:07 +0100
Subject: [PATCH] Update mylocation.app.js

---
 apps/mylocation/mylocation.app.js | 33 ++++++++++++++-----------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/apps/mylocation/mylocation.app.js b/apps/mylocation/mylocation.app.js
index 27ab17ea5..b26abb5ec 100644
--- a/apps/mylocation/mylocation.app.js
+++ b/apps/mylocation/mylocation.app.js
@@ -6,38 +6,35 @@ let settings;
 
 // initialize with default settings...
 let s = {
-  'lat': 51.5072,
-  'lon': 0.1276,
-  'location': "London"
-};
+  'lat': 53.322659,
+  'lon': 10.14107,
+  'location': "Pattensen"
+}
 
 function loadSettings() {
-  settings = require('Storage').readJSON(SETTINGS_FILE, 1) || {};
-  for (const key in settings) {
-    s[key] = settings[key]
-  }
+  settings = require('Storage').readJSON(SETTINGS_FILE, 1) || s;
 }
 
 function save() {
-  settings = s;
-  require('Storage').write(SETTINGS_FILE, settings);
+  settings = s
+  require('Storage').write(SETTINGS_FILE, settings)
 }
 
-const locations = ["London" ,"Newcastle","Edinburgh", "Paris" , "New York" , "Tokyo"  , "Frankfurt", "Auckland", "???"];
-const lats =      [ 51.5072 ,  54.9783  , 55.9533   , 48.8566 ,  40.7128   ,  35.6762 ,  50.1236   ,  -36.9    ,  0.0 ];
-const lons =      [ -0.1276 ,  -1.6178  , -3.1883   ,  2.3522 , -74.0060   , 139.6503 ,   8.6553   ,  174.7832 ,  0.0 ];
+const locations = ["Pattensen","Essen", "Kalamata", "???"];
+const lats =      [ 53.322659,  51.46302, 37.04006,   0.0];
+const lons =      [ 10.14107,    6.99891, 22.11535,   0.0];
 
 function setFromGPS() {
   Bangle.on('GPS', (gps) => {
     //console.log(".");
     if (gps.fix === 0) return;
     //console.log("fix from GPS");
-    s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' };
+    s = {'lat': gps.lat, 'lon': gps.lon, 'location': '???' }
     Bangle.buzz(1500); // buzz on first position
     Bangle.setGPSPower(0);
     save();
 
-    Bangle.setUI("updown", ()=>{ load(); });
+    Bangle.setUI("updown", ()=>{ load() });
     E.showPrompt("Location has been saved from the GPS fix",{
       title:"Location Saved",
       buttons : {"OK":1}
@@ -52,13 +49,13 @@ function setFromGPS() {
 }
 
 function showMainMenu() {
-  //console.log("showMainMenu");
+  console.log("showMainMenu");
   const mainmenu = {
     '': { 'title': 'My Location' },
     '<Back': ()=>{ load(); },
     'City': {
       value: 0 | locations.indexOf(s.location),
-      min: 0, max: locations.length - 1,
+      min: 0, max: 6,
       format: v => locations[v],
       onchange: v => {
         if (v != 6) {
@@ -70,7 +67,7 @@ function showMainMenu() {
       }
     },
     'Set From GPS': ()=>{ setFromGPS(); }
-  };
+  }
   return E.showMenu(mainmenu);
 }