darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-01 15:46:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update utils to bring in coordinate transformation"

Browse Source
This commit is contained in:
Chris Hill-Scott
2021-08-20 16:05:39 +01:00
committed by GitHub
parent c50ef90d53
commit f3e6d92046
6 changed files with 14 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/broadcast_message/translators.py
View File

@@ -28,5 +28,5 @@ def cap_xml_polygon_to_list(polygon_string):
[
float(coordinate) for coordinate in pair.split(',')
]
for pair in polygon_string.strip().split(' ')
for pair in polygon_string.split(' ')
]

12
app/v2/broadcast/post_broadcast.py
View File

@@ -43,10 +43,7 @@ def create_broadcast():
validate(broadcast_json, post_broadcast_schema)
polygons = Polygons(list(chain.from_iterable((
[
[[y, x] for x, y in polygon]
for polygon in area['polygons']
] for area in broadcast_json['areas']
area['polygons'] for area in broadcast_json['areas']
))))
template = BroadcastMessageTemplate.from_content(
@@ -65,11 +62,6 @@ def create_broadcast():
status_code=400,
)
if len(polygons) > 12 or polygons.point_count > 250:
simple_polygons = polygons.smooth.simplify
else:
simple_polygons = polygons
broadcast_message = BroadcastMessage(
service_id=authenticated_service.id,
content=broadcast_json['content'],
@@ -78,7 +70,7 @@ def create_broadcast():
'areas': [
area['name'] for area in broadcast_json['areas']
],
'simple_polygons': simple_polygons.as_coordinate_pairs_lat_long,
'simple_polygons': polygons.smooth.simplify.as_coordinate_pairs_long_lat,
},
status=BroadcastStatusType.PENDING_APPROVAL,
api_key_id=api_user.id,