Radar: Use new data source for improved list of radar sites

tests/dwd/radar/test_sites.py

@@ -1,18 +1,27 @@
 # -*- coding: utf-8 -*-
 # Copyright (c) 2018-2021, earthobservations developers.
 # Distributed under the MIT License. See LICENSE for more info.
-from wetterdienst.dwd.radar import DWDRadarValues
-from wetterdienst.dwd.radar.sites import DWDRadarSite
+import pytest
 
+from wetterdienst.dwd.radar.sites import DWDRadarSite, OperaRadarSites
 
-def test_radar_sites_data():
 
-    sites = DWDRadarValues.get_sites()
+def test_radar_sites_data():
 
+    sites = OperaRadarSites.dwd_sites()
     assert len(sites) == 18
-    assert sites["ASB"]["name"] == "ASR Borkum"
-    assert sites["EMD"]["name"] == "Emden"
-    assert sites["UMD"]["name"] == "Ummendorf"
+
+    OperaRadarSites.dwd_site("ASB")["location"] == "ASR Borkum"
+    OperaRadarSites.dwd_site("EMD")["location"] == "Emden"
+    OperaRadarSites.dwd_site("UMD")["location"] == "Ummendorf"
+
+    with pytest.raises(ValueError) as ex:
+        OperaRadarSites.dwd_site("foobar")
+        assert str(ex) == "ValueError: Radar site code must be three or five letters"
+
+    with pytest.raises(KeyError) as ex:
+        OperaRadarSites.dwd_site("foo")
+        assert str(ex) == "KeyError: 'Radar site not found'"
 
 
 def test_radar_sites_enum():

wetterdienst/dwd/radar/api.py

@@ -16,7 +16,7 @@
     DWDRadarResolution,
 )
 from wetterdienst.dwd.radar.metadata.parameter import DWDRadarDate, DWDRadarParameter
-from wetterdienst.dwd.radar.sites import RADAR_LOCATIONS, DWDRadarSite
+from wetterdienst.dwd.radar.sites import RADAR_SITES, DWDRadarSite
 from wetterdienst.metadata.period import Period
 from wetterdienst.metadata.resolution import Resolution
 from wetterdienst.util.datetime import raster_minutes, round_minutes
@@ -253,7 +253,3 @@ def collect_data(self):
         )
 
         return self.query()
-
-    @staticmethod
-    def get_sites():
-        return RADAR_LOCATIONS