uk_bin_collection 0.120.0__py3-none-any.whl → 0.121.1__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -364,6 +364,14 @@
         "wiki_name": "Chelmsford City Council",
         "wiki_note": "Follow the instructions [here](https://www.chelmsford.gov.uk/myhome/) until you get the page listing your address, then copy the entire address text and use that in the house number field."
     },
+    "CheltenhamBoroughCouncil": {
+        "skip_get_url": true,
+        "house_number": "Monday",
+        "postcode": "Week 1",
+        "url": "https://www.cheltenham.gov.uk",
+        "wiki_name": "Cheltenham Borough Council",
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. [Monday/Tuesday/Wednesday/Thursday/Friday]. Use the 'postcode' field to pass the WEEK (wrapped in quotes) for your collections. [Week 1/Week 2]."
+    },
     "CheshireEastCouncil": {
         "url": "https://online.cheshireeast.gov.uk/MyCollectionDay/SearchByAjax/GetBartecJobList?uprn=100012791226&onelineaddress=3%20COBBLERS%20YARD,%20SK9%207DZ&_=1689413260149",
         "wiki_command_url_override": "https://online.cheshireeast.gov.uk/MyCollectionDay/SearchByAjax/GetBartecJobList?uprn=XXXXXXXX&onelineaddress=XXXXXXXX&_=1689413260149",
@@ -723,6 +731,13 @@
         "wiki_name": "Flintshire County Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
+    "FolkstoneandHytheDistrictCouncil": {
+        "skip_get_url": true,
+        "uprn": "50032097",
+        "url": "https://www.folkestone-hythe.gov.uk",
+        "wiki_name": "Folkstone and Hythe District Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "ForestOfDeanDistrictCouncil": {
         "house_number": "ELMOGAL, PARKEND ROAD, BREAM, LYDNEY",
         "postcode": "GL15 6JT",
@@ -781,6 +796,13 @@
         "wiki_name": "Guildford Council",
         "wiki_note": "If the bin day is 'today' then the collectionDate will only show today's date if before 7 AM; else the date will be in 'previousCollectionDate'. To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "HackneyCouncil": {
+        "house_number": "101",
+        "postcode": "N16 9AS",
+        "url": "https://www.hackney.gov.uk",
+        "wiki_name": "Hackney Council",
+        "wiki_note": "Pass the postcode and house number in their respective arguments, both wrapped in quotes."
+    },
     "HaltonBoroughCouncil": {
         "house_number": "12",
         "postcode": "WA7 4HA",
@@ -879,6 +901,12 @@
         "wiki_name": "Islington Council",
         "wiki_note": "Replace XXXXXXXX with your UPRN."
     },
+    "KingsLynnandWestNorfolkBC": {
+        "uprn": "10023636886",
+        "url": "https://www.west-norfolk.gov.uk/",
+        "wiki_name": "Kings Lynn and West Norfolk Borough Council",
+        "wiki_note": "Provide your UPRN. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "KingstonUponThamesCouncil": {
         "url": "https://waste-services.kingston.gov.uk/waste/2701097",
         "wiki_command_url_override": "https://waste-services.kingston.gov.uk/waste/XXXXXXX",
@@ -984,6 +1012,15 @@
         "wiki_name": "London Borough Lambeth",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "LondonBoroughLewisham": {
+        "postcode": "SE12 9QF",
+        "skip_get_url": true,
+        "uprn": "100021954849",
+        "url": "https://www.lewisham.gov.uk",
+        "web_driver": "http://selenium:4444",
+        "wiki_name": "London Borough Lewisham",
+        "wiki_note": "Pass the UPRN and postcode. To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "LondonBoroughRedbridge": {
         "postcode": "IG2 6LQ",
         "uprn": "10023770353",
@@ -1095,6 +1132,12 @@
         "wiki_name": "Mole Valley District Council",
         "wiki_note": "UPRN can only be parsed with a valid postcode."
     },
+    "MorayCouncil": {
+        "uprn": "28841",
+        "url": "https://bindayfinder.moray.gov.uk/",
+        "wiki_name": "Moray Council",
+        "wiki_note": "Find your property ID by going to (https://bindayfinder.moray.gov.uk), search for your property and extracting the ID from the URL. i.e. (https://bindayfinder.moray.gov.uk/disp_bins.php?id=00028841)"
+    },
     "NeathPortTalbotCouncil": {
         "house_number": "2",
         "postcode": "SA13 3BA",
@@ -1392,6 +1435,14 @@
         "wiki_command_url_override": "https://www.rotherham.gov.uk/bin-collections?address=XXXXXXXXX&submit=Submit",
         "wiki_note": "Replace `XXXXXXXXX` with your UPRN in the URL. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "RoyalBoroughofGreenwich": {
+        "house_number": "57",
+        "postcode": "BR7 6DN",
+        "skip_get_url": true,
+        "url": "https://www.royalgreenwich.gov.uk",
+        "wiki_name": "Royal Borough of Greenwich",
+        "wiki_note": "Provide your house number in the `house_number` parameter and your postcode in the `postcode` parameter."
+    },
     "RugbyBoroughCouncil": {
         "postcode": "CV22 6LA",
         "skip_get_url": true,
@@ -1422,6 +1473,13 @@
         "wiki_name": "Salford City Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "SandwellBoroughCouncil": {
+        "uprn": "10008755549",
+        "skip_get_url": true,
+        "url": "https://www.sandwell.gov.uk",
+        "wiki_name": "Sandwell Borough Council",
+        "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
+    },
     "SeftonCouncil": {
         "house_number": "1",
         "postcode": "L20 6GG",
@@ -1537,10 +1595,10 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "SouthStaffordshireDistrictCouncil": {
-      "uprn": "200004523954",
-      "url": "https://www.sstaffs.gov.uk/where-i-live?uprn=200004523954",
-      "wiki_name": "South Staffordshire District Council",
-      "wiki_note": "The URL needs to be `https://www.sstaffs.gov.uk/where-i-live?uprn=<Your_UPRN>`. Replace `<Your_UPRN>` with your UPRN."
+        "uprn": "200004523954",
+        "url": "https://www.sstaffs.gov.uk/where-i-live?uprn=200004523954",
+        "wiki_name": "South Staffordshire District Council",
+        "wiki_note": "The URL needs to be `https://www.sstaffs.gov.uk/where-i-live?uprn=<Your_UPRN>`. Replace `<Your_UPRN>` with your UPRN."
     },
     "SouthTynesideCouncil": {
         "house_number": "1",
@@ -1739,6 +1797,14 @@
         "wiki_name": "Three Rivers District Council",
         "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
+    "ThurrockCouncil": {
+        "skip_get_url": true,
+        "house_number": "Monday",
+        "postcode": "Round A",
+        "url": "https://www.thurrock.gov.uk",
+        "wiki_name": "Thurrock Council",
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. [Monday/Tuesday/Wednesday/Thursday/Friday]. Use the 'postcode' field to pass the ROUND (wrapped in quotes) for your collections. [Round A/Round B]."
+    },
     "TonbridgeAndMallingBC": {
         "postcode": "ME19 4JS",
         "skip_get_url": true,
@@ -1909,11 +1975,11 @@
         "wiki_note": "Provide your UPRN. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WestNorthamptonshireCouncil": {
-        "postcode": "NN3 2JB",
+        "uprn": "28056796",
         "skip_get_url": true,
-        "url": "https://www.northampton.gov.uk/info/200084/bins-waste-and-recycling/1602/check-your-collection-day",
+        "url": "https://www.westnorthants.gov.uk",
         "wiki_name": "West Northamptonshire Council",
-        "wiki_note": "Provide your postcode in the `postcode` parameter."
+        "wiki_note": "Provide your UPRN. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WestOxfordshireDistrictCouncil": {
         "house_number": "24",
@@ -2028,6 +2094,13 @@
         "wiki_name": "Wyre Council",
         "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search). The postcode should be wrapped in double quotes with a space in the middle."
     },
+    "WyreForestDistrictCouncil": {
+        "skip_get_url": true,
+        "house_number": "Monday",
+        "url": "https://www.wyreforestdc.gov.uk",
+        "wiki_name": "Wyre Forest District Council",
+        "wiki_note": "Use the House Number field to pass the DAY of the week for your collections. [Monday/Tuesday/Wednesday/Thursday/Friday/Saturday/Sunday]."
+    },
     "YorkCouncil": {
         "skip_get_url": true,
         "uprn": "100050535540",

uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -0,0 +1,102 @@
+import re
+import time
+
+import requests
+from bs4 import BeautifulSoup
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import Select
+from selenium.webdriver.support.wait import WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        collection_day = kwargs.get("paon")
+        collection_week = kwargs.get("postcode")
+        bindata = {"bins": []}
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+
+        week = ["Week 1", "Week 2"]
+
+        offset_days = days_of_week.index(collection_day)
+        collection_week = week.index(collection_week)
+
+        if collection_week == 0:
+            refusestartDate = datetime(2024, 11, 25)
+            recyclingstartDate = datetime(2024, 11, 18)
+        else:
+            refusestartDate = datetime(2024, 11, 18)
+            recyclingstartDate = datetime(2024, 11, 25)
+
+        refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
+        recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
+        food_dates = get_dates_every_x_days(recyclingstartDate, 7, 56)
+
+        for refuseDate in refuse_dates:
+
+            collection_date = (
+                datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Refuse Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for recyclingDate in recycling_dates:
+
+            collection_date = (
+                datetime.strptime(recyclingDate, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Recycling Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+            dict_data = {
+                "type": "Garden Waste Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for food_date in food_dates:
+
+            collection_date = (
+                datetime.strptime(food_date, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Food Waste Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py

@@ -42,14 +42,14 @@ class CouncilClass(AbstractGetBinDataClass):
             wait = WebDriverWait(driver, 60)
             address_entry_field = wait.until(
                 EC.presence_of_element_located(
-                    (By.XPATH, '//*[@id="combobox-input-19"]')
+                    (By.XPATH, '//*[@id="combobox-input-20"]')
                 )
             )
 
             address_entry_field.send_keys(str(full_address))
 
             address_entry_field = wait.until(
-                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-19"]'))
+                EC.element_to_be_clickable((By.XPATH, '//*[@id="combobox-input-20"]'))
             )
             address_entry_field.click()
             address_entry_field.send_keys(Keys.BACKSPACE)
@@ -57,7 +57,7 @@ class CouncilClass(AbstractGetBinDataClass):
 
             first_found_address = wait.until(
                 EC.element_to_be_clickable(
-                    (By.XPATH, '//*[@id="dropdown-element-19"]/ul')
+                    (By.XPATH, '//*[@id="dropdown-element-20"]/ul')
                 )
             )
 

uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py

@@ -30,14 +30,17 @@ class CouncilClass(AbstractGetBinDataClass):
         # Find each <time> element in the schedule
         for entry in soup.find_all("time"):
 
-            dict_data = {
-                "type": entry.find(class_="ScheduleItem").text.strip(),
-                "collectionDate": datetime.strptime(
-                    entry["datetime"],
-                    "%Y-%m-%d",
-                ).strftime("%d/%m/%Y"),
-            }
-            bindata["bins"].append(dict_data)
+            ScheduleItems = entry.find_all(class_="ScheduleItem")
+
+            for ScheduleItem in ScheduleItems:
+                dict_data = {
+                    "type": ScheduleItem.text.strip(),
+                    "collectionDate": datetime.strptime(
+                        entry["datetime"],
+                        "%Y-%m-%d",
+                    ).strftime("%d/%m/%Y"),
+                }
+                bindata["bins"].append(dict_data)
 
         bindata["bins"].sort(
             key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")

uk_bin_collection/uk_bin_collection/councils/FolkstoneandHytheDistrictCouncil.py

@@ -0,0 +1,81 @@
+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
+
+
+# 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": []}
+
+        URI = f"https://service.folkestone-hythe.gov.uk/webapp/myarea/index.php?uprn={user_uprn}"
+
+        # Make the GET request
+        response = requests.get(URI)
+
+        soup = BeautifulSoup(response.content, "html.parser")
+
+        soup = soup.find("div", {"id": "bincollections"})
+
+        # Find the Recycling and Non-Recyclables sections
+        bin_schedule = {}
+
+        # Extract the recycling schedule
+        recycling_section = soup.find("span", text=lambda x: x and "Recycling" in x)
+        if recycling_section:
+            bin_types = recycling_section.text.replace("Recycling: ", "").split(" / ")
+            recycling_dates = recycling_section.find_next("ul").find_all("li")
+            bin_schedule["Recycling"] = [date.text.strip() for date in recycling_dates]
+            for date in recycling_dates:
+                for bin_type in bin_types:
+                    dict_data = {
+                        "type": bin_type.strip(),
+                        "collectionDate": datetime.strptime(
+                            remove_ordinal_indicator_from_date_string(
+                                date.text.strip()
+                            ),
+                            "%A %d %B %Y",
+                        ).strftime("%d/%m/%Y"),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        # Extract the non-recyclables schedule
+        non_recyclables_section = soup.find(
+            "span", text=lambda x: x and "Non-Recyclables" in x
+        )
+        if non_recyclables_section:
+            bin_types = non_recyclables_section.text.replace(
+                "Non-Recyclables: ", ""
+            ).split(" / ")
+            non_recyclables_dates = non_recyclables_section.find_next("ul").find_all(
+                "li"
+            )
+            for date in non_recyclables_dates:
+                for bin_type in bin_types:
+                    dict_data = {
+                        "type": bin_type.strip(),
+                        "collectionDate": datetime.strptime(
+                            remove_ordinal_indicator_from_date_string(
+                                date.text.strip()
+                            ),
+                            "%A %d %B %Y",
+                        ).strftime("%d/%m/%Y"),
+                    }
+                    bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/HackneyCouncil.py

@@ -0,0 +1,85 @@
+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_paon = kwargs.get("paon")
+        user_postcode = kwargs.get("postcode")
+        check_postcode(user_postcode)
+        check_paon(user_paon)
+        bindata = {"bins": []}
+
+        URI = "https://waste-api-hackney-live.ieg4.net/f806d91c-e133-43a6-ba9a-c0ae4f4cccf6/property/opensearch"
+
+        data = {
+            "Postcode": user_postcode,
+        }
+        headers = {"Content-Type": "application/json"}
+
+        # Make the GET request
+        response = requests.post(URI, json=data, headers=headers)
+
+        addresses = response.json()
+
+        for address in addresses["addressSummaries"]:
+            summary = address["summary"]
+            if user_paon in summary:
+                systemId = address["systemId"]
+        if systemId:
+            URI = f"https://waste-api-hackney-live.ieg4.net/f806d91c-e133-43a6-ba9a-c0ae4f4cccf6/alloywastepages/getproperty/{systemId}"
+
+            response = requests.get(URI)
+
+            address = response.json()
+
+            binIDs = address["providerSpecificFields"][
+                "attributes_wasteContainersAssignableWasteContainers"
+            ]
+            for binID in binIDs.split(","):
+                URI = f"https://waste-api-hackney-live.ieg4.net/f806d91c-e133-43a6-ba9a-c0ae4f4cccf6/alloywastepages/getbin/{binID}"
+                response = requests.get(URI)
+                getBin = response.json()
+
+                bin_type = getBin["subTitle"]
+
+                URI = f"https://waste-api-hackney-live.ieg4.net/f806d91c-e133-43a6-ba9a-c0ae4f4cccf6/alloywastepages/getcollection/{binID}"
+                response = requests.get(URI)
+                getcollection = response.json()
+
+                collectionID = getcollection["scheduleCodeWorkflowID"]
+
+                URI = f"https://waste-api-hackney-live.ieg4.net/f806d91c-e133-43a6-ba9a-c0ae4f4cccf6/alloywastepages/getworkflow/{collectionID}"
+                response = requests.get(URI)
+                collection_dates = response.json()
+
+                dates = collection_dates["trigger"]["dates"]
+
+                for date in dates:
+                    parsed_datetime = datetime.strptime(
+                        date, "%Y-%m-%dT%H:%M:%SZ"
+                    ).strftime(date_format)
+
+                    dict_data = {
+                        "type": bin_type.strip(),
+                        "collectionDate": parsed_datetime,
+                    }
+                    bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/KingsLynnandWestNorfolkBC.py

@@ -0,0 +1,59 @@
+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
+
+
+# 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)
+        user_uprn = user_uprn.zfill(12)
+        bindata = {"bins": []}
+
+        URI = "https://www.west-norfolk.gov.uk/info/20174/bins_and_recycling_collection_dates"
+
+        headers = {"Cookie": f"bcklwn_uprn={user_uprn}"}
+
+        # Make the GET request
+        response = requests.get(URI, headers=headers)
+
+        soup = BeautifulSoup(response.content, features="html.parser")
+        soup.prettify()
+
+        # Find all bin_date_container divs
+        bin_date_containers = soup.find_all("div", class_="bin_date_container")
+
+        # Loop through each bin_date_container
+        for container in bin_date_containers:
+            # Extract the collection date
+            date = (
+                container.find("h3", class_="collectiondate").text.strip().rstrip(":")
+            )
+
+            # Extract the bin type from the alt attribute of the img tag
+            bin_type = container.find("img")["alt"]
+
+            dict_data = {
+                "type": bin_type,
+                "collectionDate": datetime.strptime(
+                    date,
+                    "%A %d %B %Y",
+                ).strftime("%d/%m/%Y"),
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py

@@ -0,0 +1,140 @@
+import re
+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, WebDriverWait
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_uprn = kwargs.get("uprn")
+        user_postcode = kwargs.get("postcode")
+        web_driver = kwargs.get("web_driver")
+        headless = kwargs.get("headless")
+        check_uprn(user_uprn)
+        bindata = {"bins": []}
+
+        # Initialize the WebDriver (Chrome in this case)
+        with create_webdriver(
+            web_driver,
+            headless,
+            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
+            __name__,
+        ) as driver:
+
+            # Step 1: Navigate to the form page
+            driver.get(
+                "https://lewisham.gov.uk/myservices/recycling-and-rubbish/your-bins/collection"
+            )
+
+            try:
+                cookie_accept_button = WebDriverWait(driver, 5).until(
+                    EC.element_to_be_clickable(
+                        (By.ID, "CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll")
+                    )
+                )
+                cookie_accept_button.click()
+            except Exception:
+                print("No cookie consent banner found or already dismissed.")
+
+            # Wait for the form to load
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.CLASS_NAME, "address-finder"))
+            )
+
+            # Step 2: Locate the input field for the postcode
+            postcode_input = driver.find_element(
+                By.CLASS_NAME, "js-address-finder-input"
+            )
+
+            # Enter the postcode
+            postcode_input.send_keys(
+                user_postcode
+            )  # Replace with your desired postcode
+            time.sleep(1)  # Optional: Wait for the UI to react
+
+            # Step 4: Click the "Find address" button with retry logic
+            find_button = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (By.CLASS_NAME, "js-address-finder-step-address")
+                )
+            )
+            find_button.click()
+
+            # Wait for the address selector to appear and options to load
+            WebDriverWait(driver, 10).until(
+                lambda d: len(
+                    d.find_element(By.ID, "address-selector").find_elements(
+                        By.TAG_NAME, "option"
+                    )
+                )
+                > 1
+            )
+
+            # Select the dropdown and print available options
+            address_selector = driver.find_element(By.ID, "address-selector")
+
+            # Use Select class to interact with the dropdown
+            select = Select(address_selector)
+            if len(select.options) > 1:
+                select.select_by_value(user_uprn)
+            else:
+                print("No additional addresses available to select")
+
+            # Wait until the URL contains the expected substring
+            WebDriverWait(driver, 10).until(
+                EC.url_contains("/find-your-collection-day-result")
+            )
+
+            # Parse the HTML
+            soup = BeautifulSoup(driver.page_source, "html.parser")
+
+            # Extract the main container
+            collection_result = soup.find("div", class_="js-find-collection-result")
+
+            # Extract each collection type and its frequency/day
+            for strong_tag in collection_result.find_all("strong"):
+                bin_type = strong_tag.text.strip()  # e.g., "Food waste"
+                # Extract the sibling text
+                schedule_text = (
+                    strong_tag.next_sibling.next_sibling.next_sibling.text.strip()
+                    .replace("\n", " ")
+                    .replace("\t", " ")
+                )
+
+                # Extract the day using regex
+                print(schedule_text)
+                day_match = re.search(r"on\s*(\w+day)", schedule_text)
+                print(day_match)
+                day = day_match.group(1) if day_match else None
+
+                # Extract the next collection date using regex
+                date_match = re.search(
+                    r"Your next collection date is\s*(\d{2}/\d{2}/\d{4})(.?)",
+                    schedule_text,
+                )
+                if date_match:
+                    next_collection_date = date_match.group(1)
+                else:
+                    next_collection_date = get_next_day_of_week(day, date_format)
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": next_collection_date,
+                }
+                bindata["bins"].append(dict_data)
+
+            return bindata

uk_bin_collection/uk_bin_collection/councils/MorayCouncil.py

@@ -0,0 +1,65 @@
+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
+
+
+# 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")
+        bindata = {"bins": []}
+
+        user_uprn = user_uprn.zfill(8)
+
+        year = datetime.today().year
+        response = requests.get(
+            f"https://bindayfinder.moray.gov.uk/cal_{year}_view.php",
+            params={"id": user_uprn},
+        )
+        if response.status_code != 200:
+            # fall back to known good calendar URL
+            response = requests.get(
+                "https://bindayfinder.moray.gov.uk/cal_2024_view.php",
+                params={"id": user_uprn},
+            )
+        soup = BeautifulSoup(response.text, "html.parser")
+
+        bin_types = {
+            "G": "Green",
+            "B": "Brown",
+            "P": "Purple",
+            "C": "Blue",
+            "O": "Orange",
+        }
+
+        for month_container in soup.findAll("div", class_="month-container"):
+            for div in month_container.findAll("div"):
+                if "month-header" in div["class"]:
+                    month = div.text
+                elif div["class"] and div["class"][0] in ["B", "GPOC", "GBPOC"]:
+                    bins = div["class"][0]
+                    dom = int(div.text)
+                    for i in bins:
+                        dict_data = {
+                            "type": bin_types.get(i),
+                            "collectionDate": datetime.strptime(
+                                f"{dom} {month} {year}",
+                                "%d %B %Y",
+                            ).strftime("%d/%m/%Y"),
+                        }
+                        bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py

@@ -0,0 +1,113 @@
+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_postcode = kwargs.get("postcode")
+        user_paon = kwargs.get("paon")
+        check_postcode(user_postcode)
+        check_paon(user_paon)
+        bindata = {"bins": []}
+
+        user_postcode = user_postcode.replace(" ", "+")
+
+        URI = f"https://www.royalgreenwich.gov.uk/site/custom_scripts/apps/waste-collection/new2023/source.php?term={user_postcode}"
+
+        # Make the GET request
+        response = requests.get(URI)
+
+        for address in response.json():
+            if user_paon in address:
+                collection_address = address
+                break
+
+        URI = "https://www.royalgreenwich.gov.uk/site/custom_scripts/repo/apps/waste-collection/new2023/ajax-response-uprn.php"
+
+        data = {"address": collection_address}
+
+        response = requests.post(URI, data=data)
+
+        response = response.json()
+
+        collection_day = response["Day"]
+        week = response["Frequency"]
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+        collectionweek = ["Week A", "Week B"]
+
+        offset_days = days_of_week.index(collection_day)
+        week = collectionweek.index(week)
+
+        greenstartDate = datetime(2024, 11, 25)
+        bluestartDate = datetime(2024, 11, 25)
+        if week == 0:
+            blackstartDate = datetime(2024, 11, 18)
+        elif week == 1:
+            blackstartDate = datetime(2024, 11, 25)
+
+        green_dates = get_dates_every_x_days(greenstartDate, 7, 100)
+        blue_dates = get_dates_every_x_days(bluestartDate, 7, 100)
+        black_dates = get_dates_every_x_days(blackstartDate, 14, 50)
+
+        for greenDate in green_dates:
+
+            collection_date = (
+                datetime.strptime(greenDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Green Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for blueDate in blue_dates:
+
+            collection_date = (
+                datetime.strptime(blueDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Blue Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for blackDate in black_dates:
+
+            collection_date = (
+                datetime.strptime(blackDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Black Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py

@@ -0,0 +1,87 @@
+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://my.sandwell.gov.uk/authapi/isauthenticated?uri=https%253A%252F%252Fmy.sandwell.gov.uk%252Fen%252FAchieveForms%252F%253Fform_uri%253Dsandbox-publish%253A%252F%252FAF-Process-ebaa26a2-393c-4a3c-84f5-e61564192a8a%252FAF-Stage-e4c2cb32-db55-4ff5-845c-8b27f87346c4%252Fdefinition.json%2526redirectlink%253D%25252Fen%2526cancelRedirectLink%253D%25252Fen%2526consentMessage%253Dyes&hostname=my.sandwell.gov.uk&withCredentials=true"
+
+        API_URL = "https://my.sandwell.gov.uk/apibroker/runLookup"
+
+        headers = {
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+            "User-Agent": "Mozilla/5.0",
+            "X-Requested-With": "XMLHttpRequest",
+            "Referer": "https://my.sandwell.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"]
+
+        data = {
+            "formValues": {
+                "Property details": {
+                    "Uprn": {
+                        "value": user_uprn,
+                    },
+                    "NextCollectionFromDate": {
+                        "value": datetime.now().strftime("%Y-%m-%d"),
+                    },
+                },
+            },
+        }
+
+        params = {
+            "id": "58a1a71694992",
+            "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 = {
+            "Recycling (Blue)",
+            "Household Waste (Grey)",
+            "Food Waste (Brown)",
+            "Garden Waste (Green)",
+        }
+        for row in rows_data.items():
+            date = row[1]["DWDate"]
+            for bin_type in bin_types:
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": date,
+                }
+                bindata["bins"].append(dict_data)
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/ThurrockCouncil.py

@@ -0,0 +1,93 @@
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        collection_day = kwargs.get("paon")
+        round = kwargs.get("postcode")
+
+        bindata = {"bins": []}
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+
+        round_week = ["Round A", "Round B"]
+
+        offset_days = days_of_week.index(collection_day)
+        round_collection = round_week.index(round)
+
+        if round_collection == 0:
+            bluebrownstartDate = datetime(2024, 10, 21)
+            greengreystartDate = datetime(2024, 10, 28)
+        else:
+            greengreystartDate = datetime(2024, 10, 21)
+            bluebrownstartDate = datetime(2024, 10, 28)
+
+        greengrey_dates = get_dates_every_x_days(greengreystartDate, 14, 28)
+        bluebrown_dates = get_dates_every_x_days(bluebrownstartDate, 14, 28)
+        food_dates = get_dates_every_x_days(greengreystartDate, 7, 56)
+
+        for greengrey_date in greengrey_dates:
+
+            collection_date = (
+                datetime.strptime(greengrey_date, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Green/Grey Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for bluebrown_date in bluebrown_dates:
+
+            collection_date = (
+                datetime.strptime(bluebrown_date, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Blue Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+            dict_data = {
+                "type": "Brown Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for food_date in food_dates:
+
+            collection_date = (
+                datetime.strptime(food_date, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Food Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py

@@ -15,20 +15,22 @@ class CouncilClass(AbstractGetBinDataClass):
     """
 
     def parse_data(self, page: str, **kwargs) -> dict:
-        user_postcode = kwargs.get("postcode")
-        check_postcode(user_postcode)
+        user_uprn = kwargs.get("uprn")
+        check_uprn(user_uprn)
 
-        api_url = f"https://mycouncil.northampton.digital/BinRoundFinder?postcode={urllib.parse.quote(user_postcode)}"
+        api_url = f"https://api.westnorthants.digital/openapi/v1/unified-waste-collections/{user_uprn}"
         json_data = requests.get(api_url).json()
 
         data = {"bins": []}
 
-        dict_data = {
-            "type": json_data["type"].capitalize(),
-            "collectionDate": datetime.strptime(
-                json_data["date"], "%Y%m%d%H%M"
-            ).strftime(date_format),
-        }
-        data["bins"].append(dict_data)
+        collections = json_data["collectionItems"]
+        for collection in collections:
+            dict_data = {
+                "type": collection["type"].capitalize(),
+                "collectionDate": datetime.strptime(
+                    collection["date"], "%Y-%m-%d"
+                ).strftime(date_format),
+            }
+            data["bins"].append(dict_data)
 
         return data

uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py

@@ -0,0 +1,65 @@
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        collection_day = kwargs.get("paon")
+        bindata = {"bins": []}
+
+        days_of_week = [
+            "Monday",
+            "Tuesday",
+            "Wednesday",
+            "Thursday",
+            "Friday",
+            "Saturday",
+            "Sunday",
+        ]
+
+        refusestartDate = datetime(2024, 11, 25)
+        recyclingstartDate = datetime(2024, 11, 18)
+
+        offset_days = days_of_week.index(collection_day)
+
+        refuse_dates = get_dates_every_x_days(refusestartDate, 14, 28)
+        recycling_dates = get_dates_every_x_days(recyclingstartDate, 14, 28)
+
+        for refuseDate in refuse_dates:
+
+            collection_date = (
+                datetime.strptime(refuseDate, "%d/%m/%Y") + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Black/Grey Rubbish Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        for recyclingDate in recycling_dates:
+
+            collection_date = (
+                datetime.strptime(recyclingDate, "%d/%m/%Y")
+                + timedelta(days=offset_days)
+            ).strftime("%d/%m/%Y")
+
+            dict_data = {
+                "type": "Green Recycling Bin",
+                "collectionDate": collection_date,
+            }
+            bindata["bins"].append(dict_data)
+
+        bindata["bins"].sort(
+            key=lambda x: datetime.strptime(x.get("collectionDate"), "%d/%m/%Y")
+        )
+
+        return bindata

{uk_bin_collection-0.120.0.dist-info → uk_bin_collection-0.121.1.dist-info}/METADATA

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

{uk_bin_collection-0.120.0.dist-info → uk_bin_collection-0.121.1.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=icnJmApeU711a_vyDoloeQv9ept1fjonba0zGYEbB_c,107279
+uk_bin_collection/tests/input.json,sha256=IfNcYfT9YNy84xy-ETXgBvdUN9vW6Pc2y3tYjq2AAyI,110958
 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=VZ0a81sioJULD7syAYHjvK_-nT_Rd36tUyzPetSA0gk,3475
@@ -59,6 +59,7 @@ uk_bin_collection/uk_bin_collection/councils/CarmarthenshireCountyCouncil.py,sha
 uk_bin_collection/uk_bin_collection/councils/CastlepointDistrictCouncil.py,sha256=JVPYUIlU2ISgbUSr5AOOXNK6IFQFtQmhZyYIMAOedD4,3858
 uk_bin_collection/uk_bin_collection/councils/CharnwoodBoroughCouncil.py,sha256=tXfzMetN6wxahuGGRp2mIyCCDSL4F2aG61HhUxw6COQ,2172
 uk_bin_collection/uk_bin_collection/councils/ChelmsfordCityCouncil.py,sha256=EB88D0MNJwuDZ2GX1ENc5maGYx17mnHTCtNl6s-v11E,5090
+uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py,sha256=z59g9h6QwdeCNzonM5AI-6NvpLKocD-DT8eSvqk8RwU,3198
 uk_bin_collection/uk_bin_collection/councils/CheshireEastCouncil.py,sha256=73P5GF6Y7Ud1hNgyFypvT1d6eBWjzdBjr3h0Dsl6NWw,1679
 uk_bin_collection/uk_bin_collection/councils/CheshireWestAndChesterCouncil.py,sha256=5mKZf22NgdyBY-SqV0c2q8b8IJobkoZrsfGEVUcxUyM,3544
 uk_bin_collection/uk_bin_collection/councils/ChesterfieldBoroughCouncil.py,sha256=mZiM8Ugm_OP0JkC5pLaQmi4i79mAp4SNNrcIdsREjHw,7198
@@ -68,7 +69,7 @@ uk_bin_collection/uk_bin_collection/councils/ColchesterCityCouncil.py,sha256=Mny
 uk_bin_collection/uk_bin_collection/councils/ConwyCountyBorough.py,sha256=el75qv2QyfWZBU09tJLvD8vLQZ9pCg73u1NBFs6ybo8,1034
 uk_bin_collection/uk_bin_collection/councils/CopelandBoroughCouncil.py,sha256=JDtcJFUY47a3Ws4_7pnCYlngw_3p_A-m5MitPLdrv3w,3983
 uk_bin_collection/uk_bin_collection/councils/CornwallCouncil.py,sha256=WZiz50svwyZgO8QKUCLy7hfFuy2HmAx5h-TG3yAweRA,2836
-uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py,sha256=K_HVkAJHEs-i3PRdoBqWVtWUl3BNed6mRLGaqvtSskg,4896
+uk_bin_collection/uk_bin_collection/councils/CotswoldDistrictCouncil.py,sha256=Y2yvduT6XTy54bDYX17-dltjd7L36cc7GDjlx0xWskA,4896
 uk_bin_collection/uk_bin_collection/councils/CoventryCityCouncil.py,sha256=kfAvA2e4MlO0W9YT70U_mW9gxVPrmr0BOGzV99Tw2Bg,2012
 uk_bin_collection/uk_bin_collection/councils/CrawleyBoroughCouncil.py,sha256=Oaj5INA3zNjtzBRsfLvRTIxZzcd4E4bJfVF1ULWlrL4,4322
 uk_bin_collection/uk_bin_collection/councils/CroydonCouncil.py,sha256=Vxh5ICoaXTAvx0nDOq_95XQ4He9sQKcLdI5keV2uxM4,11384
@@ -83,7 +84,7 @@ uk_bin_collection/uk_bin_collection/councils/DoverDistrictCouncil.py,sha256=3Zga
 uk_bin_collection/uk_bin_collection/councils/DudleyCouncil.py,sha256=tDGfBWD5AVEzHt-XowD4qmmDcdlOLKC0oON8jkARRAI,3134
 uk_bin_collection/uk_bin_collection/councils/DurhamCouncil.py,sha256=6O8bNsQVYQbrCYQE9Rp0c_rtkcXuxR3s9J6jn4MK4_s,1695
 uk_bin_collection/uk_bin_collection/councils/EalingCouncil.py,sha256=UhNXGi-_6NYZu50988VEvOzmAVunxOoyJ6mz0OEaUz4,1321
-uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py,sha256=U3Y_cQFR2KG5YZ7pPXeT7ZQJ85NUyx16Dky56IdvXUQ,1489
+uk_bin_collection/uk_bin_collection/councils/EastAyrshireCouncil.py,sha256=i3AcWkeAnk7rD59nOm0QCSH7AggqjUAdwsXuSIC8ZJE,1614
 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/EastHertsCouncil.py,sha256=hjIrZXM0qe8xvHfrBqMDyXnq0_h_ySODqTfmOI5ahTc,4071
@@ -104,6 +105,7 @@ uk_bin_collection/uk_bin_collection/councils/FarehamBoroughCouncil.py,sha256=25Q
 uk_bin_collection/uk_bin_collection/councils/FenlandDistrictCouncil.py,sha256=sFrnKzIE2tIcz0YrC6A9HcevzgNdf6E6_HLGMWDKtGw,2513
 uk_bin_collection/uk_bin_collection/councils/FifeCouncil.py,sha256=eP_NnHtBLyflRUko9ubi_nxUPb7qg9SbaaSxqWZxNEs,2157
 uk_bin_collection/uk_bin_collection/councils/FlintshireCountyCouncil.py,sha256=RvPHhGbzP3mcjgWe2rIQux43UuDH7XofJGIKs7wJRe0,2060
+uk_bin_collection/uk_bin_collection/councils/FolkstoneandHytheDistrictCouncil.py,sha256=yKgZhua-2hjMihHshhncXVUBagbTOQBnNbKzdIZkWjw,3114
 uk_bin_collection/uk_bin_collection/councils/ForestOfDeanDistrictCouncil.py,sha256=YWT2GM2-bQ3Zh9ps1K14XRZfanuJOlV-zHpOOYMXAXY,4893
 uk_bin_collection/uk_bin_collection/councils/GatesheadCouncil.py,sha256=SRCgYhYs6rv_8C1UEDVORHZgXxcJkoZBjzdYS4Lu-ew,4531
 uk_bin_collection/uk_bin_collection/councils/GedlingBoroughCouncil.py,sha256=XzfFMCwclh9zAJgsbaj4jywjdiH0wPaFicaVsLrN3ms,2297
@@ -111,6 +113,7 @@ uk_bin_collection/uk_bin_collection/councils/GlasgowCityCouncil.py,sha256=9N5GXR
 uk_bin_collection/uk_bin_collection/councils/GloucesterCityCouncil.py,sha256=8Wjvmdvg5blHVrREaEnhhWZaWhYVP4v_KdDVPLIUxaU,4889
 uk_bin_collection/uk_bin_collection/councils/GraveshamBoroughCouncil.py,sha256=ueQ9xFiTxMUBTGV9VjtySHA1EFWliTM0AeNePBIG9ho,4568
 uk_bin_collection/uk_bin_collection/councils/GuildfordCouncil.py,sha256=9pVrmQhZcK2AD8gX8mNvP--L4L9KaY6L3B822VX6fec,5695
+uk_bin_collection/uk_bin_collection/councils/HackneyCouncil.py,sha256=fJZTHCk-uXC61V_7uxiU_MhIupfeObjaUYAT0v0onLo,3100
 uk_bin_collection/uk_bin_collection/councils/HaltonBoroughCouncil.py,sha256=gq_CPqi6qM2oNiHhKKF1lZC86fyKL4lPhh_DN9pJZ04,5971
 uk_bin_collection/uk_bin_collection/councils/HarboroughDistrictCouncil.py,sha256=uAbCgfrqkIkEKUyLVE8l72s5tzbfMFsw775i0nVRAyc,1934
 uk_bin_collection/uk_bin_collection/councils/HaringeyCouncil.py,sha256=t_6AkAu4wrv8Q0WlDhWh_82I0djl5tk531Pzs-SjWzg,2647
@@ -123,6 +126,7 @@ uk_bin_collection/uk_bin_collection/councils/HounslowCouncil.py,sha256=LXhJ47ruj
 uk_bin_collection/uk_bin_collection/councils/HullCityCouncil.py,sha256=UHcesBoctFVcXDYuwfag43KbcJcopkEDzJ-54NxtK0Q,1851
 uk_bin_collection/uk_bin_collection/councils/HuntingdonDistrictCouncil.py,sha256=dGyhhG6HRjQ2SPeiRwUPTGlk9dPIslagV2k0GjEOn1s,1587
 uk_bin_collection/uk_bin_collection/councils/IslingtonCouncil.py,sha256=xavzL6ZIU9DG8Xro3vN0CEnYmNU31OGnOvnq78wgpQc,1258
+uk_bin_collection/uk_bin_collection/councils/KingsLynnandWestNorfolkBC.py,sha256=Shj18R-7NW4ivqJJFVJOLmf-EeN6hXP2Of30oI-SeAQ,1932
 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
@@ -137,6 +141,7 @@ uk_bin_collection/uk_bin_collection/councils/LondonBoroughHarrow.py,sha256=kzKwb
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHavering.py,sha256=6DNX6IShdoEG4FjoyrzrY_HLEu9R2Bgl6PN0bSCbhow,2436
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py,sha256=UOeiOxGMvVMm2UFaqjmQpm7vxzqJNSSN8LM9lAUjs2c,3021
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py,sha256=r9D5lHe5kIRStCd5lRIax16yhb4KTFzzfYEFv1bacWw,2009
+uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py,sha256=d8rlJDTbY3nj-Zjg6iwvwfe-X13Gq86DGGW6QkQAUW0,5310
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py,sha256=A_6Sis5hsF53Th04KeadHRasGbpAm6aoaWJ6X8eC4Y8,6604
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughSutton.py,sha256=c2haHOwX7Dy1phVUTv3xaQgM9VeHmFuBwdAgqGcGs8Y,2369
 uk_bin_collection/uk_bin_collection/councils/LutonBoroughCouncil.py,sha256=vScUi_R8FnBddii2_zLlZBLxuh85mKmCm8nKW3zxky0,2758
@@ -152,6 +157,7 @@ uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=mM5-itJDNhjsT5UEjSFfWppmfmPFSns4u_1QblewuFU,5605
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=7e2pGBLCw24pNItHeI9jkxQ3rEOZ4WC4zVlbvKYGdXE,2600
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=xWR5S0gwQu9gXxjl788Wux1KaC0CT7ZFw0iXuRLZCEM,5599
+uk_bin_collection/uk_bin_collection/councils/MorayCouncil.py,sha256=jsHCQ_aV_bG0GPfF7h6g5TP84sroplYC5k2M6iEKiTw,2265
 uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=ychYR2nsyk2UIb8tjWaKrLUT4hxSsHN558l3RqZ0mjw,5635
 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
@@ -191,10 +197,12 @@ uk_bin_collection/uk_bin_collection/councils/RochdaleCouncil.py,sha256=UTSwSw515
 uk_bin_collection/uk_bin_collection/councils/RochfordCouncil.py,sha256=rfhD66A9HfHL46ldF9sbxvV7fPaaoNxzIJbHjVT6A90,2621
 uk_bin_collection/uk_bin_collection/councils/RotherDistrictCouncil.py,sha256=-fdLvtik9ytfwXrrhwWdBxqQOMq2N1pvrIuvShhf8PU,3090
 uk_bin_collection/uk_bin_collection/councils/RotherhamCouncil.py,sha256=LtMPM8lj5bfReDR4buHEo-aRC_HTBIeo1nf8GE5-R80,1790
+uk_bin_collection/uk_bin_collection/councils/RoyalBoroughofGreenwich.py,sha256=BZzLmWK_VONOmMpSrLrnKtJaOrrepm6aStfKGVcgf9Y,3487
 uk_bin_collection/uk_bin_collection/councils/RugbyBoroughCouncil.py,sha256=a5ySLmFvvY56QMA7-bk6MVBxRp5tPBIBg4navH0eYas,4306
 uk_bin_collection/uk_bin_collection/councils/RushcliffeBoroughCouncil.py,sha256=wMtiYRirT585vtsEOIyXHugk7aEj3pvyVWBaAePdqtE,4005
 uk_bin_collection/uk_bin_collection/councils/RushmoorCouncil.py,sha256=ZsGnXjoEaOS6U7fI0w7-uqxayAHdNVKsJi2fqIWEls8,3375
 uk_bin_collection/uk_bin_collection/councils/SalfordCityCouncil.py,sha256=jJjAH_dM298VIJ4-SEy7agxUe8aFJ_sEPK_ZwmWJ9cE,2506
+uk_bin_collection/uk_bin_collection/councils/SandwellBoroughCouncil.py,sha256=shJhvqDcha2ypDCSfhss59G95jNaWBuMnVIxJiZXcY8,3110
 uk_bin_collection/uk_bin_collection/councils/SeftonCouncil.py,sha256=XUEz2li0oHrRhdkls5qzlZNZ0GuwSG7r0dwsL-qdoFA,2480
 uk_bin_collection/uk_bin_collection/councils/SevenoaksDistrictCouncil.py,sha256=qqrrRaSVm9CYAtm0rB2ZnyH_nLwaReuacoUxZpo597k,4260
 uk_bin_collection/uk_bin_collection/councils/SheffieldCityCouncil.py,sha256=9g9AeiackoWyej9EVlKUzywzAtMuBVD0f93ZryAUha8,2016
@@ -236,6 +244,7 @@ uk_bin_collection/uk_bin_collection/councils/TendringDistrictCouncil.py,sha256=D
 uk_bin_collection/uk_bin_collection/councils/TestValleyBoroughCouncil.py,sha256=Dtfkyrwt795W7gqFJxVGRR8t3R5WMNQZwTWJckLpZWE,8480
 uk_bin_collection/uk_bin_collection/councils/ThanetDistrictCouncil.py,sha256=-opmZG9GzjB_NvmWpN6nFZ7rlkSoaRrQICU5E8T0DEQ,1659
 uk_bin_collection/uk_bin_collection/councils/ThreeRiversDistrictCouncil.py,sha256=RHt3e9oeKzwxjjY-M8aC0nk-ZXhHIoyC81JzxkPVxsE,5531
+uk_bin_collection/uk_bin_collection/councils/ThurrockCouncil.py,sha256=vAZMm6mcsdEcOkP15xwxWy9gdXpmLYQFH7qRifurNoY,2935
 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
@@ -257,7 +266,7 @@ uk_bin_collection/uk_bin_collection/councils/WestLancashireBoroughCouncil.py,sha
 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
-uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=F1GeJUGND4DN_HuM6N0Elpeb0DAMm9_KeqG6qtIgZf4,1079
+uk_bin_collection/uk_bin_collection/councils/WestNorthamptonshireCouncil.py,sha256=Se3Cfn_6ADjhsUzEJI_JnGkVcIbXxSTferM4ZC6pZ0g,1166
 uk_bin_collection/uk_bin_collection/councils/WestOxfordshireDistrictCouncil.py,sha256=bkE7BUwRIEJQyfOHyXYeaJB1ruGTFu9LHIGursIBEIQ,4859
 uk_bin_collection/uk_bin_collection/councils/WestSuffolkCouncil.py,sha256=9i8AQHh-qIRPZ_5Ad97_h04-qgyLQDPV064obBzab1Y,2587
 uk_bin_collection/uk_bin_collection/councils/WiganBoroughCouncil.py,sha256=3gqFA4-BVx_In6QOu3KUNqPN4Fkn9iMlZTeopMK9p6A,3746
@@ -271,12 +280,13 @@ uk_bin_collection/uk_bin_collection/councils/WolverhamptonCityCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/WorcesterCityCouncil.py,sha256=dKHB2fPSmOGOwyvfpbdR4U8XW2ctBf63gCPxX06kwKA,1867
 uk_bin_collection/uk_bin_collection/councils/WychavonDistrictCouncil.py,sha256=GnNNMe33YMlK6S7rjM3c4BQkBnXelS0DKl2x5V4fb2w,5775
 uk_bin_collection/uk_bin_collection/councils/WyreCouncil.py,sha256=zDDa7n4K_zm5PgDL08A26gD9yOOsOhuexI3x2seaBF4,3511
+uk_bin_collection/uk_bin_collection/councils/WyreForestDistrictCouncil.py,sha256=3b7WzBXdYub6j13sqDL3jlqgICKmNyQaF4KxRxOMHWk,2000
 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=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 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.120.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.120.0.dist-info/METADATA,sha256=wvXpQZc70f0TI2_UTRc4RDel0O-sFh7-yO_vEVdVe_o,17574
-uk_bin_collection-0.120.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.120.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.120.0.dist-info/RECORD,,
+uk_bin_collection-0.121.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.121.1.dist-info/METADATA,sha256=ZqB1SnI8jyknJKcVIK20CPMBBgHQMIV5jpHIhx1jHFM,17574
+uk_bin_collection-0.121.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.121.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.121.1.dist-info/RECORD,,