rearrange marker assets

This commit is contained in:
Daniel afx 2020-10-14 18:54:37 +03:00
parent 8d1994f365
commit 060f385b5a
7 changed files with 10 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.4 KiB

View file

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

View file

@ -13,7 +13,7 @@ package.domain = net.deflax.globalforest
source.dir = . source.dir = .
# (list) Source files to include (let empty to include all the files) # (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 # (list) List of inclusions using pattern matching
source.include_patterns = assets/*,images/*.png,databases/*.db source.include_patterns = assets/*,images/*.png,databases/*.db
@ -46,10 +46,10 @@ requirements = python3,requests,certifi,urllib3,chardet,idna,sqlite3,kivy,mapvie
#garden_requirements = #garden_requirements =
# (str) Presplash of the application # (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 # (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) # (str) Supported orientation (one of landscape, sensorLandscape, portrait or all)
orientation = portrait orientation = portrait

View file

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

View file

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