From 84468543afa15c0c8ab8dca2f8652e77ad3b17ec Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Tue, 12 Mar 2024 12:48:48 +0100
Subject: [PATCH] update: split into horizontal sections from grid
---
.../__pycache__/get_relation.cpython-311.pyc | Bin 5437 -> 5724 bytes
server/map/get_relation.py | 19 +++++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/server/map/__pycache__/get_relation.cpython-311.pyc b/server/map/__pycache__/get_relation.cpython-311.pyc
index fb8ec21176d8e459a50cb57a1e64c0b8458ef3d8..61a991605c9616d12954c7a67b412e78d41c1477 100644
GIT binary patch
delta 1499
zcmZ`(%WoS+7@x7dPp{Xnb!<0|Y8#x^2?3QvQ5%6=AdUJ)qU9w(k(+T`8$Z(VMrx{E
zMS=qn>H#!8^uS{;4G3~*<wIK}{sB(w%Bs+ch)9S-B@PCOJ2UIrjiG$<eDm$h@B8L^
z`p2nXo>RXG1Y|(zhvU6cRlB3+Abgd~!H4i;;`cneX$VM4vU`_I(GVBG2N6@!1A{XF
zkZefX9ss_lt4|PIk0O5=nzD;OYWnry;0^$TH~dK1_EHVH`eZ7Gf&%+q3K*Ov0`ixl
z9SUqi3Z<)05K!oTr}*o~7?}L2OfEp64}kzwrGb*c?Wm(>OjVB!ZYk1FI=(UGeHwxp
zG($$nQm8#Gje?_E^zl%27`vr1(1d<)pP|q|Mj=;~*j)T5Ra24YNq97gQzmcl)$jma
zjSM8$hp-u;K18YcSUzk-P#8saqT4>22fF%1lRP~Vf<{9~dQ~gNoFeb}f?U)9))@N|
zk=Boc-1TLBD2B$!9bXhC9wXHdbr4jC{#ggu!``Sh&Hw_64<ivFK;Qz%C)%gDFJST!
zOZGLsR%w(L(&e+;@=`7~dHf>w5K*`cQ{;;98qclaN<$}Y;UUz>r{de3kHN{F_y(s@
z?KGK}4#_8}#ER8=la!@T&W>|x4^Xxx{LO>0!`}+`X6;y^6DxFMg)O-!gV@2FS8kl!
zl77}EdH_mUmu)TXD&fx#-(2h{nXZzt-QONb%B$WzG0^@<{s}@r&M9@5A8G%gobgOA
z(O2;^jGds&@zzQWoME4=H}e8!6~d<&J55mVjGSd6V;9@^gI__<OOU)9Uf&#cGVP_I
zZ14!~ct&T#6!qc#2v&FsR?>$ZOy@=%?M3AM(4DweRF@{HLyw6LBdyAlc^SZPQ1_Fs
zVQSM54QbUwi^!dS#JVXD9TAmQD)nNmg_*@`iSx~L8COtxtw~GQN|#HG5-#c`l;<7(
zQggk5T8^i&=I}*aY?MoEXNUN8s*Kq%<mG<e*n~M;z0z2|+TS)Dj(izOpL9Z3msgri
zj9SaCY6&@^jeniA*dJ4RNSI9sP7jz#h1PfE*T~D8v_}#LZfsbI+ppO1`A&Sk8=tp*
z+HO4g-^1Sp+4hfjgj82ZS@407v4za73wHikC%4eeE!-<U$QA5dVOLGq$=QxN*H!0i
zajwS$C1p>{*!~&YH-lN<<`a%oE;ZMR4RSep8s<nlI-8%O7Y^50udi+3cbM#L=@_%-
zcDU7Av#2}1OU-5tXGu`Y!a8|T`#ik_;Sp=42iX1;{ucR7n|>h#pSOe_pxf;e?)JaT
Gb?zTdXiOXc
delta 1131
zcmZ`&-A~g{6u-A0>(;I9M!UI62J)%H4=~OIjYN%z5)ebssEHWC%5)--uEwu6Mq?rm
zm}t%mBx35zG)jnOPdxAs;L9XpbkQgEL7(QMZ{7=3nbDJ+-#xwkopbK*^!DSH`6l_P
zB#DSvd~fOeY4w%dfN>a7_#Mtbkg4xB0*07o9KR7vV<%wy+fje3BU%zoSuxvZi$*BN
zBJ_gzia9|$Xh^#Eh@6nky8=Anv`uy>hY6MVieW^k@*1jdVwXpT7D;Qhep3<3_`Nin
zpHa#SIg+J%ZwXU`PPS5z9mQ7MAn6>11y%`@Zb~NP(OiihDQ+da4U(sLu@QmSZ1qmb
zVE!DAsBdz7wl5R*Seb|yon{bn!cK(rtDt3@?64g%Dhzc-%W*_8@fE{pVsqJ1Rp{q*
zR&q6(2KPCIudtCDrH770%SB=Y)0`fN8S8SS-3tchxmuDTQ(-6*_gc6*EydXt?s{4U
z$BC3GpMm;NQqSMyAK|+6^B;>x2G92FOaFA!`R`pM=+2294bjGZ$4pWheZ$ZqT)>qu
zB^-dy!V*?t&VK@8fnJV|8HNKJ#SRh#h-XtU9k}O@@%1G{0Jey_7)wm13tHoN;603q
zLu|ocm;WFx;NbEY%$Uu&{Ic8@Nrk1*p1=3=Ez%igYda}!)>1e?pvVrNA1U%<=EV`q
zq<1YTm~{N+Aqt0KPU#YBXh`8`UJgIT%ohZ+kt??Zva@QouY9BizC`t+tZJ=g3IAr9
zibWN#n!%K_?qKpa2ty2+GuyK~#vAdT(G6(`s!_~CjjDyrBP7?XCXn<)r@EWZ(mM^a
z>N?*w5@fH!YqhQIt00cI-gfRflXy|k3xYn~=f<b{AN4;QSWGk*63w6FctPLsMoztz
zQw4vj<U=9t!O21}QQ#7AO*@6_VNu(WOp=mCe&ovKvFqk>8nao;H0gIM@<YR;16Gk6
z9334tYhYWn7N?;%`f$U3jJLbzN{Fuiz;0k-o0~(p$`wk8EH4i(FaHHoBi()h)U@af
diff --git a/server/map/get_relation.py b/server/map/get_relation.py
index 7b411154..0ca4075b 100644
--- a/server/map/get_relation.py
+++ b/server/map/get_relation.py
@@ -33,7 +33,10 @@ def get_relation(self, body_of_water: str):
#hrz_lines = grid_lines[0] # Horizontal coordinates
#vrt_lines = grid_lines[1] # Vertical coordinates
- hrz_lines = [60.7530, 60.5931] # Horizontal coordinates
+ hrz_lines = grid_lines[1] # Horizontal coordinates
+ for line in hrz_lines:
+ print("line: ", line)
+
vrt_lines = [11.0413] # Vertical coordinates
# Cut polygon into horizontal sections
@@ -49,6 +52,8 @@ def get_relation(self, body_of_water: str):
divided_map.append(polygon)
+ break
+
tiles = gpd.GeoDataFrame(geometry=divided_map)
# NB test plot
@@ -88,12 +93,12 @@ def cut_polygon_in_two(polygon: Polygon, divisor: float, horizontal: bool):
for point in exterior_coords:
point = Point(point) # Convert coordinates to Shapely Point object
if horizontal: # Horizontal split
- if point.y > divisor:
+ if point.y < divisor:
split_shape.append(point)
else:
remaining_shape.append(point)
else: # Vertical split
- if point.x > divisor:
+ if point.x < divisor:
split_shape.append(point)
else:
remaining_shape.append(point)
@@ -125,8 +130,12 @@ def create_grid_coords(polygon: Polygon, cell_size: float):
x_coords = np.arange(min_x, max_x, cell_size)
y_coords = np.arange(min_y, max_y, cell_size)
- if len(x_coords) == 0 or len(y_coords) == 0:
+ # Round the coordinates to 4 decimals
+ x_coords_rounded = np.around(x_coords, decimals=4)
+ y_coords_rounded = np.around(y_coords, decimals=4)
+
+ if len(x_coords_rounded) == 0 or len(y_coords_rounded) == 0:
raise ValueError("No grid points generated")
# Return tuple of list of x coordinates and list of y coordinates
- return x_coords, y_coords
+ return x_coords_rounded, y_coords_rounded
--
GitLab