From ad9ba00567c47ca00d2ff01931e0075c61ab8bbb Mon Sep 17 00:00:00 2001
From: Sara <sarasdj@stud.ntnu.no>
Date: Thu, 9 May 2024 19:21:28 +0200
Subject: [PATCH] update: rollback some of the division logic
---
.../__pycache__/add_new_lake.cpython-311.pyc | Bin 11083 -> 10702 bytes
server/map_handler/add_new_lake.py | 18 +++---------------
.../lake_relations/all_lake_names.json | 3 ++-
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc b/server/map_handler/__pycache__/add_new_lake.cpython-311.pyc
index dd89aae39ab901f86fce84e3504e94ab4d91eb4c..a2f322da4b53723c391fe39b2dd41dda48c08e24 100644
GIT binary patch
delta 1690
zcmZuxTWBLy7(R2$Ol~ttn#;6Fn<j0VCfZ%CR>8eMx4VLFD_gsi6?a$Cp0p;mP4;A}
zww~EmL`2*b>JdRHZ1ADpWic;4cm+YkDqGN(0YwlmFJjpjWkK<riL*_XJ!HQ5=Kucx
z{OA1tIr)0}+bQ)8zuyDsxF#H$)A~2mOPsdx{y0f<{TqJ|l6$#H-g1#wxmS3@O?LPU
z=Ousf$u$|fpxnvg>``_(%v7*)S_Hs!n;z3^da(eNRWJSaVV|KnUI1V>bgxPPY;gd*
zL!aibJ^k2q6r8zesz%VUQ-2lvpoc|Z|CSJ<L4qTi8rJG=a!wA5SS@?Vq@qt7F-N5V
zT6+>xGxk<~Gc~>!Yjp2%tdSwHThg#x*I2fIk!lfDD*G~t!yLHq;yf?|P&R{DrW^Ui
z4B^mTf$ZXRm|-(wMvcCf38FZP!z3l?p*C{_M{ox<$0IR1t!`vmLPEv>nUvzUgvw#Z
zT8=o3rXDjp+ve(oGWlHUQrnH>Qz<ERVZB+y1>DtMF1n$kM%I~?mQ!!n%{cTMLoIr+
zUB@w~Zt^%@zTOh3Z3<=r2bu}*#EJF*4&We^R{iwQ1TXvw12~9%*pCGqfWb|d*^Rln
zPU{~bpSg4*()S-O&E120)??R|E;%|n(y}D^#tg>YEh>+@w|IJ@=+hi@1)!dwIdbGp
zB}y*KQSzFdM-4EkoOB%Pz3d>U#+YLOpqwUuN;+TfvzK_kGLW*bSJR;%pwnj3xNpxL
zcH$)2P+}ZQ7a^Z0;TuziIq(pG9cJ=;5_U}e&l)4{FF8&j|9DPuN@Lpl9M5IQkNy-H
zRPzI_LbY04f|fE<Szdw#w1U|6MD*?eOI#?`3?x%Z9#gYH%TubAmTE>}X|{+IW_?M0
zo9iWqv;(RamL4y`B79`AP(?%J11-&?2-(q2a(9t|z_i%Q+@B8grcjhJOP*aeY}YgN
zi#89`{-sxR9qfi7`64h*o(!&eN8d_ZerhK?_FZ_4@S(-Vv!Rdp*f<y$!M5m`$P3%*
zXmBDUe3OwT@{LoGq%gt`7IHJ#Pa)?+XBqEjz-|Jv^-0DaWH80xBzadK_UvPn!THAT
z`U^rAI}eEU0u3{`odK%@+D|SfGJP|Q&QYkbI`y()?+e|*1O~4+zE6B5a>vM}R6KVp
zHCSSW))^hKDO_Hx(&|<Uu(?tRu^ONf`8k#L9AuQi#|<rgRpd?(K0D0)Mn<wv(D~lW
zJ{&vFCXtNNLa}BEbESD?vXB!bIhghwV3ffR<oMu@x5_?QQuGYT=58Bar_}P+9xYUh
z3oH97)tcSuX3yCMt$?G=7b}ZJ1FewfbN$EI4X~s+x?%&dmf5wkH)@HnG;7%FwbLT{
zcMFitfOYzsa&WN%mlukM(aYp&?kqW%?-Z_pd&mR%o+Cejp)2jbUDp!F#diV2`c(7%
P;Yjm+6PzL2`L+K5gb-ja
delta 1987
zcmaJ>U5pb|6u#5HnYP>i>3?^(KifZ{QrKNlzz2oJsF0O_3sH1am@eDW-PV~|mGzE5
zB9Z9&gC{W<FgC`ZVk9wr;X&e)F@%7WG+{HwL?1Nq#niuq2Oqq*WoV1WN&C&Y=bU@K
zbI&<*ukF4vWB=G@vmo-sQD*Mf<SF|HjP=xo9S~(wr*5TSJF`po5ex4z?`}GT6c!r=
zU66Wro^9xv`xFjyWka84tzwp~+8QBjmWQAj2pYYZt+Vi4z&mL^#~}0>`F9@%t>jiV
z$}Vk9_OOE<ibeLodR>z7!d~6zQ7bkHY%h!Q9X4eM5A7$pC^p5eI1~rg3*0iXDo*T_
zdm9k83Fc)ZLW3+FPZu_kQ@x>Za=0%a4m$-4-GN=_^lp;8UNb6g?Cu^*&z0@4J{Xvh
zM>QkycMozXZaMb9)<n-bP!TsAXCo%UX05xSknlRvJx9!8H@uaIaHNuNb{t5R;U(Th
zTjmj1g~wKMsGk%s_V$X^DU?s~D*+`aXZxZBaS;0<X9&9bwE-N!KB5f-=5$Jk1P%{$
z+1u^%npr~O)q<6MnndWgDv<%22wX7?JNhXif)TD7LL4C&#^G*N;VIU!pPXx(Y|~<q
zs)p~X>WE;I*Y(-?K|2l!_Om)XQVwW7g5#`S8O5G1$@u7?KZ7tY7?%m7!ms=+I5Cf%
z*oF1jBe>3*lqhEELHN;_V?qRZc$BkSlo*a3^WQdj;R%y3w^1V_30v<bkRRx?>Tncd
zoCi402Va_a_}k=#Vb0Ht-VX1yV^of68|pDS0O=`hjZpc{)ZpkKQGJYr@WL@RmE?Q=
zV@TYu#O23(8X<_|XVCjPxMa%0pX|R=@Y>=p#|6)BBzP1eH4by%FpLq#E&CW_W5x2S
zj!6M;i)GBEMY$-Js-mP?N>XW2k_(Fmiz4}SkZLN_YQ;rCq}L5h*wzHO1J$KPp&%X+
z%|s<~)X7jONiv+UrQwq8Jd=QV`{qq{E$D2mS~((#bih<jQ>xZNr7~NRDuqQsQmsPi
z`I1l+W)})IF%MtZ<FIPq#cYIo95W=`aYte-8jXr{GFA5AlHBntkQJRT36tC77;5u1
z_}Z~!zHLIG$VvOEKT&_I<zLrEdh<jFPCl|4NwgxlHqzOMhQQn0_nzU?^PjU#Prl{J
zw-Mu-Smon4`Rolo`$?wBkGJ^o>-_kwwvl-M#UX#JKGO8%TfY2BE4Z9Tt%XlVE{2=@
zREwX2GtLE%nZL<}Zg8Q~o10v^#ig%v>4wqumCnC2xigEdW-ZeW{nhb@T+<f)w-)2H
zqw$?*R6m&~rw~mPas;wN;sGj;QAkqg*q@}*428WE_Q5*;2FrRXQh2R#*#Ejdw3e<}
z3KJB@DbUV|IdF!Pi8(5k2}rcJq@=ftDo#=Zg$s>+;md}p?L<^{RY^6}3i7;aD!xb>
zEQ$2e7U?&u8meR}#H}4sSX!u&5vUe~ZvIA*wnbckxoF(-AQdTGZoCuy-N5XD6UhzC
zA8;}G0<#_Rsi*zZG>B0yRf>|TpDP^_kJBxC;KNkhvW1Eiet~PLrd6g(N-Dkz=hOKO
zuMkmnO7n$Uv2x_zL&fSsQ6_^)57(_HErn{;9I7=5hB9O6`>EDAM>3X0Iz^odc8;$a
zgwjE|ldrf1_GX5e)3B6z7Jkb_pqUwY_y?4`KKN^!mKi48MilG2yYGvW-S>asGE8TW
F{sWW>va|pI
diff --git a/server/map_handler/add_new_lake.py b/server/map_handler/add_new_lake.py
index a674b4b9..f2db0741 100644
--- a/server/map_handler/add_new_lake.py
+++ b/server/map_handler/add_new_lake.py
@@ -4,8 +4,8 @@ import random
from math import cos
import geopandas as gpd
from matplotlib import pyplot as plt
-from shapely.geometry import Polygon, LineString, MultiLineString
from shapely.ops import linemerge, unary_union, polygonize
+from shapely.geometry import Polygon, LineString, MultiLineString
from server.consts import LAKE_RELATIONS_PATH
@@ -26,15 +26,6 @@ def cut_map(self, cursor, lake_name: str, cell_size_in_km: float = 0.5):
polygon_data = geo_data[geo_data['geometry'].geom_type == 'Polygon']
polygons = [Polygon(polygon.exterior) for polygon in polygon_data['geometry']]
- # Extracting interior polygons to preserve fully enclosed islands
- interior_polys = []
- for polygon in polygon_data['geometry']:
- for interior in polygon.interiors:
- if isinstance(interior, Polygon): # Only include Polygon objects
- interior_polys.append(interior)
-
- all_islands = polygonize(interior_polys)
-
if len(polygons) <= 1:
raise Exception("Failed to convert JSON object to Shapely Polygons")
@@ -45,13 +36,13 @@ def cut_map(self, cursor, lake_name: str, cell_size_in_km: float = 0.5):
bounds = polygons[0].bounds
start_x, start_y, _, _ = bounds
- cell_width = 0.5 / 111.3200
+ cell_width = cell_size_in_km / 111.3200
cell_height = cell_width / cos(start_x * 0.01745)
# Process all polygons
for polygon in polygons:
# Generate a grid based on the calculated cell size
- lines = create_grid(polygon, cell_width * 2, cell_height)
+ lines = create_grid(polygon, cell_width*2, cell_height)
lines.append(polygon.boundary)
# Merge the grid lines into a single grid object
lines = unary_union(lines)
@@ -61,9 +52,6 @@ def cut_map(self, cursor, lake_name: str, cell_size_in_km: float = 0.5):
# Divide the polygon into tiles based on the generated grid
divided_map.extend(combine_grid_with_poly(polygon, lines))
- # Add islands as the last object
- divided_map.extend(all_islands)
-
# List to store new GeoJSON feature objects
features = []
diff --git a/server/map_handler/lake_relations/all_lake_names.json b/server/map_handler/lake_relations/all_lake_names.json
index d1d3eb65..3a0d20e1 100644
--- a/server/map_handler/lake_relations/all_lake_names.json
+++ b/server/map_handler/lake_relations/all_lake_names.json
@@ -1,4 +1,5 @@
[
"Mjøsa",
- "Skumsjøen"
+ "Skumsjøen",
+ "Mjøsa"
]
\ No newline at end of file
--
GitLab