From f534b552f7b74f6f3b5608056afbc2ea4adc4296 Mon Sep 17 00:00:00 2001
From: Daniel afx <daniel.krastev@luckbox.com>
Date: Wed, 30 Sep 2020 16:09:07 +0300
Subject: [PATCH] migrate from mapview flower to mapview package

---
 buildozer.spec   | 4 ++--
 forestmapview.kv | 4 ++--
 forestmapview.py | 4 ++--
 gpsblinker.py    | 2 +-
 requierments.txt | 1 +
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/buildozer.spec b/buildozer.spec
index 0f4fb03..f5389a9 100644
--- a/buildozer.spec
+++ b/buildozer.spec
@@ -36,14 +36,14 @@ version = 0.1
 
 # (list) Application requirements
 # comma separated e.g. requirements = sqlite3,kivy
-requirements = python3,kivy,kivymd
+requirements = python3,kivy,kivymd,mapview
 
 # (str) Custom source folders for requirements
 # Sets custom source for any requirements with recipes
 # requirements.source.kivy = ../../kivy
 
 # (list) Garden requirements
-#garden_requirements =
+#garden_requirements = 
 
 # (str) Presplash of the application
 #presplash.filename = %(source.dir)s/data/presplash.png
diff --git a/forestmapview.kv b/forestmapview.kv
index 61f982f..7cf0923 100644
--- a/forestmapview.kv
+++ b/forestmapview.kv
@@ -1,11 +1,11 @@
-#:import MapView kivy.garden.mapview.MapView
+#:import MapView kivy_garden.mapview.MapView
 #:import GpsBlinker gpsblinker.GpsBlinker
 #:include gpsblinker.kv
 
 <ForestMapView>:
     lat: 42.131331
     lon: 24.747571
-    zoom: 18
+    zoom: 15
     on_zoom:
         self.zoom = 15 if self.zoom < 15 else self.zoom
     on_lat:
diff --git a/forestmapview.py b/forestmapview.py
index 5f173ec..a952ada 100644
--- a/forestmapview.py
+++ b/forestmapview.py
@@ -1,4 +1,4 @@
-from kivy.garden.mapview import MapView
+from kivy_garden.mapview import MapView
 from kivy.clock import Clock
 from kivy.app import App
 
@@ -19,7 +19,7 @@ class ForestMapView(MapView):
         app = App.get_running_app()
         print(self.get_bbox()) # debug gps position
         min_lat, min_lon, max_lat, max_lon = self.get_bbox()
-        sql_statement = "SELECT * FROM locations WHERE x > %s AND x < %s and y> %s AND Y < %s" % (min_lon, max_lon, min_lat, max_lat)
+        sql_statement = "SELECT * FROM locations WHERE x > %s AND x < %s AND y > %s AND y < %s" % (min_lat, max_lat, min_lon, max_lon)       #sql_statement = "SELECT * FROM locations"
         app.cursor.execute(sql_statement)
         trees = app.cursor.fetchall()
         print(trees)
diff --git a/gpsblinker.py b/gpsblinker.py
index 1ad1c99..06ac1c3 100644
--- a/gpsblinker.py
+++ b/gpsblinker.py
@@ -1,4 +1,4 @@
-from kivy.garden.mapview import MapMarker
+from kivy_garden.mapview import MapMarker
 
 class GpsBlinker(MapMarker):
     def blink(self):
diff --git a/requierments.txt b/requierments.txt
index d389cb2..0351b11 100644
--- a/requierments.txt
+++ b/requierments.txt
@@ -3,3 +3,4 @@ sqlite_utils
 Kivy
 Kivy-examples
 kivymd
+mapview