Skip to content
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

Fix for srsDimension is not read from parent element #12

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix for srsDimension is not read from parent element #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f47fb55
Fixed srsDimension for parse_linestring_or_linear_ring
xdml Jul 15, 2024
466e394
Fixed srsDimension for parse_multi,_curve parse_multi_linestring and …
xdml Jul 15, 2024
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
19 changes: 13 additions & 6 deletions pygml/v3_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,20 +196,24 @@ def parse_multi_point(element: Element, nsmap: NameSpaceMap) -> ParseResult:


def parse_linestring_or_linear_ring(element: Element,
nsmap: NameSpaceMap) -> ParseResult:
nsmap: NameSpaceMap,
dimension: int=None) -> ParseResult:
pos_lists = element.xpath('gml:posList', namespaces=nsmap)
poss = element.xpath('gml:pos', namespaces=nsmap)
coordinates_elems = element.xpath('gml:coordinates', namespaces=nsmap)
coords = element.xpath('gml:coord', namespaces=nsmap)

if dimension is None:
dimension = 2

if pos_lists:
if len(pos_lists) > 1:
raise ValueError('Too many gml:posList elements')

pos_list0 = pos_lists[0]
coordinates = parse_poslist(
pos_list0.text,
int(pos_list0.attrib.get('srsDimension', 2))
int(pos_list0.attrib.get('srsDimension', element.attrib.get('srsDimension', dimension)))
)
srs = pos_list0.attrib.get('srsName')
elif poss:
Expand Down Expand Up @@ -263,8 +267,9 @@ def parse_multi_curve(element: Element, nsmap: NameSpaceMap) -> ParseResult:
'Only gml:LineString elements are supported for gml:MultiCurves'
)

dimension = element.attrib.get('srsDimension')
linestrings, srss = zip(*(
parse_linestring_or_linear_ring(linestring_element, nsmap)
parse_linestring_or_linear_ring(linestring_element, nsmap, dimension)
for linestring_element in linestring_elements
))

Expand All @@ -285,8 +290,9 @@ def parse_multi_linestring(element: Element,
'gml:lineStringMember/gml:LineString',
namespaces=nsmap
)
dimension = element.attrib.get('srsDimension')
linestrings, srss = zip(*(
parse_linestring_or_linear_ring(linestring_element, nsmap)
parse_linestring_or_linear_ring(linestring_element, nsmap, dimension)
for linestring_element in linestring_elements
))

Expand All @@ -310,8 +316,9 @@ def parse_polygon(element: Element, nsmap: NameSpaceMap) -> ParseResult:
elif len(exterior_rings) > 1:
raise ValueError('Too many gml:exterior/gml:LinearRing elements')

dimension = element.attrib.get('srsDimension')
exterior, ext_srs = parse_linestring_or_linear_ring(
exterior_rings[0], nsmap
exterior_rings[0], nsmap, dimension
)
exterior = exterior['coordinates']

Expand All @@ -321,7 +328,7 @@ def parse_polygon(element: Element, nsmap: NameSpaceMap) -> ParseResult:

if len(interior_elems) > 0:
interior_rings, int_srss = zip(*(
parse_linestring_or_linear_ring(linear_ring, nsmap)
parse_linestring_or_linear_ring(linear_ring, nsmap, dimension)
for linear_ring in interior_elems
))
interiors = [
Expand Down