Merge 7c35410 into 8ab7676

exxamalte · Jan 20, 2020 · 8fdd018 · 8fdd018
2 parents 8ab7676 + 7c35410
commit 8fdd018
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/aio_georss_gdacs/feed_entry.py b/aio_georss_gdacs/feed_entry.py
@@ -35,7 +35,7 @@ def attribution(self) -> Optional[str]:
     @property
     def category(self) -> Optional[str]:
         """Return the category of this entry."""
-        return self.event_type_long
+        return self.event_type
 
     @property
     def alert_level(self) -> Optional[str]:
@@ -75,19 +75,19 @@ def event_name(self) -> Optional[str]:
         return None
 
     @property
-    def event_type(self) -> Optional[str]:
-        """Return the event type of this entry."""
+    def event_type_short(self) -> Optional[str]:
+        """Return the short event type of this entry."""
         if self._rss_entry:
             return self._rss_entry.get_additional_attribute(
                 XML_TAG_GDACS_EVENT_TYPE)
         return None
 
     @property
-    def event_type_long(self) -> Optional[str]:
-        """Return the long event type of this entry."""
-        event_type = self.event_type
-        if event_type and event_type in EVENT_TYPE_MAP:
-            return EVENT_TYPE_MAP[event_type]
+    def event_type(self) -> Optional[str]:
+        """Return the event type of this entry."""
+        event_type_short = self.event_type_short
+        if event_type_short and event_type_short in EVENT_TYPE_MAP:
+            return EVENT_TYPE_MAP[event_type_short]
         return "Unknown"
 
     @property

diff --git a/tests/test_feed.py b/tests/test_feed.py
@@ -52,8 +52,8 @@ async def test_update_ok(aresponses, event_loop):
         assert feed_entry.country == 'Mauritius'
         assert feed_entry.duration_in_week == 0
         assert feed_entry.event_name == 'CALVINIA-19'
-        assert feed_entry.event_type == 'TC'
-        assert feed_entry.event_type_long == "Tropical Cyclone"
+        assert feed_entry.event_type_short == 'TC'
+        assert feed_entry.event_type == "Tropical Cyclone"
         assert feed_entry.from_date == datetime.datetime(2019, 12, 29, 12,
                                                          0, 0, tzinfo=pytz.utc)
         assert feed_entry.to_date == datetime.datetime(2019, 12, 29, 12,

diff --git a/tests/test_feed_entry.py b/tests/test_feed_entry.py
@@ -12,8 +12,8 @@ async def test_empty_feed_entry(aresponses, event_loop):
     assert feed_entry.country is None
     assert feed_entry.duration_in_week is None
     assert feed_entry.event_name is None
-    assert feed_entry.event_type is None
-    assert feed_entry.event_type_long == "Unknown"
+    assert feed_entry.event_type_short is None
+    assert feed_entry.event_type == "Unknown"
     assert feed_entry.from_date is None
     assert feed_entry.icon_url is None
     assert feed_entry.is_current is None