diff --git a/server/map/get_markers.py b/server/map/get_markers.py index 3ba997316f98eb71de12c6677b6beb6397c9a543..06a95e2092447ab806311837e7d1b44c5598ef45 100644 --- a/server/map/get_markers.py +++ b/server/map/get_markers.py @@ -1,19 +1,31 @@ import os import sys +from datetime import datetime current_dir = os.path.dirname(__file__) parent_dir = os.path.abspath(os.path.join(current_dir, '..')) sys.path.append(parent_dir) -from data_structs import MarkerTemplate +from data_structs import Measurement, Sensor, MarkerTemplate from flask import json # get_markers parses a list of MarkerTemplate objects to json, and returns either a successfully # parsed json object with status code 200, or and error message and status code 501 def get_markers(): try: + # NB: temporary test data + sensor1 = Sensor(ID=1, type="Type1", active=True) + sensor2 = Sensor(ID=2, type="Type2", active=False) + + measurement1 = Measurement(longitude=10.9771, latitude=60.7066, datetime=datetime(2023, 12, 31, 15, 43, 2), + sensor=sensor1, precipitation=0.0, thickness=0.0, max_weight=0.0, safety_level=0.0, accuracy=2.5), + measurement2 = Measurement(longitude=10.8171, latitude=60.6366, datetime=datetime(2024, 1, 7, 23, 59, 59), + sensor=sensor2, precipitation=0.0, thickness=0.0, max_weight=0.0, safety_level=0.0, accuracy=1.5), + measurement3 = Measurement(longitude=10.8471, latitude=60.7366, datetime=datetime(2024, 2, 3, 12, 00, 19), + sensor=sensor1, precipitation=0.0, thickness=0.0, max_weight=0.0, safety_level=0.0, accuracy=4.0), + testData = [ - MarkerTemplate(latitude=60.7066, longitude=10.9771, size=50.0, color='blue', radius=10.0), - MarkerTemplate(latitude=60.6366, longitude=10.8171, size=30.0, color='red', radius=8.0), - MarkerTemplate(latitude=60.7366, longitude=10.8471, size=20.0, color='green', radius = 14.0), + MarkerTemplate(measurement1, 30.0-measurement1.accuracy, "Green"), + MarkerTemplate(measurement2, 10.0-measurement2.accuracy, "Red"), + MarkerTemplate(measurement3, 20.0-measurement3.accuracy, "Yellow"), ] return json.dumps([marker.to_dict() for marker in testData]), 200