mirror of
https://github.com/sascha-hemi/hacs_waste_collection_schedule.git
synced 2026-03-21 02:04:22 +01:00
new sourcew: Kirklees council (#959)
* feature: adding kirklees council source * docs: add Kirklees to the main readme * fix: update the testcases to pass * docs: Updating info.md via script * remove not needed Logger & added Test case
This commit is contained in:
Lewis England
GitHub
@@ -721,6 +721,7 @@ Waste collection schedules in the following formats and countries are supported.
|
||||
- [Herefordshire City Council](/doc/source/herefordshire_gov_uk.md) / herefordshire.gov.uk
|
||||
- [Horsham District Council](/doc/source/horsham_gov_uk.md) / horsham.gov.uk
|
||||
- [Huntingdonshire District Council](/doc/source/huntingdonshire_gov_uk.md) / huntingdonshire.gov.uk
|
||||
- [Kirklees Council](/doc/source/kirklees_gov_uk.md) / kirklees.gov.uk
|
||||
- [Leicester City Council](/doc/source/biffaleicester_co_uk.md) / leicester.gov.uk
|
||||
- [Lewes District Council](/doc/source/environmentfirst_co_uk.md) / lewes-eastbourne.gov.uk
|
||||
- [Lisburn and Castlereagh City Council](/doc/source/lisburn_castlereagh_gov_uk.md) / lisburncastlereagh.gov.uk
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
import logging
|
||||
import re
|
||||
import requests
|
||||
from bs4 import BeautifulSoup
|
||||
from datetime import datetime
|
||||
from waste_collection_schedule import Collection # type: ignore[attr-defined]
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
TITLE = "Kirklees Council"
|
||||
DESCRIPTION = "Source for waste collections for Kirklees Council"
|
||||
URL = "https://www.kirklees.gov.uk"
|
||||
TEST_CASES = {
|
||||
"Test_001": {"door_num": 20, "postcode": "HD9 6LW"},
|
||||
"test_002": {"door_num": "6", "postcode": "hd9 1js"},
|
||||
}
|
||||
|
||||
BASE_URL = "https://www.kirklees.gov.uk/beta/your-property-bins-recycling/your-bins/"
|
||||
|
||||
PARAMS = {
|
||||
"__EVENTTARGET": "",
|
||||
"__EVENTARGUMENT": "",
|
||||
"__LASTFOCUS": "",
|
||||
"__VIEWSTATE": "",
|
||||
"__VIEWSTATEGENERATOR": "",
|
||||
"__SCROLLPOSITIONX": "0",
|
||||
"__SCROLLPOSITIONY": "0",
|
||||
"__EVENTVALIDATION": "",
|
||||
"ctl00$ctl00$cphPageBody$cphContent$hdnBinUPRN": "",
|
||||
"ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$txtGeoPremises": "",
|
||||
"ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$txtGeoSearch": "",
|
||||
"ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$butGeoSearch": ""
|
||||
}
|
||||
|
||||
COLLECTION_REGEX = "(Recycling|Domestic|Garden Waste).*collection date ([0-3][0-9] [a-zA-Z]* [0-9]{4})"
|
||||
|
||||
ICON_MAP = {
|
||||
"DOMESTIC": "mdi:trash-can",
|
||||
"RECYCLING": "mdi:recycle",
|
||||
"GARDEN WASTE": "mdi:leaf",
|
||||
}
|
||||
|
||||
|
||||
class Source:
|
||||
def __init__(self, door_num, postcode):
|
||||
self._door_num = door_num
|
||||
self._postcode = postcode
|
||||
self._session = requests.Session()
|
||||
|
||||
def fetch(self):
|
||||
entries = []
|
||||
self._session.cookies.set("cookiesacceptedGDPR", "true", domain=".kirklees.gov.uk")
|
||||
|
||||
r0 = self._session.get(f"{BASE_URL}/default.aspx")
|
||||
r0.raise_for_status()
|
||||
r0_bs4 = BeautifulSoup(r0.text, features="html.parser")
|
||||
PARAMS['__VIEWSTATE'] = r0_bs4.find("input", {"id": "__VIEWSTATE"})['value']
|
||||
PARAMS['__VIEWSTATEGENERATOR'] = r0_bs4.find("input", {"id": "__VIEWSTATEGENERATOR"})['value']
|
||||
PARAMS['__EVENTVALIDATION'] = r0_bs4.find("input", {"id": "__EVENTVALIDATION"})['value']
|
||||
|
||||
PARAMS['ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$txtGeoPremises'] = self._door_num
|
||||
PARAMS['ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$txtGeoSearch'] = self._postcode
|
||||
PARAMS['ctl00$ctl00$cphPageBody$cphContent$thisGeoSearch$butGeoSearch'] = r0_bs4.find("input", {"id": "butGeoSearch"})['value']
|
||||
|
||||
r1 = self._session.get(f"{BASE_URL}/default.aspx", params=PARAMS)
|
||||
r1.raise_for_status()
|
||||
r1_bs4 = BeautifulSoup(r1.text, features="html.parser")
|
||||
cal_link = r1_bs4.find("a", {"id": "cphPageBody_cphContent_wtcDomestic240__LnkCalendar"})['href']
|
||||
|
||||
r2 = self._session.get(f"{BASE_URL}/{cal_link}")
|
||||
r2.raise_for_status()
|
||||
r2_bs4 = BeautifulSoup(r2.text, features="html.parser")
|
||||
|
||||
for collection in r2_bs4.find_all("img", {"id": re.compile('^cphPageBody_cphContent_rptr_Sticker_rptr_Collections_[0-9]_rptr_Bins_[0-9]_img_binType_[0-9]')}):
|
||||
matches = re.findall(COLLECTION_REGEX, collection['alt'])
|
||||
entries.append(
|
||||
Collection(
|
||||
date=datetime.strptime(matches[0][1], "%d %B %Y").date(),
|
||||
t=matches[0][0],
|
||||
icon=ICON_MAP.get(matches[0][0].upper()),
|
||||
)
|
||||
)
|
||||
return entries
|
||||
26
doc/source/kirklees_gov_uk.md
Normal file
26
doc/source/kirklees_gov_uk.md
Normal file
@@ -0,0 +1,26 @@
|
||||
# Kirklees Council
|
||||
|
||||
Support for schedules provided by [Kirklees Council](https://www.kirklees.gov.uk)
|
||||
|
||||
## Configuration via configuration.yaml
|
||||
|
||||
```yaml
|
||||
waste_collection_schedule:
|
||||
sources:
|
||||
- name: kirklees_gov_uk
|
||||
args:
|
||||
door_num: 1
|
||||
postcode: "HD9 6RJ"
|
||||
```
|
||||
|
||||
### Configuration Variables
|
||||
|
||||
**door_num**
|
||||
*(string) (required)*
|
||||
|
||||
Door number identifier for the property
|
||||
|
||||
**postcode**
|
||||
*(string) (required)*
|
||||
|
||||
Postcode of the property
|
||||
2
info.md
2
info.md
@@ -30,7 +30,7 @@ Waste collection schedules from service provider web sites are updated daily, de
|
||||
| Slovenia | Moji odpadki, Ljubljana |
|
||||
| Sweden | Affärsverken, Jönköping - June Avfall & Miljö, Landskrona - Svalövs Renhållning, Lerum Vatten och Avlopp, Linköping - Tekniska Verken, Region Gotland, Ronneby Miljöteknik, Samverkan Återvinning Miljö (SÅM), SRV Återvinning, SSAM, Sysav Sophämntning, Uppsala Vatten och Avfall AB, VA Syd Sophämntning |
|
||||
| Switzerland | A-Region, Andwil, Appenzell, Berg, Bühler, Eggersriet, Gais, Gaiserwald, Goldach, Grosswangen, Grub, Heiden, Herisau, Horn, Hundwil, Häggenschwil, Lindau, Lutzenberg, Muolen, Mörschwil, Münchenstein, Rehetobel, Rorschach, Rorschacherberg, Schwellbrunn, Schönengrund, Speicher, Stein, Steinach, Teufen, Thal, Trogen, Tübach, Untereggen, Urnäsch, Wald, Waldkirch, Waldstatt, Wittenbach, Wolfhalden |
|
||||
| United Kingdom | Amber Valley Borough Council, Ashfield District Council, Basildon Council, Basingstoke and Deane Borough Council, Bedford Borough Council, Binzone, Blackburn with Darwen Borough Council, Bracknell Forest Council, Bradford Metropolitan District Council, Braintree District Council, Breckland Council, Bristol City Council, Buckinghamshire Waste Collection - Former Chiltern, South Bucks or Wycombe areas, Cambridge City Council, Canterbury City Council, Central Bedfordshire Council, Cherwell District Council, Cheshire East Council, Chesterfield Borough Council, Chichester District Council, City of Doncaster Council, City of York Council, Colchester City Council, Cornwall Council, Derby City Council, East Cambridgeshire District Council, East Herts Council, East Northamptonshire and Wellingborough, Eastbourne Borough Council, Elmbridge Borough Council, Environment First, Exeter City Council, Fareham Council, FCC Environment, Fenland District Council, Fife Council, Gateshead Council, Glasgow City Council, Guildford Borough Council, Harborough District Council, Harlow Council, Herefordshire City Council, Horsham District Council, Huntingdonshire District Council, Leicester City Council, Lewes District Council, Lisburn and Castlereagh City Council, Liverpool City Council, London Borough of Bexley, London Borough of Bromley, London Borough of Lewisham, London Borough of Merton, Maldon District Council, Manchester City Council, Mid-Sussex District Council, Middlesbrough Council, Newcastle City Council, Newcastle Under Lyme Borough Council, Newport City Council, North Herts Council, North Lincolnshire Council, North Somerset Council, Nottingham City Council, Oxford City Council, Peterborough City Council, Portsmouth City Council, Reading Council, Reigate & Banstead Borough Council, Richmondshire District Council, Rotherham Metropolitan Borough Council, Runnymede Borough Council, Rushmoor Borough Council, Salford City Council, Sheffield City Council, South Cambridgeshire District Council, South Derbyshire District Council, South Gloucestershire Council, South Hams District Council, South Norfolk and Broadland Council, South Oxfordshire District Council, South Tyneside Council, Southampton City Council, Stevenage Borough Council, Stockport Council, Stockton-on-Tees Borough Council, Swindon Borough Council, Telford and Wrekin Council, Tewkesbury Borough Council, The Royal Borough of Kingston Council, Tonbridge and Malling Borough Council, Uttlesford District Council, Vale of White Horse District Council, Walsall Council, Waverley Borough Council, West Berkshire Council, West Devon Borough Council, West Dunbartonshire Council, Wigan Council, Wiltshire Council, Wirral Council, Wyre Forest District Council |
|
||||
| United Kingdom | Amber Valley Borough Council, Ashfield District Council, Basildon Council, Basingstoke and Deane Borough Council, Bedford Borough Council, Binzone, Blackburn with Darwen Borough Council, Bracknell Forest Council, Bradford Metropolitan District Council, Braintree District Council, Breckland Council, Bristol City Council, Buckinghamshire Waste Collection - Former Chiltern, South Bucks or Wycombe areas, Cambridge City Council, Canterbury City Council, Central Bedfordshire Council, Cherwell District Council, Cheshire East Council, Chesterfield Borough Council, Chichester District Council, City of Doncaster Council, City of York Council, Colchester City Council, Cornwall Council, Derby City Council, East Cambridgeshire District Council, East Herts Council, East Northamptonshire and Wellingborough, Eastbourne Borough Council, Elmbridge Borough Council, Environment First, Exeter City Council, Fareham Council, FCC Environment, Fenland District Council, Fife Council, Gateshead Council, Glasgow City Council, Guildford Borough Council, Harborough District Council, Harlow Council, Herefordshire City Council, Horsham District Council, Huntingdonshire District Council, Kirklees Council, Leicester City Council, Lewes District Council, Lisburn and Castlereagh City Council, Liverpool City Council, London Borough of Bexley, London Borough of Bromley, London Borough of Lewisham, London Borough of Merton, Maldon District Council, Manchester City Council, Mid-Sussex District Council, Middlesbrough Council, Newcastle City Council, Newcastle Under Lyme Borough Council, Newport City Council, North Herts Council, North Lincolnshire Council, North Somerset Council, Nottingham City Council, Oxford City Council, Peterborough City Council, Portsmouth City Council, Reading Council, Reigate & Banstead Borough Council, Richmondshire District Council, Rotherham Metropolitan Borough Council, Runnymede Borough Council, Rushmoor Borough Council, Salford City Council, Sheffield City Council, South Cambridgeshire District Council, South Derbyshire District Council, South Gloucestershire Council, South Hams District Council, South Norfolk and Broadland Council, South Oxfordshire District Council, South Tyneside Council, Southampton City Council, Stevenage Borough Council, Stockport Council, Stockton-on-Tees Borough Council, Swindon Borough Council, Telford and Wrekin Council, Tewkesbury Borough Council, The Royal Borough of Kingston Council, Tonbridge and Malling Borough Council, Uttlesford District Council, Vale of White Horse District Council, Walsall Council, Waverley Borough Council, West Berkshire Council, West Devon Borough Council, West Dunbartonshire Council, Wigan Council, Wiltshire Council, Wirral Council, Wyre Forest District Council |
|
||||
| United States of America | City of Oklahoma City, City of Pittsburgh, Republic Services, Seattle Public Utilities |
|
||||
<!--End of country section-->
|
||||
|
||||
|
||||
Reference in New Issue
Block a user