darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Stop saying "areas" when we mean "area_ids"

Browse Source 
"areas" normally means an instance of BroadcastArea or similar, so
we should be more accurate to avoid confusion.
This commit is contained in:
Ben Thorner
2021-08-26 10:42:20 +01:00
parent bdf0fdbd5f
commit de9d1f991b
5 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/broadcast_areas/models.py
View File

@@ -184,8 +184,8 @@ class CustomBroadcastArea(BaseBroadcastArea):
class CustomBroadcastAreas(SerialisedModelCollection):
model = CustomBroadcastArea
def __init__(self, *, areas, polygons):
self.items = areas
def __init__(self, *, area_ids, polygons):
self.items = area_ids
self._polygons = polygons
def __getitem__(self, index):

29
app/models/broadcast_message.py
View File

@@ -88,7 +88,7 @@ class BroadcastMessage(JSONModel):
@property
def areas(self):
library_areas = self.get_areas(areas=self._dict['areas'])
library_areas = self.get_areas(self._dict['areas'])
if library_areas:
if len(library_areas) != len(self._dict['areas']):
@@ -99,7 +99,7 @@ class BroadcastMessage(JSONModel):
return library_areas
return CustomBroadcastAreas(
areas=self._dict['areas'],
area_ids=self._dict['areas'],
polygons=self._dict['simple_polygons'],
)
@@ -201,9 +201,9 @@ class BroadcastMessage(JSONModel):
return round_to_significant_figures(count, 1)
def get_areas(self, areas):
def get_areas(self, area_ids):
return broadcast_area_libraries.get_areas(
areas
area_ids
)
def get_simple_polygons(self, areas):
@@ -216,20 +216,17 @@ class BroadcastMessage(JSONModel):
# combined shapes to keep the point count down
return polygons.smooth.simplify if len(areas) > 1 else polygons
def add_areas(self, *new_areas):
areas = list(OrderedSet(
self._dict['areas'] + list(new_areas)
def add_areas(self, *new_area_ids):
area_ids = list(OrderedSet(
self._dict['areas'] + list(new_area_ids)
))
simple_polygons = self.get_simple_polygons(areas=self.get_areas(areas=areas))
self._update(areas=areas, simple_polygons=simple_polygons.as_coordinate_pairs_lat_long)
simple_polygons = self.get_simple_polygons(areas=self.get_areas(area_ids))
self._update(areas=area_ids, simple_polygons=simple_polygons.as_coordinate_pairs_lat_long)
def remove_area(self, area_to_remove):
areas = [
area for area in self._dict['areas']
if area != area_to_remove
]
simple_polygons = self.get_simple_polygons(areas=self.get_areas(areas=areas))
self._update(areas=areas, simple_polygons=simple_polygons.as_coordinate_pairs_lat_long)
def remove_area(self, area_id):
area_ids = list(set(self._dict['areas']) - {area_id})
simple_polygons = self.get_simple_polygons(areas=self.get_areas(area_ids))
self._update(areas=area_ids, simple_polygons=simple_polygons.as_coordinate_pairs_lat_long)
def _set_status_to(self, status):
broadcast_message_api_client.update_broadcast_message_status(