From 7da3cc5565283b3e5bae403fc204275adec60b07 Mon Sep 17 00:00:00 2001
From: Thomas Bouve <crahan@n00.be>
Date: Sun, 20 Sep 2020 20:25:25 +0200
Subject: [PATCH] Revert. Changes are handled in a separate branch

---
 pwnagotchi/plugins/default/gps.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pwnagotchi/plugins/default/gps.py b/pwnagotchi/plugins/default/gps.py
index 7b6b8f6..d9c992b 100644
--- a/pwnagotchi/plugins/default/gps.py
+++ b/pwnagotchi/plugins/default/gps.py
@@ -10,7 +10,7 @@ from pwnagotchi.ui.view import BLACK
 
 class GPS(plugins.Plugin):
     __author__ = "evilsocket@gmail.com"
-    __version__ = "1.0.1"
+    __version__ = "1.0.0"
     __license__ = "GPL3"
     __description__ = "Save GPS coordinates whenever an handshake is captured."
 
@@ -57,7 +57,7 @@ class GPS(plugins.Plugin):
     def on_ui_setup(self, ui):
         # add coordinates for other displays
         if ui.is_waveshare_v2():
-            lat_pos = (127, 74)
+            lat_pos = (127, 75)
             lon_pos = (122, 84)
             alt_pos = (127, 94)
         elif ui.is_waveshare_v1():
@@ -66,21 +66,21 @@ class GPS(plugins.Plugin):
             alt_pos = (130, 90)
         elif ui.is_inky():
             lat_pos = (127, 60)
-            lon_pos = (122, 70)
+            lon_pos = (127, 70)
             alt_pos = (127, 80)
         elif ui.is_waveshare144lcd():
             # guessed values, add tested ones if you can
             lat_pos = (67, 73)
             lon_pos = (62, 83)
             alt_pos = (67, 93)
-        elif ui.is_dfrobot_v2():
-            lat_pos = (127, 74)
+        elif ui.is_dfrobot_v2: 
+            lat_pos = (127, 75)
             lon_pos = (122, 84)
             alt_pos = (127, 94)
         elif ui.is_waveshare27inch():
-            lat_pos = (6, 120)
-            lon_pos = (1, 135)
-            alt_pos = (6, 150)
+            lat_pos = (6,120)
+            lon_pos = (1,135)
+            alt_pos = (6,150)
         else:
             # guessed values, add tested ones if you can
             lat_pos = (127, 51)
@@ -126,6 +126,7 @@ class GPS(plugins.Plugin):
             ),
         )
 
+
     def on_unload(self, ui):
         with ui._lock:
             ui.remove_element('latitude')
@@ -140,5 +141,5 @@ class GPS(plugins.Plugin):
             # last char is sometimes not completely drawn ¯\_(ツ)_/¯
             # using an ending-whitespace as workaround on each line
             ui.set("latitude", f"{self.coordinates['Latitude']:.4f} ")
-            ui.set("longitude", f"{self.coordinates['Longitude']:.4f} ")
-            ui.set("altitude", f"{self.coordinates['Altitude']:.1f}m ")
+            ui.set("longitude", f" {self.coordinates['Longitude']:.4f} ")
+            ui.set("altitude", f" {self.coordinates['Altitude']:.1f}m ")