From 25e357741a06af6029a5562b8996d7b435d2c071 Mon Sep 17 00:00:00 2001 From: Hoa Ben The Nguyen <hbnguye@stud.ntnu.no> Date: Mon, 4 Mar 2024 10:53:20 +0100 Subject: [PATCH] change: test data --- .../__pycache__/get_weather.cpython-39.pyc | Bin 2017 -> 2017 bytes server/__pycache__/consts.cpython-39.pyc | Bin 329 -> 329 bytes .../process_lidar_data.cpython-39.pyc | Bin 2853 -> 2853 bytes server/main.py | 2 ++ .../__pycache__/get_markers.cpython-39.pyc | Bin 2646 -> 2646 bytes .../__pycache__/get_relation.cpython-39.pyc | Bin 0 -> 933 bytes .../__pycache__/input_new_data.cpython-39.pyc | Bin 1759 -> 1759 bytes server/map/input_new_data.py | 2 +- server/sql_db/icedb | Bin 49152 -> 49152 bytes 9 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 server/map/__pycache__/get_relation.cpython-39.pyc diff --git a/server/APIs/__pycache__/get_weather.cpython-39.pyc b/server/APIs/__pycache__/get_weather.cpython-39.pyc index f8858872de717cd7d93b420283a1654752615aec..6a4217c61d5d10230214c9f68adf82ae4e7d0ed4 100644 GIT binary patch delta 164 zcmaFJ|B#<Mk(ZZ?0SI<ae!7uciiI(1vKmV?cNB+DVo7F6X-aC;<{p-0MxgKqRz)Bw z#AeT^J~@a@g^drWsfcHC4Vww0(d3P6w?j>U0-9{MSkrP6i?fTEK+<X;LIFgGfC!L^ hA|q777|6ZFVUwGmQks)$#|Y#Va{vh*Mh*~U0RRhUBH91| delta 164 zcmaFJ|B#<Mk(ZZ?0SHR&T;Iqo#lm=NvKmV?_bm>e#FEUC(v;L&n|oN28G*tdSQUY! z5Su-t*5n{I6*hjLrXt?SHEbq~=94$F-43+`3TU$3Vol3QEY2=s0!eFv2xSl<4kAD* hip)_73n2FvhfQvNN@-529V3ue%mE~L7&$<Y1prW1C4T?_ diff --git a/server/__pycache__/consts.cpython-39.pyc b/server/__pycache__/consts.cpython-39.pyc index e433442a8c71c203e1aa9f944f8e34593d10cba5..eeb75f82b9a15f779acada9e282ada5a3919fb91 100644 GIT binary patch delta 20 acmX@fbdrfXk(ZZ?0SI<ae!7v{ju8Mh(gjrj delta 20 acmX@fbdrfXk(ZZ?0SFwXJ=n-?#|Qv3ZUoo> 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 GIT binary patch delta 20 acmZ1~wp5Hek(ZZ?0SKl{dAgBXiW>kk0R;5` delta 20 acmZ1~wp5Hek(ZZ?0SLBEd9aaNiW>kk&jk?x diff --git a/server/main.py b/server/main.py index 90c4048f..021581b6 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 GIT binary patch delta 20 acmca6a!rIgk(ZZ?0SI<ae!7v{n+pItYXzwQ delta 20 acmca6a!rIgk(ZZ?0SFwXJ=n<Y%>@8B2L&tu 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 GIT binary patch literal 933 zcmYjQPjAyO6u09fP16>(aoITS+Qa^62LuQqq#+@pu^~-dqDqllyIHy<j%;_MRd?eX zAaUZ59{C1H9J%lrd_^4g36MDP>=rRw_WS*w{rvvPwAYIfjBg)*@!tfYpO)MmphGWU zsYkFe#BhO<mBa~l+)Id)ei<YoMjSEkGiHSOAN-`n@Hy%Sw_uA-``Gk`g3VGfPOquv za^zY4dW0YYSjVu`C)hM<FvClH<1Jt^ZwF00MlM0#kOgVT5@DqMCSd*&I~1~Djan>R zqsZNAH!)armIz++b-U><z~&}cpr*%K_9mcvEMo1Y=kR@NwLp`NW^)lVTP$8e92nAu zWICtwZN=pkmj@-S56X#9bU))_qC{mP043LQmbBiAVwQ<&`VdlCW3`)CyKg4nzbd-> zii_9hXQ!rpBC0IcQ^rknLbXG;Kfq?*Jr<SbmEO~{n$I_AT^IQXZiwo@`kDt*J>GlV ze_%*fGt-uwvUHpmJZak?Qfp=Wx)9osy3i(ox8X2+U(g{hl5pmv@zsU6Hol8KC<JB7 zw6sW9oK4GGnV#YmOC?ves1!FHM=!t~m!@NnR#=(f+WH3}bInc2tC3*5AA%2FjHPXM zVhfZqs%g@#R|Q%#&|9A=%SSrt{d4Bx_=4m%*#0>?emZyurB{OsLDQqbS;b$<{E83G zFRd5~$p*C)+0m23!~bB_s{!<CkZ}!Z6t0H*^~`kdDk5;9Y_pITlPwbA*v*LCBQc3_ z7e_?e<9=j9rDa}avIo>vyQUSRO16NT&5~+c^&%gF4_E(iC8hmo?hTjEoo&Y&M$byY RrUieFfhikKgzfD5e*xQA4}t&y literal 0 HcmV?d00001 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 GIT binary patch delta 20 acmcc5d!Ls(k(ZZ?0SKl{dAgDN3L5}B$Oa4m delta 20 acmcc5d!Ls(k(ZZ?0SInSez1}I3L5}Dng&e( diff --git a/server/map/input_new_data.py b/server/map/input_new_data.py index ae0965bb..b032150f 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 GIT binary patch delta 487 zcmZo@U~Xt&o*>Q0KT*b+m7hT`UV3B70)K86eg+19ZT=(to&1{x1wQgAYqD@KavF<s zaImu&85o)98W`&um?#)nTA3JI8JhWK<rgPTR*rwj!@~cHf&UNxH~tU&uYfvl@lXEX z&%(sQGWkQkhzt+!Z3h0c{4@De_|5p4_%8F!=PTgz;#1>e;Jpo0yqmXPnTL~+k&~01 zot=|~$w6Vy86Y_8;Fo-z%eG*NgKDq;ee0Ac6>gv+Mu;M2CI`70kuO{4&2aEb^1bwN z<sS#t4U2)w3zfJyfhIvzIVfD}I--Abhl5|@>sGlPK@O@#x_n_Qk}8}ClR)-~rOdyu zboV<4zj%;6vJR>fo+dbUnr|+so5Co=!@rV&|2O{^{<r+k`0w*y=fA*zf`2FfO8$-f z2Y{~c<d<h>0lJHYi3dV6bF;B9ax$`TLAWfOlTY;900U?t1OH3@i$I+Vfx0I0%ZM`@ zGhzu-7LfSl!g%4$7v`G?0QKEu;QtP^`!WAbpuQ6R$u0Xs)j65P8Nq?i0%tM9Sxg+v I;+$Yv0L2D_-2eap delta 196 zcmZo@U~Xt&o*>Q0H&Mo!m5)I$?bXJV1^!&j{Mros+WbfOJ2wjo$nsCtj=#B?#o;f% zI0FL%2VVgL|5^T-{3-lq{7ih8`R4N#098fsZ7!&r!YIPQe}aMkH~$y@xBSoe@AF^h zzrcS2D7}Gy@`-*MpusyC_+Rp0<lhMtTg^Xt=X&=|3s?kz;*S~lzXSC=28x&QPj1;C is?NsAXe`doWMp8($t=$3o0VUj$P8yOaWIQ>g2e!_b2@7P -- GitLab