explicitly pass the namespace ids to be processed #318

cleder · Jun 19, 2024 · 40bee72 · 40bee72
1 parent bed73f8
commit 40bee72
Show file tree

Hide file tree

Showing 19 changed files with 224 additions and 61 deletions.
diff --git a/fastkml/atom.py b/fastkml/atom.py
@@ -164,6 +164,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="href",
         node_name="href",
         classes=(str,),
@@ -174,6 +175,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="rel",
         node_name="rel",
         classes=(str,),
@@ -184,6 +186,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="type",
         node_name="type",
         classes=(str,),
@@ -194,6 +197,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="hreflang",
         node_name="hreflang",
         classes=(str,),
@@ -205,6 +209,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="title",
         node_name="title",
         classes=(str,),
@@ -215,6 +220,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     Link,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="length",
         node_name="length",
         classes=(int,),
@@ -286,6 +292,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     _Person,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -296,6 +303,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     _Person,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="uri",
         node_name="uri",
         classes=(str,),
@@ -306,6 +314,7 @@ def __eq__(self, other: object) -> bool:
 registry.register(
     _Person,
     item=RegistryItem(
+        ns_ids=("atom",),
         attr_name="email",
         node_name="email",
         classes=(str,),

diff --git a/fastkml/base.py b/fastkml/base.py
@@ -157,17 +157,22 @@ def _get_kwargs(
         name_spaces = {**config.NAME_SPACES, **name_spaces}
         kwargs: Dict[str, Any] = {"ns": ns, "name_spaces": name_spaces}
         for item in registry.get(cls):
-            kwargs.update(
-                item.get_kwarg(
+            for name_space in item.ns_ids:
+                # breakpoint()
+                kwarg = item.get_kwarg(
                     element=element,
-                    ns=ns,
+                    ns=name_spaces.get(name_space, ""),
                     name_spaces=name_spaces,
                     node_name=item.node_name,
                     kwarg=item.attr_name,
                     classes=item.classes,
                     strict=strict,
-                ),
-            )
+                )
+                if kwarg:
+                    kwargs.update(
+                        kwarg,
+                    )
+                    break
         return kwargs
 
     @classmethod

diff --git a/fastkml/containers.py b/fastkml/containers.py
@@ -262,6 +262,7 @@ def get_style_by_url(self, style_url: str) -> Optional[Union[Style, StyleMap]]:
 registry.register(
     _Container,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="features",
         node_name="Folder,Placemark,Document",
         classes=(Folder, Placemark, Document),
@@ -272,6 +273,7 @@ def get_style_by_url(self, style_url: str) -> Optional[Union[Style, StyleMap]]:
 registry.register(
     Document,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="schemata",
         node_name="Schema",
         classes=(Schema,),

diff --git a/fastkml/data.py b/fastkml/data.py
@@ -125,6 +125,7 @@ def __bool__(self) -> bool:
 registry.register(
     SimpleField,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -135,6 +136,7 @@ def __bool__(self) -> bool:
 registry.register(
     SimpleField,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="type",
         node_name="type",
         classes=(DataType,),
@@ -145,6 +147,7 @@ def __bool__(self) -> bool:
 registry.register(
     SimpleField,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="display_name",
         node_name="displayName",
         classes=(str,),
@@ -213,6 +216,7 @@ def append(self, field: SimpleField) -> None:
 registry.register(
     Schema,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -223,6 +227,7 @@ def append(self, field: SimpleField) -> None:
 registry.register(
     Schema,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="fields",
         node_name="SimpleField",
         classes=(SimpleField,),
@@ -285,6 +290,7 @@ def __bool__(self) -> bool:
 registry.register(
     Data,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -296,6 +302,7 @@ def __bool__(self) -> bool:
 registry.register(
     Data,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="value",
         node_name="value",
         classes=(str,),
@@ -306,6 +313,7 @@ def __bool__(self) -> bool:
 registry.register(
     Data,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="display_name",
         node_name="displayName",
         classes=(str,),
@@ -360,6 +368,7 @@ def __bool__(self) -> bool:
 registry.register(
     SimpleData,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="value",
         node_name="value",
         classes=(str,),
@@ -370,6 +379,7 @@ def __bool__(self) -> bool:
 registry.register(
     SimpleData,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -441,6 +451,7 @@ def append_data(self, data: SimpleData) -> None:
 registry.register(
     SchemaData,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="schema_url",
         node_name="schemaUrl",
         classes=(str,),
@@ -451,6 +462,7 @@ def append_data(self, data: SimpleData) -> None:
 registry.register(
     SchemaData,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="data",
         node_name="SimpleData",
         classes=(SimpleData,),
@@ -511,6 +523,7 @@ def __bool__(self) -> bool:
 registry.register(
     ExtendedData,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="elements",
         node_name="Data,SchemaData",
         classes=(

diff --git a/fastkml/features.py b/fastkml/features.py
@@ -133,6 +133,7 @@ def __bool__(self) -> bool:
 registry.register(
     Snippet,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="text",
         node_name="",
         classes=(str,),
@@ -143,6 +144,7 @@ def __bool__(self) -> bool:
 registry.register(
     Snippet,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="max_lines",
         node_name="maxLines",
         classes=(int,),
@@ -328,6 +330,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="name",
         node_name="name",
         classes=(str,),
@@ -338,6 +341,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="visibility",
         node_name="visibility",
         classes=(bool,),
@@ -348,6 +352,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="isopen",
         node_name="open",
         classes=(bool,),
@@ -358,6 +363,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="atom_link",
         node_name="atom:link",
         classes=(atom.Link,),
@@ -368,6 +374,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="atom_author",
         node_name="atom:author",
         classes=(atom.Author,),
@@ -378,6 +385,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="address",
         node_name="address",
         classes=(str,),
@@ -388,6 +396,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="phone_number",
         node_name="phoneNumber",
         classes=(str,),
@@ -398,6 +407,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="snippet",
         node_name="Snippet",
         classes=(Snippet,),
@@ -408,6 +418,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="description",
         node_name="description",
         classes=(str,),
@@ -418,6 +429,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="view",
         node_name="Camera,LookAt",
         classes=(
@@ -431,6 +443,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="times",
         node_name="TimeSpan,TimeStamp",
         classes=(
@@ -444,6 +457,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="style_url",
         node_name="styleUrl",
         classes=(StyleUrl,),
@@ -454,6 +468,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="styles",
         node_name="Style,StyleMap",
         classes=(
@@ -467,6 +482,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="region",
         node_name="region",
         classes=(Region,),
@@ -477,6 +493,7 @@ def __repr__(self) -> str:
 registry.register(
     _Feature,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="extended_data",
         node_name="ExtendedData",
         classes=(ExtendedData,),
@@ -592,6 +609,7 @@ def geometry(self) -> Optional[AnyGeometryType]:
 registry.register(
     Placemark,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="kml_geometry",
         node_name=(
             "Point,LineString,LinearRing,Polygon,MultiGeometry,"
@@ -746,6 +764,7 @@ def __bool__(self) -> bool:
 registry.register(
     NetworkLink,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="refresh_visibility",
         node_name="refreshVisibility",
         classes=(bool,),
@@ -756,6 +775,7 @@ def __bool__(self) -> bool:
 registry.register(
     NetworkLink,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="fly_to_view",
         node_name="flyToView",
         classes=(bool,),
@@ -766,6 +786,7 @@ def __bool__(self) -> bool:
 registry.register(
     NetworkLink,
     RegistryItem(
+        ns_ids=("kml",),
         attr_name="link",
         node_name="Link",
         classes=(Link,),