Skip to content
Snippets Groups Projects
Commit 13bfa301 authored by Sara Savanovic Djordjevic's avatar Sara Savanovic Djordjevic
Browse files

fix: color parsing problem

parent 53a8ab44
No related branches found
No related tags found
No related merge requests found
......@@ -113,6 +113,7 @@ class MarkerTemplate {
// parseColor parses the color strings into Colors types
static Color parseColor(String colorString) {
colorString = colorString.toLowerCase();
switch (colorString) {
case 'yellow':
return Colors.yellow;
......
No preview for this file type
No preview for this file type
from flask import Flask, jsonify
from http.server import HTTPServer, BaseHTTPRequestHandler
from pymongo import MongoClient
from pymongo.server_api import ServerApi
from consts import DB_NAME, COLLECTION, MONGO_URI, MONGO_CERT_PATH, SSL_CERT_PATH, SSL_KEY_PATH, HOST, PORT
from map.get_markers import get_markers
import atexit
import ssl
import keyboard
......
No preview for this file type
import os
import sys
from data_structs import Measurement, Sensor, MarkerTemplate, DateAndTime
from flask import json
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 Measurement, Sensor, MarkerTemplate, DateAndTime
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
......@@ -25,14 +25,14 @@ def get_markers():
measurement3 = Measurement(longitude=10.8471, latitude=60.7366, datetime=datetime3, sensor=sensor1,
precipitation=0.0, thickness=0.0, max_weight=0.0, safety_level=0.0, accuracy=4.0)
testData = [
test_data = [
MarkerTemplate(measurement1, 30.0-measurement1.accuracy, "green"),
MarkerTemplate(measurement2, 10.0-measurement2.accuracy, "red"),
MarkerTemplate(measurement3, 20.0-measurement3.accuracy, "yellow"),
]
# NB: return test data as JSON
return json.dumps([marker.to_dict() for marker in testData]), 200
return json.dumps([marker.to_dict() for marker in test_data]), 200
except Exception as e:
return e, 500
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment