From 75bf19e6c2d704e99619d82db6036741484923c8 Mon Sep 17 00:00:00 2001
From: Archon Studio <dev@archon.si>
Date: Sat, 18 Jan 2025 20:38:58 +0100
Subject: [PATCH 1/3] New Source: Add script to fetch from pup_si API

---
 .../source/pup_si.py                          | 89 +++++++++++++++++++
 doc/source/pup_si.md                          | 36 ++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
 create mode 100644 doc/source/pup_si.md

diff --git a/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py b/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
new file mode 100644
index 000000000..24d69adce
--- /dev/null
+++ b/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
@@ -0,0 +1,89 @@
+import requests
+from bs4 import BeautifulSoup
+from datetime import datetime
+from waste_collection_schedule import Collection  # type: ignore[attr-defined]
+
+TITLE = "PUP Saubermacher"
+DESCRIPTION = "Source for PUP Saubermacher."
+URL = "https://www.pup-saubermacher.si/"
+TEST_CASES = {
+    "Sostanj 1": {"place_id": 412177},
+    "Sostanj 2": {"place_id": 100911},
+}
+
+BIN_TYPES = {
+    "M": "Mešani (črn)",
+    "B": "Biološki (rjav)",
+    "E": "Embalaža (rumeni)",
+}
+ICON_MAP = {
+    "M": "mdi:trash-can",
+    "B": "mdi:leaf",
+    "E": "mdi:recycle",
+}
+
+BASE_URL = "https://www.pup-saubermacher.si/php/dobi_tabelo.php"
+
+
+class Source:
+    def __init__(self, place_id: int):
+        self._place_id: int = place_id
+
+    def fetch(self) -> list[Collection]:
+        args = {
+            "q": self._place_id,
+        }
+        response = requests.get(BASE_URL, params=args)
+        response.encoding = 'utf-8'
+        response.raise_for_status()
+
+        content = BeautifulSoup(response.text, "html.parser")
+
+        if response.text == "null" or not content.find_all("ul"):
+            raise Exception("Invalid place id")
+
+        entries = []
+        data = self.parse_to_obj(content)
+
+        for item in data:
+            type_char = self.get_type(item["title"])
+
+            for date_info in item["dates"]:
+                date = self.get_date(date_info)
+
+                if date is not None:
+                    entries.append(Collection(date, BIN_TYPES[type_char], ICON_MAP[type_char]))
+
+        return entries
+
+    def parse_to_obj(self, content):
+        # Find all <b> tags and their following <ul> tags
+        b_tags = content.find_all('b')[2:]  # Skip the first two <b> tags
+        data = []
+
+        for b_tag in b_tags:
+            title = b_tag.get_text()
+            ul_tag = b_tag.find_next_sibling('ul')
+
+            if ul_tag:
+                dates = [line.strip() for line in ul_tag.decode_contents().split('<br>') if line.strip()]
+                data.append({"title": title, "dates": dates[0].split("<br/>")})
+
+        return data
+
+    def get_type(self, title):
+        if title.startswith("Mešana embalaža"):
+            return "E"
+        elif title.startswith("Mešani komunalni odpadki"):
+            return "M"
+        else:
+            return "B"
+
+    def get_date(self, date_info):
+        parsed_date = date_info.split(" ")
+
+        if isinstance(parsed_date, list) and len(parsed_date) == 1:
+            return None
+        else:
+            date_obj = datetime.strptime(parsed_date[0].strip(), "%d.%m.%Y")
+            return date_obj.date()
\ No newline at end of file
diff --git a/doc/source/pup_si.md b/doc/source/pup_si.md
new file mode 100644
index 000000000..d5da92168
--- /dev/null
+++ b/doc/source/pup_si.md
@@ -0,0 +1,36 @@
+# Simbio
+
+Support for schedules provided by [Simbio](https://www.simbio.si/sl/), serving Simbio, Slovenia.
+
+## Configuration via configuration.yaml
+
+```yaml
+waste_collection_schedule:
+    sources:
+    - name: pup_si
+      args:
+        place_id: ODJEMNO MESTO (številka)
+```
+
+### Configuration Variables
+
+**place_id**  
+*(Integer) (required)*
+
+
+## Example
+
+```yaml
+waste_collection_schedule:
+    sources:
+    - name: pup_si
+      args:
+        place_id: 12345
+        
+```
+
+## How to get the source argument
+
+Find the parameter of your place id written on you monthly bill for PUP. The number is written on the right side of "Odjemno mesto:" row.
+
+For more information follow go to PUP website [https://www.pup-saubermacher.si/index.php/domov/urnik-odvoza-odpadkov](https://www.pup-saubermacher.si/index.php/domov/urnik-odvoza-odpadkov).

From 8a0bd73036283a76c93f4e78515cba58fe2af376 Mon Sep 17 00:00:00 2001
From: Archon Studio <dev@archon.si>
Date: Sat, 18 Jan 2025 20:39:58 +0100
Subject: [PATCH 2/3] Update docs with script for pup_si

---
 README.md                                     |  1 +
 .../waste_collection_schedule/sources.json    |  6 ++++++
 .../translations/de.json                      | 20 +++++++++++++++++++
 .../translations/en.json                      | 20 +++++++++++++++++++
 .../translations/fr.json                      | 20 +++++++++++++++++++
 .../translations/it.json                      | 20 +++++++++++++++++++
 info.md                                       |  2 +-
 7 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98b68e7ff..54b9eaa81 100644
--- a/README.md
+++ b/README.md
@@ -2006,6 +2006,7 @@ If your service provider is not listed, feel free to open a [source request issu
 <summary>Slovenia</summary>
 
 - [Moji odpadki, Ljubljana](/doc/source/mojiodpadki_si.md) / mojiodpadki.si
+- [PUP Saubermacher](/doc/source/pup_si.md) / pup-saubermacher.si
 - [Snaga Maribor](/doc/source/snaga_mb_si.md) / snaga-mb.si
 </details>
 
diff --git a/custom_components/waste_collection_schedule/sources.json b/custom_components/waste_collection_schedule/sources.json
index 3d7e0ee6a..332e582d6 100644
--- a/custom_components/waste_collection_schedule/sources.json
+++ b/custom_components/waste_collection_schedule/sources.json
@@ -12942,6 +12942,12 @@
       "default_params": {},
       "id": "mojiodpadki_si"
     },
+    {
+      "title": "PUP Saubermacher",
+      "module": "pup_si",
+      "default_params": {},
+      "id": "pup_si"
+    },
     {
       "title": "Snaga Maribor",
       "module": "snaga_mb_si",
diff --git a/custom_components/waste_collection_schedule/translations/de.json b/custom_components/waste_collection_schedule/translations/de.json
index 175acf3ed..14b776128 100644
--- a/custom_components/waste_collection_schedule/translations/de.json
+++ b/custom_components/waste_collection_schedule/translations/de.json
@@ -11319,6 +11319,26 @@
           "uprn": "Eine einfache Möglichkeit, Ihre Unique Property Reference Number (UPRN) zu finden, besteht darin, auf https://www.findmyaddress.co.uk/ zu gehen und Ihre Adressdaten einzugeben."
         }
       },
+      "args_pup_si": {
+        "title": "Quelle konfigurieren",
+        "description": "Konfiguriere deinen Service Provider. Mehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md",
+        "data": {
+          "calendar_title": "Kalender Titel",
+          "place_id": "Place Id"
+        },
+        "data_description": {
+          "calendar_title": "Ein lesbarerer oder benutzerfreundlicherer Name für den Müllkalender. Wenn nichts angegeben wird, wird der Name der Quelle verwendet."
+        }
+      },
+      "reconfigure_pup_si": {
+        "title": "Quelle Neu Konfigurieren",
+        "description": "Konfiguriere deinen Service Provider. Mehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md",
+        "data": {
+          "calendar_title": "Kalender Titel",
+          "place_id": "Place Id"
+        },
+        "data_description": {}
+      },
       "args_snaga_mb_si": {
         "title": "Quelle konfigurieren",
         "description": "Konfiguriere deinen Service Provider. Mehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/snaga_mb_si.md",
diff --git a/custom_components/waste_collection_schedule/translations/en.json b/custom_components/waste_collection_schedule/translations/en.json
index 22cd3e9a2..bb0674985 100644
--- a/custom_components/waste_collection_schedule/translations/en.json
+++ b/custom_components/waste_collection_schedule/translations/en.json
@@ -11361,6 +11361,26 @@
           "uprn": "An easy way to discover your Unique Property Reference Number (UPRN) is by going to https://www.findmyaddress.co.uk/ and entering in your address details."
         }
       },
+      "args_pup_si": {
+        "title": "Configure Source",
+        "description": "Configure your service provider. More details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Calendar Title",
+          "place_id": "Place Id"
+        },
+        "data_description": {
+          "calendar_title": "A more readable, or user-friendly, name for the waste calendar. If nothing is provided, the name returned by the source will be used."
+        }
+      },
+      "reconfigure_pup_si": {
+        "title": "Reconfigure Source",
+        "description": "Configure your service provider. More details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Calendar Title",
+          "place_id": "Place Id"
+        },
+        "data_description": {}
+      },
       "args_snaga_mb_si": {
         "title": "Configure Source",
         "description": "Configure your service provider. More details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/snaga_mb_si.md.",
diff --git a/custom_components/waste_collection_schedule/translations/fr.json b/custom_components/waste_collection_schedule/translations/fr.json
index dc0c1bcd8..caefb6c35 100644
--- a/custom_components/waste_collection_schedule/translations/fr.json
+++ b/custom_components/waste_collection_schedule/translations/fr.json
@@ -11270,6 +11270,26 @@
           "uprn": "Une manière simple de retrouver votre numéro unique de propriété (UPRN) est de vous rendre sur https://www.findmyaddress.co.uk/ et de saisir les détails de votre adresse."
         }
       },
+      "args_pup_si": {
+        "title": "Configurer la Source",
+        "description": "Configurez votre fournisseur de services. Plus de détails : https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Titre du Calendrier",
+          "place_id": "Place Id"
+        },
+        "data_description": {
+          "calendar_title": "Un nom plus lisible ou convivial pour le calendrier des déchets. Si aucun n'est fourni, le nom renvoyé par la source sera utilisé."
+        }
+      },
+      "reconfigure_pup_si": {
+        "title": "Reconfigurer la Source",
+        "description": "Configurez votre fournisseur de services. Plus de détails : https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Titre du Calendrier",
+          "place_id": "Place Id"
+        },
+        "data_description": {}
+      },
       "args_snaga_mb_si": {
         "title": "Configurer la Source",
         "description": "Configurez votre fournisseur de services. Plus de détails : https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/snaga_mb_si.md.",
diff --git a/custom_components/waste_collection_schedule/translations/it.json b/custom_components/waste_collection_schedule/translations/it.json
index b28fdc44b..1781c9de1 100644
--- a/custom_components/waste_collection_schedule/translations/it.json
+++ b/custom_components/waste_collection_schedule/translations/it.json
@@ -11277,6 +11277,26 @@
           "uprn": "Un modo facile per scoprire il tuo Numero di Riferimento Proprietà Unica (UPRN) è andare su https://www.findmyaddress.co.uk/ e inserire i dettagli del tuo indirizzo."
         }
       },
+      "args_pup_si": {
+        "title": "Configurazione Sorgente",
+        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. Maggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Nome Calendario",
+          "place_id": "Place Id"
+        },
+        "data_description": {
+          "calendar_title": "Puoi cambiare il nome del calendario della raccolta dei rifiuti, altrimenti di default verra' utilizzato il nome del tuo fornitore di servizi."
+        }
+      },
+      "reconfigure_pup_si": {
+        "title": "Riconfigurazione Sorgente",
+        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. Per maggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/pup_si.md.",
+        "data": {
+          "calendar_title": "Nome Calendario",
+          "place_id": "Place Id"
+        },
+        "data_description": {}
+      },
       "args_snaga_mb_si": {
         "title": "Configurazione Sorgente",
         "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. Maggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/source/snaga_mb_si.md.",
diff --git a/info.md b/info.md
index b04deca8e..83f7ec3a2 100644
--- a/info.md
+++ b/info.md
@@ -35,7 +35,7 @@ Waste collection schedules from service provider web sites are updated daily, de
 | Norway | Avfall Sør, Kristiansand, BIR (Bergensområdets Interkommunale Renovasjonsselskap), Fosen Renovasjon, IRiS, Min Renovasjon, Movar IKS, Oslo Kommune, ReMidt Orkland muni, Sandnes Kommune, Stavanger Kommune, Trondheim |
 | Poland | ABRUKO PLUS, App Moje Odpady, Bydgoszcz Pronatura, Czerwonak, Murowana Goślina, Oborniki, Ecoharmonogram, Gmina Bardo, Gmina Bartniczka, Gmina Brzeg Dolny, Gmina Brzeziny, Gmina Cedry Wielkie, Gmina Chojnów, Gmina Czechowice- Dziedzice, Gmina Czernichów, Gmina Daleszyce, Gmina Dobra, Gmina Dygowo, Gmina Gaworzyce, Gmina Gać, Gmina Gniew, Gmina Gorlice, Gmina Gorzyce, Gmina Gościno, Gmina Grabów nad Prosną, Gmina Grodków, Gmina Grodzisk Mazowiecki, Gmina i Miasto Dzierzgoń, Gmina i Miasto Nowe Skalmierzyce, Gmina Inowrocław, Gmina Jeżewo, Gmina Kamionka Wielka, Gmina Kluczbork, Gmina Kolbudy, Gmina Kozy, Gmina Krotoszyce, Gmina Kruszwica, Gmina Krzanowice, Gmina Legnickie Pole, Gmina Lubrza, Gmina Miedziana Góra, Gmina Miejska Hrubieszów, Gmina Miejska Kowal, Gmina Mielec, Gmina Międzybórz, Gmina Miękinia, Gmina Mogilany, Gmina Mokrsko, Gmina Mysłakowice, Gmina Nowa Ruda, Gmina Nowa Słupia, Gmina Nowy Staw, Gmina Olsztynek, Gmina Osiecznica, Gmina Osiek, Gmina Ostrowiec Świętokrzyski, Gmina Pajęczno, Gmina Pawłowice, Gmina Polanica-Zdrój, Gmina Porąbka, Gmina Pruszcz, Gmina Przeworno, Gmina Przykładowa, Gmina Pyskowice, Gmina Radoszyce, Gmina Reda, Gmina Rumia, Gmina Skarszewy, Gmina Sobótka, Gmina Sośno, Gmina Starogard Gdański, Gmina Staszów, Gmina Stawiguda, Gmina Strzelin, Gmina Szczytna, Gmina Sztum, Gmina Szumowo, Gmina Słupca, Gmina Słupno, Gmina Topólka, Gmina Ulan-Majorat, Gmina Wieluń, Gmina Wierzchlas, Gmina Wilkowice, Gmina Wisznia Mała, Gmina Wiązów, Gmina Wodzisław, Gmina Wojcieszków, Gmina Wołów, Gmina Wąchock, Gmina Władysławowo, Gmina Zaleszany, Gmina Zbrosławice, Gmina Zduńska Wola, Gmina Złoty Stok, Gmina Łęczyce, Gmina Środa Śląska, Gmina Świdnica, Gmina Świecie, Gmina Żmigród, Gminne Przedsiębiorstwo Komunalne Sp. z o.o. w Skarszewach, Gospodarka Odpadami - Pelplin, Gospodarka Odpadami - Starogard Gdański, Kiedy śmieci, Klient Szablonowy - Ekostrażnik, Klient Szablonowy - Karty Usług, KOMUS, Koziegłowy/Objezierze/Oborniki, Miasto i Gmina Morawica, Miasto i Gmina Łasin, Miasto Inowrocław, Miasto Malbork, Miasto Rejowiec Fabryczny, Miasto Rydułtowy, Miasto Wałbrzych, MPGK Katowice, Parafia św. Wojciecha Biskupa i Męczennika w Nidzicy, Polkowice, Poznań, Przedsiębiorstwo Gospodarki Komunalnej w Wołowie Sp. z o.o., SISMS.pl / BLISKO, Strzelce Krajeńskie, Warsaw, Wrocław, ZGPD-7 |
 | Slovakia | fcc Environment, OLO |
-| Slovenia | Moji odpadki, Ljubljana, Snaga Maribor |
+| Slovenia | Moji odpadki, Ljubljana, PUP Saubermacher, Snaga Maribor |
 | Sweden | Affärsverken, Avfallsapp.se - Multi Source, Boden, Borås Energi och Miljö, EDPEvent - Multi Source, Gästrike Återvinnare, Jönköping - June Avfall & Miljö, Kretslopp Sydost, Kristianstad Renhållning, Landskrona - Svalövs Renhållning, Lerum Vatten och Avlopp, Linköping - Tekniska Verken, Luleå, Lund Waste Collection, Mölndal, Norrtalje Vatten & Avfall, North / Middle Bohuslän - Rambo AB, Region Gotland, Ronneby Miljöteknik, Roslagsvatten, Samverkan Återvinning Miljö (SÅM), Skellefteå, SRV Återvinning, SSAM (Deprecated), SSAM Södra Smalånds Avfall & Miljö, Sysav Sophämntning, Söderköping, Uppsala Vatten, Uppsala Vatten och Avfall AB (Deprecated), VA Syd Sophämntning, VIVAB Sophämtning, Västervik Miljö & Energi, Ökrab Sophämntning |
 | Switzerland | A-Region, Alchenstorf, Andwil, Appenzell, Berg, Bühler, Canton of Zürich, Eggersriet, Gais, Gaiserwald, Gasel, Goldach, Grosswangen, Grub, Heiden, Herisau, Horn, Hundwil, Häggenschwil, Köniz, Köniz, Liebefeld, Lindau, Lutzenberg, Mittelhäusern, Muolen, Mörschwil, Münchenstein, Münsingen BE, Switzerland, Nieder-/Oberscherli, Niederwangen, Oberwangen, Rapperswil, Real Luzern, Real Luzern, Rehetobel, Rorschach, Rorschacherberg, Sammelkalender.ch, Schliern, Schwellbrunn, Schönengrund, Seon, Speicher, Spiegel, Stadt Bülach, Stein, Steinach, Teufen, Thal, Thörishaus, Trogen, Tübach, Untereggen, Urnäsch, Wabern, Wald, Waldkirch, Waldstatt, Winterthur, Wittenbach, Wolfhalden, ZAKU Entsorgung, Zeba, ZKRI |
 | United Kingdom | Aberdeenshire Council, Adur & Worthing Councils, Allerdale Borough Council, Amber Valley Borough Council, Anglesey, Antrim and Newtownabbey, Apps by imactivate, Ards and North Down Borough Council, Arun District Council, Ashfield District Council, Ashford Borough Council, Aylesbury Vale District Council, Barnsley Metropolitan Borough Council, Basildon Council, Basingstoke and Deane Borough Council, Bath & North East Somerset Council, BCP Council, Bedford Borough Council, Binzone, Birmingham City Council, Blackburn with Darwen Borough Council, Blackpool Council, Blaenau Gwent County Borough Council, Borough Council of King's Lynn & West Norfolk, Borough of Broxbourne Council, Bracknell Forest Council, Bradford Metropolitan District Council, Braintree District Council, Breckland Council, Brent Council, Bridgend County Borough Council, Bristol City Council, Broadland District Council, Bromsgrove City Council, Broxtowe Borough Council, Buckinghamshire: Former (Chiltern, South Bucks, Wycombe), Burnley Council, Bury Council, Caerphilly, Wales, Cambridge City Council, Cannock Chase Council, Canterbury City Council, Cardiff Council, Carmarthenshire County Council, Central Bedfordshire Council, Charnwood, Chelmsford City Council, Cherwell District Council, Cheshire East Council, Cheshire West and Chester Council, Chesterfield Borough Council, Chichester District Council, City of Doncaster Council, City Of Lincoln Council, City of York Council, Colchester City Council, Conwy County Borough Council, Cornwall Council, Coventry City Council, Crawley Borough Council (myCrawley), Croydon Council, Cumberland Council, Dacorum Borough Council, Darlington Borough Council, Dartford Borough Council, Denbighshire County Council, Deprecated: Buckinghamshire, Derby City Council, Dorset Council, Dover District Council, Dudley Metropolitan Borough Council, Dundee City Council, Dundee MyBins, Durham County Council, Ealing Council, East Ayrshire Council, East Cambridgeshire District Council, East Devon District Council, East Herts Council, East Lothian, East Northamptonshire and Wellingborough, East Renfrewshire Council, East Riding of Yorkshire Council, Eastbourne Borough Council, Eastleigh Borough Council, Elmbridge Borough Council, Environment First, Exeter City Council, Falkirk, Fareham Borough Council, FCC Environment, Fenland, Fenland District Council, Fife Council, Flintshire, Folkestone and Hythe District Councol, Fylde Council, Gateshead Council, Gedling Borough Council (unofficial), Glasgow City Council, Guildford Borough Council, Gwynedd, Harborough District Council, Haringey Council, Harlow Council, Hart District Council, Hastings Borough Council, Herefordshire City Council, High Peak Borough Council, Highland, Horsham District Council, Hull City Council, Huntingdonshire District Council, Islington Council, iTouchVision, Itouchvision Source using the encrypted API, Joint Waste Solutions, Kirklees Council, Knowsley Council, Lancaster City Council, Leeds, Leicester City Council, Lewes District Council, Lichfield District Council, Lisburn and Castlereagh City Council, Liverpool City Council, London Borough of Barking and Dagenham, London Borough of Bexley, London Borough of Bromley, London Borough of Camden, London Borough of Harrow, London Borough of Hounslow, London Borough of Lewisham, London Borough of Merton (New), London Borough of Merton (Old), London Borough of Newham, Luton, Maidstone Borough Council, Maldon District Council, Malvern Hills, Malvern Hills District Council, Manchester City Council, Mansfield District Council, Melton Borough Council, Mendip District Council, Mid and East Antrim, Mid-Sussex District Council, Middlesbrough Council, Milton Keynes council, Moray Council, Newark & Sherwood District Council, Newcastle City Council, Newcastle Under Lyme Borough Council, Newport City Council, Newport City Council, North Ayrshire Council, North Herts Council, North Kesteven District Council, North Lanarkshire Council, North Lincolnshire Council, North Norfolk District Council, North Northamptonshire council, North Somerset Council, North West Leicestershire District Council, North Yorkshire Council - Hambleton, North Yorkshire Council - Harrogate, North Yorkshire Council - Scarborough, North Yorkshire Council - Selby, Nottingham City Council, Oadby and Wigston Council, Oldham Council, Oxford City Council, Pembrokeshire County Council, Peterborough City Council, Portsmouth City Council, Reading Council, Redbridge Council, Reigate & Banstead Borough Council, Renfrewshire Council, Rhondda Cynon Taf County Borough Council, Richmondshire District Council, Rochdale Borough Council, Rother District Council, Rotherham, Rotherham Metropolitan Borough Council, Royal Borough Of Greenwich, Runnymede Borough Council, Rushcliffe Brough Council, Rushmoor Borough Council, Salford City Council, Sedgemoor District Council, Sefton Council, Sheffield City Council, Shropshire Council, Solihull Council, Somerset Council, Somerset County Council, Somerset West & Taunton District Council, South Cambridgeshire District Council, South Derbyshire District Council, South Gloucestershire Council, South Hams District Council, South Holland District Council, South Kesteven District Council, South Norfolk Council, South Oxfordshire District Council, South Somerset District Council, South Staffordshire Council, South Tyneside Council, Southampton City Council, St Albans City & District Council, Stafford Borough Council, Stevenage Borough Council, Stirling.gov.uk, Stockport Council, Stockton-on-Tees Borough Council, Stoke-on-Trent, Stratford District Council, Stroud District Council, Sunderland City Council, Surrey Heath Borough Council, Sutton Council, London, Swale Borough Council, Swansea Council, Swindon Borough Council, Tameside Metropolitan Borough Council, Telford and Wrekin Council, Test Valley Borough Council, Tewkesbury Borough Council, Thanet District Council, The Royal Borough of Kingston Council, Thurrock, Tonbridge and Malling Borough Council, Tunbridge Wells, UK Bin Collection Schedule (UKBCD) project, Uttlesford District Council, Vale of Glamorgan Council, Vale of White Horse District Council, Wakefield Council, Walsall Council, Warrington Borough Council, Warwick District Council, Waverley Borough Council, Wealden District Council, Welwyn Hatfield Borough Council, West Berkshire Council, West Devon Borough Council, West Dunbartonshire Council, West Lothian Council, West Northamptonshire council, West Oxfordshire District Council, West Suffolk Council, Westmorland & Furness Council, Barrow area, Westmorland & Furness Council, South Lakeland area, Wigan Council, Wiltshire Council, Winchester City Council, Windsor and Maidenhead, Wirral Council, Woking Borough Council, Wokingham Borough Council, Worcester City, Wychavon, Wychavon District Council (Deprecated), Wyre Borough Council, Wyre Forest District Council |

From ff1ce26accd0983127fb574911ba23fd08ca879d Mon Sep 17 00:00:00 2001
From: Archon Studio <dev@archon.si>
Date: Sat, 18 Jan 2025 21:16:42 +0100
Subject: [PATCH 3/3] Update the naming of bin types pup_si

---
 .../waste_collection_schedule/source/pup_si.py              | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py b/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
index 24d69adce..15ecb9182 100644
--- a/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
+++ b/custom_components/waste_collection_schedule/waste_collection_schedule/source/pup_si.py
@@ -12,9 +12,9 @@
 }
 
 BIN_TYPES = {
-    "M": "Mešani (črn)",
-    "B": "Biološki (rjav)",
-    "E": "Embalaža (rumeni)",
+    "M": "Mesani",
+    "B": "Bioloski",
+    "E": "Embalaza",
 }
 ICON_MAP = {
     "M": "mdi:trash-can",