From a7739fcaf0952e459ba83d87195cc9c639993ce3 Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 29 Feb 2024 11:42:29 +0100
Subject: [PATCH] update: return only polygons
---
server/main.py | 15 ------------
.../__pycache__/get_relation.cpython-311.pyc | Bin 1254 -> 1716 bytes
server/map/get_relation.py | 22 ++++++++++++++----
server/map/map_test.py | 13 -----------
4 files changed, 18 insertions(+), 32 deletions(-)
delete mode 100644 server/map/map_test.py
diff --git a/server/main.py b/server/main.py
index af5739ff..e81df051 100644
--- a/server/main.py
+++ b/server/main.py
@@ -7,8 +7,6 @@ from APIs.get_weather import get_weather
import ssl
import keyboard
import sqlite3
-import geopandas as gpd
-import matplotlib.pyplot as plt
app = Flask(__name__)
@@ -67,19 +65,6 @@ def on_key_press(server, event, cursor, conn):
# Start a server on port 8443 using self defined HTTP class
if __name__ == "__main__":
- # Load GeoJSON data using geopandas
- geo_data = gpd.read_file("server/map/mjosa.geojson")
-
- # Filter only polygons
- polygon_data = geo_data[geo_data['geometry'].geom_type == 'Polygon']
-
- # Plot polygons
- polygon_data.plot()
- plt.title('Polygons in Mjøsa GeoJSON')
- plt.xlabel('Longitude')
- plt.ylabel('Latitude')
- plt.show()
-
try:
# Initialize database connection
conn = sqlite3.connect('server/sql_db/icedb')
diff --git a/server/map/__pycache__/get_relation.cpython-311.pyc b/server/map/__pycache__/get_relation.cpython-311.pyc
index c5c2481c4d403b41071361384a1aea05bc62f196..9abb43f4a971374e309b1d6edad01e9cd85b6552 100644
GIT binary patch
literal 1716
zcmaJ>&1)M+6rYu5^$}Td9DO*EUDx!3qBx0-;xvjWy`&IVIBp^IBGihtXQW73?Jhf`
zx>6-j!G|7t$RQ9Pb#hz$59HoUkGo>QVxUkcJ>+I^a>=PPBd;taG_xP?_ul)>dvD*&
z?62|o1;EF8`EUF(2*5u=@kihcoPNr|Gk^e6bWj{grKm_fPz*{58)`A602IKW5<tOy
zSPUcOA;`iPBFHw2@0h4nHY?>ljbeM(4=tQ3e|TzeYH;f_KowyejrtfP<&fi}vEB`I
z_=N&jeJZGrW1`?=iO+rAU?<oYIo=wF+;TLwDu71E3aE?9<Unvb`y0H_n5Vvz7asFM
z@8m^%-doird=CJ1xo|?~-xfQ!pQGv7(;2&vPR5$?XLa8A(yrP8{kZR)lqftMQ30HJ
zagyO<6hYBLz9L8C6_VUp-#;m*YZkovCEwql^U<X2sQt^6x{uL?>H4NMzEuI=p0Vxr
z6@u;WvAx>Rtkp){B-+g?HtWPRScHQHrgn>kzc%$&)ijzJ9{miH<(jelp#H~mqAlOY
zX5ryi+bp_e8r2$YBFrLN8kOk9pL|Yx=ALO#Y|tCDW#RTE&9d~`E@zm=s>sz=o3wHx
zpG~k})j}+4V-1xnH6634D55N8F=*)~WkE})Oy#k;GxUS5?O>gSS|bU`BXf^IS-q;8
z8X_!A&GJY`&4xu-oL~c$ZA>iFAehCZ`iQ5)Hj4?@2ot96$^7b`U86h`Hg-*fvmpiv
z)+@F+OtL{`q*0B{Sfd7=X=fcQquMTIaX*=?gNVbjEXV7+_clu3@b;6EL5*hV3rrqU
z(<)iES<T&DTPuxLro>mKRK=7Rt;>$xv|4Ot(qMncV~RsVlKcnJ1OLum{-x`@cgLO0
zd$al8=1B-77Y{c3MQ?G<TikeF8!X=U5}Um(?oj8BVQK(VE}Zw^yaVU|g5muyor~98
zxZ=ST2d)T1;pZP+xZuGB2QG~CwhJ>J%s4P3^v$0N`-NWN6;E{K>BfP6yp$U(<=mxp
zZ)x34-1ZW;dt2O@y85(m&~cO3z2x=Y1Cc#?4ATRcenQ6KhcI#slLMH1@}2YX9T(<3
zn0H`)Y<6MVgJ}n*<@Ei+8Ts4eRCbWc{`QHR%6X}r3vYSwmgC>2yg48nVIe~8no+gI
z*_T_((hQ^#Tl`DdTtlN`i|Mr;-eS4gLL+I5b1l34JFq_z_yhiW9r>(bqNa{Nx36(k
u{F_OUzfOXRq6|U2C$Axh_2e}K^NxQH!TZkieG<ti>;1|J;NpK@GWUORE{-Yy
literal 1254
zcmZ`&&1(}u6rV|E)5J8j#UxNGL9`+{^fQX76fx9O!J>$VmS~8bNli?4mz|9<A%z@z
zsL(?Xf<5L`EA`-?U~e9?A&{`plXxh2h*Y8U<eROVCau27zOVW1Z|1$X`QY<iKp;O_
z`|Obep>HCv1!7AMuYq}wD55xvmQE~Q!qmY~%0ZoLWXVDC6BH%~0={7SUMRGfP*RCP
zQfJz-O(Qm4@HpW){DcLi4%!xq%edMV+j)ex!QJhICGe<2=xspncHX#+Rvo(3fuW2z
z$C9$67rE+$QebVv&2~Gt!$|gCM^lKCg5!;I5fv~-iwMK&VI>__=NVQ~M%AwKZ5-V8
z3=$(iicXvpN~m=9R)Fn02ZTg#R|IFqZR4sQ+v~PvQniNNofAHF^;XgwVdxYLw{M~3
z<xG3cw253&ohZ4-SD2FFihS@DC`$cvimWqPAJdB}D-9-9HJe^e>S;xu5TKHj*HdHB
zu-7Dt%4Ac@Dg~yQMC_R)t0bu@(R@zjrjIk3CN#!XMdr+eGa-D*k`&<HQ=gksA(hTD
zFj`t?ri;nT3T0u*B%Ebani#%`QzoHFJ!$%EzJxfCiz!_day&D4H~tjL;&EA*^YI6a
zztR;ou4>B4^vvXB{G{SIR2*MnI$SGj)ikaa&HnC$76eK$QjXz+tf226-+FE<*9=Y7
zLsLd5(g;P2fyn2KF>v4T#2TJh8)50nm&f}TFKraJhTfJp%Il=<gq*cush<M!OQ_S_
zzr3TPqkpA;yHQ~H-Tanr_(vQ5(aOWN3rU_P3D!w)lN)5DK}Kq1q($6K;;$3`=JVQ(
zI|hk1NVG<xowPxM4HB%8p!NFN{9o|1W*}S-gm-Qlf$2tI+8~hziPY>LAA(lw1Y#cN
zo`=MIeS3o#bl7RSxUQw;6-|7pR?j}7LvWE60Cnu1%_%gWW%snp5Q={`p9KYd!MKHd
a6>GJSw_>ffdjQ|6rrHS1f0Z^21b+Zp{TOrr
diff --git a/server/map/get_relation.py b/server/map/get_relation.py
index 72b9aa1a..0a6a2b21 100644
--- a/server/map/get_relation.py
+++ b/server/map/get_relation.py
@@ -1,15 +1,29 @@
import string
import json
+import geopandas as gpd
+import matplotlib.pyplot as plt
# get_relation returns the geojson data for a selected body of water
def get_relation(self, body_of_water: string):
- # Read geojson file
- with open("server/map/" + body_of_water.lower() + ".geojson") as f:
- data = json.load(f)
+ # Load GeoJSON data using geopandas
+ geo_data = gpd.read_file("server/map/mjosa.geojson")
+
+ # Filter only polygons
+ polygon_data = geo_data[geo_data['geometry'].geom_type == 'Polygon']
+
+ # Plot polygons
+ polygon_data.plot()
+ plt.title('Polygons in Mjøsa GeoJSON')
+ plt.xlabel('Longitude')
+ plt.ylabel('Latitude')
+ plt.show()
+
+ # Convert GeoDataFrame to GeoJSON-like dictionary
+ geojson_dict = json.loads(polygon_data.to_json())
# Convert response data to JSON string
- response_json = json.dumps(data)
+ response_json = json.dumps(geojson_dict)
# Set headers
self.send_response(200)
diff --git a/server/map/map_test.py b/server/map/map_test.py
deleted file mode 100644
index a4c4cc8f..00000000
--- a/server/map/map_test.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import geopandas as gpd
-import matplotlib.pyplot as plt
-
-def map_test():
- # Load GeoJSON data using geopandas
- geo_data = gpd.read_file("mjosa.geojson")
-
- # Plot choropleth map
- geo_data.plot()
- plt.title('Choropleth Map of Mjøsa Lake')
- plt.xlabel('Longitude')
- plt.ylabel('Latitude')
- plt.show()
\ No newline at end of file
--
GitLab