uk_bin_collection 0.79.0__py3-none-any.whl → 0.80.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -263,9 +263,9 @@
         "wiki_name": "Croydon Council"
     },
     "DartfordBoroughCouncil": {
+        "uprn": "010094157511",
         "url": "https://windmz.dartford.gov.uk/ufs/WS_CHECK_COLLECTIONS.eb?UPRN=010094157511",
         "wiki_name": "DartfordBoroughCouncil",
-        "uprn": "010094157511",
         "wiki_note": "Use https://uprn.uk/ to find your UPRN "
     },
     "DerbyshireDalesDistrictCouncil": {
@@ -602,6 +602,14 @@
         "web_driver": "http://selenium:4444",
         "wiki_name": "Neath Port Talbot Council"
     },
+    "NewForestCouncil": {
+        "postcode": "SO41 0GJ",
+        "skip_get_url": true,
+        "uprn": "100060482345",
+        "url": "https://forms.newforest.gov.uk/id/FIND_MY_COLLECTION",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "New Forest Council"
+    },
     "NewarkAndSherwoodDC": {
         "url": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=200004258529",
         "wiki_command_url_override": "http://app.newark-sherwooddc.gov.uk/bincollection/calendar?pid=XXXXXXXX",
@@ -909,6 +917,12 @@
         "url": "https://www.sthelens.gov.uk/",
         "wiki_name": "St Helens Borough Council"
     },
+    "StaffordBoroughCouncil": {
+        "uprn": "100032203010",
+        "url": "https://www.staffordbc.gov.uk/address/100032203010",
+        "wiki_name": "StaffordBoroughCouncil",
+        "wiki_note": "The URL needs to be https://www.staffordbc.gov.uk/address/<Your_UPRN>"
+    },
     "StaffordshireMoorlandsDistrictCouncil": {
         "postcode": "ST8 6HN",
         "skip_get_url": true,
@@ -959,6 +973,13 @@
         "url": "https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days",
         "wiki_name": "Swale Borough Council"
     },
+    "SwanseaCouncil": {
+        "postcode": "SA43PQ",
+        "skip_get_url": true,
+        "uprn": "100100324821",
+        "url": "https://www1.swansea.gov.uk/recyclingsearch/",
+        "wiki_name": "SwanseaCouncil"
+    },
     "TamesideMBCouncil": {
         "skip_get_url": true,
         "uprn": "100012835362",
@@ -992,6 +1013,14 @@
         "url": "https://testvalley.gov.uk/wasteandrecycling/when-are-my-bins-collected",
         "wiki_name": "Test Valley Borough Council"
     },
+    "ThreeRiversDistrictCouncil": {
+        "postcode": "WD3 7AZ",
+        "skip_get_url": true,
+        "uprn": "100080913662",
+        "url": "https://my.threerivers.gov.uk/en/AchieveForms/?mode=fill&consentMessage=yes&form_uri=sandbox-publish://AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b/AF-Stage-01ee28aa-1584-442c-8d1f-119b6e27114a/definition.json&process=1&process_uri=sandbox-processes://AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b&process_id=AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b&noLoginPrompt=1",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "Three Rivers District Council"
+    },
     "TonbridgeAndMallingBC": {
         "postcode": "ME19 4JS",
         "skip_get_url": true,
@@ -1011,6 +1040,15 @@
         "url": "https://collections-torridge.azurewebsites.net/WebService2.asmx",
         "wiki_name": "Torridge District Council"
     },
+    "UttlesfordDistrictCouncil": {
+        "url": "https://bins.uttlesford.gov.uk/",
+        "wiki_name": "UttlesfordDistrictCouncil",
+        "skip_get_url": true,
+        "postcode": "CM23 5QF",
+        "uprn": "100090643434",
+        "house_number": "72, Birchanger Lane",
+        "web_driver": "http://selenium:4444"
+    },
     "ValeofGlamorganCouncil": {
         "skip_get_url": true,
         "uprn": "64029020",

uk_bin_collection/uk_bin_collection/common.py

@@ -5,7 +5,7 @@ import os
 import pandas as pd
 import re
 import requests
-from datetime import datetime
+from datetime import datetime, timedelta
 from dateutil.parser import parse
 from enum import Enum
 from selenium import webdriver
@@ -242,6 +242,28 @@ def save_data(file_path, data):
         json.dump(data, file, sort_keys=True, indent=4)
 
 
+def get_next_day_of_week(day_name):
+    days_of_week = [
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Sunday",
+    ]
+    today = datetime.now()
+    today_idx = today.weekday()  # Monday is 0 and Sunday is 6
+    target_idx = days_of_week.index(day_name)
+
+    days_until_target = (target_idx - today_idx) % 7
+    if days_until_target == 0:
+        days_until_target = 7  # Ensure it's the next instance of the day, not today if today is that day
+
+    next_day = today + timedelta(days=days_until_target)
+    return next_day.strftime(date_format)
+
+
 def contains_date(string, fuzzy=False) -> bool:
     """
     Return whether the string can be interpreted as a date.

uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py

@@ -2,6 +2,7 @@ from datetime import datetime
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -22,7 +23,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Start a new session to walk through the form
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
 
         headers = {
             "Origin": "https://www.centralbedfordshire.gov.uk",

uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py

@@ -1,5 +1,6 @@
-from dateutil.relativedelta import relativedelta
 from bs4 import BeautifulSoup
+from dateutil.relativedelta import relativedelta
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py

@@ -64,7 +64,7 @@ def get_csrf_token(s: requests.session, base_url: str) -> str:
     """
     Gets a CSRF token
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :return: CSRF token
     """
@@ -95,7 +95,7 @@ def get_address_id(
     """
     Gets the address ID
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :param csrf_token: CSRF token to use
         :param postcode: Postcode to use
@@ -156,7 +156,7 @@ def get_collection_data(
     """
     Gets the collection data
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :param csrf_token: CSRF token to use
         :param address_id: Address id to use
@@ -203,7 +203,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
     def parse_data(self, page: str, **kwargs) -> dict:
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
         base_url = "https://selfservice.mybfc.bracknell-forest.gov.uk"
         paon = kwargs.get("paon")
         postcode = kwargs.get("postcode")

uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py

@@ -2,6 +2,7 @@ import ast
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -19,7 +20,7 @@ class CouncilClass(AbstractGetBinDataClass):
         check_uprn(user_uprn)
 
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
 
         service_type_headers = {
             "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,"

uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py

@@ -35,7 +35,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         data = {"bins": []}
 
-        titles = [title.text for title in soup.select(".title")]
+        titles = [title.text for title in soup.select(".block-title")]
         collection_tag = soup.body.find_all(
             "div", {"class": "col-md-6 col-sm-6 col-xs-6"}, string="Next collection"
         )

uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py

@@ -1,6 +1,7 @@
 import time
 
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -75,7 +76,7 @@ def get_csrf_token(s: requests.session, base_url: str) -> str:
     """
     Gets a CSRF token
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :return: CSRF token
     """
@@ -106,7 +107,7 @@ def get_address_id(
     """
     Gets the address ID
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :param csrf_token: CSRF token to use
         :param postcode: Postcode to use
@@ -171,7 +172,7 @@ def get_collection_data(
     """
     Gets the collection data
         :rtype: str
-        :param s: requests.session() to use
+        :param s: requests.Session() to use
         :param base_url: Base URL to use
         :param csrf_token: CSRF token to use
         :param address_id: Address id to use
@@ -240,7 +241,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
     def parse_data(self, page: str, **kwargs) -> dict:
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
         base_url = "https://service.croydon.gov.uk"
         paon = kwargs.get("paon")
         postcode = kwargs.get("postcode")

uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py

@@ -17,27 +17,25 @@ class CouncilClass(AbstractGetBinDataClass):
         soup.prettify()
 
         # Extract data
-        bin_data = {
-            "bins": []
-        }
+        bin_data = {"bins": []}
 
         # Find the table containing the bin collection data
-        table = soup.find('table', {'class': 'eb-EVDNdR1G-tableContent'})
+        table = soup.find("table", {"class": "eb-EVDNdR1G-tableContent"})
 
         if table:
-            rows = table.find_all('tr', class_='eb-EVDNdR1G-tableRow')
-            
+            rows = table.find_all("tr", class_="eb-EVDNdR1G-tableRow")
+
             for row in rows:
-                columns = row.find_all('td')
+                columns = row.find_all("td")
                 if len(columns) >= 4:
                     collection_type = columns[1].get_text(strip=True)
                     collection_date = columns[3].get_text(strip=True)
-                    
+
                     # Validate collection_date format
                     if re.match(r"\d{2}/\d{2}/\d{4}", collection_date):
                         bin_entry = {
                             "type": collection_type,
-                            "collectionDate": collection_date
+                            "collectionDate": collection_date,
                         }
                         bin_data["bins"].append(bin_entry)
 

uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -21,7 +22,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Make Request
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
         page = s.get(url)
 
         # Make a BS4 object

uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py

@@ -1,8 +1,10 @@
-from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
-from uk_bin_collection.uk_bin_collection.common import *
-from bs4 import BeautifulSoup
 from datetime import datetime
+
 import requests
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
 
 class CouncilClass(AbstractGetBinDataClass):
@@ -19,7 +21,7 @@ class CouncilClass(AbstractGetBinDataClass):
         # start session
         # note: this ignores the given url
         base_url = "https://lcc-wrp.whitespacews.com"
-        session = requests.session()
+        session = requests.Session()
         response = session.get(base_url + "/#!")
         links = [
             a["href"]

uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py

@@ -3,6 +3,7 @@ from datetime import date, datetime
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py

@@ -2,6 +2,7 @@ from datetime import datetime
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -20,7 +21,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Start a new session to walk through the form
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
 
         # There's a cookie that makes the whole thing valid when you search for a postcode,
         # but postcode and UPRN is a hassle imo, so this makes a request for the session to get a cookie

uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py

@@ -0,0 +1,146 @@
+import logging
+import pickle
+import time
+
+import requests
+from bs4 import BeautifulSoup
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+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.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+# Set up logging
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+)
+
+
+class CouncilClass(AbstractGetBinDataClass):
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            collections = []
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_postcode(user_postcode)
+            url = "https://forms.newforest.gov.uk/ufs/FIND_MY_COLLECTION.eb"
+
+            # Get session cookies using requests
+
+            user_agent = """general.useragent.override", "userAgent=Mozilla/5.0 
+            (iPhone; CPU iPhone OS 15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like 
+            Gecko) CriOS/101.0.4951.44 Mobile/15E148 Safari/604.1"""
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, user_agent, __name__)
+
+            # Navigate to the page first
+            driver.get(url)
+            driver.refresh()  # important otherwise it results in too many redirects
+
+            wait = WebDriverWait(driver, 60)
+
+            logging.info("Entering postcode")
+            input_element_postcode = wait.until(
+                EC.presence_of_element_located((By.XPATH, '//input[@id="CTID-1-_-A"]'))
+            )
+
+            input_element_postcode.send_keys(user_postcode)
+
+            logging.info("Searching for postcode")
+            input_element_postcode_btn = wait.until(
+                EC.element_to_be_clickable((By.XPATH, '//input[@type="submit"]'))
+            )
+
+            input_element_postcode_btn.click()
+
+            logging.info("Waiting for address dropdown")
+            input_element_postcode_dropdown = wait.until(
+                EC.presence_of_element_located((By.XPATH, '//select[@id="CTID-6-_-A"]'))
+            )
+
+            logging.info("Selecting address")
+            drop_down_values = Select(input_element_postcode_dropdown)
+            option_element = wait.until(
+                EC.presence_of_element_located(
+                    (By.CSS_SELECTOR, f'option[value="{str(user_uprn)}"]')
+                )
+            )
+
+            driver.execute_script("arguments[0].scrollIntoView();", option_element)
+            drop_down_values.select_by_value(str(user_uprn))
+
+            input_element_address_btn = wait.until(
+                EC.element_to_be_clickable((By.XPATH, '//input[@value="Submit"]'))
+            )
+
+            input_element_address_btn.click()
+
+            logging.info("Waiting for bin collection page")
+            h4_element = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//h1[contains(text(), 'Collections days for')]")
+                )
+            )
+
+            logging.info("Extracting bin collection data")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            bins = []
+
+            # Rubbish and recycling
+            rubbish_recycling = soup.find(
+                "span", class_="CTID-77-_ eb-77-Override-textControl"
+            )
+            if rubbish_recycling:
+                match = re.search(r"collected weekly on (\w+)", rubbish_recycling.text)
+                if match:
+                    day_name = match.group(1)
+                    next_collection = get_next_day_of_week(day_name)
+                    bins.append(
+                        {
+                            "type": "Rubbish and recycling",
+                            "collectionDate": next_collection,
+                        }
+                    )
+
+            # Glass collection
+            glass_collection = soup.find("span", class_="CTID-78-_ eb-78-textControl")
+            if glass_collection:
+                match = re.search(
+                    r"next collection is\s+(\d{2}/\d{2}/\d{4})", glass_collection.text
+                )
+                if match:
+                    bins.append(
+                        {"type": "Glass collection", "collectionDate": match.group(1)}
+                    )
+
+            # Garden waste
+            garden_waste = soup.find("span", class_="CTID-17-_ eb-17-textControl")
+            if garden_waste:
+                match = re.search(
+                    r"next collection is\s+(\d{2}/\d{2}/\d{4})", garden_waste.text
+                )
+                if match:
+                    bins.append(
+                        {"type": "Garden waste", "collectionDate": match.group(1)}
+                    )
+
+            return {"bins": bins}
+
+        except Exception as e:
+            logging.error(f"An error occurred: {e}")
+            raise
+
+        finally:
+            if driver:
+                driver.quit()

uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py

@@ -3,6 +3,7 @@ from datetime import *
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -24,7 +25,7 @@ class CouncilClass(AbstractGetBinDataClass):
         check_postcode(user_postcode)
 
         # Get form data
-        s = requests.session()
+        s = requests.Session()
         cookies = {
             "ntc-cookie-policy": "1",
             "SSESS6ec6d5d2d471c0357053d5993a839bce": "qBdR7XhmSMd5_PDBIqG0It2R0Fq67igrejRY-WOcskE",

uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py

@@ -1,5 +1,6 @@
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/StHelensBC.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -21,7 +22,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Make Request
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
         page = s.get(url)
 
         # Make a BS4 object

uk_bin_collection/uk_bin_collection/councils/StaffordBoroughCouncil.py

@@ -0,0 +1,69 @@
+from bs4 import BeautifulSoup
+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_date(self, date_str):
+        months = {
+            "Jan": "01",
+            "Feb": "02",
+            "Mar": "03",
+            "Apr": "04",
+            "May": "05",
+            "Jun": "06",
+            "Jul": "07",
+            "Aug": "08",
+            "Sep": "09",
+            "Oct": "10",
+            "Nov": "11",
+            "Dec": "12",
+        }
+        day, date, month_abbr, year = date_str.split()
+        month = months[month_abbr]
+        return f"{date}/{month}/{year}"
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Make a BS4 object
+        soup = BeautifulSoup(page.text, features="html.parser")
+        soup.prettify()
+
+        # Initialize the bin data structure
+        bin_data = {"bins": []}
+
+        # Find the table with collection dates
+        table = soup.find("table", class_="my-area")
+
+        # Extract the rows containing the bin collection information
+        rows = table.find_all("tr")
+
+        # Loop through the rows and extract bin data
+        for row in rows:
+            cells = row.find_all("td")
+            if len(cells) == 2:
+                bin_type = cells[0].get_text(strip=True)
+                collection_date = cells[1].get_text(strip=True)
+
+                if "Next refuse" in bin_type:
+                    bin_data["bins"].append(
+                        {
+                            "type": "refuse",
+                            "collectionDate": self.parse_date(collection_date),
+                        }
+                    )
+                elif "Next recycling" in bin_type:
+                    bin_data["bins"].append(
+                        {
+                            "type": "recycling",
+                            "collectionDate": self.parse_date(collection_date),
+                        }
+                    )
+
+        return bin_data

uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py

@@ -0,0 +1,70 @@
+import logging
+from datetime import datetime
+
+import requests
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+HEADERS = {
+    "user-agent": "Mozilla/5.0",
+}
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete class implementing all abstract operations of the base class.
+    """
+
+    def get_session_variable(self, soup, id) -> str:
+        """Extract ASP.NET variable from the HTML."""
+        element = soup.find("input", {"id": id})
+        if element:
+            return element.get("value")
+        else:
+            raise ValueError(f"Unable to find element with id: {id}")
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Create a session to handle cookies and headers
+        session = requests.Session()
+        session.headers.update(HEADERS)
+        user_uprn = kwargs.get("uprn")
+        user_postcode = kwargs.get("postcode")
+        URL = "https://www1.swansea.gov.uk/recyclingsearch/"
+
+        # Get initial ASP.NET variables
+        response = session.get(URL)
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, "html.parser")
+
+        data = {
+            "__VIEWSTATE": self.get_session_variable(soup, "__VIEWSTATE"),
+            "__VIEWSTATEGENERATOR": self.get_session_variable(
+                soup, "__VIEWSTATEGENERATOR"
+            ),
+            "__VIEWSTATEENCRYPTED": "",
+            "__EVENTVALIDATION": self.get_session_variable(soup, "__EVENTVALIDATION"),
+            "txtRoadName": user_uprn,
+            "txtPostCode": user_postcode,
+            "btnSearch": "Search",
+        }
+
+        # Get the collection calendar
+        response = session.post(URL, data=data)
+        response.raise_for_status()
+
+        soup = BeautifulSoup(response.text, "html.parser")
+
+        next_refuse_date = soup.find("span", {"id": "lblNextRefuse"}).text.strip()
+        next_recycling_date = soup.find("span", {"id": "lblNextRecycling"}).text.strip()
+
+        bin_data = {
+            "bins": [
+                {"type": "Pink Week", "collectionDate": next_refuse_date},
+                {"type": "Green Week", "collectionDate": next_recycling_date},
+            ]
+        }
+
+        return bin_data

uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py

@@ -1,4 +1,5 @@
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py

@@ -0,0 +1,140 @@
+import logging
+import time
+
+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
+
+# Set up logging
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+)
+
+
+class CouncilClass(AbstractGetBinDataClass):
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            data = {"bins": []}
+            collections = []
+            user_uprn = kwargs.get("uprn")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_postcode(user_postcode)
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, None, __name__)
+            if headless:
+                driver.set_window_size(1920, 1080)
+
+            driver.get(
+                "https://my.threerivers.gov.uk/en/AchieveForms/?mode=fill&consentMessage=yes&form_uri=sandbox-publish://AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b/AF-Stage-01ee28aa-1584-442c-8d1f-119b6e27114a/definition.json&process=1&process_uri=sandbox-processes://AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b&process_id=AF-Process-52df96e3-992a-4b39-bba3-06cfaabcb42b&noLoginPrompt=1"
+            )
+            wait = WebDriverWait(driver, 60)
+
+            def click_element(by, value):
+                element = wait.until(EC.element_to_be_clickable((by, value)))
+                driver.execute_script("arguments[0].scrollIntoView();", element)
+                element.click()
+
+            click_element(By.XPATH, "//button[contains(text(), 'Continue')]")
+
+            logging.info("Switching to iframe")
+            iframe_presence = wait.until(
+                EC.presence_of_element_located((By.ID, "fillform-frame-1"))
+            )
+            driver.switch_to.frame(iframe_presence)
+
+            logging.info("Entering postcode")
+            input_element_postcode = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//input[@id="postcode_search"]')
+                )
+            )
+            input_element_postcode.send_keys(user_postcode)
+
+            logging.info("Selecting address")
+            dropdown = wait.until(EC.element_to_be_clickable((By.ID, "chooseAddress")))
+            dropdown_options = wait.until(
+                EC.presence_of_element_located((By.CLASS_NAME, "lookup-option"))
+            )
+            drop_down_values = Select(dropdown)
+            option_element = wait.until(
+                EC.presence_of_element_located(
+                    (By.CSS_SELECTOR, f'option.lookup-option[value="{str(user_uprn)}"]')
+                )
+            )
+
+            driver.execute_script("arguments[0].scrollIntoView();", option_element)
+            drop_down_values.select_by_value(str(user_uprn))
+
+            option_element = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, '//div[@class="fieldContent"][1]')
+                )
+            )
+
+            time.sleep(2)
+
+            click_element(By.XPATH, "//button/span[contains(text(), 'Next')]")
+
+            logging.info("Waiting for bin schedule")
+            bin_results = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//div[@data-field-name='subCollectionCalendar']//table")
+                )
+            )
+
+            logging.info("Extracting bin collection data")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+            bin_cards = soup.find_all(
+                "div", {"data-field-name": "subCollectionCalendar"}
+            )
+
+            bins = []
+
+            for bin_card in bin_cards:
+                # Try to find the table within the bin_card
+                table = bin_card.find(
+                    "table",
+                    {
+                        "class": "repeatable-table table table-responsive table-hover table-condensed"
+                    },
+                )
+
+                if table:
+                    print("Table found")
+                    rows = table.select("tr.repeatable-value")
+                    for row in rows:
+                        cols = row.find_all("td", class_="value")
+                        if len(cols) >= 3:  # Ensure there are enough columns
+                            bin_type = cols[1].find_all("span")[-1].text.strip()
+                            collection_date = (
+                                cols[2]
+                                .find_all("span")[-1]
+                                .text.strip()
+                                .replace("-", "/")
+                            )
+                            bins.append(
+                                {"type": bin_type, "collectionDate": collection_date}
+                            )
+                else:
+                    print("Table not found within bin_card")
+
+            bin_data = {"bins": bins}
+            logging.info("Data extraction complete")
+            return bin_data
+
+        except Exception as e:
+            logging.error(f"An error occurred: {e}")
+            raise
+
+        finally:
+            if driver:
+                driver.quit()

uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py

@@ -0,0 +1,117 @@
+import logging
+import pickle
+import time
+
+import requests
+from bs4 import BeautifulSoup
+from selenium import webdriver
+from selenium.webdriver.common.by import By
+from selenium.webdriver.common.keys import Keys
+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.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+# Set up logging
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s"
+)
+
+
+class CouncilClass(AbstractGetBinDataClass):
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        driver = None
+        try:
+            user_paon = kwargs.get("paon")
+            user_postcode = kwargs.get("postcode")
+            web_driver = kwargs.get("web_driver")
+            headless = kwargs.get("headless")
+            check_postcode(user_postcode)
+            url = "https://bins.uttlesford.gov.uk/"
+
+            # Get session cookies using requests
+
+            user_agent = """general.useragent.override", "userAgent=Mozilla/5.0 
+            (iPhone; CPU iPhone OS 15_4 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like 
+            Gecko) CriOS/101.0.4951.44 Mobile/15E148 Safari/604.1"""
+
+            # Create Selenium webdriver
+            driver = create_webdriver(web_driver, headless, user_agent, __name__)
+
+            # Navigate to the page first
+            driver.get(url)
+
+            wait = WebDriverWait(driver, 60)
+
+            logging.info("Entering postcode")
+            input_element_postcode = wait.until(
+                EC.presence_of_element_located((By.XPATH, '//input[@id="postcode"]'))
+            )
+
+            input_element_postcode.send_keys(user_postcode)
+            input_element_postcode.send_keys(Keys.ENTER)
+
+            logging.info("Searching for postcode")
+            input_element_postcode_dd = wait.until(
+                EC.element_to_be_clickable((By.XPATH, '//select[@id="housenn"]'))
+            )
+
+            logging.info("Selecting address")
+            drop_down_values = Select(input_element_postcode_dd)
+
+            drop_down_values.select_by_visible_text(str(user_paon))
+
+            input_element_address_btn = wait.until(
+                EC.element_to_be_clickable(
+                    (By.XPATH, '//input[@alt="View your waste collection days"]')
+                )
+            )
+
+            input_element_address_btn.click()
+
+            logging.info("Waiting for bin collection page")
+            h3_element = wait.until(
+                EC.presence_of_element_located(
+                    (By.XPATH, "//h3[contains(text(), 'Future Collection Dates')]")
+                )
+            )
+
+            logging.info("Extracting bin collection data")
+            soup = BeautifulSoup(driver.page_source, features="html.parser")
+
+            bins = []
+            rows = soup.select("div.wrap table tbody tr")
+
+            for row in rows:
+                cols = row.find_all("td")
+                if len(cols) == 2:
+                    bin_types = [img["alt"] for img in cols[0].find_all("img")]
+                    collection_date_str = cols[1].text
+                    collection_date = datetime.strptime(
+                        collection_date_str, "%A %dth %B"
+                    )
+                    collection_date = collection_date.replace(
+                        year=2024
+                    )  # Assuming the year is 2024
+                    collection_date_str = collection_date.strftime("%d/%m/%Y")
+
+                    for bin_type in bin_types:
+                        bins.append(
+                            {"type": bin_type, "collectionDate": collection_date_str}
+                        )
+
+            bin_data = {"bins": bins}
+
+            return bin_data
+
+        except Exception as e:
+            logging.error(f"An error occurred: {e}")
+            raise
+
+        finally:
+            if driver:
+                driver.quit()

uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py

@@ -2,6 +2,7 @@ from datetime import date, datetime
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -24,7 +25,7 @@ class CouncilClass(AbstractGetBinDataClass):
         # WBC use a url parameter called "Track" that's generated when you start a form session.
         # So first off, open the page, find the page link and copy it with the Track
         start_url = "https://wav-wrp.whitespacews.com/"
-        s = requests.session()
+        s = requests.Session()
         response = s.get(start_url)
         soup = BeautifulSoup(response.content, features="html.parser")
         soup.prettify()

uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py

@@ -2,6 +2,7 @@ from datetime import datetime
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -27,7 +28,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
         # Start a new session to walk through the form
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
 
         # Get our initial session running
         response = s.get("https://apps.wigan.gov.uk/MyNeighbourhood/")

uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py

@@ -3,6 +3,7 @@ from urllib.parse import urlparse
 
 import requests
 from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 
@@ -25,7 +26,7 @@ class CouncilClass(AbstractGetBinDataClass):
         data = {"bins": []}
 
         requests.packages.urllib3.disable_warnings()
-        s = requests.session()
+        s = requests.Session()
         # Form start
         headers = {
             "authority": "my.rbwm.gov.uk",

uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py

@@ -1,5 +1,7 @@
-from bs4 import BeautifulSoup
 import urllib
+
+from bs4 import BeautifulSoup
+
 from uk_bin_collection.uk_bin_collection.common import *
 from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
 

{uk_bin_collection-0.79.0.dist-info → uk_bin_collection-0.80.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.79.0
+Version: 0.80.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.79.0.dist-info → uk_bin_collection-0.80.0.dist-info}/RECORD

@@ -2,14 +2,14 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=eVZzMAByRNVnh8dc0G4QjErrElo5SkJiX0fujKVsw5g,57171
+uk_bin_collection/tests/input.json,sha256=-t4WOCeYWUchkdm32IFhOJbufu0rP9vjwlzR43KLw3U,58920
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=zDLF5UUBp2n5S3ZlJod7AmYHt92TYQMMhHbX1keNn8U,3424
 uk_bin_collection/tests/test_collect_data.py,sha256=C5w1qfz_1CU37_T7UPdBk3nisMLobIeVHNl6EXrgfrQ,3316
 uk_bin_collection/tests/test_common_functions.py,sha256=IvTNmuFKm9u5j2A9PumMB6eScQS165sPknFakc0l-eg,11190
 uk_bin_collection/uk_bin_collection/collect_data.py,sha256=txdtYoPgWDHLPohGz_Wu9OLXOr8TpXyuIGn0WnsFbZQ,4383
-uk_bin_collection/uk_bin_collection/common.py,sha256=eo1hGsVMeWLBmb1EZG_1J1Z6TMZhxRkdOuzMdGoA7UU,9200
+uk_bin_collection/uk_bin_collection/common.py,sha256=ZvylERlKexeHtqBRb2_fZhYxC8aoEpUtcGo0dzJnWUo,9837
 uk_bin_collection/uk_bin_collection/councils/AdurAndWorthingCouncils.py,sha256=ppbrmm-MzB1wOulK--CU_0j4P-djNf3ozMhHnmQFqLo,1511
 uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
@@ -19,15 +19,15 @@ uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=MgF_7Xy
 uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py,sha256=VPWGljnH4C3q8qs5ZmCtqjNjgWQvviALzjk00q3EZeQ,2632
 uk_bin_collection/uk_bin_collection/councils/BathAndNorthEastSomersetCouncil.py,sha256=N_TPiIv8VBzN3rY0p3JtLlxSEru-6k1wW4UNIhN5X1M,3709
 uk_bin_collection/uk_bin_collection/councils/BedfordBoroughCouncil.py,sha256=CvGB7w9HMn7XyEtwfd9MWZE_HlZ75pDcaKMsQJz0xhk,1669
-uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py,sha256=MbjOgQDJRSVXe1OW_0QuDosk9TIvoibIS29WwYxVTC8,2548
+uk_bin_collection/uk_bin_collection/councils/BedfordshireCouncil.py,sha256=U1HOr9YLMAlFoZysfw5n04E0bVuCliO5Yj1FMiiwcHA,2549
 uk_bin_collection/uk_bin_collection/councils/BexleyCouncil.py,sha256=9MrbpfR17R6DYjDrItQL3CPF7ie1SJkaoNbwQumPgIQ,5399
-uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py,sha256=wIJgp7gjUL2zVALZNEz0YapDpvAXmriOswE03EqH49o,4130
+uk_bin_collection/uk_bin_collection/councils/BirminghamCityCouncil.py,sha256=x1LZiPn2C6JMHnj-R9cyrtUMnFb5o-kKtZK4sNuf6hY,4131
 uk_bin_collection/uk_bin_collection/councils/BlackburnCouncil.py,sha256=jHbCK8sL09vdmdP7Xnh8lIrU5AHTnJLEZfOLephPvWg,4090
 uk_bin_collection/uk_bin_collection/councils/BoltonCouncil.py,sha256=MrSzfK3EukRVasgP1nxAqg3lTkZzlAkDLJ2Nu5dJJ-0,4023
-uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=35P9f4j6LpteYMaUhpE-NdfzupTRg0wEQyojH1n-OUw,9015
+uk_bin_collection/uk_bin_collection/councils/BracknellForestCouncil.py,sha256=Llo1rULaAZ8rChVYZqXFFLo7CN6vbT0ULUJD6ActouY,9015
 uk_bin_collection/uk_bin_collection/councils/BradfordMDC.py,sha256=9EDTdhbGb8BQ5PLEw9eiWZ3BrS0TtoFpYOHQU44wc2k,4308
 uk_bin_collection/uk_bin_collection/councils/BrightonandHoveCityCouncil.py,sha256=k6qt4cds-Ejd97Z-__pw2BYvGVbFdc9SUfF73PPrTNA,5823
-uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=VT7k0AzcWL_h6E7Yr84NXs-FJ7qbYed7giR4HClHYE0,5575
+uk_bin_collection/uk_bin_collection/councils/BristolCityCouncil.py,sha256=kJmmDJz_kQ45DHmG7ocrUpNJonEn0kuXYEDQyZaf9ks,5576
 uk_bin_collection/uk_bin_collection/councils/BromleyBoroughCouncil.py,sha256=h92cM4SQwqFrBd9snnZuRgFjnftyZEoS7XfG3OUWa4k,4758
 uk_bin_collection/uk_bin_collection/councils/BroxtoweBoroughCouncil.py,sha256=-Facq-ToQkcWUePpKBwq90LZUFxgUSydNL2sYaLX4yw,4473
 uk_bin_collection/uk_bin_collection/councils/BuckinghamshireCouncil.py,sha256=rMc3lwu8UivbUZBiRedDhT8nBQQ83tvinc0QtmFjJNI,3184
@@ -43,15 +43,15 @@ uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sh
 uk_bin_collection/uk_bin_collection/councils/ChichesterDistrictCouncil.py,sha256=HxrLcJves7ZsE8FbooymeecTUmScY4R7Oi71vwCePPo,4118
 uk_bin_collection/uk_bin_collection/councils/ChorleyCouncil.py,sha256=M7HjuUaFq8aSnOf_9m1QS4MmPPMmPhF3mLHSrfDPtV0,5194
 uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=el75qv2QyfWZBU09tJLvD8vLQZ9pCg73u1NBFs6ybo8,1034
-uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=rZIRiXp0rOkc20M9DpgxuhbykACip7LNjpn6ytDsnwk,2361
-uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=vaMbSKPmKZ2xzXuviTbENhAS20qzlIvdM3EpdHb505M,11593
-uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=Tb4h0UBbVPo7nNFIzU3yj0aZsAuXnDPot3ORr2lnpv4,1603
+uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=_BEKZAjlS5Ad5DjyxqAEFSLn8F-KYox0zmn4BXaAD6A,2367
+uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=QJH27plySbbmoNcLNUXq-hUiFmZ5zBlRS5mzOJgWSK8,11594
+uk_bin_collection/uk_bin_collection/councils/DartfordBoroughCouncil.py,sha256=SPirUUoweMwX5Txtsr0ocdcFtKxCQ9LhzTTJN20tM4w,1550
 uk_bin_collection/uk_bin_collection/councils/DerbyshireDalesDistrictCouncil.py,sha256=MQC1-jXezXczrxTcvPQvkpGgyyAbzSKlX38WsmftHak,4007
 uk_bin_collection/uk_bin_collection/councils/DoncasterCouncil.py,sha256=b7pxoToXu6dBBYXsXmlwfPXE8BjHxt0hjCOBNlNgvX8,3118
 uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py,sha256=sdSR5ryOSWHtK_0OKJ75LGOvMiUAnQCc3uwT3xfqZ_0,2304
 uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py,sha256=3Zgap6kaVpDXtRfBKEL1Ms6eb0iFIipYKNtOq3Hrdd4,1891
 uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py,sha256=6O8bNsQVYQbrCYQE9Rp0c_rtkcXuxR3s9J6jn4MK4_s,1695
-uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=_iSifwbdSFhnuhdf4U42xMQjkWJUalTytKPV-QGSNYU,1500
+uk_bin_collection/uk_bin_collection/councils/EastCambridgeshireCouncil.py,sha256=aYUVE5QqTxdj8FHhCB4EiFVDJahWJD9Pq0d1upBEvXg,1501
 uk_bin_collection/uk_bin_collection/councils/EastDevonDC.py,sha256=U0VwSNIldMv5nUoiXtFgjbE0m6Kb-8W2WZQGVCNF_WI,3261
 uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py,sha256=o_HPSFhb2ybmwv32_7T7CO1f2mGDkYCNPfaM5xz6bUI,4356
 uk_bin_collection/uk_bin_collection/councils/EastRidingCouncil.py,sha256=CsYdkmL-8Ty-Kz7uNdlnJnhiDMgOPah_swYgSKbaFqA,5218
@@ -77,15 +77,15 @@ uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py,sha256
 uk_bin_collection/uk_bin_collection/councils/KingstonUponThamesCouncil.py,sha256=iZ7njIxccCGBhUUWWd9Azh7cxUAKaofebCm3lo-TuxA,3543
 uk_bin_collection/uk_bin_collection/councils/KirkleesCouncil.py,sha256=gtAtM6FappSZ0-BKid7_pnSrnqPPjHn_UYWqMg9wQlM,4499
 uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py,sha256=VdlWDESoHfr_X0r8-UMaLMUQhKZOa2BnpVPkX-1u3EQ,5605
-uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py,sha256=_wOByXM_IN1jSkeQq76kdPXkndDEO49_gqQiRSe74do,2535
+uk_bin_collection/uk_bin_collection/councils/LancasterCityCouncil.py,sha256=FmHT6oyD4BwWuhxA80PHnGA7HPrLuyjP_54Cg8hT6k4,2537
 uk_bin_collection/uk_bin_collection/councils/LeedsCityCouncil.py,sha256=iSZApZ9oSfSatQ6dAxmykSfti91jGuY6n2BwEkVMOiU,5144
-uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py,sha256=SChaWQkoOpwQ9W27vK3RMHGEyfz36UQQRbT7qJrRtxQ,3308
+uk_bin_collection/uk_bin_collection/councils/LisburnCastlereaghCityCouncil.py,sha256=vSOzdEwp9ZeUhed7E3eVv9ReD-2XgbSkpyAbVnfc-Gk,3309
 uk_bin_collection/uk_bin_collection/councils/LiverpoolCityCouncil.py,sha256=n17OqZrCGrPrnxGUfHc-RGkb4oJ9Bx6uUWiLdzxfQlY,2587
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py,sha256=UOeiOxGMvVMm2UFaqjmQpm7vxzqJNSSN8LM9lAUjs2c,3021
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py,sha256=A_6Sis5hsF53Th04KeadHRasGbpAm6aoaWJ6X8eC4Y8,6604
 uk_bin_collection/uk_bin_collection/councils/MaldonDistrictCouncil.py,sha256=PMVt2XFggttPmbWyrBrHJ-W6R_6-0ux1BkY1kj1IKzg,1997
 uk_bin_collection/uk_bin_collection/councils/MalvernHillsDC.py,sha256=iQG0EkX2npBicvsGKQRYyBGSBvKVUbKvUvvwrC9xV1A,2100
-uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py,sha256=ZgBMja1jvuj1nWmHHAvrf0FH3_HuysPR7eEved1C_hY,4919
+uk_bin_collection/uk_bin_collection/councils/ManchesterCityCouncil.py,sha256=RFXC4bRDYZgeFIzfsOWZXoBEWV7mNiM0HejhcPsP3a0,4920
 uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py,sha256=F5AiTxImrnjE1k3ry96bfstOf5XSNBJS_4qqmymmh3w,1386
 uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py,sha256=3Y2Un4xXo1sCcMsudynODSzocV_mMofWkX2JqONDb5o,1997
 uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,sha256=oOWwU5FSgGej2Mv7FQ66N-EzS5nZgmGsd0WnfLWUc1I,5238
@@ -93,10 +93,11 @@ uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=3olsWa77L34vz-c7NgeGK9xmNuR4Ws_oAk5D4UpIkPw,2005
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=54-autRRGAM4pBxlqmUE6g825rmUF-gRqrcgHL_lkIk,3994
 uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=2DJ0gK385CWTdJzWyDdmNBTTrwX6F5YbIXg7di2oXDQ,5506
+uk_bin_collection/uk_bin_collection/councils/NewForestCouncil.py,sha256=ylTn9KmWITtaO9_Z8kJCN2w2ALfhrfGt3SeJ78lgw7M,5391
 uk_bin_collection/uk_bin_collection/councils/NewarkAndSherwoodDC.py,sha256=lAleYfCGUWCKOi7Ye_cjgfpI3pWwTcFctlYmh0hjebM,2140
 uk_bin_collection/uk_bin_collection/councils/NewcastleCityCouncil.py,sha256=eJMX10CG9QO7FRhHSmUDL-jO_44qoK3_1ztNTAXhkbw,2085
 uk_bin_collection/uk_bin_collection/councils/NewhamCouncil.py,sha256=klFqr2Km1BuQ4wERmjbXZzOvN1N0jnVmhTGRSVzVOaU,2086
-uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=dPeDmxNT1QT6C_V30PZFHypqQrvppzE3qF12a5gF94E,8479
+uk_bin_collection/uk_bin_collection/councils/NewportCityCouncil.py,sha256=dAcl5P97bttl2xCPvxof1a18kmqOrMmiElgtn3Ej7zs,8480
 uk_bin_collection/uk_bin_collection/councils/NorthEastDerbyshireDistrictCouncil.py,sha256=bps_uCFAeUHQla7AE5lZOv6sUkUz1fb6zduZdAcYMuw,4651
 uk_bin_collection/uk_bin_collection/councils/NorthEastLincs.py,sha256=fYf438VZIaOaqPSwdTTWVjFTdrI0jGfFsxVzOc-QdkA,1817
 uk_bin_collection/uk_bin_collection/councils/NorthKestevenDistrictCouncil.py,sha256=vYOCerJXr9LTP6F2wm4vpYNYbQaWNZ6yfHEQ33N_hTw,1681
@@ -105,7 +106,7 @@ uk_bin_collection/uk_bin_collection/councils/NorthLincolnshireCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/NorthNorfolkDistrictCouncil.py,sha256=VV_zqVZYv8ekXcUHhrBlTX_W5qLYE9IA3mT2xmrZqoI,4315
 uk_bin_collection/uk_bin_collection/councils/NorthNorthamptonshireCouncil.py,sha256=kcMN-5GBjYDM9F1BKfHoYeydub8SuDxHamJbSvJRZ68,2337
 uk_bin_collection/uk_bin_collection/councils/NorthSomersetCouncil.py,sha256=EbFVnPYZIOkru5_Y75kjljM3Cr3HIJgP-SU6hxgf6tk,2754
-uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py,sha256=h2VzxJot0JjHX5IacfRBvZTxEBu5bdAlw_4CYnSXztM,11352
+uk_bin_collection/uk_bin_collection/councils/NorthTynesideCouncil.py,sha256=waH6_PyJaiEF-v9HR3C_aUdiPTcdHlxfAuuuKBsvkII,11353
 uk_bin_collection/uk_bin_collection/councils/NorthWestLeicestershire.py,sha256=gJj0dyQc5QUefqusKGk2LLXfWbG5tlEXUOh8KAPh3RI,4584
 uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py,sha256=2wTrr3VrZDp9-YtDPmWd649gXeWH4hbm2-Hw8Vau5Xs,1933
 uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py,sha256=KEFsxEvQ159fkuFo-fza67YCnnCZ5ElwE80zTrqDEWI,4990
@@ -127,9 +128,9 @@ uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py,sha256=9g9AeiackoWyej9EVlKUzywzAtMuBVD0f93ZryAUha8,2016
 uk_bin_collection/uk_bin_collection/councils/ShropshireCouncil.py,sha256=6OIEhJmv-zLJiEo8WaJePA7JuhNRGkh2WohFLhzN8Kk,1477
 uk_bin_collection/uk_bin_collection/councils/SolihullCouncil.py,sha256=gbTHjbdV46evGfLfF8rxVMQIgNZD-XPHgZeuyje7kGY,1609
-uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py,sha256=zsbpknHcIWK1MVW0FreIcaEienbWs3c5q32KKGQl1IE,8479
+uk_bin_collection/uk_bin_collection/councils/SomersetCouncil.py,sha256=CZJnkCGn4-yH31HH5_ix-8V2_vsjGuKYxgzAPGZdSAw,8480
 uk_bin_collection/uk_bin_collection/councils/SouthAyrshireCouncil.py,sha256=03eapeXwxneKI4ccKPSHoviIbhmV1m90I-0WQ_s3KsY,2722
-uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py,sha256=2DvHgy5EuopGyY4EV8us8B4BN82qt1N8RWMJszjenHc,2307
+uk_bin_collection/uk_bin_collection/councils/SouthCambridgeshireCouncil.py,sha256=xGSMcikxjS4UzqKs0X50LJKmn09C-XAAs98SPhNZgkQ,2308
 uk_bin_collection/uk_bin_collection/councils/SouthGloucestershireCouncil.py,sha256=ytQot0J7i6DTJo6hb9koTB1UpXLATKVeRU4FBF9kHRo,2412
 uk_bin_collection/uk_bin_collection/councils/SouthKestevenDistrictCouncil.py,sha256=AgycOW-UIAm5_c8QondfKL0n4wUA4cbaN_Jp0e8g494,5587
 uk_bin_collection/uk_bin_collection/councils/SouthLanarkshireCouncil.py,sha256=fj-eZI0yrvQVCv8GvhcovZ3b9bV6Xv_ws3IunWjnv4U,3126
@@ -137,7 +138,8 @@ uk_bin_collection/uk_bin_collection/councils/SouthNorfolkCouncil.py,sha256=ThO-o
 uk_bin_collection/uk_bin_collection/councils/SouthOxfordshireCouncil.py,sha256=zW4bN3hcqNoK_Y0-vPpuZs3K0LTPvApu6_v9K-D7WjE,3879
 uk_bin_collection/uk_bin_collection/councils/SouthTynesideCouncil.py,sha256=dxXGrJfg_fn2IPTBgq6Duwy0WY8GYLafMuisaCjOnbs,3426
 uk_bin_collection/uk_bin_collection/councils/StAlbansCityAndDistrictCouncil.py,sha256=mPZz6Za6kTSkrfHnj0OfwtnpRYR1dKvxbuFEKnWsiL8,1451
-uk_bin_collection/uk_bin_collection/councils/StHelensBC.py,sha256=E3kxbreq1BAOegT7T85Mz88rBvAsxcPNn96nSJDETbI,2068
+uk_bin_collection/uk_bin_collection/councils/StHelensBC.py,sha256=c7ZM8gnUkKdz9GYIhFLzTtwN0KAoMEKomTWDVbtJIpM,2069
+uk_bin_collection/uk_bin_collection/councils/StaffordBoroughCouncil.py,sha256=9Qj4HJI7Dbiqb2mVSG2UtkBe27Y7wvQ5SYFTwGzJ5g0,2292
 uk_bin_collection/uk_bin_collection/councils/StaffordshireMoorlandsDistrictCouncil.py,sha256=_N8Cg26EbTaKp0RsWvQuELVcZDHbT2BlD2LW8qhkS_Q,4361
 uk_bin_collection/uk_bin_collection/councils/StockportBoroughCouncil.py,sha256=v0HmioNVRoU1-9OnLJl2V3M5pVR1aVu1BgOLHFR1Sf4,1429
 uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py,sha256=KM0EgWeO7mk8lkozX0RCTfMchXdjrfBqIjCiOtB09aM,2884
@@ -145,20 +147,23 @@ uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/StroudDistrictCouncil.py,sha256=9bYWppi7ViLGHL4VEg--nFn28MLYJYbiEntull1uZxU,3561
 uk_bin_collection/uk_bin_collection/councils/SunderlandCityCouncil.py,sha256=4DnKyyu56_AwuchD6_oL1dvpDStMvkkxQtYN79rUKOs,3825
 uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py,sha256=CCAjclhkCxwf_MkdrIif7MZpLfV5SPy7hyM7BE0TRPc,2048
+uk_bin_collection/uk_bin_collection/councils/SwanseaCouncil.py,sha256=nmVPoPhnFgVi--vczX2i4Sf3bqM5RWJuwfhioRUr5XE,2303
 uk_bin_collection/uk_bin_collection/councils/TamesideMBCouncil.py,sha256=k2TAAZG7n2S1BWVyxbE_-4-lZuzhOimCNz4yimUCOGk,1995
 uk_bin_collection/uk_bin_collection/councils/TandridgeDistrictCouncil.py,sha256=KLVvM2NNq_DQylVe5dwO2l7qPahLHg08jJGLCv1MBQ4,2324
 uk_bin_collection/uk_bin_collection/councils/TelfordAndWrekinCouncil.py,sha256=p1ZS5R4EGxbEWlRBrkGXgKwE_lkyBT-R60yKFFhVObc,1844
 uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py,sha256=DJbYI8m6lIISDrK5h8V5Jo-9kGG7kr9dz7GD8St4nc8,4274
-uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=ohbndldGHqx6AXKaJLNYWpSK4umKaBU6YaWlgYhR1HI,8479
+uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=Dtfkyrwt795W7gqFJxVGRR8t3R5WMNQZwTWJckLpZWE,8480
+uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha256=oZSW0Y5QHdqVy2fLys4sdB13tHgeNLha9WCUqG_R-gU,5527
 uk_bin_collection/uk_bin_collection/councils/TonbridgeAndMallingBC.py,sha256=UlgnHDoi8ecav2H5-HqKNDpqW1J3RN-c___5c08_Q7I,4859
 uk_bin_collection/uk_bin_collection/councils/TorbayCouncil.py,sha256=JW_BS7wkfxFsmx6taQtPAQWdBp1AfLrxs0XRQ2XZcSw,2029
 uk_bin_collection/uk_bin_collection/councils/TorridgeDistrictCouncil.py,sha256=6gOO02pYU0cbj3LAHiBVNG4zkFMyIGbkE2jAye3KcGM,6386
+uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=8CvO-WgdKdvyaOf3TYc4XwME8ogAXojgB40oyGRL8Dw,4129
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=5nZLbU5YVKNsJ2X_wuybrNLFAzjVAxkazu-bYP4IGXw,4292
 uk_bin_collection/uk_bin_collection/councils/WakefieldCityCouncil.py,sha256=9zW4C0WKbsDLCKvFyVYFpyvp20JbrWc4G0HzadqF8WQ,4466
 uk_bin_collection/uk_bin_collection/councils/WalthamForest.py,sha256=P7MMw0EhpRmDbbnHb25tY5_yvYuZUFwJ1br4TOv24sY,4997
 uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3WQrAxzYzKoV4LyOqNTp9xINVsNi1xW9t8etducGeag,1146
-uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py,sha256=nhGbhcGyeULLWhpkwRC1anZbQOmZxMhC-VRHIj2ZJlY,4661
+uk_bin_collection/uk_bin_collection/councils/WaverleyBoroughCouncil.py,sha256=tp9l7vdgSGRzNNG0pDfnNuFj4D2bpRJUJmAiTJ6bM0g,4662
 uk_bin_collection/uk_bin_collection/councils/WealdenDistrictCouncil.py,sha256=SvSSaLkx7iJjzypAwKkaJwegXkSsIQtUOS2V605kz1A,3368
 uk_bin_collection/uk_bin_collection/councils/WelhatCouncil.py,sha256=ikUft37dYNJghfe-_6Fskiq1JihqpLmLNj38QkKSUUA,2316
 uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py,sha256=r90AIUdPgo85VuuvN_NeCDUy3NEJXdO4Ntt93yKo6qI,5110
@@ -166,17 +171,17 @@ uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py,sha25
 uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py,sha256=dq0jimtARvRkZiGbVFrXXZgY-BODtz3uYZ5UKn0bf64,4114
 uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=F1GeJUGND4DN_HuM6N0Elpeb0DAMm9_KeqG6qtIgZf4,1079
 uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=HMFWxM7VMhBuC7iubNGbZYEoCVWi--gRHDJMVdPPFOM,2633
-uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=YEbpbjkparhah4ahl6WZzI0mMHNrbKzdC6kA5gDQCUA,3745
+uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=3gqFA4-BVx_In6QOu3KUNqPN4Fkn9iMlZTeopMK9p6A,3746
 uk_bin_collection/uk_bin_collection/councils/WiltshireCouncil.py,sha256=it2Oh5Kmq3lD30gAZgk2bzZPNCtJcFHyQO1NgOQtfvU,5653
-uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=triYeI4IIHF6_XMokF6BGAZkx_lPAXeGyuS9DEr5UxY,5553
-uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=EUfFU1lNvV0Ry5CpdE2rBJ2zRfsPfi9hg0ux3wYAmzw,5202
+uk_bin_collection/uk_bin_collection/councils/WindsorAndMaidenheadCouncil.py,sha256=yG5iu294q138Bvk-0IPd4pJDFsOQPDmtU5XXytxnAnA,5554
+uk_bin_collection/uk_bin_collection/councils/WokingBoroughCouncil.py,sha256=hYC3LRaLM_enYs8KhSgwUB4HhnPOhmYuPDeaREysY9E,5204
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
 uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bIdsvmoSzBjJAvTTi6yPfJa8xjJx1ys2w,1490
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=9qppF2oPkhmOoK8-ZkRIU1M6vhBh-yUCWAZEEd07iLk,5414
-uk_bin_collection-0.79.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.79.0.dist-info/METADATA,sha256=lKq0D1bGtiEW-AmeaGgM17-J2ZGVMjw0iCnioCKgNb8,12594
-uk_bin_collection-0.79.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.79.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.79.0.dist-info/RECORD,,
+uk_bin_collection-0.80.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.80.0.dist-info/METADATA,sha256=k2g8TXLix_QcBSmaj0nFopo0X_ZkiOWk7GBtY_WjmFs,12594
+uk_bin_collection-0.80.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.80.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.80.0.dist-info/RECORD,,