Merge branch 'master' of github.com:mampfes/hacs_waste_collection_sch…

…edule into coventry

README.md

@@ -174,7 +174,6 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Abfallverband Korneuburg](/doc/source/umweltverbaende_at.md) / korneuburg.umweltverbaende.at
 - [Abfallverband Schwechat](/doc/source/umweltverbaende_at.md) / schwechat.umweltverbaende.at
 - [Abfallwirtschaft der Stadt St. Pölten](/doc/ics/st-poelten_at.md) / st-poelten.at/sonstiges/17653-abfallkalender
-- [Abfallwirtschaft Stadt Krems](/doc/source/umweltverbaende_at.md) / kremsstadt.umweltverbaende.at
 - [Absdorf](/doc/source/citiesapps_com.md) / absdorf.gv.at
 - [Afritz am See](/doc/ics/muellapp_com.md) / muellapp.com
 - [Alpbach](/doc/ics/muellapp_com.md) / muellapp.com
@@ -187,7 +186,6 @@ If your service provider is not listed, feel free to open a [source request issu
 - [App CITIES](/doc/source/citiesapps_com.md) / citiesapps.com
 - [Arnoldstein](/doc/ics/muellapp_com.md) / muellapp.com
 - [Aschau im Zillertal](/doc/ics/muellapp_com.md) / muellapp.com
-- [AWV Neunkirchen](/doc/source/umweltverbaende_at.md) / neunkirchen.umweltverbaende.at
 - [AWV Wr. Neustadt](/doc/source/umweltverbaende_at.md) / wrneustadt.umweltverbaende.at
 - [Bad Blumau](/doc/source/citiesapps_com.md) / bad-blumau-gemeinde.at
 - [Bad Fischau-Brunn](/doc/source/citiesapps_com.md) / bad-fischau-brunn.at
@@ -219,6 +217,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Burgenländischer Müllverband](/doc/source/bmv_at.md) / bmv.at
 - [Burgschleinitz-Kühnring](/doc/source/citiesapps_com.md) / burgschleinitz-kuehnring.at
 - [Bürg-Vöstenhof](/doc/source/citiesapps_com.md) / buerg-voestenhof.at
+- [City of Krems](/doc/ics/kremsstadt_umweltverbaende_at.md) / kremsstadt.umweltverbaende.at
 - [Dechantskirchen](/doc/source/citiesapps_com.md) / dechantskirchen.gv.at
 - [Dellach](/doc/ics/muellapp_com.md) / muellapp.com
 - [Dellach im Drautal](/doc/ics/muellapp_com.md) / muellapp.com
@@ -264,7 +263,6 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Frohnleiten](/doc/source/citiesapps_com.md) / frohnleiten.com
 - [Fürstenfeld](/doc/source/citiesapps_com.md) / fuerstenfeld.gv.at
 - [Gabersdorf](/doc/source/citiesapps_com.md) / gabersdorf.gv.at
-- [GABL](/doc/source/umweltverbaende_at.md) / bruck.umweltverbaende.at
 - [Gattendorf](/doc/source/citiesapps_com.md) / gattendorf.at
 - [GAUL Laa an der Thaya](/doc/source/umweltverbaende_at.md) / laa.umweltverbaende.at
 - [GAUM Mistelbach](/doc/source/umweltverbaende_at.md) / mistelbach.umweltverbaende.at
@@ -577,6 +575,7 @@ If your service provider is not listed, feel free to open a [source request issu
 - [Vorderstoder](/doc/source/citiesapps_com.md) / vorderstoder.ooe.gv.at
 - [Völkermarkt](/doc/ics/muellapp_com.md) / muellapp.com
 - [Völkermarkt](/doc/source/citiesapps_com.md) / voelkermarkt.gv.at
+- [Waidhofen an der Ybbs](/doc/ics/waidhofen_at.md) / waidhofen.at
 - [Walpersbach](/doc/source/citiesapps_com.md) / walpersbach.gv.at
 - [Wartberg ob der Aist](/doc/source/citiesapps_com.md) / wartberg-aist.at
 - [Wattens](/doc/ics/muellapp_com.md) / muellapp.com
@@ -2130,7 +2129,8 @@ If your service provider is not listed, feel free to open a [source request issu
 - [London Borough of Harrow](/doc/source/harrow_gov_uk.md) / harrow.gov.uk
 - [London Borough of Hounslow](/doc/source/hounslow_gov_uk.md) / hounslow.gov.uk
 - [London Borough of Lewisham](/doc/source/lewisham_gov_uk.md) / lewisham.gov.uk
-- [London Borough of Merton](/doc/source/merton_gov_uk.md) / merton.gov.uk
+- [London Borough of Merton (New)](/doc/ics/merton_gov_uk.md) / merton.gov.uk
+- [London Borough of Merton (Old)](/doc/source/merton_gov_uk.md) / merton.gov.uk
 - [London Borough of Newham](/doc/source/newham_gov_uk.md) / newham.gov.uk
 - [Luton](/doc/source/apps_imactivate_com.md) / luton.gov.uk
 - [Maidstone Borough Council](/doc/source/maidstone_gov_uk.md) / maidstone.gov.uk

custom_components/waste_collection_schedule/sources.json

@@ -902,14 +902,6 @@
       },
       "id": "ics_st-poelten_at"
     },
-    {
-      "title": "Abfallwirtschaft Stadt Krems",
-      "module": "umweltverbaende_at",
-      "default_params": {
-        "district": "kremsstadt"
-      },
-      "id": "umweltverbaende_at"
-    },
     {
       "title": "Absdorf",
       "module": "citiesapps_com",
@@ -982,14 +974,6 @@
       "default_params": {},
       "id": "ics_muellapp_com"
     },
-    {
-      "title": "AWV Neunkirchen",
-      "module": "umweltverbaende_at",
-      "default_params": {
-        "district": "neunkirchen"
-      },
-      "id": "umweltverbaende_at"
-    },
     {
       "title": "AWV Wr. Neustadt",
       "module": "umweltverbaende_at",
@@ -1178,6 +1162,12 @@
       "default_params": {},
       "id": "citiesapps_com"
     },
+    {
+      "title": "City of Krems",
+      "module": "ics",
+      "default_params": {},
+      "id": "ics_kremsstadt_umweltverbaende_at"
+    },
     {
       "title": "Dechantskirchen",
       "module": "citiesapps_com",
@@ -1448,14 +1438,6 @@
       "default_params": {},
       "id": "citiesapps_com"
     },
-    {
-      "title": "GABL",
-      "module": "umweltverbaende_at",
-      "default_params": {
-        "district": "bruck"
-      },
-      "id": "umweltverbaende_at"
-    },
     {
       "title": "Gattendorf",
       "module": "citiesapps_com",
@@ -3364,6 +3346,12 @@
       "default_params": {},
       "id": "citiesapps_com"
     },
+    {
+      "title": "Waidhofen an der Ybbs",
+      "module": "ics",
+      "default_params": {},
+      "id": "ics_waidhofen_at"
+    },
     {
       "title": "Walpersbach",
       "module": "citiesapps_com",
@@ -13525,7 +13513,13 @@
       "id": "lewisham_gov_uk"
     },
     {
-      "title": "London Borough of Merton",
+      "title": "London Borough of Merton (New)",
+      "module": "ics",
+      "default_params": {},
+      "id": "ics_merton_gov_uk"
+    },
+    {
+      "title": "London Borough of Merton (Old)",
       "module": "merton_gov_uk",
       "default_params": {},
       "id": "merton_gov_uk"