Skip to content

Enhance datatype determination and improve service_ok util #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 17, 2025
Merged

Enhance datatype determination and improve service_ok util #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0d5b58
fix: update datatype determination for WFS attributes
KaiVolland May 12, 2025
c44f7b8
fix: update service_ok util to support arcgis server
KaiVolland May 12, 2025
efa6c20
test: parametrize data_type tests
KaiVolland May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 39 additions & 3 deletions owslib/feature/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ def get_schema(
type_element = root.find("./{%s}element" % XS_NAMESPACE)
if type_element is None:
return None

complex_type = type_element.attrib["type"].split(":")[1]
elements = _get_elements(complex_type, root)
nsmap = None
Expand All @@ -78,16 +79,45 @@ def _get_elements(complex_type, root):
return found_elements


def _get_datatype(element, schema_key, gml_key):
"""Extract the data type from an element based on different XML structure variants.

:param element: The XML element to extract the data type from
:param str schema_key: The XML namespace key for schema elements
:param str gml_key: The XML namespace key for GML elements
:return: The extracted data type as string
"""
# Case 1: Type defined as attribute
if "type" in element.attrib:
data_type = element.attrib["type"]
# Remove any namespace prefix
if ":" in data_type:
data_type = data_type.split(":")[-1]
return data_type
# Case 2: Reference to another element
elif "ref" in element.attrib:
return element.attrib["ref"].split(":")[-1]
# Case 3: Type defined as SimpleType with Restriction
simple_type = element.find(".//{%s}restriction" % XS_NAMESPACE)
if simple_type is not None:
return simple_type.attrib.get("base", "").replace(schema_key + ":", "")
# Case 4: Complex Type Definition
complex_type = element.find(".//{%s}complexType//{%s}element" % (XS_NAMESPACE, XS_NAMESPACE))
if complex_type is not None and "type" in complex_type.attrib:
return complex_type.attrib["type"].replace(schema_key + ":", "")
return None


def _construct_schema(elements, nsmap):
"""Consruct fiona schema based on given elements
"""Construct fiona schema based on given elements

:param list Element: list of elements
:param dict nsmap: namespace map

:return dict: schema
"""
if elements is None:
return None

schema = {"properties": {}, "required": [], "geometry": None}

schema_key = None
Expand Down Expand Up @@ -123,10 +153,16 @@ def _construct_schema(elements, nsmap):
}

for element in elements:
data_type = element.attrib["type"].replace(gml_key + ":", "")
if "name" not in element.attrib:
continue

name = element.attrib["name"]
non_nillable = element.attrib.get("nillable", "false") == "false"

data_type = _get_datatype(element, schema_key, gml_key)
if data_type is None:
continue

if data_type in mappings:
schema["geometry"] = mappings[data_type]
schema["geometry_column"] = name
Expand Down
177 changes: 177 additions & 0 deletions tests/resources/wfs_koeln_arcgis_describefeaturetype_110.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
<?xml version="1.0" encoding="UTF-8"?>
<xsd:schema xmlns:adressen_stadtteil="https://k00364:6443/arcgis/admin/services/adressen_stadtteil/MapServer/WFSServer" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:gml="http://www.opengis.net/gml" targetNamespace="https://k00364:6443/arcgis/admin/services/adressen_stadtteil/MapServer/WFSServer" elementFormDefault="qualified" attributeFormDefault="unqualified">
<xsd:import namespace="http://www.opengis.net/gml" schemaLocation="http://schemas.opengis.net/gml/3.1.1/base/gml.xsd"/>
<xsd:element name="Blumenberg" type="adressen_stadtteil:BlumenbergFeatureType" substitutionGroup="gml:_Feature"/>
<xsd:complexType name="BlumenbergFeatureType">
<xsd:complexContent>
<xsd:extension base="gml:AbstractFeatureType">
<xsd:sequence>
<xsd:element minOccurs="0" maxOccurs="1" name="objectid" type="xsd:int"/>
<xsd:element minOccurs="0" maxOccurs="1" name="Nummer">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="11"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Adresse">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="47"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Strassenschlüssel">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="5"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Straße">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="40"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Amtl._Straßenname">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Straße__Stadtbezirk_">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Hausnummer">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="5"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Gebäude_ID_ALKIS">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="16"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Nutzung__ALKIS_Gebäudefunktion_">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="80"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Blockseite">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="8"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtviertel__Nr._">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="5"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtviertel">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="40"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Statistisches_Quartier__Nr._">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="9"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Statistisches_Quartier">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtteil__Nr._">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="3"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtteil">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="40"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtbezirk__Nr._">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stadtbezirk">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="40"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Stimmbezirk">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="5"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Postleitzahlgebiet">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="5"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Schiedsamtsbezirk">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="2"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Sozialraum__Nr._">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="9"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="Sozialraum">
<xsd:simpleType>
<xsd:restriction base="xsd:string">
<xsd:maxLength value="100"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:element>
<xsd:element minOccurs="0" maxOccurs="1" name="globalid" type="xsd:string"/>
<xsd:element minOccurs="0" maxOccurs="1" name="shape" type="gml:PointPropertyType"/>
</xsd:sequence>
</xsd:extension>
</xsd:complexContent>
</xsd:complexType>
</xsd:schema>
Loading