rearrange marker assets

build.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
 
 buildozer android debug deploy run
+echo "] Starting logcat in 5 seconds..."
+sleep 5
+adb logcat | grep python

buildozer.spec

@@ -13,7 +13,7 @@ package.domain = net.deflax.globalforest
 source.dir = .
 
 # (list) Source files to include (let empty to include all the files)
-source.include_exts = py,png,jpg,kv,atlas,db
+source.include_exts = py,png,jpg,kv,atlas,ttf,db,txt
 
 # (list) List of inclusions using pattern matching
 source.include_patterns = assets/*,images/*.png,databases/*.db
@@ -46,10 +46,10 @@ requirements = python3,requests,certifi,urllib3,chardet,idna,sqlite3,kivy,mapvie
 #garden_requirements = 
 
 # (str) Presplash of the application
-#presplash.filename = %(source.dir)s/data/presplash.png
+presplash.filename = %(source.dir)s/assets/images/splash.png
 
 # (str) Icon of the application
-#icon.filename = %(source.dir)s/data/icon.png
+icon.filename = %(source.dir)s/assets/images/icon.png
 
 # (str) Supported orientation (one of landscape, sensorLandscape, portrait or all)
 orientation = portrait

forestmapview.kv

@@ -5,7 +5,7 @@
 <ForestMapView>:
     lat: 42.131331
     lon: 24.747571
-    zoom: 5
+    zoom: 15
     snap_to_zoom: False
     on_zoom:
         self.zoom = 7 if self.zoom < 7 else self.zoom

forestmapview.py

@@ -8,8 +8,8 @@ class ForestMapView(MapView):
     get_trees_timer = None
     tree_names = []
     
-    def print_current_zoom(self):
-        print("] Zoom level: " + zoom)
+    def print_current_zoom(self, *args):
+        print("] Zoom level: " + str(self.zoom))
     
     def start_get_fov_trees(self):
         # After one second get the trees in field of view
@@ -41,7 +41,7 @@ class ForestMapView(MapView):
         # Create TreeMarker
         name = tree[0]
         lat, lon = tree[1], tree[2]
-        treemarker = TreeMarker(lat=lat, lon=lon, source='assets/images/marker_tree.png')
+        treemarker = TreeMarker(lat=lat, lon=lon, source='assets/images/markers/tree.png')
         treemarker.tree_data = treemarker
         
         # Add TreeMarker to the map