hasslesstech/IoT-Systems
1
0
Fork 0
mirror of https://github.com/Rhinemann/IoT-Systems.git synced 2026-03-14 20:50:39 +02:00
Code

add multiuser rendering support

Browse Source
This commit is contained in:
ІО-23 Шмуляр Олег 2026-03-13 20:41:16 +02:00
parent ee509f72a4
commit 63aca15824
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MapView/datasource.py
View File

@ -75,6 +75,7 @@ class Datasource:
processed_agent_data.latitude, processed_agent_data.latitude,
processed_agent_data.longitude, processed_agent_data.longitude,
processed_agent_data.road_state, processed_agent_data.road_state,
processed_agent_data.user_id
) )
for processed_agent_data in processed_agent_data_list for processed_agent_data in processed_agent_data_list
] ]

41
MapView/main.py
View File

@ -5,6 +5,14 @@ from kivy.clock import Clock
from lineMapLayer import LineMapLayer from lineMapLayer import LineMapLayer
from datasource import Datasource from datasource import Datasource
line_layer_colors = [
[1, 0, 0, 1],
[1, 0.5, 0, 1],
[0, 1, 0, 1],
[0, 1, 1, 1],
[0, 0, 1, 1],
[1, 0, 1, 1],
]
class MapViewApp(App): class MapViewApp(App):
def __init__(self, **kwargs): def __init__(self, **kwargs):
@ -12,8 +20,8 @@ class MapViewApp(App):
self.mapview = None self.mapview = None
self.datasource = Datasource(user_id=1) self.datasource = Datasource(user_id=1)
self.line_layer = None self.line_layers = dict()
self.car_marker = None self.car_markers = dict()
# додати необхідні змінні # додати необхідні змінні
self.bump_markers = [] self.bump_markers = []
@ -37,13 +45,17 @@ class MapViewApp(App):
for point in new_points: for point in new_points:
lat, lon, road_state = point lat, lon, road_state, user_id = point
# Оновлює лінію маршрута # Оновлює лінію маршрута
self.line_layer.add_point((lat, lon)) if user_id not in self.line_layers:
self.line_layers[user_id] = LineMapLayer(color = line_layer_colors[user_id])
self.mapview.add_layer(self.line_layers[user_id])
self.line_layers[user_id].add_point((lat, lon))
# Оновлює маркер маниши # Оновлює маркер маниши
self.update_car_marker((lat, lon)) self.update_car_marker(lat, lon, user_id)
# Перевіряємо стан дороги # Перевіряємо стан дороги
self.check_road_quality(point) self.check_road_quality(point)
@ -56,26 +68,24 @@ class MapViewApp(App):
if len(point) < 3: if len(point) < 3:
return return
lat, lon, road_state = point lat, lon, road_state, user_id = point
if road_state == "pothole": if road_state == "pothole":
self.set_pothole_marker((lat, lon)) self.set_pothole_marker((lat, lon))
elif road_state == "bump": elif road_state == "bump":
self.set_bump_marker((lat, lon)) self.set_bump_marker((lat, lon))
def update_car_marker(self, point): def update_car_marker(self, lat, lon, user_id):
""" """
Оновлює відображення маркера машини на мапі Оновлює відображення маркера машини на мапі
:param point: GPS координати :param point: GPS координати
""" """
lat, lon = point[0], point[1] if user_id not in self.car_markers:
self.car_markers[user_id] = MapMarker(lat=lat, lon=lon, source='./images/car.png')
if not self.car_marker: self.mapview.add_marker(self.car_markers[user_id])
self.car_marker = MapMarker(lat=lat, lon=lon, source='./images/car')
self.mapview.add_marker(self.car_marker)
else: else:
self.car_marker.lat = lat self.car_markers[user_id].lat = lat
self.car_marker.lon = lon self.car_markers[user_id].lon = lon
self.mapview.center_on(lat, lon) self.mapview.center_on(lat, lon)
@ -129,9 +139,6 @@ class MapViewApp(App):
lon=30.5234 lon=30.5234
) )
self.line_layer = LineMapLayer()
self.mapview.add_layer(self.line_layer)
return self.mapview return self.mapview