uk_bin_collection 0.133.0__py3-none-any.whl → 0.134.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -1,17 +1,17 @@
 {
+    "AberdeenCityCouncil": {
+        "uprn": "9051156186",
+        "url": "https://www.aberdeencity.gov.uk",
+        "wiki_name": "Aberdeen City Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "AberdeenshireCouncil": {
+        "uprn": "151176430",
         "url": "https://online.aberdeenshire.gov.uk",
         "wiki_command_url_override": "https://online.aberdeenshire.gov.uk",
-        "uprn": "151176430",
         "wiki_name": "Aberdeenshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
-    "AberdeenCityCouncil": {
-        "url": "https://www.aberdeencity.gov.uk",
-        "uprn": "9051156186",
-        "wiki_name": "Aberdeen City Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "AdurAndWorthingCouncils": {
         "url": "https://www.adur-worthing.gov.uk/bin-day/?brlu-selected-address=100061878829",
         "wiki_command_url_override": "https://www.adur-worthing.gov.uk/bin-day/?brlu-selected-address=XXXXXXXX",
@@ -25,23 +25,23 @@
         "wiki_note": "Navigate to [https://antrimandnewtownabbey.gov.uk/residents/bins-recycling/bins-schedule] and search for your street name. Use the URL with the ID to replace XXXXXXXX with your specific ID."
     },
     "ArdsAndNorthDownCouncil": {
+        "uprn": "187136177",
         "url": "https://www.ardsandnorthdown.gov.uk",
         "wiki_command_url_override": "https://www.ardsandnorthdown.gov.uk",
-        "uprn": "187136177",
         "wiki_name": "Ards and North Down Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "ArgyllandButeCouncil": {
-        "uprn": "125061759",
         "skip_get_url": true,
+        "uprn": "125061759",
         "url": "https://www.argyll-bute.gov.uk",
         "wiki_name": "Argyll and Bute Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "ArmaghBanbridgeCraigavonCouncil": {
+        "uprn": "185625284",
         "url": "https://www.armaghbanbridgecraigavon.gov.uk/",
         "wiki_command_url_override": "https://www.armaghbanbridgecraigavon.gov.uk/",
-        "uprn": "185625284",
         "wiki_name": "Armagh Banbridge Craigavon Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -55,18 +55,18 @@
         "wiki_note": "Pass the house name/number and postcode in their respective parameters, both wrapped in double quotes. This parser requires a Selenium webdriver."
     },
     "AshfieldDistrictCouncil": {
-        "url": "https://www.ashfield.gov.uk",
-        "postcode": "NG16 6RH",
         "house_number": "1",
+        "postcode": "NG16 6RH",
+        "url": "https://www.ashfield.gov.uk",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Ashfield District Council",
         "wiki_note": "Pass the house name/number and postcode in their respective parameters, both wrapped in double quotes. This parser requires a Selenium webdriver"
     },
     "AshfordBoroughCouncil": {
-        "url": "https://ashford.gov.uk",
-        "wiki_command_url_override": "https://ashford.gov.uk",
         "postcode": "TN23 7SP",
         "uprn": "100060777899",
+        "url": "https://ashford.gov.uk",
+        "wiki_command_url_override": "https://ashford.gov.uk",
         "wiki_name": "Ashford Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -77,22 +77,22 @@
         "wiki_name": "Aylesbury Vale Council (Buckinghamshire)",
         "wiki_note": "To get the UPRN, please use [FindMyAddress](https://www.findmyaddress.co.uk/search). Returns all published collections in the past, present, future."
     },
-    "BaberghDistrictCouncil": {
+    "BCPCouncil": {
         "skip_get_url": true,
+        "uprn": "100040810214",
+        "url": "https://online.bcpcouncil.gov.uk/bindaylookup/",
+        "wiki_name": "BCP Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
+    "BaberghDistrictCouncil": {
         "house_number": "Monday",
         "postcode": "Week 1",
+        "skip_get_url": true,
         "uprn": "Tuesday",
         "url": "https://www.babergh.gov.uk",
         "wiki_name": "Babergh District Council",
         "wiki_note": "Use the House Number field to pass the DAY of the week for your NORMAL collections. [Monday/Tuesday/Wednesday/Thursday/Friday]. [OPTIONAL] Use the 'postcode' field to pass the WEEK for your garden collection. [Week 1/Week 2]. [OPTIONAL] Use the 'uprn' field to pass the DAY for your garden collection. [Monday/Tuesday/Wednesday/Thursday/Friday]"
     },
-    "BCPCouncil": {
-        "skip_get_url": true,
-        "uprn": "100040810214",
-        "url": "https://online.bcpcouncil.gov.uk/bindaylookup/",
-        "wiki_name": "BCP Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "BarnetCouncil": {
         "house_number": "HA8 7NA, 2, MANOR PARK GARDENS, EDGWARE, BARNET",
         "postcode": "HA8 7NA",
@@ -172,9 +172,9 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "BlabyDistrictCouncil": {
+        "uprn": "100030401782",
         "url": "https://www.blaby.gov.uk",
         "wiki_command_url_override": "https://www.blaby.gov.uk",
-        "uprn": "100030401782",
         "wiki_name": "Blaby District Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -188,9 +188,9 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "BlaenauGwentCountyBoroughCouncil": {
-        "uprn": "100100471367",
         "postcode": "NP23 7TE",
         "skip_get_url": false,
+        "uprn": "100100471367",
         "url": "https://www.blaenau-gwent.gov.uk",
         "web_driver": "http://selenium:4444",
         "wiki_name": "Blaenau Gwent County Borough Council",
@@ -206,11 +206,11 @@
         "wiki_note": "To get the UPRN, you will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search). Previously required a single field that was UPRN and full address; now requires UPRN and postcode as separate fields."
     },
     "BostonBoroughCouncil": {
+        "house_number": "CEDAR",
         "postcode": "PE20 1AY",
         "skip_get_url": true,
-        "house_number": "CEDAR",
-        "web_driver": "http://selenium:4444",
         "url": "https://www.boston.gov.uk/findwastecollections",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Boston Borough Council",
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
@@ -240,9 +240,9 @@
         "wiki_note": "Provide your UPRN and postcode. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "BrecklandCouncil": {
+        "uprn": "100091495479",
         "url": "https://www.breckland.gov.uk",
         "wiki_command_url_override": "https://www.breckland.gov.uk",
-        "uprn": "100091495479",
         "wiki_name": "Breckland Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -278,16 +278,16 @@
         "wiki_note": "Follow the instructions [here](https://recyclingservices.bromley.gov.uk/waste) until the \"Your bin days\" page then copy the URL and replace the URL in the command."
     },
     "BromsgroveDistrictCouncil": {
+        "uprn": "100120584652",
         "url": "https://www.bromsgrove.gov.uk",
         "wiki_command_url_override": "https://www.bromsgrove.gov.uk",
-        "uprn": "100120584652",
         "wiki_name": "Bromsgrove District Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "BroxbourneCouncil": {
-        "url": "https://www.broxbourne.gov.uk",
-        "uprn": "148048608",
         "postcode": "EN8 7FL",
+        "uprn": "148048608",
+        "url": "https://www.broxbourne.gov.uk",
         "wiki_name": "Broxbourne Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -341,9 +341,9 @@
         "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "CanterburyCityCouncil": {
+        "uprn": "10094583181",
         "url": "https://www.canterbury.gov.uk",
         "wiki_command_url_override": "https://www.canterbury.gov.uk",
-        "uprn": "10094583181",
         "wiki_name": "Canterbury City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -355,9 +355,9 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "CarmarthenshireCountyCouncil": {
+        "uprn": "10004859302",
         "url": "https://www.carmarthenshire.gov.wales",
         "wiki_command_url_override": "https://www.carmarthenshire.gov.wales",
-        "uprn": "10004859302",
         "wiki_name": "Carmarthenshire County Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -383,9 +383,9 @@
         "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",
+        "skip_get_url": true,
         "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]."
@@ -397,15 +397,15 @@
         "wiki_note": "Both the UPRN and a one-line address are passed in the URL, which needs to be wrapped in double quotes. The one-line address is made up of the house number, street name, and postcode. Use the form [here](https://online.cheshireeast.gov.uk/mycollectionday/) to find them, then take the first line and postcode and replace all spaces with `%20`."
     },
     "CheshireWestAndChesterCouncil": {
-        "uprn": "100012346655",
         "skip_get_url": true,
+        "uprn": "100012346655",
         "url": "https://my.cheshirewestandchester.gov.uk",
         "wiki_name": "Cheshire West and Chester Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "ChesterfieldBoroughCouncil": {
-        "uprn": "74008234",
         "skip_get_url": true,
+        "uprn": "74008234",
         "url": "https://www.chesterfield.gov.uk",
         "wiki_name": "Chesterfield Borough Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
@@ -489,12 +489,6 @@
         "wiki_name": "Croydon Council",
         "wiki_note": "Pass the house number and postcode in their respective parameters."
     },
-    "CumberlandCouncil": {
-        "uprn": "100110734613",
-        "url": "https://waste.cumberland.gov.uk",
-        "wiki_name": "Cumberland Borough Council",
-        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
-    },
     "CumberlandAllerdaleCouncil": {
         "house_number": "2",
         "postcode": "CA13 0DE",
@@ -502,12 +496,18 @@
         "wiki_name": "Cumberland Council - Allerdale District",
         "wiki_note": "Pass the house number and postcode in their respective parameters."
     },
+    "CumberlandCouncil": {
+        "uprn": "100110734613",
+        "url": "https://waste.cumberland.gov.uk",
+        "wiki_name": "Cumberland Borough Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "DacorumBoroughCouncil": {
         "house_number": "13",
         "postcode": "HP3 9JY",
         "skip_get_url": true,
-        "web_driver": "http://selenium:4444",
         "url": "https://webapps.dacorum.gov.uk/bincollections/",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Dacorum Borough Council",
         "wiki_note": "Pass the house number and postcode in their respective parameters. This parser requires a Selenium webdriver."
     },
@@ -518,14 +518,14 @@
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "DenbighshireCouncil": {
-        "url": "https://www.denbighshire.gov.uk/",
         "uprn": "200004299351",
+        "url": "https://www.denbighshire.gov.uk/",
         "wiki_name": "Denbighshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "DerbyCityCouncil": {
-        "url": "https://www.derby.gov.uk",
         "uprn": "10010684240",
+        "url": "https://www.derby.gov.uk",
         "wiki_name": "Derby City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -559,15 +559,15 @@
         "wiki_note": "Replace XXXXXXXXXXX with your UPRN. To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "DudleyCouncil": {
+        "uprn": "90014244",
         "url": "https://my.dudley.gov.uk",
         "wiki_command_url_override": "https://my.dudley.gov.uk",
-        "uprn": "90014244",
         "wiki_name": "Dudley Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "DundeeCityCouncil": {
-        "url": "https://www.dundeecity.gov.uk/",
         "uprn": "9059043390",
+        "url": "https://www.dundeecity.gov.uk/",
         "wiki_name": "Dundee City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -586,9 +586,9 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "EastAyrshireCouncil": {
+        "uprn": "127074727",
         "url": "https://www.east-ayrshire.gov.uk",
         "wiki_command_url_override": "https://www.east-ayrshire.gov.uk",
-        "uprn": "127074727",
         "wiki_name": "East Ayrshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -671,17 +671,17 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "EdinburghCityCouncil": {
-        "skip_get_url": true,
         "house_number": "Tuesday",
         "postcode": "Week 1",
+        "skip_get_url": true,
         "url": "https://www.edinburgh.gov.uk",
         "wiki_name": "Edinburgh City 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 for your collection. [Week 1/Week 2]"
     },
     "ElmbridgeBoroughCouncil": {
+        "uprn": "10013119164",
         "url": "https://www.elmbridge.gov.uk",
         "wiki_command_url_override": "https://www.elmbridge.gov.uk",
-        "uprn": "10013119164",
         "wiki_name": "Elmbridge Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -698,7 +698,7 @@
         "url": "https://environmentfirst.co.uk/house.php?uprn=100060055444",
         "wiki_command_url_override": "https://environmentfirst.co.uk/house.php?uprn=XXXXXXXXXX",
         "wiki_name": "Environment First",
-        "wiki_note": "For properties with collections managed by Environment First, such as Lewes and Eastbourne. Replace the XXXXXXXXXX with the UPRN of your property—you can use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find this."
+        "wiki_note": "For properties with collections managed by Environment First, such as Lewes and Eastbourne. Replace the XXXXXXXXXX with the UPRN of your property\u2014you can use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find this."
     },
     "EppingForestDistrictCouncil": {
         "postcode": "IG9 6EP",
@@ -720,9 +720,9 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "FalkirkCouncil": {
+        "uprn": "136065818",
         "url": "https://www.falkirk.gov.uk",
         "wiki_command_url_override": "https://www.falkirk.gov.uk",
-        "uprn": "136065818",
         "wiki_name": "Falkirk Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -741,16 +741,16 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "FifeCouncil": {
+        "uprn": "320203521",
         "url": "https://www.fife.gov.uk",
         "wiki_command_url_override": "https://www.fife.gov.uk",
-        "uprn": "320203521",
         "wiki_name": "Fife Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "FlintshireCountyCouncil": {
+        "uprn": "100100213710",
         "url": "https://digital.flintshire.gov.uk",
         "wiki_command_url_override": "https://digital.flintshire.gov.uk",
-        "uprn": "100100213710",
         "wiki_name": "Flintshire County Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -795,16 +795,16 @@
     "GloucesterCityCouncil": {
         "house_number": "111",
         "postcode": "GL2 0RR",
-        "uprn": "100120479507",
         "skip_get_url": true,
-        "web_driver": "http://selenium:4444",
+        "uprn": "100120479507",
         "url": "https://gloucester-self.achieveservice.com/service/Bins___Check_your_bin_day",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Gloucester City Council",
         "wiki_note": "Pass the house number, postcode, and UPRN in their respective parameters. This parser requires a Selenium webdriver."
     },
     "GraveshamBoroughCouncil": {
-        "uprn": "100060927046",
         "skip_get_url": true,
+        "uprn": "100060927046",
         "url": "https://www.gravesham.gov.uk",
         "wiki_name": "Gravesham Borough Council",
         "wiki_note": "Pass the UPRN. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
@@ -820,8 +820,8 @@
         "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)."
     },
     "GwyneddCouncil": {
-        "url": "https://diogel.gwynedd.llyw.cymru",
         "uprn": "10070350463",
+        "url": "https://diogel.gwynedd.llyw.cymru",
         "wiki_name": "Gwynedd Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -842,16 +842,9 @@
         "wiki_note": "Pass the house number and postcode. This parser requires a Selenium webdriver."
     },
     "HarboroughDistrictCouncil": {
-        "url": "https://www.harborough.gov.uk",
-        "wiki_command_url_override": "https://www.harborough.gov.uk",
         "uprn": "100030489072",
-        "wiki_name": "Harborough District Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
-    "HarboroughDistrictCouncil": {
         "url": "https://www.harborough.gov.uk",
         "wiki_command_url_override": "https://www.harborough.gov.uk",
-        "uprn": "100030489072",
         "wiki_name": "Harborough District Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -877,8 +870,8 @@
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "HartlepoolBoroughCouncil": {
-        "url": "https://www.hartlepool.gov.uk",
         "uprn": "100110019551",
+        "url": "https://www.hartlepool.gov.uk",
         "wiki_name": "Hartlepool Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -897,13 +890,6 @@
         "wiki_name": "Hertsmere Borough Council",
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
-    "HighlandCouncil": {
-        "url": "https://www.highland.gov.uk",
-        "wiki_command_url_override": "https://www.highland.gov.uk",
-        "uprn": "130072429",
-        "wiki_name": "Highland Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "HighPeakCouncil": {
         "house_number": "9 Ellison Street, Glossop",
         "postcode": "SK13 8BX",
@@ -913,9 +899,16 @@
         "wiki_name": "High Peak Council",
         "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes. This parser requires a Selenium webdriver."
     },
+    "HighlandCouncil": {
+        "uprn": "130072429",
+        "url": "https://www.highland.gov.uk",
+        "wiki_command_url_override": "https://www.highland.gov.uk",
+        "wiki_name": "Highland Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "HinckleyandBosworthBoroughCouncil": {
-        "url": "https://www.hinckley-bosworth.gov.uk",
         "uprn": "100030533512",
+        "url": "https://www.hinckley-bosworth.gov.uk",
         "wiki_name": "Hinckley and Bosworth Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -942,6 +935,12 @@
         "wiki_name": "Huntingdon District Council",
         "wiki_note": "Replace XXXXXXXX with your UPRN."
     },
+    "IpswichBoroughCouncil": {
+        "house_number": "Siloam Place",
+        "url": "https://app.ipswich.gov.uk/bin-collection/",
+        "wiki_name": "Ipswich Borough Council",
+        "wiki_note": "Provide only the street name (no house number) as the PAON"
+    },
     "IslingtonCouncil": {
         "uprn": "5300094897",
         "url": "https://www.islington.gov.uk/your-area?Postcode=unused&Uprn=5300094897",
@@ -962,8 +961,8 @@
         "wiki_note": "Follow the instructions [here](https://waste-services.kingston.gov.uk/waste) until the \"Your bin days\" page, then copy the URL and replace the URL in the command."
     },
     "KirkleesCouncil": {
-        "uprn": "83002937",
         "skip_get_url": true,
+        "uprn": "83002937",
         "url": "https://www.kirklees.gov.uk/beta/your-property-bins-recycling/your-bins",
         "wiki_name": "Kirklees Council",
         "wiki_note": "Provide your UPRN. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
@@ -996,23 +995,23 @@
         "wiki_note": "Pass the house number, postcode, and UPRN. This parser requires a Selenium webdriver."
     },
     "LeicesterCityCouncil": {
-        "url": "https://biffaleicester.co.uk",
         "uprn": "2465027976",
+        "url": "https://biffaleicester.co.uk",
         "wiki_name": "Leicester City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "LichfieldDistrictCouncil": {
+        "uprn": "100031694085",
         "url": "https://www.lichfielddc.gov.uk",
         "wiki_command_url_override": "https://www.lichfielddc.gov.uk",
-        "uprn": "100031694085",
         "wiki_name": "Lichfield District Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "LincolnCouncil": {
+        "postcode": "LN5 7SH",
+        "uprn": "000235024846",
         "url": "https://lincoln.gov.uk",
         "wiki_command_url_override": "https://lincoln.gov.uk",
-        "uprn": "000235024846",
-        "postcode": "LN5 7SH",
         "wiki_name": "Lincoln Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1037,23 +1036,16 @@
         "wiki_name": "London Borough Ealing",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "LondonBoroughOfRichmondUponThames": {
-        "house_number": "March Road",
-        "skip_get_url": true,
-        "url": "https://www.richmond.gov.uk/services/waste_and_recycling/collection_days/",
-        "wiki_name": "London Borough Of Richmond Upon Thames",
-        "wiki_note": "Pass the name of the street ONLY in the house number parameter, unfortunately post code's are not allowed. "
-    },
     "LondonBoroughHarrow": {
+        "uprn": "100021298754",
         "url": "https://www.harrow.gov.uk",
         "wiki_command_url_override": "https://www.harrow.gov.uk",
-        "uprn": "100021298754",
         "wiki_name": "London Borough Harrow",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "LondonBoroughHavering": {
-        "url": "https://www.havering.gov.uk",
         "uprn": "100021380730",
+        "url": "https://www.havering.gov.uk",
         "wiki_name": "London Borough Havering",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
@@ -1080,6 +1072,13 @@
         "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)."
     },
+    "LondonBoroughOfRichmondUponThames": {
+        "house_number": "March Road",
+        "skip_get_url": true,
+        "url": "https://www.richmond.gov.uk/services/waste_and_recycling/collection_days/",
+        "wiki_name": "London Borough Of Richmond Upon Thames",
+        "wiki_note": "Pass the name of the street ONLY in the house number parameter, unfortunately post code's are not allowed. "
+    },
     "LondonBoroughRedbridge": {
         "postcode": "IG2 6LQ",
         "uprn": "10023770353",
@@ -1089,16 +1088,16 @@
         "wiki_note": "Follow the instructions [here](https://my.redbridge.gov.uk/RecycleRefuse) until you get the page listing your address, then copy the entire address text and use that in the house number field."
     },
     "LondonBoroughSutton": {
+        "uprn": "4473006",
         "url": "https://waste-services.sutton.gov.uk/waste",
         "wiki_command_url_override": "https://waste-services.sutton.gov.uk/waste",
-        "uprn": "4473006",
         "wiki_name": "London Borough Sutton",
         "wiki_note": "You will need to find your unique property reference by going to (https://waste-services.sutton.gov.uk/waste), entering your details and then using the 7 digit reference in the URL as your UPRN"
     },
     "LutonBoroughCouncil": {
+        "uprn": "100080155778",
         "url": "https://myforms.luton.gov.uk",
         "wiki_command_url_override": "https://myforms.luton.gov.uk",
-        "uprn": "100080155778",
         "wiki_name": "Luton Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1152,24 +1151,16 @@
         "wiki_note": "Pass the house name/number plus the name of the street with the postcode parameter, wrapped in double quotes. Check the address on the website first. This version will only pick the first SHOW button returned by the search or if it is fully unique."
     },
     "MidDevonCouncil": {
+        "uprn": "200003997770",
         "url": "https://www.middevon.gov.uk",
         "wiki_command_url_override": "https://www.middevon.gov.uk",
-        "uprn": "200003997770",
         "wiki_name": "Mid Devon Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
-    "MidlothianCouncil": {
-        "house_number": "52",
-        "postcode": "EH19 2EB",
-        "skip_get_url": true,
-        "url": "https://www.midlothian.gov.uk/info/1054/bins_and_recycling/343/bin_collection_days",
-        "wiki_name": "Midlothian Council",
-        "wiki_note": "Pass the house name/number wrapped in double quotes along with the postcode parameter."
-    },
     "MidSuffolkDistrictCouncil": {
-        "skip_get_url": true,
         "house_number": "Monday",
         "postcode": "Week 2",
+        "skip_get_url": true,
         "uprn": "Monday",
         "url": "https://www.midsuffolk.gov.uk",
         "wiki_name": "Mid Suffolk District Council",
@@ -1184,6 +1175,14 @@
         "wiki_name": "Mid Sussex District Council",
         "wiki_note": "Pass the name of the street with the house number parameter, wrapped in double quotes. This parser requires a Selenium webdriver."
     },
+    "MidlothianCouncil": {
+        "house_number": "52",
+        "postcode": "EH19 2EB",
+        "skip_get_url": true,
+        "url": "https://www.midlothian.gov.uk/info/1054/bins_and_recycling/343/bin_collection_days",
+        "wiki_name": "Midlothian Council",
+        "wiki_note": "Pass the house name/number wrapped in double quotes along with the postcode parameter."
+    },
     "MiltonKeynesCityCouncil": {
         "uprn": "25109551",
         "url": "https://mycouncil.milton-keynes.gov.uk/en/service/Waste_Collection_Round_Checker",
@@ -1199,8 +1198,8 @@
         "wiki_note": "UPRN can only be parsed with a valid postcode."
     },
     "MonmouthshireCountyCouncil": {
-        "url": "https://maps.monmouthshire.gov.uk",
         "uprn": "100100266220",
+        "url": "https://maps.monmouthshire.gov.uk",
         "wiki_name": "Monmouthshire County Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1241,8 +1240,8 @@
         "wiki_note": "Replace XXXXXXXX with your UPRN. UPRNs need to be 12 digits long so please pad the left hand side with 0s if your UPRN is not long enough"
     },
     "NewcastleUnderLymeCouncil": {
-        "url": "https://www.newcastle-staffs.gov.uk",
         "uprn": "100031725433",
+        "url": "https://www.newcastle-staffs.gov.uk",
         "wiki_name": "Newcastle Under Lyme Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -1262,9 +1261,9 @@
         "wiki_note": "Pass the postcode and UPRN. You can find the UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "NorthAyrshireCouncil": {
+        "uprn": "126045552",
         "url": "https://www.north-ayrshire.gov.uk/",
         "wiki_command_url_override": "https://www.north-ayrshire.gov.uk/",
-        "uprn": "126045552",
         "wiki_name": "North Ayrshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1358,13 +1357,6 @@
         "wiki_name": "North Yorkshire Council",
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "NorwichCityCouncil": {
-        "url": "https://www.norwich.gov.uk",
-        "wiki_command_url_override": "https://www.norwich.gov.uk",
-        "uprn": "100090888980",
-        "wiki_name": "Norwich City Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
     "NorthumberlandCouncil": {
         "house_number": "22",
         "postcode": "NE46 1UQ",
@@ -1374,6 +1366,13 @@
         "wiki_name": "Northumberland Council",
         "wiki_note": "Pass the house number and postcode in their respective parameters. This parser requires a Selenium webdriver."
     },
+    "NorwichCityCouncil": {
+        "uprn": "100090888980",
+        "url": "https://www.norwich.gov.uk",
+        "wiki_command_url_override": "https://www.norwich.gov.uk",
+        "wiki_name": "Norwich City Council",
+        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
+    },
     "NottinghamCityCouncil": {
         "skip_get_url": true,
         "uprn": "100031540180",
@@ -1382,15 +1381,15 @@
         "wiki_note": "Pass the UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "NuneatonBedworthBoroughCouncil": {
+        "house_number": "Newdigate Road",
+        "skip_get_url": true,
         "url": "https://www.nuneatonandbedworth.gov.uk",
         "wiki_name": "Nuneaton and Bedworth Borough Council",
-        "skip_get_url": true,
-        "house_number": "Newdigate Road",
         "wiki_note": "Pass the name of the street ONLY in the house number parameter, wrapped in double quotes. Street name must match exactly as it appears on the council's website."
     },
     "OadbyAndWigstonBoroughCouncil": {
-        "url": "https://my.oadby-wigston.gov.uk",
         "uprn": "10010149102",
+        "url": "https://my.oadby-wigston.gov.uk",
         "wiki_name": "Oadby & Wigston Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1400,24 +1399,24 @@
         "wiki_note": "Replace UPRN in URL with your own UPRN."
     },
     "OxfordCityCouncil": {
+        "postcode": "OX3 7QF",
+        "uprn": "100120820551",
         "url": "https://www.oxford.gov.uk",
         "wiki_command_url_override": "https://www.oxford.gov.uk",
-        "uprn": "100120820551",
-        "postcode": "OX3 7QF",
         "wiki_name": "Oxford City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "PerthAndKinrossCouncil": {
+        "uprn": "124032322",
         "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."
     },
     "PlymouthCouncil": {
+        "uprn": "100040420582",
         "url": "https://www.plymouth.gov.uk",
         "wiki_command_url_override": "https://www.plymouth.gov.uk",
-        "uprn": "100040420582",
         "wiki_name": "Plymouth Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1454,9 +1453,9 @@
         "wiki_note": "Replace XXXXXXXX with your property's UPRN."
     },
     "RedditchBoroughCouncil": {
+        "uprn": "10094557691",
         "url": "https://redditchbc.gov.uk",
         "wiki_command_url_override": "https://redditchbc.gov.uk",
-        "uprn": "10094557691",
         "wiki_name": "Redditch Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1485,7 +1484,7 @@
         "wiki_name": "Rhondda Cynon Taff Council",
         "wiki_note": "To get the UPRN, you can use [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-"RochdaleCouncil": {
+    "RochdaleCouncil": {
         "postcode": "OL11 5BE",
         "skip_get_url": true,
         "uprn": "23049922",
@@ -1505,10 +1504,10 @@
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "RotherhamCouncil": {
-        "url": "https://www.rotherham.gov.uk/bin-collections?address=100050866000&submit=Submit",
         "uprn": "100050866000",
-        "wiki_name": "Rotherham Council",
+        "url": "https://www.rotherham.gov.uk/bin-collections?address=100050866000&submit=Submit",
         "wiki_command_url_override": "https://www.rotherham.gov.uk/bin-collections?address=XXXXXXXXX&submit=Submit",
+        "wiki_name": "Rotherham Council",
         "wiki_note": "Replace `XXXXXXXXX` with your UPRN in the URL. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "RoyalBoroughofGreenwich": {
@@ -1550,8 +1549,8 @@
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "SandwellBoroughCouncil": {
-        "uprn": "10008755549",
         "skip_get_url": true,
+        "uprn": "10008755549",
         "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)."
@@ -1615,9 +1614,9 @@
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
     "SouthDerbyshireDistrictCouncil": {
+        "uprn": "10000820668",
         "url": "https://maps.southderbyshire.gov.uk/iShareLIVE.web//getdata.aspx?RequestType=LocalInfo&ms=mapsources/MyHouse&format=JSONP&group=Recycling%20Bins%20and%20Waste|Next%20Bin%20Collections&uid=",
         "wiki_command_url_override": "https://maps.southderbyshire.gov.uk/iShareLIVE.web//getdata.aspx?RequestType=LocalInfo&ms=mapsources/MyHouse&format=JSONP&group=Recycling%20Bins%20and%20Waste|Next%20Bin%20Collections&uid=XXXXXXXX",
-        "uprn": "10000820668",
         "wiki_name": "South Derbyshire District Council",
         "wiki_note": "Replace `XXXXXXXX` with your UPRN. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
@@ -1664,9 +1663,9 @@
         "wiki_note": "Provide your UPRN. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to locate it."
     },
     "SouthRibbleCouncil": {
+        "uprn": "010013246384",
         "url": "https://www.southribble.gov.uk",
         "wiki_command_url_override": "https://www.southribble.gov.uk",
-        "uprn": "010013246384",
         "wiki_name": "South Ribble Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -1685,9 +1684,9 @@
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
     "SouthwarkCouncil": {
+        "uprn": "200003469271",
         "url": "https://services.southwark.gov.uk/bins/lookup/",
         "wiki_command_url_override": "https://services.southwark.gov.uk/bins/lookup/XXXXXXXX",
-        "uprn": "200003469271",
         "wiki_name": "Southwark Council",
         "wiki_note": "Replace `XXXXXXXX` with your UPRN. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -1698,12 +1697,6 @@
         "wiki_name": "St Albans City and District Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
-    "StevenageBoroughCouncil": {
-        "uprn": "100080878852",
-        "url": "https://www.stevenage.gov.uk",
-        "wiki_name": "Stevenage Borough Council",
-        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
-    },
     "StHelensBC": {
         "house_number": "15",
         "postcode": "L34 2GA",
@@ -1728,21 +1721,18 @@
         "wiki_name": "Staffordshire Moorlands District Council",
         "wiki_note": "Provide your UPRN and postcode. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
+    "StevenageBoroughCouncil": {
+        "uprn": "100080878852",
+        "url": "https://www.stevenage.gov.uk",
+        "wiki_name": "Stevenage Borough Council",
+        "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
+    },
     "StockportBoroughCouncil": {
         "url": "https://myaccount.stockport.gov.uk/bin-collections/show/100011434401",
         "wiki_command_url_override": "https://myaccount.stockport.gov.uk/bin-collections/show/XXXXXXXX",
         "wiki_name": "Stockport Borough Council",
         "wiki_note": "Replace `XXXXXXXX` with your UPRN."
     },
-    "StocktonOnTeesCouncil": {
-        "house_number": "24",
-        "postcode": "TS20 2RD",
-        "skip_get_url": true,
-        "url": "https://www.stockton.gov.uk",
-        "web_driver": "http://selenium:4444",
-        "wiki_name": "Stockton On Tees Council",
-        "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
-    },
     "StocktonOnTeesCouncil": {
         "house_number": "24",
         "postcode": "TS20 2RD",
@@ -1789,11 +1779,11 @@
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
     "SwaleBoroughCouncil": {
+        "house_number": "81",
         "postcode": "ME12 2NQ",
         "skip_get_url": true,
-        "house_number": "81",
-        "web_driver": "http://selenium:4444",
         "url": "https://swale.gov.uk/bins-littering-and-the-environment/bins/collection-days",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Swale Borough Council",
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
@@ -1806,9 +1796,9 @@
         "wiki_note": "Provide your UPRN and postcode. Find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "SwindonBoroughCouncil": {
+        "uprn": "10022793351",
         "url": "https://www.swindon.gov.uk",
         "wiki_command_url_override": "https://www.swindon.gov.uk",
-        "uprn": "10022793351",
         "wiki_name": "Swindon Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -1827,18 +1817,10 @@
         "wiki_note": "Provide your UPRN. Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to locate it."
     },
     "TeignbridgeCouncil": {
-        "url": "https://www.google.co.uk",
-        "wiki_command_url_override": "https://www.google.co.uk",
         "uprn": "100040338776",
-        "web_driver": "http://selenium:4444",
-        "wiki_name": "Teignbridge Council",
-        "wiki_note": "Provide Google as the URL as the real URL breaks the integration. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
-    },
-    "TeignbridgeCouncil": {
         "url": "https://www.google.co.uk",
-        "wiki_command_url_override": "https://www.google.co.uk",
-        "uprn": "100040338776",
         "web_driver": "http://selenium:4444",
+        "wiki_command_url_override": "https://www.google.co.uk",
         "wiki_name": "Teignbridge Council",
         "wiki_note": "Provide Google as the URL as the real URL breaks the integration. You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1882,9 +1864,9 @@
         "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",
+        "skip_get_url": true,
         "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]."
@@ -1912,9 +1894,9 @@
         "wiki_note": "Provide your UPRN."
     },
     "TunbridgeWellsCouncil": {
+        "uprn": "10090058289",
         "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 your UPRN."
     },
@@ -1953,9 +1935,9 @@
         "wiki_note": "Follow the instructions [here](https://www.wakefield.gov.uk/where-i-live/) until you get the page that includes a 'Bin Collections' section, then copy the URL and replace the URL in the command."
     },
     "WalsallCouncil": {
+        "uprn": "100071080513",
         "url": "https://cag.walsall.gov.uk/",
         "wiki_command_url_override": "https://cag.walsall.gov.uk/",
-        "uprn": "100071080513",
         "wiki_name": "Walsall Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
@@ -1970,16 +1952,16 @@
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "WandsworthCouncil": {
+        "uprn": "100022684035",
         "url": "https://www.wandsworth.gov.uk",
         "wiki_command_url_override": "https://www.wandsworth.gov.uk",
-        "uprn": "100022684035",
         "wiki_name": "Wandsworth Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "WarringtonBoroughCouncil": {
+        "uprn": "10094964379",
         "url": "https://www.warrington.gov.uk",
         "wiki_command_url_override": "https://www.warrington.gov.uk",
-        "uprn": "10094964379",
         "wiki_name": "Warrington Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -1990,16 +1972,9 @@
         "wiki_note": "Replace `XXXXXXXX` with your UPRN."
     },
     "WatfordBoroughCouncil": {
-        "url": "https://www.watford.gov.uk",
-        "wiki_command_url_override": "https://www.watford.gov.uk",
         "uprn": "100080942183",
-        "wiki_name": "Watford Borough Council",
-        "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
-    },
-    "WatfordBoroughCouncil": {
         "url": "https://www.watford.gov.uk",
         "wiki_command_url_override": "https://www.watford.gov.uk",
-        "uprn": "100080942183",
         "wiki_name": "Watford Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -2035,15 +2010,15 @@
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
     "WestDunbartonshireCouncil": {
-        "url": "https://www.west-dunbarton.gov.uk/",
         "uprn": "129001383",
+        "url": "https://www.west-dunbarton.gov.uk/",
         "wiki_name": "West Dunbartonshire Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
     "WestLancashireBoroughCouncil": {
-        "url": "https://www.westlancs.gov.uk",
-        "uprn": "10012343339",
         "postcode": "WN8 0HR",
+        "uprn": "10012343339",
+        "url": "https://www.westlancs.gov.uk",
         "wiki_name": "West Lancashire Borough Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -2065,15 +2040,15 @@
         "wiki_note": "Provide your house name/number in the `house_number` parameter (wrapped in double quotes) and your postcode in the `postcode` parameter."
     },
     "WestMorlandAndFurness": {
+        "uprn": "100110353478",
         "url": "https://www.westmorlandandfurness.gov.uk/",
         "wiki_command_url_override": "https://www.westmorlandandfurness.gov.uk/",
-        "uprn": "100110353478",
         "wiki_name": "West Morland and Furness Council",
         "wiki_note": "Provide your UPRN. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WestNorthamptonshireCouncil": {
-        "uprn": "28056796",
         "skip_get_url": true,
+        "uprn": "28056796",
         "url": "https://www.westnorthants.gov.uk",
         "wiki_name": "West Northamptonshire Council",
         "wiki_note": "Provide your UPRN. You can find your UPRN using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
@@ -2122,17 +2097,17 @@
         "wiki_note": "Provide your house name/number in the `house_number` parameter (wrapped in double quotes) and your postcode in the `postcode` parameter."
     },
     "WindsorAndMaidenheadCouncil": {
-        "web_driver": "http://selenium:4444",
-        "uprn": "100080371082",
         "skip_get_url": true,
+        "uprn": "100080371082",
         "url": "https://forms.rbwm.gov.uk/bincollections?uprn=",
+        "web_driver": "http://selenium:4444",
         "wiki_name": "Windsor and Maidenhead Council",
         "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
     },
     "WirralCouncil": {
+        "uprn": "Vernon Avenue,Seacombe",
         "url": "https://www.wirral.gov.uk",
         "wiki_command_url_override": "https://www.wirral.gov.uk",
-        "uprn": "Vernon Avenue,Seacombe",
         "wiki_name": "Wirral Council",
         "wiki_note": "In the `uprn` field, enter your street name and suburb separated by a comma (e.g., 'Vernon Avenue,Seacombe')."
     },
@@ -2153,24 +2128,17 @@
         "wiki_name": "Wokingham Borough Council",
         "wiki_note": "Provide your house number in the `house_number` parameter and postcode in the `postcode` parameter."
     },
-    "WorcesterCityCouncil": {
-        "url": "https://www.worcester.gov.uk",
-        "wiki_command_url_override": "https://www.worcester.gov.uk",
-        "uprn": "100120650345",
-        "wiki_name": "Worcester City Council",
-        "wiki_note": "Provide your UPRN. You can find it using [FindMyAddress](https://www.findmyaddress.co.uk/search)."
-    },
     "WolverhamptonCityCouncil": {
-        "uprn": "100071205205",
         "postcode": "WV3 9NZ",
+        "uprn": "100071205205",
         "url": "https://www.wolverhampton.gov.uk",
         "wiki_name": "Wolverhampton City Council",
         "wiki_note": "Use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find your UPRN."
     },
     "WorcesterCityCouncil": {
+        "uprn": "100120650345",
         "url": "https://www.Worcester.gov.uk",
         "wiki_command_url_override": "https://www.Worcester.gov.uk",
-        "uprn": "100120650345",
         "wiki_name": "Worcester City Council",
         "wiki_note": "You will need to use [FindMyAddress](https://www.findmyaddress.co.uk/search) to find the UPRN."
     },
@@ -2192,8 +2160,8 @@
         "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",
+        "skip_get_url": true,
         "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]."
@@ -2205,4 +2173,4 @@
         "wiki_name": "York Council",
         "wiki_note": "Provide your UPRN."
     }
-}
+}

uk_bin_collection/uk_bin_collection/councils/IpswichBoroughCouncil.py

@@ -0,0 +1,80 @@
+import re
+
+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.
+    """
+
+    # Constants specific to IBC
+    IBC_INCOMING_DATE_FORMAT = (
+        r"\b(?:on\s+)?([A-Za-z]+ \d{1,2}(?:st|nd|rd|th)? [A-Za-z]+ \d{4})\b"
+    )
+
+    IBC_SUPPORTED_BINS_DICT = {
+        "black": "General Waste",
+        "blue": "Recycling Waste",
+        "brown": "Garden Waste",
+    }
+
+    IBC_DIV_MARKER = "ibc-page-content-section"
+
+    IBC_ENDPOINT = "https://app.ipswich.gov.uk/bin-collection/"
+
+    def transform_date(self, date_str):
+        date_str = re.sub(r"(st|nd|rd|th)", "", date_str)  # Remove ordinal suffixes
+        date_obj = datetime.strptime(date_str, "%A %d %B %Y")
+        return date_obj.strftime(date_format)
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+
+        user_paon = kwargs.get("paon")
+        check_paon(user_paon)
+
+        # Make the request
+        form_data = {"street-input": user_paon}
+        response = requests.post(self.IBC_ENDPOINT, data=form_data, timeout=10)
+        soup = BeautifulSoup(response.content, features="html.parser")
+
+        data = {"bins": []}
+
+        # Start scarping
+        div_section = soup.find("div", class_=self.IBC_DIV_MARKER)
+
+        if div_section:
+            li_elements = div_section.find_all(
+                "li"
+            )  # li element exists for each day a bin or bins will be collected.
+
+            date_pattern = re.compile(self.IBC_INCOMING_DATE_FORMAT)
+
+            for li in li_elements:
+                distinct_collection_info = li.get_text()
+                date_match = date_pattern.search(distinct_collection_info)
+
+                if date_match:
+                    date = date_match.group(1)
+
+                    for supported_bin in self.IBC_SUPPORTED_BINS_DICT:
+                        if supported_bin in distinct_collection_info:
+                            # Transform the date from council format to expected UKBCD format
+                            date_transformed = self.transform_date(date)
+
+                            dict_data = {
+                                "type": supported_bin.capitalize()
+                                + " - "
+                                + self.IBC_SUPPORTED_BINS_DICT[supported_bin],
+                                "collectionDate": date_transformed,
+                            }
+
+                            data["bins"].append(dict_data)
+        return data

{uk_bin_collection-0.133.0.dist-info → uk_bin_collection-0.134.0.dist-info}/METADATA

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

{uk_bin_collection-0.133.0.dist-info → uk_bin_collection-0.134.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=EUx3biB0uK4bYrQEM5YTMa3xXTxKVfb0-mcw8bupyqM,115835
+uk_bin_collection/tests/input.json,sha256=b5kS_5XsRt-cTRw-YdKTLciyPZHAk1mzHXPSqNgUbJ0,114203
 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
@@ -137,6 +137,7 @@ uk_bin_collection/uk_bin_collection/councils/HinckleyandBosworthBoroughCouncil.p
 uk_bin_collection/uk_bin_collection/councils/HounslowCouncil.py,sha256=LXhJ47rujx7k3naz0tFiTT1l5k6gAYcVdekJN1t_HLY,4564
 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/IpswichBoroughCouncil.py,sha256=57lmDl_FprG68gUhKQYpOa1M2pudyb1utfoMhUXNwzs,2802
 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
@@ -306,8 +307,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=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.133.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.133.0.dist-info/METADATA,sha256=NX85mj1hdHBOuTAoTgQq6bdNOKrCxb8iI1BaJ9gHtHI,19741
-uk_bin_collection-0.133.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.133.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.133.0.dist-info/RECORD,,
+uk_bin_collection-0.134.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.134.0.dist-info/METADATA,sha256=Svl74e_j58YAsZNRQkgc2gzL1rrJNozpkXcz-nwQWSo,19741
+uk_bin_collection-0.134.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.134.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.134.0.dist-info/RECORD,,