Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PROG2900
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sara Savanovic Djordjevic
PROG2900
Commits
33b45233
Commit
33b45233
authored
1 year ago
by
Sara Savanovic Djordjevic
Browse files
Options
Downloads
Patches
Plain Diff
update: only treat first polygon, still no work
parent
1fef2ffa
No related branches found
Branches containing commit
No related tags found
1 merge request
!6
Clhp map
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server/map/__pycache__/get_relation.cpython-311.pyc
+0
-0
0 additions, 0 deletions
server/map/__pycache__/get_relation.cpython-311.pyc
server/map/get_relation.py
+16
-7
16 additions, 7 deletions
server/map/get_relation.py
with
16 additions
and
7 deletions
server/map/__pycache__/get_relation.cpython-311.pyc
+
0
−
0
View file @
33b45233
No preview for this file type
This diff is collapsed.
Click to expand it.
server/map/get_relation.py
+
16
−
7
View file @
33b45233
...
...
@@ -30,8 +30,11 @@ def get_relation(self, body_of_water: str):
# Divide the length and with of polygon into a grid
grid_lines
=
create_grid_coords
(
polygon
,
cell_size
=
0.1
)
#hrz_lines = grid_lines[0] # Horizontal coordinates
#vrt_lines = grid_lines[1] # Vertical coordinates
hrz_lines
=
[
60.7530
]
# Horizontal coordinates
vrt_lines
=
[
1
0.8572
]
# Vertical coordinates
vrt_lines
=
[
1
1.2267
]
# Vertical coordinates
# Cut polygon into horizontal sections
for
hrz_line
in
hrz_lines
:
...
...
@@ -54,8 +57,16 @@ def get_relation(self, body_of_water: str):
polygon
=
cut_poly_1
[
1
]
# Set polygon to the remaining, un-split shape for next iteration
# Append last remainder
divided_map
.
append
(
polygon
)
# Split last remainder into horizontal lines
for
vrt_line
in
vrt_lines
:
last_section
=
cut_polygon_in_two
(
polygon
,
vrt_line
,
False
)
divided_map
.
append
(
last_section
[
0
])
# Append part to final list of shapes
# Set polygon_part to the remaining, un-split, horizontal section for next iteration
polygon
=
last_section
[
1
]
break
# NB: temporary break to ensure treatment of only the first polygon
tiles
=
gpd
.
GeoDataFrame
(
geometry
=
divided_map
)
...
...
@@ -104,15 +115,14 @@ def cut_polygon_in_two(polygon: Polygon, divisor: float, horizontal: bool):
# Check if the split_shape has enough coordinates to create a polygon
if
len
(
split_shape
)
<
3
:
print
(
"
Not enough coordinates to create valid polygon
s
: Split shape
"
)
print
(
"
Not enough coordinates to create valid polygon: Split shape
"
)
split_shape
=
None
# Check if the remaining_shape has enough coordinates to create a polygon
if
len
(
remaining_shape
)
<
3
:
print
(
"
Not enough coordinates to create valid polygon
s
: Remaining shape
"
)
print
(
"
Not enough coordinates to create valid polygon: Remaining shape
"
)
remaining_shape
=
None
# Return split polygons as Shapely Polygon objects
return
Polygon
(
split_shape
),
Polygon
(
remaining_shape
)
...
...
@@ -131,4 +141,3 @@ def create_grid_coords(polygon: Polygon, cell_size: float):
# Return tuple of list of x coordinates and list of y coordinates
return
x_coords
,
y_coords
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment