Refactor KmlDateTime and TimeSpan classes, and AbstractView class

cleder · Dec 20, 2023 · d3ed751 · d3ed751
1 parent 7c4e36a
commit d3ed751
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 23 deletions.
diff --git a/fastkml/features.py b/fastkml/features.py
@@ -35,6 +35,7 @@
 from fastkml.helpers import xml_subelement
 from fastkml.helpers import xml_subelement_kwarg
 from fastkml.helpers import xml_subelement_list
+from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.links import Link
 from fastkml.mixins import TimeMixin
 from fastkml.styles import Style
@@ -356,29 +357,25 @@ def _get_kwargs(
         )
         name_spaces = kwargs["name_spaces"]
         assert name_spaces is not None
-        styles = element.findall(f"{ns}Style")
-        kwargs["styles"] = []
-        if styles is not None:
-            for style in styles:
-                kwargs["styles"].append(
-                    Style.class_from_element(
-                        ns=ns,
-                        name_spaces=name_spaces,
-                        element=style,
-                        strict=strict,
-                    ),
-                )
-        stylemaps = element.findall(f"{ns}StyleMap")
-        if stylemaps is not None:
-            for stylemap in stylemaps:
-                kwargs["styles"].append(
-                    StyleMap.class_from_element(
-                        ns=ns,
-                        name_spaces=name_spaces,
-                        element=stylemap,
-                        strict=strict,
-                    ),
-                )
+        kwargs["styles"] = xml_subelement_list_kwarg(
+            element=element,
+            ns=ns,
+            name_spaces=name_spaces,
+            kwarg="styles",
+            obj_class=Style,
+            strict=strict,
+        ).get("styles", [])
+        kwargs["styles"].extend(
+            xml_subelement_list_kwarg(
+                element=element,
+                ns=ns,
+                name_spaces=name_spaces,
+                kwarg="styles",
+                obj_class=StyleMap,
+                strict=strict,
+            ).get("styles", []),
+        )
+
         kwargs.update(
             xml_subelement_kwarg(
                 element=element,

diff --git a/fastkml/helpers.py b/fastkml/helpers.py
@@ -1,6 +1,7 @@
 """Helper functions for fastkml."""
 
 from typing import Dict
+from typing import List
 from typing import Optional
 from typing import Type
 
@@ -128,3 +129,28 @@ def xml_subelement_kwarg(
             strict=strict,
         ),
     }
+
+
+def xml_subelement_list_kwarg(
+    *,
+    element: Element,
+    ns: str,
+    name_spaces: Dict[str, str],
+    kwarg: str,
+    obj_class: Type[_XMLObject],
+    strict: bool,
+) -> Dict[str, List[_XMLObject]]:
+    if subelements := element.findall(f"{ns}{obj_class.get_tag_name()}"):
+        return {
+            kwarg: [
+                obj_class.class_from_element(
+                    ns=ns,
+                    name_spaces=name_spaces,
+                    element=subelement,
+                    strict=strict,
+                )
+                for subelement in subelements
+            ],
+        }
+    else:
+        return {}