Merge pull request #214 from cleder/sourcery/develop

1.0.alpha.4 (Sourcery refactored)
cleder · Jan 14, 2023 · ccf1d1a · ccf1d1a
2 parents b2cfa39 + 48673e1
commit ccf1d1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/fastkml/mixins.py b/fastkml/mixins.py
@@ -32,9 +32,7 @@ class TimeMixin:
     @property
     def time_stamp(self) -> Optional[KmlDateTime]:
         """This just returns the datetime portion of the timestamp"""
-        if self._timestamp is not None:
-            return self._timestamp.timestamp
-        return None
+        return self._timestamp.timestamp if self._timestamp is not None else None
 
     @time_stamp.setter
     def time_stamp(self, timestamp: Optional[KmlDateTime]) -> None:
@@ -50,9 +48,7 @@ def time_stamp(self, timestamp: Optional[KmlDateTime]) -> None:
 
     @property
     def begin(self) -> Optional[KmlDateTime]:
-        if self._timespan is not None:
-            return self._timespan.begin
-        return None
+        return self._timespan.begin if self._timespan is not None else None
 
     @begin.setter
     def begin(self, dt: Optional[KmlDateTime]) -> None:
@@ -68,9 +64,7 @@ def begin(self, dt: Optional[KmlDateTime]) -> None:
 
     @property
     def end(self) -> Optional[KmlDateTime]:
-        if self._timespan is not None:
-            return self._timespan.end
-        return None
+        return self._timespan.end if self._timespan is not None else None
 
     @end.setter
     def end(self, dt: Optional[KmlDateTime]) -> None:

diff --git a/fastkml/views.py b/fastkml/views.py
@@ -155,8 +155,8 @@ def altitude_mode(self) -> str:
 
     @altitude_mode.setter
     def altitude_mode(self, mode: str) -> None:
-        if mode in ("relativeToGround", "clampToGround", "absolute"):
-            self._altitude_mode = str(mode)
+        if mode in {"relativeToGround", "clampToGround", "absolute"}:
+            self._altitude_mode = mode
         else:
             self._altitude_mode = "relativeToGround"
             # raise ValueError(
@@ -181,11 +181,9 @@ def from_element(self, element: Element):
         if tilt is not None:
             self.tilt = tilt.text
         altitude_mode = element.find(f"{self.ns}altitudeMode")
-        if altitude_mode is not None:
-            self.altitude_mode = altitude_mode.text
-        else:
+        if altitude_mode is None:
             altitude_mode = element.find(f"{gx.NS}altitudeMode")
-            self.altitude_mode = altitude_mode.text
+        self.altitude_mode = altitude_mode.text
         timespan = element.find(f"{self.ns}TimeSpan")
         if timespan is not None:
             s = TimeSpan(self.ns)