diff --git a/app/broadcast_areas/broadcast-areas.sqlite3 b/app/broadcast_areas/broadcast-areas.sqlite3 index 9d0a04847..d865009d3 100644 Binary files a/app/broadcast_areas/broadcast-areas.sqlite3 and b/app/broadcast_areas/broadcast-areas.sqlite3 differ diff --git a/app/broadcast_areas/create-broadcast-areas-db.py b/app/broadcast_areas/create-broadcast-areas-db.py index f6eb77ae5..855d7ba95 100755 --- a/app/broadcast_areas/create-broadcast-areas-db.py +++ b/app/broadcast_areas/create-broadcast-areas-db.py @@ -125,7 +125,7 @@ def polygons_and_simplified_polygons(feature): point_counts.append(simplified.point_count) - if simplified.point_count >= 200: + if simplified.point_count >= 250: raise RuntimeError( 'Too many points ' '(adjust Polygons.perimeter_to_simplification_ratio or ' diff --git a/requirements.in b/requirements.in index 94cc82379..e886d3dc4 100644 --- a/requirements.in +++ b/requirements.in @@ -26,7 +26,7 @@ fido2==0.9.1 awscli-cwlogs>=1.4,<1.5 itsdangerous==1.1.0 # pyup: <2 -git+https://github.com/alphagov/notifications-utils.git@44.2.2#egg=notifications-utils==44.2.2 +git+https://github.com/alphagov/notifications-utils.git@44.4.2#egg=notifications-utils==44.4.2 git+https://github.com/alphagov/govuk-frontend-jinja.git@v0.5.8-alpha#egg=govuk-frontend-jinja==0.5.8-alpha # cryptography 3.4+ incorporates Rust code, which isn't supported on PaaS diff --git a/requirements.txt b/requirements.txt index 83a11ef77..f32fce091 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,17 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.6 # To update, run: # # pip-compile requirements.in # ago==0.0.93 # via -r requirements.in -awscli-cwlogs==1.4.6 - # via -r requirements.in awscli==1.19.84 # via # awscli-cwlogs # notifications-utils +awscli-cwlogs==1.4.6 + # via -r requirements.in bleach==3.3.0 # via notifications-utils blinker==1.4 @@ -53,12 +53,6 @@ eventlet==0.30.2 # pyup: ignore # via -r requirements.in fido2==0.9.1 # via -r requirements.in -flask-login==0.5.0 - # via -r requirements.in -flask-redis==0.4.0 - # via notifications-utils -flask-wtf==0.15.1 - # via -r requirements.in flask==1.1.2 # via # -r requirements.in @@ -67,6 +61,12 @@ flask==1.1.2 # flask-wtf # gds-metrics # notifications-utils +flask-login==0.5.0 + # via -r requirements.in +flask-redis==0.4.0 + # via notifications-utils +flask-wtf==0.15.1 + # via -r requirements.in gds-metrics==0.2.4 # via -r requirements.in geojson==2.5.0 @@ -118,7 +118,7 @@ mistune==0.8.4 # via notifications-utils notifications-python-client==6.1.0 # via -r requirements.in -git+https://github.com/alphagov/notifications-utils.git@44.2.2#egg=notifications-utils==44.2.2 +git+https://github.com/alphagov/notifications-utils.git@44.4.2#egg=notifications-utils==44.4.2 # via -r requirements.in openpyxl==3.0.7 # via pyexcel-xlsx @@ -136,6 +136,8 @@ pyasn1==0.4.8 # via rsa pycparser==2.20 # via cffi +pyexcel==0.6.6 + # via -r requirements.in pyexcel-ezodf==0.3.4 # via pyexcel-ods3 pyexcel-io==0.6.4 @@ -151,8 +153,6 @@ pyexcel-xls==0.6.2 # via -r requirements.in pyexcel-xlsx==0.6.0 # via -r requirements.in -pyexcel==0.6.6 - # via -r requirements.in pyjwt==2.1.0 # via notifications-python-client pyparsing==2.4.7 diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 2fb72494d..68d3014a0 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -811,8 +811,8 @@ def test_broadcast_page( 'England remove', 'Scotland remove', ], [ - 'An area of 177,439.8 square miles Will get the alert', - 'An extra area of 6,392.3 square miles is Likely to get the alert', + 'An area of 166,426.2 square miles Will get the alert', + 'An extra area of 7,942.4 square miles is Likely to get the alert', '40,000,000 phones estimated', ]), ([ @@ -837,7 +837,7 @@ def test_broadcast_page( ], [ 'Islington remove', ], [ - 'An area of 9.7 square miles Will get the alert', + 'An area of 9.6 square miles Will get the alert', 'An extra area of 4.7 square miles is Likely to get the alert', '200,000 to 500,000 phones', ]), @@ -908,8 +908,8 @@ def test_preview_broadcast_areas_page( [[7, 8], [9, 10], [11, 12]], ], [ - 'An area of 722.3 square miles Will get the alert', - 'An extra area of 1,498.5 square miles is Likely to get the alert', + 'An area of 543.3 square miles Will get the alert', + 'An extra area of 1,595.9 square miles is Likely to get the alert', 'Unknown number of phones', ] ), @@ -924,8 +924,8 @@ def test_preview_broadcast_areas_page( ( [SKYE], [ - 'An area of 3,205.0 square miles Will get the alert', - 'An extra area of 763.4 square miles is Likely to get the alert', + 'An area of 3,201.7 square miles Will get the alert', + 'An extra area of 767.0 square miles is Likely to get the alert', '4,000 phones estimated', ] ), diff --git a/tests/app/models/test_broadcast_message.py b/tests/app/models/test_broadcast_message.py index 361c5d149..f15a7c721 100644 --- a/tests/app/models/test_broadcast_message.py +++ b/tests/app/models/test_broadcast_message.py @@ -34,7 +34,7 @@ def test_simple_polygons(fake_uuid): # Because the areas are close to each other, the simplification # and unioning process results in a single polygon with fewer # total coordinates - [51], + [54], ]