-
Notifications
You must be signed in to change notification settings - Fork 93
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Adding Babergh and Mid Suffolk District Councils
- Loading branch information
Showing
4 changed files
with
304 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
uk_bin_collection/uk_bin_collection/councils/BaberghDistrictCouncil.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import re | ||
| import time | ||
|
|
||
| import requests | ||
| from bs4 import BeautifulSoup | ||
| from selenium.webdriver.common.by import By | ||
| from selenium.webdriver.support import expected_conditions as EC | ||
| from selenium.webdriver.support.ui import Select | ||
| from selenium.webdriver.support.wait import WebDriverWait | ||
|
|
||
| from uk_bin_collection.uk_bin_collection.common import * | ||
| from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass | ||
|
|
||
|
|
||
| # import the wonderful Beautiful Soup and the URL grabber | ||
| class CouncilClass(AbstractGetBinDataClass): | ||
| """ | ||
| Concrete classes have to implement all abstract operations of the | ||
| base class. They can also override some operations with a default | ||
| implementation. | ||
| """ | ||
|
|
||
| def parse_data(self, page: str, **kwargs) -> dict: | ||
|
|
||
| collection_day = kwargs.get("paon") | ||
| bindata = {"bins": []} | ||
|
|
||
| days_of_week = [ | ||
| "Monday", | ||
| "Tuesday", | ||
| "Wednesday", | ||
| "Thursday", | ||
| "Friday", | ||
| "Saturday", | ||
| "Sunday", | ||
| ] | ||
|
|
||
| refusestartDate = datetime(2024, 11, 4) | ||
| recyclingstartDate = datetime(2024, 11, 11) | ||
|
|
||
| offset_days = days_of_week.index(collection_day) | ||
|
|
||
| refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28) | ||
| recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28) | ||
|
|
||
| bank_holidays = [ | ||
| ("25/12/2024", 2), | ||
| ("26/12/2024", 2), | ||
| ("27/12/2024", 3), | ||
| ("30/12/2024", 1), | ||
| ("31/12/2024", 2), | ||
| ("01/01/2025", 2), | ||
| ("02/01/2025", 2), | ||
| ("03/01/2025", 3), | ||
| ("06/01/2025", 1), | ||
| ("07/01/2025", 1), | ||
| ("08/01/2025", 1), | ||
| ("09/01/2025", 1), | ||
| ("10/01/2025", 1), | ||
| ("18/04/2025", 1), | ||
| ("21/04/2025", 1), | ||
| ("22/04/2025", 1), | ||
| ("23/04/2025", 1), | ||
| ("24/04/2025", 1), | ||
| ("25/04/2025", 1), | ||
| ("05/05/2025", 1), | ||
| ("06/05/2025", 1), | ||
| ("07/05/2025", 1), | ||
| ("08/05/2025", 1), | ||
| ("09/05/2025", 1), | ||
| ("26/05/2025", 1), | ||
| ("27/05/2025", 1), | ||
| ("28/05/2025", 1), | ||
| ("29/05/2025", 1), | ||
| ("30/05/2025", 1), | ||
| ("25/08/2025", 1), | ||
| ("26/08/2025", 1), | ||
| ("27/08/2025", 1), | ||
| ("28/08/2025", 1), | ||
| ("29/08/2025", 1), | ||
| ] | ||
|
|
||
| for refuseDate in refuse_dates: | ||
|
|
||
| collection_date = ( | ||
| datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| holiday_offset = next( | ||
| (value for date, value in bank_holidays if date == collection_date), 0 | ||
| ) | ||
|
|
||
| if holiday_offset > 0: | ||
| collection_date = ( | ||
| datetime.strptime(collection_date, "%d/%m/%Y") | ||
| + timedelta(days=holiday_offset) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| dict_data = { | ||
| "type": "Refuse Bin", | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| for recyclingDate in recycling_dates: | ||
|
|
||
| collection_date = ( | ||
| datetime.strptime(recyclingDate, "%d/%m/%Y") | ||
| + timedelta(days=offset_days) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| holiday_offset = next( | ||
| (value for date, value in bank_holidays if date == collection_date), 0 | ||
| ) | ||
|
|
||
| if holiday_offset > 0: | ||
| collection_date = ( | ||
| datetime.strptime(collection_date, "%d/%m/%Y") | ||
| + timedelta(days=holiday_offset) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| dict_data = { | ||
| "type": "Recycling Bin", | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| bindata["bins"].sort( | ||
| key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y") | ||
| ) | ||
|
|
||
| return bindata |
132 changes: 132 additions & 0 deletions
132
uk_bin_collection/uk_bin_collection/councils/MidSuffolkDistrictCouncil.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| import re | ||
| import time | ||
|
|
||
| import requests | ||
| from bs4 import BeautifulSoup | ||
| from selenium.webdriver.common.by import By | ||
| from selenium.webdriver.support import expected_conditions as EC | ||
| from selenium.webdriver.support.ui import Select | ||
| from selenium.webdriver.support.wait import WebDriverWait | ||
|
|
||
| from uk_bin_collection.uk_bin_collection.common import * | ||
| from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass | ||
|
|
||
|
|
||
| # import the wonderful Beautiful Soup and the URL grabber | ||
| class CouncilClass(AbstractGetBinDataClass): | ||
| """ | ||
| Concrete classes have to implement all abstract operations of the | ||
| base class. They can also override some operations with a default | ||
| implementation. | ||
| """ | ||
|
|
||
| def parse_data(self, page: str, **kwargs) -> dict: | ||
|
|
||
| collection_day = kwargs.get("paon") | ||
| bindata = {"bins": []} | ||
|
|
||
| days_of_week = [ | ||
| "Monday", | ||
| "Tuesday", | ||
| "Wednesday", | ||
| "Thursday", | ||
| "Friday", | ||
| "Saturday", | ||
| "Sunday", | ||
| ] | ||
|
|
||
| refusestartDate = datetime(2024, 11, 11) | ||
| recyclingstartDate = datetime(2024, 11, 4) | ||
|
|
||
| offset_days = days_of_week.index(collection_day) | ||
|
|
||
| refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28) | ||
| recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28) | ||
|
|
||
| bank_holidays = [ | ||
| ("25/12/2024", 2), | ||
| ("26/12/2024", 2), | ||
| ("27/12/2024", 3), | ||
| ("30/12/2024", 1), | ||
| ("31/12/2024", 2), | ||
| ("01/01/2025", 2), | ||
| ("02/01/2025", 2), | ||
| ("03/01/2025", 3), | ||
| ("06/01/2025", 1), | ||
| ("07/01/2025", 1), | ||
| ("08/01/2025", 1), | ||
| ("09/01/2025", 1), | ||
| ("10/01/2025", 1), | ||
| ("18/04/2025", 1), | ||
| ("21/04/2025", 1), | ||
| ("22/04/2025", 1), | ||
| ("23/04/2025", 1), | ||
| ("24/04/2025", 1), | ||
| ("25/04/2025", 1), | ||
| ("05/05/2025", 1), | ||
| ("06/05/2025", 1), | ||
| ("07/05/2025", 1), | ||
| ("08/05/2025", 1), | ||
| ("09/05/2025", 1), | ||
| ("26/05/2025", 1), | ||
| ("27/05/2025", 1), | ||
| ("28/05/2025", 1), | ||
| ("29/05/2025", 1), | ||
| ("30/05/2025", 1), | ||
| ("25/08/2025", 1), | ||
| ("26/08/2025", 1), | ||
| ("27/08/2025", 1), | ||
| ("28/08/2025", 1), | ||
| ("29/08/2025", 1), | ||
| ] | ||
|
|
||
| for refuseDate in refuse_dates: | ||
|
|
||
| collection_date = ( | ||
| datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| holiday_offset = next( | ||
| (value for date, value in bank_holidays if date == collection_date), 0 | ||
| ) | ||
|
|
||
| if holiday_offset > 0: | ||
| collection_date = ( | ||
| datetime.strptime(collection_date, "%d/%m/%Y") | ||
| + timedelta(days=holiday_offset) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| dict_data = { | ||
| "type": "Refuse Bin", | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| for recyclingDate in recycling_dates: | ||
|
|
||
| collection_date = ( | ||
| datetime.strptime(recyclingDate, "%d/%m/%Y") | ||
| + timedelta(days=offset_days) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| holiday_offset = next( | ||
| (value for date, value in bank_holidays if date == collection_date), 0 | ||
| ) | ||
|
|
||
| if holiday_offset > 0: | ||
| collection_date = ( | ||
| datetime.strptime(collection_date, "%d/%m/%Y") | ||
| + timedelta(days=holiday_offset) | ||
| ).strftime("%d/%m/%Y") | ||
|
|
||
| dict_data = { | ||
| "type": "Recycling Bin", | ||
| "collectionDate": collection_date, | ||
| } | ||
| bindata["bins"].append(dict_data) | ||
|
|
||
| bindata["bins"].sort( | ||
| key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y") | ||
| ) | ||
|
|
||
| return bindata |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters