From 060f385b5adc10fcaa50e6ea6d6312984cf020d1 Mon Sep 17 00:00:00 2001 From: Daniel afx Date: Wed, 14 Oct 2020 18:54:37 +0300 Subject: [PATCH] rearrange marker assets --- assets/images/marker_fountain.png | Bin 8056 -> 0 bytes assets/images/marker_tree.png | Bin 3048 -> 0 bytes assets/images/player.png | Bin 5569 -> 0 bytes build.sh | 3 +++ buildozer.spec | 6 +++--- forestmapview.kv | 2 +- forestmapview.py | 6 +++--- 7 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 assets/images/marker_fountain.png delete mode 100644 assets/images/marker_tree.png delete mode 100644 assets/images/player.png diff --git a/assets/images/marker_fountain.png b/assets/images/marker_fountain.png deleted file mode 100644 index 1306d290186d0192c25ee5f764df7434b28971cb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8056 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: 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 diff --git a/forestmapview.py b/forestmapview.py index d2eb1a0..b0a12d5 100644 --- a/forestmapview.py +++ b/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