uk_bin_collection 0.98.4__py3-none-any.whl → 0.99.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -620,6 +620,14 @@
         "wiki_name": "Lichfield District Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "LincolnCouncil": {
+        "url": "https://lincoln.gov.uk",
+        "wiki_command_url_override": "https://lincoln.gov.uk",
+        "uprn": "000235024846",
+        "postcode": "LN5 7SH",
+        "wiki_name": "Tunbridge Wells Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "LisburnCastlereaghCityCouncil": {
         "house_number": "97",
         "postcode": "BT28 1JN",
@@ -871,6 +879,13 @@
         "wiki_name": "Oldham Council",
         "wiki_note": "Replace UPRN in URL with your own UPRN."
     },
+    "PerthAndKinrossCouncil": {
+        "url": "https://www.pkc.gov.uk",
+        "wiki_command_url_override": "https://www.pkc.gov.uk",
+        "uprn": "124032322",
+        "wiki_name": "Perth and Kinross Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "PortsmouthCityCouncil": {
         "postcode": "PO4 0LE",
         "skip_get_url": true,
@@ -1128,7 +1143,8 @@
     "SwaleBoroughCouncil": {
         "postcode": "ME12 2NQ",
         "skip_get_url": true,
-        "uprn": "100061081168",
+        "house_number": "81",
+        "web_driver": "http://selenium:4444",
         "url": "https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days",
         "wiki_name": "Swale Borough Council"
     },
@@ -1199,6 +1215,13 @@
         "url": "https://collections-torridge.azurewebsites.net/WebService2.asmx",
         "wiki_name": "Torridge District Council"
     },
+    "TunbridgeWellsCouncil": {
+        "url": "https://tunbridgewells.gov.uk",
+        "wiki_command_url_override": "https://tunbridgewells.gov.uk",
+        "uprn": "10090058289",
+        "wiki_name": "Tunbridge Wells Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "UttlesfordDistrictCouncil": {
         "house_number": "72, Birchanger Lane",
         "postcode": "CM23 5QF",

uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py

@@ -74,13 +74,30 @@ class CouncilClass(AbstractGetBinDataClass):
 
             driver.get(page)
 
+            wait = WebDriverWait(driver, 10)
+            accept_cookies_button = wait.until(
+                EC.element_to_be_clickable(
+                    (
+                        By.XPATH,
+                        "//button[contains(text(), 'Accept additional cookies')]",
+                    )
+                )
+            )
+            accept_cookies_button.click()
+
             # Wait for the element to be clickable
-            find_your_collection_button = WebDriverWait(driver, 10).until(
+            wait = WebDriverWait(driver, 10)
+            find_your_collection_button = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//a[contains(text(), "Find your household collection day")]')
+                    (By.LINK_TEXT, "Find your household collection day")
                 )
             )
 
+            # Scroll to the element (in case something is blocking it)
+            driver.execute_script(
+                "arguments[0].scrollIntoView();", find_your_collection_button
+            )
+
             # Click the element
             find_your_collection_button.click()
 
@@ -107,12 +124,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             postcode_input.send_keys(user_postcode)
 
-            find_address_button = WebDriverWait(driver, 10).until(
-                EC.presence_of_element_located(
-                    (By.CSS_SELECTOR, '[value="Find address"]')
-                )
+            find_address_button = WebDriverWait(driver, 30).until(
+                EC.element_to_be_clickable((By.CSS_SELECTOR, '[value="Find address"]'))
             )
-            find_address_button.click()
+            driver.execute_script("arguments[0].scrollIntoView();", find_address_button)
+            driver.execute_script("arguments[0].click();", find_address_button)
+            # find_address_button.click()
 
             time.sleep(15)
             # Wait for address box to be visible

uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py

@@ -80,6 +80,10 @@ class CouncilClass(AbstractGetBinDataClass):
                 )
             )
             search_btn.send_keys(Keys.ENTER)
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "collectionTabs"))
+            )
+
             soup = BeautifulSoup(driver.page_source, features="html.parser")
 
             # Find all tab panels within the collectionTabs

uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py

@@ -0,0 +1,96 @@
+import time
+
+import requests
+
+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:
+
+        user_uprn = kwargs.get("uprn")
+        user_postcode = kwargs.get("postcode")
+        check_uprn(user_uprn)
+        check_postcode(user_postcode)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://contact.lincoln.gov.uk/authapi/isauthenticated?uri=https://contact.lincoln.gov.uk/AchieveForms/?mode=fill&consentMessage=yes&form_uri=sandbox-publish://AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196/AF-Stage-a1c0af0f-fec1-4419-80c0-0dd4e1d965c9/definition.json&process=1&process_uri=sandbox-processes://AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196&process_id=AF-Process-503f9daf-4db9-4dd8-876a-6f2029f11196&hostname=contact.lincoln.gov.uk&withCredentials=true"
+
+        API_URL = "https://contact.lincoln.gov.uk/apibroker/runLookup"
+
+        data = {
+            "formValues": {
+                "Section 1": {
+                    "chooseaddress": {"value": user_uprn},
+                    "postcode": {"value": user_postcode},
+                }
+            },
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://contact.lincoln.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "62aafd258f72c",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        BIN_TYPES = [
+            ("refusenextdate", "Black Bin", "refuse_freq"),
+            ("recyclenextdate", "Brown Bin", "recycle_freq"),
+            ("gardennextdate", "Green Bin", "garden_freq"),
+        ]
+
+        for uprn, data in rows_data.items():
+            if uprn != user_uprn:
+                continue
+            for key, bin_type, freq in BIN_TYPES:
+                if not data[key]:
+                    continue
+                offsets = [0]
+                if data[freq] == "fortnightly":
+                    offsets.extend(list(range(14, 30, 14)))
+                elif data[freq] == "weekly":
+                    offsets.extend(list(range(7, 30, 7)))
+                date = datetime.strptime(data[key], "%Y-%m-%d").date()
+                for offset in offsets:
+                    dict_data = {
+                        "type": bin_type,
+                        "collectionDate": (date + timedelta(days=offset)).strftime(
+                            "%d/%m/%Y"
+                        ),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/PerthAndKinrossCouncil.py

@@ -0,0 +1,95 @@
+import time
+
+import requests
+
+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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://pkc-self.achieveservice.com/authapi/isauthenticated?uri=https%253A%252F%252Fpkc-self.achieveservice.com%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-de9223b1-a7c6-408f-aaa3-aee33fd7f7fa%252FAF-Stage-9fa33e2e-4c1b-4963-babf-4348ab8154bc%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=pkc-self.achieveservice.com&withCredentials=true"
+
+        API_URL = "https://pkc-self.achieveservice.com/apibroker/runLookup"
+
+        data = {
+            "formValues": {
+                "Bin collections": {"propertyUPRNQuery": {"value": user_uprn}}
+            },
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://pkc-self.achieveservice.com/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "5c9267cee5efe",
+            "repeat_against": "",
+            "noRetry": "true",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]["0"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        schedule = {
+            "Green Bin": [
+                rows_data.get("nextGeneralWasteCollectionDate"),
+                rows_data.get("nextGeneralWasteCollectionDate2nd"),
+            ],
+            "Blue Bin": [
+                rows_data.get("nextBlueCollectionDate"),
+                rows_data.get("nextBlueWasteCollectionDate2nd"),
+            ],
+            "Grey Bin": [
+                rows_data.get("nextGreyWasteCollectionDate"),
+                rows_data.get("nextGreyWasteCollectionDate2nd"),
+            ],
+            "Brown Bin": [
+                rows_data.get("nextGardenandFoodWasteCollectionDate"),
+                rows_data.get("nextGardenandFoodWasteCollectionDate2nd"),
+            ],
+            "Paper Waste": [
+                rows_data.get("nextPaperWasteCollectionDate"),
+                rows_data.get("nextPaperWasteCollectionDate2nd"),
+            ],
+        }
+
+        # Format and output the schedule
+        for bin_type, dates in schedule.items():
+            if any(dates):
+                for date in dates:
+                    dict_data = {"type": bin_type, "collectionDate": date}
+                    bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/SwaleBoroughCouncil.py

@@ -1,9 +1,11 @@
-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.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
 
 
@@ -17,36 +19,72 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         # Get postcode and UPRN from kwargs
         user_postcode = kwargs.get("postcode")
-        user_uprn = kwargs.get("uprn")
+        user_paon = kwargs.get("paon")
+        web_driver = kwargs.get("web_driver")
+        headless = kwargs.get("headless")
         check_postcode(user_postcode)
-        check_uprn(user_uprn)
+        check_paon(user_paon)
 
         # Build URL to parse
-        council_url = f"https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days?postcode={user_postcode.replace(' ', '+')}&addresses={user_uprn}&address-submit="
+        council_url = "https://swale.gov.uk/bins-littering-and-the-environment/bins/my-collection-day"
+
+        # Create Selenium webdriver
+        driver = create_webdriver(web_driver, headless, None, __name__)
+        driver.get(council_url)
+
+        # Wait for the postcode field to appear then populate it
+        try:
+            inputElement_postcode = WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.ID, "q462406_q1"))
+            )
+            inputElement_postcode.send_keys(user_postcode)
+        except Exception:
+            print("Page failed to load. Probably due to Cloudflare robot check!")
+
+        # Click search button
+        findAddress = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+        )
+        driver.execute_script("arguments[0].click();", findAddress)
+
+        # Wait for the 'Select address' dropdown to appear and select option matching the house name/number
+        WebDriverWait(driver, 10).until(
+            EC.element_to_be_clickable(
+                (
+                    By.XPATH,
+                    "//select[@id='SBCYBDAddressList']//option[contains(., '"
+                    + user_paon
+                    + "')]",
+                )
+            )
+        ).click()
+
+        # Click search button
+        getBins = WebDriverWait(driver, 10).until(
+            EC.presence_of_element_located((By.ID, "form_email_462397_submit"))
+        )
+        driver.execute_script("arguments[0].click();", getBins)
+
+        BinTable = WebDriverWait(driver, 30).until(
+            EC.presence_of_element_located((By.ID, "SBC-YBD-Main"))
+        )
 
-        # Parse URL and read if connection successful
-        requests.packages.urllib3.disable_warnings()
-        response = requests.get(council_url, verify=False)
-        if response.status_code == 200:
-            soup = BeautifulSoup(response.text, features="html.parser")
-            soup.prettify()
-        else:
-            raise ConnectionAbortedError("Could not parse council website.")
+        soup = BeautifulSoup(driver.page_source, features="html.parser")
+        soup.prettify()
 
         data = {"bins": []}
 
         # Get the collection bullet points on the page and parse them
-        form_area = soup.find("form", {"class": "integration bin-lookup"})
-        collections = [
-            item.text.strip().split(",") for item in form_area.find_all("li")
-        ]
-        for c in collections:
-            bin_type = c[0].strip()
-            # temp_date = c[2].strip() + " " + str(datetime.now().year)
-            bin_date = datetime.strptime(
-                c[2].strip() + " " + str(datetime.now().year), "%d %B %Y"
-            ).strftime(date_format)
-            dict_data = {"type": bin_type, "collectionDate": bin_date}
-            data["bins"].append(dict_data)
+        nextCollections = soup.find("div", {"id": "nextCollections"})
+        for c in nextCollections:
+            collection = c.find_all("strong")
+            for bin in collection:
+                split = (bin.text).split(" on ")
+                bin_type = split[0]
+                bin_date = datetime.strptime(split[1], "%A %d %b %Y").strftime(
+                    "%d/%m/%Y"
+                )
+                dict_data = {"type": bin_type, "collectionDate": bin_date}
+                data["bins"].append(dict_data)
 
         return data

uk_bin_collection/uk_bin_collection/councils/TunbridgeWellsCouncil.py

@@ -0,0 +1,71 @@
+import time
+
+import requests
+
+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:
+
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        SESSION_URL = "https://mytwbc.tunbridgewells.gov.uk/authapi/isauthenticated?uri=https%3A%2F%2Fmytwbc.tunbridgewells.gov.uk%2FAchieveForms%2F%3Fmode%3Dfill%26consentMessage%3Dyes%26form_uri%3Dsandbox-publish%3A%2F%2FAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed%2FAF-Stage-88caf66c-378f-4082-ad1d-07b7a850af38%2Fdefinition.json%26process%3D1%26process_uri%3Dsandbox-processes%3A%2F%2FAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed%26process_id%3DAF-Process-e01af4d4-eb0f-4cfe-a5ac-c47b63f017ed&hostname=mytwbc.tunbridgewells.gov.uk&withCredentials=true"
+
+        API_URL = "https://mytwbc.tunbridgewells.gov.uk/apibroker/runLookup"
+
+        data = {
+            "formValues": {"Property": {"siteReference": {"value": user_uprn}}},
+        }
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://mytwbc.tunbridgewells.gov.uk/fillform/?iframe_id=fillform-frame-1&db_id=",
+        }
+        s = requests.session()
+        r = s.get(SESSION_URL)
+        r.raise_for_status()
+        session_data = r.json()
+        sid = session_data["auth-session"]
+        params = {
+            "id": "6314720683f30",
+            "repeat_against": "",
+            "noRetry": "false",
+            "getOnlyTokens": "undefined",
+            "log_id": "",
+            "app_name": "AF-Renderer::Self",
+            # unix_timestamp
+            "_": str(int(time.time() * 1000)),
+            "sid": sid,
+        }
+
+        r = s.post(API_URL, json=data, headers=headers, params=params)
+        r.raise_for_status()
+
+        data = r.json()
+        rows_data = data["integration"]["transformed"]["rows_data"]
+        if not isinstance(rows_data, dict):
+            raise ValueError("Invalid data returned from API")
+
+        for _, item in rows_data.items():
+            bin_type = item["collectionType"]
+            date = datetime.strptime(item["nextDateUnformatted"], "%d/%m/%Y").strftime(
+                "%d/%m/%Y"
+            )
+            dict_data = {"type": bin_type, "collectionDate": date}
+            bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py

@@ -74,30 +74,51 @@ class CouncilClass(AbstractGetBinDataClass):
             soup = BeautifulSoup(driver.page_source, features="html.parser")
             soup.prettify()
 
-            rubbish_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[6:8]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
-            recycling_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[6:8]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
-            food_date = datetime.strptime(
-                " ".join(
-                    soup.find("div", {"id": "FINDYOURBINDAYS_FOODWASTEDATE_OUTERDIV"})
-                    .get_text(strip=True)
-                    .split()[8:10]
-                ),
-                "%d %B",
-            ).replace(year=datetime.now().year)
+            rubbish_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RUBBISHDATE_OUTERDIV"}
+            )
+            try:
+                rubbish_date = rubbish_div.find_all("div")[2]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                rubbish_date = rubbish_div.find_all("div")[3]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            recycling_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
+            )
+            try:
+                recycling_date = recycling_div.find_all("div")[2]
+                recycling_date = datetime.strptime(
+                    recycling_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                rubbish_date = recycling_div.find_all("div")[3]
+                rubbish_date = datetime.strptime(
+                    rubbish_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            food_div = soup.find(
+                "div", {"id": "FINDYOURBINDAYS_RECYCLINGDATE_OUTERDIV"}
+            )
+            try:
+                food_date = food_div.find_all("div")[2]
+                food_date = datetime.strptime(
+                    food_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
+            except:
+                food_date = food_div.find_all("div")[3]
+                food_date = datetime.strptime(
+                    food_date.text,
+                    "%A %d %B",
+                ).replace(year=datetime.now().year)
 
             if datetime.now().month == 12 and rubbish_date.month == 1:
                 rubbish_date = rubbish_date + relativedelta(years=1)

{uk_bin_collection-0.98.4.dist-info → uk_bin_collection-0.99.0.dist-info}/METADATA

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

{uk_bin_collection-0.98.4.dist-info → uk_bin_collection-0.99.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=R0NULatIVLIsX13cKIDBD9ukIbCJ3nw_Gg3iC4nudvE,68070
+uk_bin_collection/tests/input.json,sha256=MyICwD7_JIC5MIoyHk9kUItaHIxkPHuWdG85bsAiI4g,69171
 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=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -17,7 +17,7 @@ uk_bin_collection/uk_bin_collection/councils/ArmaghBanbridgeCraigavonCouncil.py,
 uk_bin_collection/uk_bin_collection/councils/ArunCouncil.py,sha256=yfhthv9nuogP19VOZ3TYQrq51qqjiCZcSel4sXhiKjs,4012
 uk_bin_collection/uk_bin_collection/councils/AylesburyValeCouncil.py,sha256=LouqjspEMt1TkOGqWHs2zkxwOETIy3n7p64uKIlAgUg,2401
 uk_bin_collection/uk_bin_collection/councils/BCPCouncil.py,sha256=W7QBx6Mgso8RYosuXsaYo3GGNAu-tiyBSmuYxr1JSOU,1707
-uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=NccMd0830aiNRQ8SH6mc4r5Hlugfey5-PyUd24QLo4s,8478
+uk_bin_collection/uk_bin_collection/councils/BarnetCouncil.py,sha256=Sd4-pbv0QZsR7soxvXYqsfdOUIqZqS6notyoZthG77s,9182
 uk_bin_collection/uk_bin_collection/councils/BarnsleyMBCouncil.py,sha256=MgF_7XyIcIoNzFR0OJsjBkLCZKgWxBrV6nTcutMxO1Q,4244
 uk_bin_collection/uk_bin_collection/councils/BasildonCouncil.py,sha256=SBvAa0GZM3V7ygK8ARawbHAPH6R_303U30RH8WYPi5Q,3020
 uk_bin_collection/uk_bin_collection/councils/BasingstokeCouncil.py,sha256=VPWGljnH4C3q8qs5ZmCtqjNjgWQvviALzjk00q3EZeQ,2632
@@ -81,7 +81,7 @@ uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=Iss
 uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=i7BympEhCm7D9yR0p5_QQICtWvNcDYNJIWB19SA0g2k,2303
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
-uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=r8cmtWhMJg-XG63ZHxidKKW7i4yQNrZSSMSCkBwrqjI,5837
+uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
 uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py,sha256=_g3fP5Nq-OUjgNrfRf4UEyFKzq0x8QK-4enh5RP1efA,2050
 uk_bin_collection/uk_bin_collection/councils/HighPeakCouncil.py,sha256=oqF8M0lcT3KsrG6W6I6JJX07E6Sc_-_sr7MybfIMab8,4626
@@ -96,6 +96,7 @@ uk_bin_collection/uk_bin_collection/councils/KnowsleyMBCouncil.py,sha256=VdlWDES
 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/LichfieldDistrictCouncil.py,sha256=l3zgTWuKOW8fgb8PmXv0OTI6HaiGBPndefNQk8MM4oY,1810
+uk_bin_collection/uk_bin_collection/councils/LincolnCouncil.py,sha256=aUCqjHuk0sLtx83a-2agcLIMgEbfqjltXRCBRXT9J-8,3733
 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/LondonBoroughEaling.py,sha256=QDx2Izr-6hUSFMi4UWqsgo3p6U8aRZ9d_Cu9cBSp2rY,1653
@@ -133,6 +134,7 @@ uk_bin_collection/uk_bin_collection/councils/NorthYorkshire.py,sha256=2wTrr3VrZD
 uk_bin_collection/uk_bin_collection/councils/NorthumberlandCouncil.py,sha256=KEFsxEvQ159fkuFo-fza67YCnnCZ5ElwE80zTrqDEWI,4990
 uk_bin_collection/uk_bin_collection/councils/NottinghamCityCouncil.py,sha256=panTCjnsBOQ98-TBO9xVZk_jcT_gjMhx3Gg5oWxBRLo,1254
 uk_bin_collection/uk_bin_collection/councils/OldhamCouncil.py,sha256=9dlesCxNoVXlmQaqZj7QFh00smnJbm1Gnjkr_Uvzurs,1771
+uk_bin_collection/uk_bin_collection/councils/PerthAndKinrossCouncil.py,sha256=Kos5GzN2co3Ij3tSHOXB9S71Yt78RROCfVRtnh7M1VU,3657
 uk_bin_collection/uk_bin_collection/councils/PortsmouthCityCouncil.py,sha256=xogNgVvwM5FljCziiNLgZ_wzkOnrQkifi1dkPMDRMtg,5588
 uk_bin_collection/uk_bin_collection/councils/PrestonCityCouncil.py,sha256=3Nuin2hQsiEsbJR_kHldtzRhzmnPFctH7C7MFG7thj8,3838
 uk_bin_collection/uk_bin_collection/councils/ReadingBoroughCouncil.py,sha256=ZlQjU0IeKylGE9VlivSMh4XKwoLgntESPiylSOYkuD4,1009
@@ -170,7 +172,7 @@ uk_bin_collection/uk_bin_collection/councils/StokeOnTrentCityCouncil.py,sha256=K
 uk_bin_collection/uk_bin_collection/councils/StratfordUponAvonCouncil.py,sha256=DMTAcXT_lay8Cl1hBbzf_LN7-GwTDGxT3Ug9QJkaF9Y,3936
 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/SwaleBoroughCouncil.py,sha256=ak0zqBJ6UAS8_t5zKGwigMxPMdlQuYXRsGCQJCNERJs,3415
 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
@@ -181,6 +183,7 @@ uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha25
 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/TunbridgeWellsCouncil.py,sha256=s8Nm9Ef-4561mEXPa0ylYHrXyYIulgCcNV2uAnrXyZk,2846
 uk_bin_collection/uk_bin_collection/councils/UttlesfordDistrictCouncil.py,sha256=GSELWbSn5jtznv6FSLIMxK6CyQ27MW9FoY_m5jhTEBA,4175
 uk_bin_collection/uk_bin_collection/councils/ValeofGlamorganCouncil.py,sha256=Phgb_ECiUOOkqOx6OsfsTHMCW5VQfRmOC2zgYIQhuZA,5044
 uk_bin_collection/uk_bin_collection/councils/ValeofWhiteHorseCouncil.py,sha256=KBKGHcWAdPC_8-CfKnLOdP7Ww6RIvlxLIJGqBsq_77g,4208
@@ -191,7 +194,7 @@ uk_bin_collection/uk_bin_collection/councils/WarwickDistrictCouncil.py,sha256=3W
 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
+uk_bin_collection/uk_bin_collection/councils/WestBerkshireCouncil.py,sha256=XhTimZAPNgcuFgNp5mQjkR8mC4LRqUEUCy6e6plHspM,6004
 uk_bin_collection/uk_bin_collection/councils/WestLindseyDistrictCouncil.py,sha256=JFWUy4w0CKulGq16PfbRDKAdQEbokVEuabwlZYigdEU,4606
 uk_bin_collection/uk_bin_collection/councils/WestLothianCouncil.py,sha256=dq0jimtARvRkZiGbVFrXXZgY-BODtz3uYZ5UKn0bf64,4114
 uk_bin_collection/uk_bin_collection/councils/WestMorlandAndFurness.py,sha256=jbqV3460rn9D0yTBGWjpSe1IvWWcdGur5pzgj-hJcQ4,2513
@@ -210,8 +213,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 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=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.98.4.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.98.4.dist-info/METADATA,sha256=YKK2go_0HJQg2QyV6u0dz0ALkinbMCvzNteuuslvn3I,16843
-uk_bin_collection-0.98.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.98.4.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.98.4.dist-info/RECORD,,
+uk_bin_collection-0.99.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.99.0.dist-info/METADATA,sha256=aakearxZxxoL0MqAE2WaAqz1NPpl2ePxoPHxxdkQHpU,16843
+uk_bin_collection-0.99.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.99.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.99.0.dist-info/RECORD,,