Refactor styles.py #286

fastkml/data.py

@@ -33,8 +33,8 @@
 from fastkml.enums import DataType
 from fastkml.enums import Verbosity
 from fastkml.exceptions import KMLSchemaError
-from fastkml.helpers import simple_text_subelement
 from fastkml.helpers import subelement_text_kwarg
+from fastkml.helpers import text_subelement
 from fastkml.helpers import xml_subelement_list
 from fastkml.helpers import xml_subelement_list_kwarg
 from fastkml.types import Element
@@ -213,13 +213,13 @@ def etree_element(
     ) -> Element:
         element = super().etree_element(precision=precision, verbosity=verbosity)
         element.set("name", self.name or "")
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="value",
             node_name="value",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="display_name",

fastkml/enums.py

@@ -226,3 +226,13 @@ class Units(REnum):
     fraction = "fraction"
     pixels = "pixels"
     inset_pixels = "insetPixels"
+
+
+@unique
+class PairKey(REnum):
+    """
+    Key for Pair.
+    """
+
+    normal = "normal"
+    highlight = "highlight"

fastkml/features.py

@@ -29,9 +29,9 @@
 from fastkml.geometry import Polygon
 from fastkml.geometry import create_kml_geometry
 from fastkml.helpers import bool_subelement
-from fastkml.helpers import simple_text_subelement
 from fastkml.helpers import subelement_bool_kwarg
 from fastkml.helpers import subelement_text_kwarg
+from fastkml.helpers import text_subelement
 from fastkml.helpers import xml_subelement
 from fastkml.helpers import xml_subelement_kwarg
 from fastkml.helpers import xml_subelement_list
@@ -307,25 +307,25 @@ def etree_element(
             verbosity=verbosity,
         )
 
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="address",
             node_name="address",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="phone_number",
             node_name="phoneNumber",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="description",
             node_name="description",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="name",

fastkml/helpers.py

@@ -1,4 +1,5 @@
 """Helper functions for fastkml."""
+import logging
 from enum import Enum
 from typing import Dict
 from typing import List
@@ -10,8 +11,10 @@
 from fastkml.enums import Verbosity
 from fastkml.types import Element
 
+logger = logging.getLogger(__name__)
 
-def simple_text_subelement(
+
+def text_subelement(
     obj: _XMLObject,
     *,
     element: Element,
@@ -35,7 +38,7 @@ def bool_subelement(
     node_name: str,
 ) -> None:
     """Set the value of an attribute from a subelement with a text node."""
-    if getattr(obj, attr_name, None):
+    if getattr(obj, attr_name, None) is not None:
         subelement = config.etree.SubElement(  # type: ignore[attr-defined]
             element,
             f"{obj.ns}{node_name}",
@@ -51,7 +54,7 @@ def int_subelement(
     node_name: str,
 ) -> None:
     """Set the value of an attribute from a subelement with a text node."""
-    if getattr(obj, attr_name, None):
+    if getattr(obj, attr_name, None) is not None:
         subelement = config.etree.SubElement(  # type: ignore[attr-defined]
             element,
             f"{obj.ns}{node_name}",
@@ -68,7 +71,7 @@ def float_subelement(
     precision: Optional[int],
 ) -> None:
     """Set the value of an attribute from a subelement with a text node."""
-    if getattr(obj, attr_name, None):
+    if getattr(obj, attr_name, None) is not None:
         subelement = config.etree.SubElement(  # type: ignore[attr-defined]
             element,
             f"{obj.ns}{node_name}",
@@ -154,6 +157,10 @@ def subelement_bool_kwarg(
             return {kwarg: True}
         if node.text.strip().lower() in {"0", "false"}:
             return {kwarg: False}
+        try:
+            return {kwarg: bool(int(float(node.text.strip())))}
+        except ValueError:
+            return {}
     return {}
 
 

fastkml/links.py

@@ -24,10 +24,10 @@
 from fastkml.enums import ViewRefreshMode
 from fastkml.helpers import enum_subelement
 from fastkml.helpers import float_subelement
-from fastkml.helpers import simple_text_subelement
 from fastkml.helpers import subelement_enum_kwarg
 from fastkml.helpers import subelement_float_kwarg
 from fastkml.helpers import subelement_text_kwarg
+from fastkml.helpers import text_subelement
 from fastkml.types import Element
 
 
@@ -80,19 +80,19 @@ def etree_element(
     ) -> Element:
         element = super().etree_element(precision=precision, verbosity=verbosity)
 
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="href",
             node_name="href",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="view_format",
             node_name="viewFormat",
         )
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="http_query",

fastkml/overlays.py

@@ -25,11 +25,11 @@
 from fastkml.helpers import enum_subelement
 from fastkml.helpers import float_subelement
 from fastkml.helpers import int_subelement
-from fastkml.helpers import simple_text_subelement
 from fastkml.helpers import subelement_enum_kwarg
 from fastkml.helpers import subelement_float_kwarg
 from fastkml.helpers import subelement_int_kwarg
 from fastkml.helpers import subelement_text_kwarg
+from fastkml.helpers import text_subelement
 from fastkml.helpers import xml_subelement
 from fastkml.helpers import xml_subelement_kwarg
 from fastkml.links import Icon
@@ -141,7 +141,7 @@ def etree_element(
         verbosity: Verbosity = Verbosity.normal,
     ) -> Element:
         element = super().etree_element(precision=precision, verbosity=verbosity)
-        simple_text_subelement(
+        text_subelement(
             self,
             element=element,
             attr_name="color",