Fix variable names (typo) and update search to support Garden Waste Collections in eastherts_gov_uk (#1008)

* Fix variable names (typo) and update search

* Update eastherts_gov_uk.md

* Update eastherts_gov_uk.py

custom_components/waste_collection_schedule/waste_collection_schedule/source/eastherts_gov_uk.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+import logging
 
 import requests
 from bs4 import BeautifulSoup
@@ -10,36 +11,46 @@ URL = "https://www.eastherts.gov.uk"
 TEST_CASES = {
     "Example": {
         "address_postcode": "SG9 9AA",
-        "address_name_numer": "1 Trove House",
-        "address_street": "Baldock Road",
+        "address_name_number": "1",
     },
     "Example No Postcode Space": {
         "address_postcode": "SG99AA",
-        "address_name_numer": "1 Trove House",
-        "address_street": "Baldock Road",
+        "address_name_number": "1",
     },
 }
 ICON_MAP = {
     "Refuse": "mdi:trash-can",
-    "Recycling": "mdi:recycle"
+    "Recycling": "mdi:recycle",
+    "Garden Waste": "mdi:leaf"
 }
 
 API_URL = "https://uhte-wrp.whitespacews.com/"
 
+_LOGGER = logging.getLogger(__name__)
 
 class Source:
     def __init__(
         self,
         address_name_numer=None,
+        address_name_number=None,
         address_street=None,
         street_town=None,
         address_postcode=None,
     ):
-        self._address_name_numer = address_name_numer
+        self._address_name_number = address_name_number if address_name_number is not None else address_name_numer
         self._address_street = address_street
         self._street_town = street_town
         self._address_postcode = address_postcode
 
+        if address_name_numer is not None:
+            _LOGGER.warning("address_name_numer is deprecated. Use address_name_number instead.")
+
+        if address_street is not None:
+            _LOGGER.warning("address_street is deprecated. Only address_name_number and address_postcode are required")
+
+        if street_town is not None:
+            _LOGGER.warning("street_town is deprecated. Only address_name_number and address_postcode are required")
+
     def fetch(self):
         session = requests.Session()
 
@@ -59,9 +70,7 @@ class Source:
         nextpageurl = alink["href"].replace("seq=1", "seq=2")
 
         data = {
-            "address_name_numer": self._address_name_numer,
-            "address_street": self._address_street,
-            "street_town": self._street_town,
+            "address_name_number": self._address_name_number,
             "address_postcode": self._address_postcode,
         }
 

doc/source/eastherts_gov_uk.md

@@ -10,30 +10,23 @@ waste_collection_schedule:
     - name: eastherts_gov_uk
       args:
         address_postcode: POST_CODE
-        address_name_numer: HOUSE_NAME_NUMER,
-        address_street: ADDRESS_STREET,
-        street_town: STREET_TOWN
+        address_name_number: HOUSE_NAME_NUMBER
         version: 1
 
 ```
 
 ### Configuration Variables
-You must supply enough address details for the search to find your property as the first match.
+You only need to supply the house name/number and post code.
 
 Test this out manually first at [East Herts Council](https://www.eastherts.gov.uk/bins-waste-and-recycling) if you are not sure which are needed.
 
 
 **ADDRESS_POSTCODE**  
-*(string) (optional)*
+*(string) (required)*
 
-**ADDRESS_NAME_NUMER**  
-*(string) (optional)*
+**ADDRESS_NAME_NUMBER**  
+*(string) (required)*
 
-**ADDRESS_STREET**  
-*(string) (optional)*
-
-**STREET_TOWN**  
-*(string) (optional)*
 
 ## Example
 
@@ -43,6 +36,5 @@ waste_collection_schedule:
     - name: eastherts_gov_uk
       args:
         address_postcode: "SG9 9AA"
-        address_name_numer: "1 Trove House"
-        address_street: "Baldock Road"
+        address_name_number: "1"
 ```