update tbr_reutlingen_de to support new source used for 2025 (mampfes…

…#3541)
srempfer · Jan 10, 2025 · 64f042a · 64f042a
1 parent fdac65a
commit 64f042a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/custom_components/waste_collection_schedule/translations/de.json b/custom_components/waste_collection_schedule/translations/de.json
@@ -9167,7 +9167,7 @@
       },
       "args_ics_tbr_reutlingen_de": {
         "title": "Quelle konfigurieren",
-        "description": "Konfiguriere deinen Service Provider. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nMehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md",
+        "description": "Konfiguriere deinen Service Provider. \n\n- Öffnen Sie https://www.tbr-reutlingen.de/entsorgungskalender und gehen Sie zum Bereich `Entsorgungskalender 2025`.\n- Wählen Sie ihre Straße und die gewünschten Abfallarten aus\n- Klicken Sie mit der rechten Maustaste auf `ICS` und kopieren Sie den Link.\n- Ersetzen Sie die `url` in der Beispielkonfiguration durch diesen Link.\n- Der Link beinhaltet einen Abfrageparameter namens `timeperiod`, welcher das Start- und Enddatum des ausgewählten Jahres definiert. Sie müssen dessen Wert von z.B. `20250101-20251231` zu '&#123;%Y&#125;0101-&#123;%Y&#125;1231' abändern\n\n\nMehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md",
         "data": {
           "calendar_title": "Kalender Titel",
           "file": "Datei",
@@ -9189,7 +9189,7 @@
       },
       "reconfigure_ics_tbr_reutlingen_de": {
         "title": "Quelle Neu Konfigurieren",
-        "description": "Konfiguriere deinen Service Provider. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nMehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md",
+        "description": "Konfiguriere deinen Service Provider. \n\n- Öffnen Sie https://www.tbr-reutlingen.de/entsorgungskalender und gehen Sie zum Bereich `Entsorgungskalender 2025`.\n- Wählen Sie ihre Straße und die gewünschten Abfallarten aus\n- Klicken Sie mit der rechten Maustaste auf `ICS` und kopieren Sie den Link.\n- Ersetzen Sie die `url` in der Beispielkonfiguration durch diesen Link.\n- Der Link beinhaltet einen Abfrageparameter namens `timeperiod`, welcher das Start- und Enddatum des ausgewählten Jahres definiert. Sie müssen dessen Wert von z.B. `20250101-20251231` zu '&#123;%Y&#125;0101-&#123;%Y&#125;1231' abändern\n\n\nMehr details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md",
         "data": {
           "calendar_title": "Kalender Titel",
           "file": "Datei",

diff --git a/custom_components/waste_collection_schedule/translations/en.json b/custom_components/waste_collection_schedule/translations/en.json
@@ -9194,7 +9194,7 @@
       },
       "args_ics_tbr_reutlingen_de": {
         "title": "Configure Source",
-        "description": "Configure your service provider. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nMore details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
+        "description": "Configure your service provider. \n\n- Open https://www.tbr-reutlingen.de/entsorgungskalender and go to section `Entsorgungskalender 2025`.\n- Select your street and desired waste types\n- Right-click on `ICS` and copy the link address.\n- Replace the `url` in the example configuration with this link.\n- The link contains a query parameter called `timeperiod` which defines the start and the end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to '&#123;%Y&#125;0101-&#123;%Y&#125;1231'.\n\n\nMore details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
         "data": {
           "calendar_title": "Calendar Title",
           "file": "File",
@@ -9216,7 +9216,7 @@
       },
       "reconfigure_ics_tbr_reutlingen_de": {
         "title": "Reconfigure Source",
-        "description": "Configure your service provider. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nMore details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
+        "description": "Configure your service provider. \n\n- Open https://www.tbr-reutlingen.de/entsorgungskalender and go to section `Entsorgungskalender 2025`.\n- Select your street and desired waste types\n- Right-click on `ICS` and copy the link address.\n- Replace the `url` in the example configuration with this link.\n- The link contains a query parameter called `timeperiod` which defines the start and the end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to '&#123;%Y&#125;0101-&#123;%Y&#125;1231'.\n\n\nMore details: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
         "data": {
           "calendar_title": "Calendar Title",
           "file": "File",

diff --git a/custom_components/waste_collection_schedule/translations/it.json b/custom_components/waste_collection_schedule/translations/it.json
@@ -9125,7 +9125,7 @@
       },
       "args_ics_tbr_reutlingen_de": {
         "title": "Configurazione Sorgente",
-        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nMaggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
+        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. \n\n- Open https://www.tbr-reutlingen.de/entsorgungskalender and go to section `Entsorgungskalender 2025`.\n- Select your street and desired waste types\n- Right-click on `ICS` and copy the link address.\n- Replace the `url` in the example configuration with this link.\n- The link contains a query parameter called `timeperiod` which defines the start and the end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to '&#123;%Y&#125;0101-&#123;%Y&#125;1231'.\n\n\nMaggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
         "data": {
           "calendar_title": "Nome Calendario",
           "file": "Nome File",
@@ -9147,7 +9147,7 @@
       },
       "reconfigure_ics_tbr_reutlingen_de": {
         "title": "Riconfigurazione Sorgente",
-        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. \n\n- Go to https://www.tbr-reutlingen.de/entsorgungskalender and select your street.  \n- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.\n- Replace the `url` in the example configuration with this link.\n- The trailing part of the URL is a URL-encoded JSON string. It contains the \"from\" and \"to\" dates for the calendar. You need to replace the \"from\" date with '01.01.&#123;%Y&#125;' and the \"to\" date with '31.12.&#123;%Y&#125;'. You can use a ureldecoding/-encoding service to make the URL path easier to edit.\n\n\nPer maggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
+        "description": "Compila i campi per ottenere le informazioni sul tuo servizio di raccolta. \n\n- Open https://www.tbr-reutlingen.de/entsorgungskalender and go to section `Entsorgungskalender 2025`.\n- Select your street and desired waste types\n- Right-click on `ICS` and copy the link address.\n- Replace the `url` in the example configuration with this link.\n- The link contains a query parameter called `timeperiod` which defines the start and the end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to '&#123;%Y&#125;0101-&#123;%Y&#125;1231'.\n\n\nPer maggiori informazioni: https://github.com/mampfes/hacs_waste_collection_schedule/blob/master/doc/ics/tbr_reutlingen_de.md.",
         "data": {
           "calendar_title": "Nome Calendario",
           "file": "Nome File",

diff --git a/doc/ics/tbr_reutlingen_de.md b/doc/ics/tbr_reutlingen_de.md
@@ -5,10 +5,11 @@ Technischer Betriebsdienst Reutlingen is supported by the generic [ICS](/doc/sou
 
 ## How to get the configuration arguments
 
-- Go to <https://www.tbr-reutlingen.de/entsorgungskalender> and select your street.  
-- Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.
+- Open <https://www.tbr-reutlingen.de/entsorgungskalender> and go to section `Entsorgungskalender 2025`.
+- Select your street and desired waste types
+- Right-click on `ICS` and copy the link address.
 - Replace the `url` in the example configuration with this link.
-- The trailing part of the URL is a URL-encoded JSON string. It contains the "from" and "to" dates for the calendar. You need to replace the "from" date with `01.01.{%Y}` and the "to" date with `31.12.{%Y}`. You can use a ureldecoding/-encoding service to make the URL path easier to edit.
+- The link contains a query parameter called `timeperiod` which defines the start and the end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to `{%Y}0101-{%Y}1231`.
 
 ## Examples
 
@@ -19,5 +20,5 @@ waste_collection_schedule:
   sources:
     - name: ics
       args:
-        url: https://www.tbr-reutlingen.de/tools/garbageCalendar/ics/1/%7B%22garbageTypeFilter%22%3A%7B%22RM2%22%3A%22RM2%22%2C%22RM4%22%3A%22RM4%22%2C%22BIO%22%3A%22BIO%22%2C%22GES%22%3A%22GES%22%2C%22GRG%22%3A%22GRG%22%2C%22PAP%22%3A%22PAP%22%2C%22WST%22%3A%22WST%22%7D%2C%22dateFilter%22%3A%7B%22from%22%3A%2201.01.{%Y}%22%2C%22to%22%3A%2231.12.{%Y}%22%7D%7D
+        url: https://api.abfall.io/?key=1bf5dd3852fd8c24ec5679c53f678540&mode=export&idhousenumber=658&wastetypes=27,50,66,65,31,3061,169&timeperiod={%Y}0101-{%Y}1231&showinactive=false&type=ics
 ```
diff --git a/doc/ics/yaml/tbr_reutlingen_de.yaml b/doc/ics/yaml/tbr_reutlingen_de.yaml
@@ -3,11 +3,18 @@ title: Technischer Betriebsdienst Reutlingen
 url: https://www.tbr-reutlingen.de
 howto:
   en: |
-    - Go to <https://www.tbr-reutlingen.de/entsorgungskalender> and select your street.  
-    - Right-click on `Abfuhrtermine (iCal) herunterladen` and copy link address.
+    - Open <https://www.tbr-reutlingen.de/entsorgungskalender> and go to section `Entsorgungskalender 2025`.
+    - Select your street, desired waste types and timeperiod.
+    - Right-click on `ICS` and copy link address.
     - Replace the `url` in the example configuration with this link.
-    - The trailing part of the URL is a URL-encoded JSON string. It contains the "from" and "to" dates for the calendar. You need to replace the "from" date with `01.01.{%Y}` and the "to" date with `31.12.{%Y}`. You can use a ureldecoding/-encoding service to make the URL path easier to edit.
+    - The link contains a query parameter called `timeperiod` which defines the start and end of the selected year. You need to modify the value of it from e.g. `20250101-20251231` to `{%Y}0101-{%Y}1231`.
+  de: |
+    - Öffnen Sie <https://www.tbr-reutlingen.de/entsorgungskalender> und gehen Sie zum Bereich `Entsorgungskalender 2025`.
+    - Wählen Sie ihre Straße, die gewünschten Abfallarten und den Zeitraum aus.
+    - Klicken Sie mit der rechten Maustaste auf `ICS` und kopieren Sie den Link.
+    - Ersetzen Sie die `url` in der Beispielkonfiguration durch diesen Link.
+    - Der Link beinhaltet einen Abfrageparameter namens `timeperiod`, welcher das Start- und Enddatum des ausgewählten Jahres definiert. Sie müssen dessen Wert von z.B. `20250101-20251231` zu `{%Y}0101-{%Y}1231` abändern.
 test_cases:
   Reutlingen:
-    url: 
-      https://www.tbr-reutlingen.de/tools/garbageCalendar/ics/1/%7B%22garbageTypeFilter%22%3A%7B%22RM2%22%3A%22RM2%22%2C%22RM4%22%3A%22RM4%22%2C%22BIO%22%3A%22BIO%22%2C%22GES%22%3A%22GES%22%2C%22GRG%22%3A%22GRG%22%2C%22PAP%22%3A%22PAP%22%2C%22WST%22%3A%22WST%22%7D%2C%22dateFilter%22%3A%7B%22from%22%3A%2201.01.{%Y}%22%2C%22to%22%3A%2231.12.{%Y}%22%7D%7D
+    url:
+      https://api.abfall.io/?key=1bf5dd3852fd8c24ec5679c53f678540&mode=export&idhousenumber=658&wastetypes=27,50,66,65,31,3061,169&timeperiod={%Y}0101-{%Y}1231&showinactive=false&type=ics