From 215dee1547f91ef2f772d4c0b23aefeb0de65661 Mon Sep 17 00:00:00 2001 From: 5ila5 <5ila5@users.noreply.github.com> Date: Sun, 4 Aug 2024 17:14:37 +0200 Subject: [PATCH] add striling_wa_gov_au --- README.md | 1 + .../waste_collection_schedule/sources.json | 5 ++ .../source/stirling_wa_gov_au.py | 82 +++++++++++++++++++ doc/source/stirling_wa_gov_au.md | 46 +++++++++++ info.md | 2 +- 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 custom_components/waste_collection_schedule/waste_collection_schedule/source/stirling_wa_gov_au.py create mode 100644 doc/source/stirling_wa_gov_au.md diff --git a/README.md b/README.md index 9d011e539..df7cf981a 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ If your service provider is not listed, feel free to open a [source request issu - [Singleton Council](/doc/source/impactapps_com_au.md) / singleton.nsw.gov.au - [Snowy Valleys Council](/doc/source/impactapps_com_au.md) / snowyvalleys.nsw.gov.au - [South Burnett Regional Council](/doc/source/impactapps_com_au.md) / southburnett.qld.gov.au +- [Stirling](/doc/source/stirling_wa_gov_au.md) / stirling.wa.gov.au - [Stonnington City Council](/doc/source/stonnington_vic_gov_au.md) / stonnington.vic.gov.au - [The Hawkesbury City Council, Sydney](/doc/source/hawkesbury_nsw_gov_au.md) / hawkesbury.nsw.gov.au - [The Hills Shire Council, Sydney](/doc/source/thehills_nsw_gov_au.md) / thehills.nsw.gov.au diff --git a/custom_components/waste_collection_schedule/sources.json b/custom_components/waste_collection_schedule/sources.json index ae7487bd1..f69e4bb2a 100644 --- a/custom_components/waste_collection_schedule/sources.json +++ b/custom_components/waste_collection_schedule/sources.json @@ -348,6 +348,11 @@ "service": "South Burnett Regional Council" } }, + { + "title": "Stirling", + "module": "stirling_wa_gov_au", + "default_params": {} + }, { "title": "Stonnington City Council", "module": "stonnington_vic_gov_au", diff --git a/custom_components/waste_collection_schedule/waste_collection_schedule/source/stirling_wa_gov_au.py b/custom_components/waste_collection_schedule/waste_collection_schedule/source/stirling_wa_gov_au.py new file mode 100644 index 000000000..996c1ebf0 --- /dev/null +++ b/custom_components/waste_collection_schedule/waste_collection_schedule/source/stirling_wa_gov_au.py @@ -0,0 +1,82 @@ +import logging + +import requests +from dateutil import parser +from waste_collection_schedule import Collection # type: ignore[attr-defined] + +_LOGGER = logging.getLogger(__name__) + +TITLE = "Stirling" +DESCRIPTION = "Source for Stirling." +URL = "https://www.stirling.wa.gov.au/" +TEST_CASES = { + "-31.9034183 115.8320855": {"lat": -31.9034183, "lon": 115.8320855}, + "-31.878331, 115.815553": {"lat": "-31.8783052", "lon": "115.8157741"}, +} + + +ICON_MAP = { + "red": "mdi:trash-can", + "green": "mdi:leaf", + "greenverge": "mdi:pine-tree", + "yellow": "mdi:recycle", +} + + +API_URL = "https://www.stirling.wa.gov.au/aapi/map" + + +class Source: + def __init__(self, lat: float, lon: float): + if isinstance(lat, str): + lat = float(lat) + if isinstance(lon, str): + lon = float(lon) + + self._lat: float = lat + self._lon: float = lon + + def fetch(self) -> list[Collection]: + headers = { + "Host": "www.stirling.wa.gov.au", + "Accept": "application/json, text/javascript, */*; q=0.01", + "configid": "7c833520-7b62-4228-8522-fb1a220b32e8", + "form": "57753bab-f589-44d7-8934-098b6d5c572f", + "fields": f"{self._lon},{self._lat}", + "apikeylookup": "Test Map Key", + "X-Requested-With": "XMLHttpRequest", + "Connection": "keep-alive", + } + r = requests.get(API_URL, headers=headers) + r.raise_for_status() + + data = r.json() + entries = [] + for collection in data: + bin_type = None + bin_date_str = None + bin_date = None + + for arg in collection: + if arg.get("name") == "type": + bin_type = arg.get("value") + if arg.get("name") == "date": + bin_date_str = arg.get("value") + if not isinstance(bin_date_str, str): + continue + bin_date_str = bin_date_str.replace(" ", " ").strip() + try: + # Aug 7 2024 + bin_date = parser.parse(bin_date_str).date() + except ValueError: + _LOGGER.warning("Could not parse date %s", bin_date_str) + + if bin_date is None: + _LOGGER.warning("Could not find date for collection %s", bin_type) + continue + if bin_type is None: + _LOGGER.warning("Skipping invalid collection record") + continue + icon = ICON_MAP.get(bin_type.lower()) # Collection icon + entries.append(Collection(date=bin_date, t=bin_type, icon=icon)) + return entries diff --git a/doc/source/stirling_wa_gov_au.md b/doc/source/stirling_wa_gov_au.md new file mode 100644 index 000000000..0b20dd5b6 --- /dev/null +++ b/doc/source/stirling_wa_gov_au.md @@ -0,0 +1,46 @@ +# Stirling + +Support for schedules provided by [Stirling](https://www.stirling.wa.gov.au/), serving Stirling, Australia. + +## Configuration via configuration.yaml + +```yaml +waste_collection_schedule: + sources: + - name: stirling_wa_gov_au + args: + lat: LATITUDE + lon: LONGITUDE + +``` + +### Configuration Variables + +**lat** +*(Float) (required)* + +**lon** +*(Float) (required)* + +## Example + +```yaml +waste_collection_schedule: + sources: + - name: stirling_wa_gov_au + args: + lat: -31.9034183 + lon: 115.8320855 + +``` + +## How to get the source argument + +### Using your address coordinates + +1. Find the coordinates of your address using any map service like Google Maps. (the coordinates should be in decimal format with 7 decimal places) +2. Write the coordinates in the configuration file. + +### Inspecting network requests of the Stirling website + +Visit and open the developer tools of your browser. Go to the network tab and filter. search for your address in the websites search bar and click on you address. In your network tab look for a GET request to https://www.stirling.wa.gov.au/aapi/map. Click on that request and look for the Request Headers. The `fields` value of the Request Headers is latitude and longitude **in inverse order!!!** (longitude,latitude). Write the coordinates in the configuration file. diff --git a/info.md b/info.md index 8f5b5005a..d7f585129 100644 --- a/info.md +++ b/info.md @@ -16,7 +16,7 @@ Waste collection schedules from service provider web sites are updated daily, de |--|--| | Generic | ICS / iCal files | | Static | User-defined dates or repeating date patterns | -| Australia | Armadale (Western Australia), Australian Capital Territory (ACT), Banyule City Council, Baw Baw Shire Council, Bayside City Council, Bega Valley Shire Council, Belmont City Council, Blacktown City Council (NSW), Blue Mountains City Council, Brisbane City Council, Burwood City Council, Campbelltown City Council (NSW), Cardinia Shire Council, City of Ballarat, City of Canada Bay Council, City of Cockburn, City of Darebin, City of Greater Geelong, City of Kingston, City of Onkaparinga Council, Cowra Council, Cumberland Council (NSW), Forbes Shire Council, Frankston City Council, Gold Coast City Council, Gwydir Shire Council, Hobsons Bay City Council, Hornsby Shire Council, Hume City Council, Impact Apps, Inner West Council (NSW), Ipswich City Council, Knox City Council, Ku-ring-gai Council, Lake Macquarie City Council, Lithgow City Council, Livingstone Shire Council, Loddon Shire Council, Logan City Council, Macedon Ranges Shire Council, Mansfield Shire Council, Maribyrnong Council, Maroondah City Council, Melton City Council, Merri-bek City Council, Moira Shire Council, Moree Plains Shire Council, Moreton Bay, Mosman Council, Nillumbik Shire Council, North Adelaide Waste Management Authority, Penrith City Council, Port Adelaide Enfield, South Australia, Port Macquarie Hastings Council, Port Stephens Council, Queanbeyan-Palerang Regional Council, RecycleSmart, Redland City Council (QLD), Shellharbour City Council, Singleton Council, Snowy Valleys Council, South Burnett Regional Council, Stonnington City Council, The Hawkesbury City Council, Sydney, The Hills Shire Council, Sydney, Town of Victoria Park, Townsville, Unley City Council (SA), Wellington Shire Council, Whittlesea City Council, Wollondilly Shire Council, Wollongong City Council, Wyndham City Council, Melbourne, Yarra Ranges Council | +| Australia | Armadale (Western Australia), Australian Capital Territory (ACT), Banyule City Council, Baw Baw Shire Council, Bayside City Council, Bega Valley Shire Council, Belmont City Council, Blacktown City Council (NSW), Blue Mountains City Council, Brisbane City Council, Burwood City Council, Campbelltown City Council (NSW), Cardinia Shire Council, City of Ballarat, City of Canada Bay Council, City of Cockburn, City of Darebin, City of Greater Geelong, City of Kingston, City of Onkaparinga Council, Cowra Council, Cumberland Council (NSW), Forbes Shire Council, Frankston City Council, Gold Coast City Council, Gwydir Shire Council, Hobsons Bay City Council, Hornsby Shire Council, Hume City Council, Impact Apps, Inner West Council (NSW), Ipswich City Council, Knox City Council, Ku-ring-gai Council, Lake Macquarie City Council, Lithgow City Council, Livingstone Shire Council, Loddon Shire Council, Logan City Council, Macedon Ranges Shire Council, Mansfield Shire Council, Maribyrnong Council, Maroondah City Council, Melton City Council, Merri-bek City Council, Moira Shire Council, Moree Plains Shire Council, Moreton Bay, Mosman Council, Nillumbik Shire Council, North Adelaide Waste Management Authority, Penrith City Council, Port Adelaide Enfield, South Australia, Port Macquarie Hastings Council, Port Stephens Council, Queanbeyan-Palerang Regional Council, RecycleSmart, Redland City Council (QLD), Shellharbour City Council, Singleton Council, Snowy Valleys Council, South Burnett Regional Council, Stirling, Stonnington City Council, The Hawkesbury City Council, Sydney, The Hills Shire Council, Sydney, Town of Victoria Park, Townsville, Unley City Council (SA), Wellington Shire Council, Whittlesea City Council, Wollondilly Shire Council, Wollongong City Council, Wyndham City Council, Melbourne, Yarra Ranges Council | | Austria | Abfallverband Hollabrunn, Abfallverband Korneuburg, Abfallverband Schwechat, Abfallwirtschaft der Stadt St. Pölten, Abfallwirtschaft Stadt Krems, Abfallwirtschaft Stadt St Pölten, Afritz am See, Alpbach, Altenmarkt an der Triesting, Althofen, Andau, Angath, Apetlon, App CITIES, Arnoldstein, Aschau im Zillertal, AWV Neunkirchen, AWV Wr. Neustadt, Bad Blumau, Bad Gleichenberg, Bad Häring, Bad Kleinkirchheim, Bad Loipersdorf, Bad Radkersburg, Bad Tatzmannsdorf, Bad Waltersdorf, Baldramsdorf, Berg im Drautal, Berndorf bei Salzburg, Bernstein, Bildein, Brandenberg, Breitenbach am Inn, Breitenbrunn am Neusiedler See, Breitenstein, Bromberg, Bruckneudorf, Buch - St. Magdalena, Burgau, Burgauberg-Neudauberg, Burgenländischer Müllverband, Dechantskirchen, Dellach, Dellach im Drautal, Deutsch Goritz, Deutsch Jahrndorf, Deutsch Kaltenbrunn, Deutschkreutz, Die NÖ Umweltverbände, Dobl-Zwaring, Drasenhofen, Draßmarkt, Ebenthal in Kärnten, Eberau, Eberndorf, Ebersdorf, Eberstein, Edelsbach bei Feldbach, Eggenburg, Eggersdorf bei Graz, Eichgraben, Eisenstadt, Eugendorf, Fehring, Feistritz im Rosental, Feistritz ob Bleiburg, Feldbach, Feldkirchen in Kärnten, Feldkirchen in Kärnten, Ferlach, Ferndorf, Ferndorf, Finkenstein am Faaker See, Frankenau-Unterpullendorf, Frauenkirchen, Frauenstein, Freistadt, Fresach, Friedberg, Frohnleiten, Fürstenfeld, Gabersdorf, GABL, Gattendorf, GAUL Laa an der Thaya, GAUM Mistelbach, GDA Amstetten, Gemeindeverband Horn, Gitschtal, Gitschtal, Globasnitz, Gmünd in Kärnten, Gols, Grafendorf bei Hartberg, Grafenschachen, Grafenstein, Grafenstein, Gratkorn, Gratwein-Straßengel, Greifenburg, Großkirchheim, Großsteinbach, Großwarasdorf, Großwilfersdorf, Gutenberg, Guttaring, GV Gmünd, GV Krems, GV Zwettl, GVA Baden, GVA Baden, GVA Lilienfeld, GVA Mödling, GVA Tulln, GVA Waidhofen/Thaya, GVU Bezirk Gänserndorf, GVU Melk, GVU Scheibbs, GVU Scheibbs, GVU St. Pölten, Güssing, Hagenberg im Mühlkreis, Hannersdorf, Hartberg, Heiligenblut am Großglockner, Heiligenkreuz, Heiligenkreuz am Waasen, Heimschuh, Henndorf am Wallersee, Henndorf am Wallersee, Hermagor-Pressegger See, Hirm, Hofstätten an der Raab, Hopfgarten im Brixental, Horitschon, Horn, Hornstein, Hüttenberg, Ilz, infeo, Innsbrucker Kommunalbetriebe, Inzenhof, Irschen, Jabing, Jagerberg, Kaindorf, Kaisersdorf, Kalsdorf bei Graz, Kapfenstein, Kemeten, Keutschach am See, Kirchbach, Kirchbach-Zerlach, Kirchberg an der Raab, Kirchbichl, Kirchdorf in Tirol, Kittsee, Klagenfurt am Wörthersee, Kleblach-Lind, Kleinmürbisch, Klingenbach, Klosterneuburg, Klöch, Kobersdorf, Kohfidisch, Korneuburg, Krems in Kärnten, Krensdorf, Krumpendorf am Wörthersee, Kuchl, Kundl, Kössen, Köstendorf, Kötschach-Mauthen, Köttmannsdorf, Laa an der Thaya, Lackenbach, Lackendorf, Langau, Langenrohr, Leibnitz, Leithaprodersdorf, Lendorf, Leoben, Lesachtal, Leutschach an der Weinstraße, Lieboch, Linz AG, Litzelsdorf, Lockenhaus, Loipersbach im Burgenland, Ludmannsdorf, Lurnfeld, Magdalensberg, Mallnitz, Malta, Maria Rain, Maria Saal, Maria Wörth, Mariasdorf, Markt Hartmannsdorf, Markt Neuhodis, Marktgemeinde Edlitz, Marz, Mattersburg, Mattsee, Meiseldorf, Melk, Mettersdorf am Saßbach, Miesenbach, Millstatt, Mischendorf, Mistelbach, Mitterdorf an der Raab, Moosburg, Mureck, Mönchhof, Mörbisch am See, Mörtschach, Mühldorf, Müll App, Münster, Neudorf bei Parndorf, Neudörfl, Neufeld an der Leitha, Neumarkt am Wallersee, Neusiedl am See, Neustift bei Güssing, Nickelsdorf, Oberdrauburg, Oberndorf in Tirol, Oberpullendorf, Oberschützen, Obertrum am See, Oberwart, Oslip, Ottendorf an der Rittschein, Ottobrunn, Paldau, Pama, Pamhagen, Parndorf, Paternion, Payerbach, Peggau, Pernegg an der Mur, Pernegg im Waldviertel, Pfarrwerfen, Pilgersdorf, Pinggau, Pinkafeld, Podersdorf am See, Poggersdorf, Poggersdorf, Potzneusiedl, Poysdorf, Pöchlarn, Pörtschach am Wörther See, Raach am Hochgebirge, Raasdorf, Radenthein, Radfeld, Radmer, Ragnitz, Raiding, Ramsau im Zillertal, Rangersdorf, Reichenau, Reichenfels, Reith im Alpbachtal, Reißeck, Rennweg am Katschberg, Rohr bei Hartberg, Rohr im Burgenland, Rudersdorf, Rust, Saalfelden am Steinernen Meer, Sachsenburg, Sankt Georgen an der Stiefing, Sankt Gilgen, Sankt Oswald bei Plankenwarth, Schiefling am Wörthersee, Schleedorf, Schrattenberg, Schwadorf, Schwaz, Schwoich, Schäffern, Schützen am Gebirge, Seeboden, Seeham, Seekirchen am Wallersee, Seiersberg-Pirka, Siegendorf, Sigleß, Sigmundsherberg, Sinabelkirchen, Spittal an der Drau, St. Andrä, St. Andrä, St. Andrä am Zicksee, St. Anna am Aigen, St. Egyden am Steinfeld, St. Georgen an der Leys, St. Jakob im Rosental, St. Jakob im Rosental, St. Johann in der Haide, St. Johann in Tirol, St. Konrad, St. Lorenzen am Wechsel, St. Margareten im Rosental, St. Margarethen an der Raab, St. Margarethen im Burgenland, St. Peter - Freienstein, St. Peter am Ottersbach, St. Ruprecht an der Raab, St. Symvaro, St. Veit in der Südsteiermark, Stadt Salzburg, Stadtgemeinde Traiskirchen, Stadtservice Korneuburg, Stall, Stegersbach, Steinbrunn, Steinfeld, Steuerberg, Stinatz, Stiwoll, Stockenboi, Stockerau, Strass im Zillertal, Straß in Steiermark, Straßwalchen, Söchau, Söll, Tadten, Tattendorf, Techelsberg am Wörther See, Thal, Tieschen, Tobaj, Trebesing, Treffen am Ossiacher See, Tulln an der Donau, Umweltprofis, Umweltv, Unterfrauenhaid, Unterkohlstätten, Unterlamm, Unterwart, Vasoldsberg, Velden am Wörther See, Villach, Vordernberg, Völkermarkt, Völkermarkt, Walpersbach, Wattens, Weiden am See, Weitersfeld, Weiz, Weißensee, Weppersdorf, Werfenweng, Wies, Wiesen, Wiesfleck, Wiesmath, Wimpassing an der Leitha, Winden am See, Winklern, Wolfau, Wolfsberg, Wolfsberg, Wolkersdorf im Weinviertel, WSZ Moosburg, Wulkaprodersdorf, Wörterberg, Zagersdorf, Zelking-Matzleinsdorf, Zell, Zell am Ziller, Zellberg, Zillingtal, Zurndorf, Übelbach | | Belgium | Hygea, Limburg.net, Recycle! | | Canada | Aurora (ON), Calgary (AB), Calgary, AB, City of Edmonton, AB, City of Greater Sudbury, ON, City of Nanaimo, City of Peterborough, ON, City of Vancouver, County of Simcoe, ON, Halifax, NS, London (ON), Montreal (QC), Ottawa, Canada, RM of Morris, MB, Strathcona County, ON, Toronto (ON), Vaughan (ON), Waste Wise APPS, Winnipeg (MB) |