bugfixes

custom_components/afvalwijzer/__init__.py

@@ -1,31 +1,31 @@
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.typing import ConfigType
-from .const.const import DOMAIN
+# from homeassistant.config_entries import ConfigEntry
+# from homeassistant.core import HomeAssistant
+# from homeassistant.helpers.typing import ConfigType
+# from .const.const import DOMAIN
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Afvalwijzer integration."""
-    hass.data.setdefault(DOMAIN, {})
-    return True
+# async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+#     """Set up the Afvalwijzer integration."""
+#     hass.data.setdefault(DOMAIN, {})
+#     return True
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Afvalwijzer from a config entry."""
-    # Store config entry data
-    hass.data[DOMAIN][entry.entry_id] = entry.data
+# async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+#     """Set up Afvalwijzer from a config entry."""
+#     # Store config entry data
+#     hass.data[DOMAIN][entry.entry_id] = entry.data
 
-    # Forward the setup to the sensor platform
-    await hass.config_entries.async_forward_entry_setups(entry, ["sensor"])
-    return True
+#     # Forward the setup to the sensor platform
+#     await hass.config_entries.async_forward_entry_setups(entry, ["sensor"])
+#     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    # Remove stored data
-    if entry.entry_id in hass.data[DOMAIN]:
-        hass.data[DOMAIN].pop(entry.entry_id)
+# async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+#     """Unload a config entry."""
+#     # Remove stored data
+#     if entry.entry_id in hass.data[DOMAIN]:
+#         hass.data[DOMAIN].pop(entry.entry_id)
 
-    # Unload the sensor platform
-    await hass.config_entries.async_forward_entry_unload(entry, "sensor")
-    return True
+#     # Unload the sensor platform
+#     await hass.config_entries.async_forward_entry_unload(entry, "sensor")
+#     return True

custom_components/afvalwijzer/collector/ximmio.py

@@ -14,7 +14,10 @@ def get_waste_data_raw(provider, postal_code, street_number, suffix):
         if provider not in SENSOR_COLLECTORS_XIMMIO_IDS:
             raise ValueError(f"Invalid provider: {provider} for XIMMIO, please verify")
 
-        url = SENSOR_COLLECTORS_XIMMIO.get("ximmio")
+        if provider in SENSOR_COLLECTORS_XIMMIO.keys():
+            url = SENSOR_COLLECTORS_XIMMIO[provider]
+        else:
+            url = SENSOR_COLLECTORS_XIMMIO["ximmio"]
 
         if not url:
             raise ValueError(f"Invalid provider: {provider} for XIMMIO, please verify")
@@ -34,7 +37,7 @@ def get_waste_data_raw(provider, postal_code, street_number, suffix):
 
         if suffix:
             data["HouseLetter"] = suffix
-
+        print(data)
         response = requests.post(url="{}/api/FetchAdress".format(url), timeout=60, data=data).json()
 
         if not response['dataList']:

custom_components/afvalwijzer/const/const.py

@@ -66,7 +66,12 @@
 ]
 
 SENSOR_COLLECTORS_XIMMIO = {
-    "ximmio": "https://wasteprod2api.ximmio.com",
+    "ximmio": "https://wasteapi.ximmio.com",
+    "avalex": "https://wasteprod2api.ximmio.com",
+    "meerlanden": "https://wasteprod2api.ximmio.com",
+    "rad": "https://wasteprod2api.ximmio.com",
+    "westland": "https://wasteprod2api.ximmio.com",
+    "woerden": "https://wasteprod2api.ximmio.com",
 }
 
 SENSOR_COLLECTORS_XIMMIO_IDS = {

custom_components/afvalwijzer/tests/test_module.py

@@ -39,9 +39,18 @@
 # street_number = "2"
 
 # Afvalwijzer
+# provider = "mijnafvalwijzer"
+# postal_code = "5146eg"
+# street_number = "1"
+
 provider = "mijnafvalwijzer"
-postal_code = "5146eg"
-street_number = "1"
+postal_code = "5563CM"
+street_number = "22"
+
+# ACV
+# provider = "acv"
+# postal_code = "6714KK"
+# street_number = "20"
 
 # iCalendar file
 # provider = "veldhoven"