From dbfcd02e062dfe645dd19cfe49ee3ac9bf9be512 Mon Sep 17 00:00:00 2001
From: Sara Djordjevic <sarasdj@stud.ntnu.no>
Date: Mon, 5 Feb 2024 14:47:09 +0100
Subject: [PATCH] :add: update_map endpoint, not tested2
---
.../__pycache__/data_structs.cpython-311.pyc | Bin 0 -> 916 bytes
.../__pycache__/update_map.cpython-311.pyc | Bin 0 -> 1137 bytes
server/calc_model/update_map.py | 2 +-
server/{sturcts.py => data_structs.py} | 2 --
server/main.py | 17 +++++++++++++++++
server/stub/stub.py | 2 +-
6 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 server/__pycache__/data_structs.cpython-311.pyc
create mode 100644 server/calc_model/__pycache__/update_map.cpython-311.pyc
rename server/{sturcts.py => data_structs.py} (83%)
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
GIT binary patch
literal 916
zcmZuvzi-n(6h1pn>_l;Xkx){B6et5hqN)%}5kd?>-O>u^5?MM~_BFBUIOco_1ZBw3
zAp?6BW>CdH!9T#pV0lGCVlxU;C*F(WEajd2-S@q_@9y25zvy~_K)n3*jeVC1`H3P8
zZ9`U1fGmlPO<JRDXKdw@+9NVKB6jwI*tyT({t90bJ;|0{leXGV6WtBdUi{8O?oy5N
z?#SyqVr;WWb4`&j-RI15d`CcH<VATgaIABW1wm98n(yg5=JW?5DhB2m6I1H433DUO
zw5%~Vt*Mo6hP|{At2&S+VFXGdJ=vBnNH1f{P+TU;cT8cPj2ur`=~>Z*r^vv!8UQTG
zOqvl2EQy&6DqWn+GN87no++TvxsF*Dl(JPhP}!|gLFH0q6DUXOa<sO!NC}vG#?i^q
zz;PZ|5wJ>*_s8+o0+g*yTy?Fd#%aKKV0gkC8^<2&aA(3=k6PU~-BY8(f^#wQjgwc$
zM~@E=4h+ux(VBo~!nk3>UC==Au_c0ie;R3&I-Vma{ZQLp(|(#O;r53Ba}qZ1EtHR?
z@Ky^tJ-qX9q5RNx)9mhj$d<#~4=~%@Oj_s*eFbLHZ7aBsXAT*qQGwFo$R4}Mi<G_{
zn{G0~D=_zx@G5k?j8IHL2NLW7%(pF;)$HAvT!+Mu*0vm#e0+B**wBZ+k0mQMaM|rH
zSK70rp67fA2Jq2?9zdLtBq`33S|hC72pi3?S`UHOcfv|FE^9S8CIItNd{dL4kn8XV
LbASIcu-^M0NWjsy
literal 0
HcmV?d00001
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
GIT binary patch
literal 1137
zcmZuwO=uHA6n?Wm$tJZ1ZE8gY*Q#g`Ytf4>tv^^5J)~kRVhDt=JJoGByUWbR+R{oX
zf<1arEQsJq5yf+ldh@t}9Kt|BkRH4Rs!%-nW@EK2eLMT++nM*x_vX#)yUxxupnY8Z
zOh*-f@A6~A)W2ZOMeq`Au!##r*()xoDn+HL7FE(7*NPg|CiD&Jo5Tj%+}r9~0`LLf
zw#8h{O;(MffmnY6#gt77kW2iK0r{LF^lNT~Pm1IO_dREPdPeE%%Mp<psf3kVzT<_~
zzr~Os<z>=q4RkLd1>vUIiGO$&CUC25+nUfE36mQ$0JCJ<tTL<EWLzo0Q3#FyamRq2
znN!1#|0A|CtG<HQ%2qys&8yq0tvTBiY<*m@lzUjxIrXtx_}fpBDR`vbgDH|r<bQlc
znVFMU8S|Oxc&6oh4=D>B@4gwxf|xdz#teP)W??ixXbPRm$eHdNUPzf&am@l{NHF6C
zoS#^fTtaBFyh68Y)qo45T(%u6ESH&vQX+Nrkwt^hkpTfig`6hRQluQ~iIn7)<$y34
z<$>>UDhTD0Y@+?XYYmphIAy%#g<h>R>d_JAJf!AnGk+&PRvMvvGW3Jet=ps5&kpqW
zmlzHF7$65TEm;-UDp!4*x}{oxI<#D^1bxA@*c&k4qMXO#?QB>Vs>&neFVM|HOX<)r
zk=5+}=Qo#T8i&u;v*#MwbBn283CJE?8mM<2Z*(1BG`?kembw<_BID5dN=LQ@Dv~z)
z6{9oSJ+!<B9k#kL+%SeCV|X>QZz&laIUn^5)H8#P%;55sD049~wzqY(R#GmCfFHoj
z7EblSr}X6$>hiJ6z3P`k1mTxn9epm%QWzlgae48Xyw2@&Q28_$T2Kieh(sj_sAr2^
z@iFj_)vS;+dHdu2zlSx1!1kj1Z46=QYA(IN4&tZ$2RKL9QVAhV=$Mb6CYaGqtqJM*
l_-TUr#CV!n$UM{P(A|LU2)dil8*ObZZ5NS++u1X@@jswH9*F<|
literal 0
HcmV?d00001
diff --git a/server/calc_model/update_map.py b/server/calc_model/update_map.py
index 05e67323..ab93991e 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 1bc01706..a0709b8e 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 503048ae..552c4918 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 cac8d74f..9abbfba8 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)
--
GitLab