diff --git a/server/APIs/__pycache__/get_weather.cpython-39.pyc b/server/APIs/__pycache__/get_weather.cpython-39.pyc index f8858872de717cd7d93b420283a1654752615aec..6a4217c61d5d10230214c9f68adf82ae4e7d0ed4 100644 Binary files a/server/APIs/__pycache__/get_weather.cpython-39.pyc and b/server/APIs/__pycache__/get_weather.cpython-39.pyc differ diff --git a/server/__pycache__/consts.cpython-39.pyc b/server/__pycache__/consts.cpython-39.pyc index e433442a8c71c203e1aa9f944f8e34593d10cba5..eeb75f82b9a15f779acada9e282ada5a3919fb91 100644 Binary files a/server/__pycache__/consts.cpython-39.pyc and b/server/__pycache__/consts.cpython-39.pyc differ diff --git a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc index ed6b00f7f03e667fd4b21e59cb7f512854ed06c6..47edf95b89a3f2a16363fcc7430b1e02bc70d60d 100644 Binary files a/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc and b/server/data_processing/__pycache__/process_lidar_data.cpython-39.pyc differ diff --git a/server/main.py b/server/main.py index 90c4048f8c59ea441269c4301db6572ff0f6d90d..021581b66bad5d2d02f87f82d89824754cd1358a 100644 --- a/server/main.py +++ b/server/main.py @@ -2,6 +2,8 @@ from flask import Flask from http.server import HTTPServer, BaseHTTPRequestHandler from consts import SSL_CERT_PATH, SSL_KEY_PATH, HOST, PORT from map.get_markers import get_all_markers +from map.input_new_data import input_new_Lidar_data +#from map.get_relation import get_relation from APIs.get_weather import get_weather import ssl import keyboard diff --git a/server/map/__pycache__/get_markers.cpython-39.pyc b/server/map/__pycache__/get_markers.cpython-39.pyc index aad0ea50bd5011763aefdf8504abb73c11223f3b..c1b95c053be539be6996efc2239388bcdada2a33 100644 Binary files a/server/map/__pycache__/get_markers.cpython-39.pyc and b/server/map/__pycache__/get_markers.cpython-39.pyc differ diff --git a/server/map/__pycache__/get_relation.cpython-39.pyc b/server/map/__pycache__/get_relation.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a9aa82b5f430dc0f6cbd1672148de6d7fae5e6d8 Binary files /dev/null and b/server/map/__pycache__/get_relation.cpython-39.pyc differ diff --git a/server/map/__pycache__/input_new_data.cpython-39.pyc b/server/map/__pycache__/input_new_data.cpython-39.pyc index 673649fd0412e6fd0fa2c004c01e4a38123e7fda..0bd02d71bf69b6ab2b4ebf9ed26a4e027128f49a 100644 Binary files a/server/map/__pycache__/input_new_data.cpython-39.pyc and b/server/map/__pycache__/input_new_data.cpython-39.pyc differ diff --git a/server/map/input_new_data.py b/server/map/input_new_data.py index ae0965bb208d57055e4aa42e64f05877b12baf04..b032150f3f3dc5db87bcf16d1aaca995503680c3 100644 --- a/server/map/input_new_data.py +++ b/server/map/input_new_data.py @@ -8,7 +8,7 @@ def input_new_Lidar_data(self, cursor, sensorId, bodyOfWater): cursor.execute(''' INSERT INTO Measurement( SensorID, TimeMeasured, WaterBodyName, WholeAverageThickness) VALUES (?,?,?,?); - ''', ( sensorId, datetime.utcnow().replace(microsecond=0), bodyOfWater,0)) + ''', ( sensorId, datetime.utcnow().replace(microsecond=0), bodyOfWater, 0)) # auto generate new measurement id measurement_id = cursor.lastrowid diff --git a/server/sql_db/icedb b/server/sql_db/icedb index 2ba5aeca796f334edd9df517a92df6a2d401852f..2b47b60d052434b9a32c5fa7d5bb044f59cf1974 100644 Binary files a/server/sql_db/icedb and b/server/sql_db/icedb differ