Refactor containers and kml class #286

fastkml/containers.py

@@ -4,7 +4,6 @@
 from typing import Any
 from typing import Dict
 from typing import Iterable
-from typing import Iterator
 from typing import List
 from typing import Optional
 from typing import Union
@@ -102,20 +101,15 @@ def __init__(
             region=region,
             extended_data=extended_data,
         )
-        self._features = features or []
-
-    def features(self) -> Iterator[_Feature]:
-        """Iterate over features."""
-        assert self._features is not None
-        yield from self._features
+        self.features = features or []
 
     def etree_element(
         self,
         precision: Optional[int] = None,
         verbosity: Verbosity = Verbosity.normal,
     ) -> Element:
         element = super().etree_element(precision=precision, verbosity=verbosity)
-        for feature in self.features():
+        for feature in self.features:
             element.append(feature.etree_element())
         return element
 
@@ -124,8 +118,8 @@ def append(self, kmlobj: _Feature) -> None:
         if kmlobj is self:
             msg = "Cannot append self"
             raise ValueError(msg)
-        assert self._features is not None
-        self._features.append(kmlobj)
+        assert self.features is not None
+        self.features.append(kmlobj)
 
     @classmethod
     def _get_kwargs(

fastkml/helpers.py

@@ -1,5 +1,5 @@
 """Helper functions for fastkml."""
-
+from enum import Enum
 from typing import Dict
 from typing import List
 from typing import Optional
@@ -44,6 +44,39 @@ def bool_subelement(
         subelement.text = str(int(getattr(obj, attr_name)))
 
 
+def float_subelement(
+    obj: _BaseObject,
+    *,
+    element: Element,
+    attr_name: str,
+    node_name: str,
+    precision: Optional[int],
+) -> None:
+    """Set the value of an attribute from a subelement with a text node."""
+    if getattr(obj, attr_name, None):
+        subelement = config.etree.SubElement(  # type: ignore[attr-defined]
+            element,
+            f"{obj.ns}{node_name}",
+        )
+        subelement.text = str(round(getattr(obj, attr_name), precision))
+
+
+def enum_subelement(
+    obj: _BaseObject,
+    *,
+    element: Element,
+    attr_name: str,
+    node_name: str,
+) -> None:
+    """Set the value of an attribute from a subelement with a text node."""
+    if getattr(obj, attr_name, None):
+        subelement = config.etree.SubElement(  # type: ignore[attr-defined]
+            element,
+            f"{obj.ns}{node_name}",
+        )
+        subelement.text = getattr(obj, attr_name).value
+
+
 def xml_subelement(
     obj: _BaseObject,
     *,
@@ -109,6 +142,23 @@ def subelement_bool_kwarg(
     return {}
 
 
+def subelement_enum_kwarg(
+    *,
+    element: Element,
+    ns: str,
+    node_name: str,
+    kwarg: str,
+    enum_class: Type[Enum],
+    strict: bool,
+) -> Dict[str, Enum]:
+    node = element.find(f"{ns}{node_name}")
+    if node is None:
+        return {}
+    if node.text and node.text.strip():
+        return {kwarg: enum_class(node.text.strip())}
+    return {}
+
+
 def xml_subelement_kwarg(
     *,
     element: Element,

fastkml/kml.py

@@ -28,7 +28,6 @@
 from typing import Any
 from typing import Dict
 from typing import Iterable
-from typing import Iterator
 from typing import List
 from typing import Optional
 from typing import Union
@@ -68,7 +67,7 @@ def __init__(
             ns=ns,
             name_spaces=name_spaces,
         )
-        self._features = list(features) if features is not None else []
+        self.features = list(features) if features is not None else []
 
     def etree_element(
         self,
@@ -91,20 +90,16 @@ def etree_element(
                 root = config.etree.Element(  # type: ignore[attr-defined]
                     f"{self.ns}kml",
                 )
-        for feature in self.features():
+        for feature in self.features:
             root.append(feature.etree_element(precision=precision, verbosity=verbosity))
         return cast(Element, root)
 
-    def features(self) -> Iterator[Union[Folder, Document, Placemark]]:
-        """Iterate over features."""
-        yield from self._features
-
     def append(self, kmlobj: Union[Folder, Document, Placemark]) -> None:
         """Append a feature."""
         if id(kmlobj) == id(self):
             msg = "Cannot append self"
             raise ValueError(msg)
-        self._features.append(kmlobj)
+        self.features.append(kmlobj)
 
     @classmethod
     def _get_kwargs(