diff --git a/server/__pycache__/data_structs.cpython-311.pyc b/server/__pycache__/data_structs.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..637f0e2f98054a92e7adcb5e251233a6d0ad1dbd Binary files /dev/null and b/server/__pycache__/data_structs.cpython-311.pyc differ diff --git a/server/calc_model/__pycache__/update_map.cpython-311.pyc b/server/calc_model/__pycache__/update_map.cpython-311.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3459a0a2d6913cc3d8585f946f395a5140620cfe Binary files /dev/null and b/server/calc_model/__pycache__/update_map.cpython-311.pyc differ diff --git a/server/calc_model/update_map.py b/server/calc_model/update_map.py index 05e673232148b649386673b1e5bdae880dffd3bf..ab93991e4aa094625797e80f0f7974118550149a 100644 --- a/server/calc_model/update_map.py +++ b/server/calc_model/update_map.py @@ -2,7 +2,7 @@ import json from flask import Flask, jsonify import sys sys.path.append('..') # Add root directory to the system path -from server import DataPoint +from data_structs import DataPoint def process_data_point(data_point): try: diff --git a/server/sturcts.py b/server/data_structs.py similarity index 83% rename from server/sturcts.py rename to server/data_structs.py index 1bc01706763c010a3cb7a2253c9df5c6fa8f2076..a0709b8e9a36f0ad54afbeafc9c9e8fa5d4554d8 100644 --- a/server/sturcts.py +++ b/server/data_structs.py @@ -20,6 +20,4 @@ class DataPoint: self.safety_level = safety_level self.accuracy = accuracy -# Test instance -test_instance = DataPoint(longitude=1.5, latitude=2.5, precipitation=10.0, thickness = 10.0, safety_level= 5, max_weight= 80) diff --git a/server/main.py b/server/main.py index 503048ae2749f6766de3b3e3d027df509b5c6a24..552c49184a6201f49ea25951325c90a368c4cdb7 100644 --- a/server/main.py +++ b/server/main.py @@ -3,6 +3,8 @@ 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 calc_model.update_map import process_data_point +from data_structs import DataPoint import atexit import ssl @@ -29,6 +31,21 @@ class IceHTTP(BaseHTTPRequestHandler): self.send_header("Content-type", "text/plain") self.end_headers() self.wfile.write(b"Root path hit!") + elif self.path == '/update_map': + # NB temporary test data + data_point_instance = DataPoint(longitude=1.0, latitude=2.0, precipitation=10.5, thickness=3.0, max_weight=50.0, safety_level=3, accuracy=8) + + # Get response from process_data_point + response, status_code = process_data_point(data_point_instance) + + # Send the response + self.send_response(status_code) + self.send_header("Content-type", "application/json") + self.end_headers() + + # Write response to response object + self.wfile.write(response.encode('utf-8')) + # Start a server on port 8443 using defined HTTP class if __name__ == "__main__": diff --git a/server/stub/stub.py b/server/stub/stub.py index cac8d74f17f01e3bcf8a9f3f7a2f14b6f632d616..9abbfba8ac637fb07e78acd4d59157581a5b7078 100644 --- a/server/stub/stub.py +++ b/server/stub/stub.py @@ -1,6 +1,6 @@ import sys sys.path.append('..') # Add root directory to the system path -from server import DataPoint +from data_structs import DataPoint # Test instances test_data1 = DataPoint(longitude=1.0, latitude=2.0, precipitation=10.5, thickness=3.0, max_weight=50.0, safety_level=2.5, accuracy=8)