Skip to content

Commit

Permalink
GML: default srsDimension to 3 for CityGML files (fixes #6989)
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault @github-actions
rouault authored and github-actions[bot] committed Dec 30, 2022
1 parent b3e4f6b commit 17c7414
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 52 deletions.
88 changes: 45 additions & 43 deletions autotest/ogr/data/gml/citygml.gml
View file
@@ -1,43 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<CityModel xmlns="http://www.opengis.net/citygml/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:trans="http://www.opengis.net/citygml/transportation/1.0"
xmlns:gml="http://www.opengis.net/gml"
xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:gen="http://www.opengis.net/citygml/generics/1.0"
xsi:schemaLocation="http://www.opengis.net/citygml/transportation/1.0 http://schemas.opengis.net/citygml/transportation/1.0/transportation.xsdn.xsd http://www.opengis.net/citygml/cityobjectgroup/1.0 http://schemas.opengis.net/citygml/cityobjectgroup/1.0/cityObjectGroup.xsd http://www.opengis.net/citygml/generics/1.0 http://schemas.opengis.net/citygml/generics/1.0/generics.xsd">
<cityObjectMember>
<trans:Road gml:id="id1">
<gml:name>aname</gml:name>
<gml:boundedBy>
<gml:Envelope srsDimension="3" srsName="urn:ogc:def:crs,crs:EPSG:6.12:3068,crs:EPSG:6.12:5783">
<gml:lowerCorner>0 0 0</gml:lowerCorner>
<gml:upperCorner>1 1 0</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<creationDate>2010-01-01+00:00</creationDate>
<gen:stringAttribute name="Name">
<gen:value>aname</gen:value>
</gen:stringAttribute>
<gen:intAttribute name="a_int_attr">
<gen:value>2</gen:value>
</gen:intAttribute>
<gen:doubleAttribute name="a_double_attr">
<gen:value>3.45</gen:value>
</gen:doubleAttribute>
<trans:lod3MultiSurface>
<gml:MultiSurface gml:id="id2">
<gml:surfaceMember>
<gml:Polygon gml:id="id3">
<gml:exterior>
<gml:LinearRing gml:id="id4">
<gml:posList srsDimension="3">0 0 0 0 1 0 1 1 0 1 0 0 0 0 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
</gml:surfaceMember>
</gml:MultiSurface>
</trans:lod3MultiSurface>
</trans:Road>
</cityObjectMember>
</CityModel>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<CityModel xmlns="http://www.opengis.net/citygml/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:trans="http://www.opengis.net/citygml/transportation/1.0"
xmlns:gml="http://www.opengis.net/gml"
xmlns:smil20lang="http://www.w3.org/2001/SMIL20/Language"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:gen="http://www.opengis.net/citygml/generics/1.0"
xsi:schemaLocation="http://www.opengis.net/citygml/transportation/1.0 http://schemas.opengis.net/citygml/transportation/1.0/transportation.xsdn.xsd http://www.opengis.net/citygml/cityobjectgroup/1.0 http://schemas.opengis.net/citygml/cityobjectgroup/1.0/cityObjectGroup.xsd http://www.opengis.net/citygml/generics/1.0 http://schemas.opengis.net/citygml/generics/1.0/generics.xsd">
<cityObjectMember>
<trans:Road gml:id="id1">
<gml:name>aname</gml:name>
<gml:boundedBy>
<!-- Do not specify srsDimension="3" so we check we can default to it for CityGML (#6989) -->
<!--<gml:Envelope srsDimension="3" srsName="urn:ogc:def:crs,crs:EPSG:6.12:3068,crs:EPSG:6.12:5783">-->
<gml:Envelope>
<gml:lowerCorner>0 0 0</gml:lowerCorner>
<gml:upperCorner>1 1 0</gml:upperCorner>
</gml:Envelope>
</gml:boundedBy>
<creationDate>2010-01-01+00:00</creationDate>
<gen:stringAttribute name="Name">
<gen:value>aname</gen:value>
</gen:stringAttribute>
<gen:intAttribute name="a_int_attr">
<gen:value>2</gen:value>
</gen:intAttribute>
<gen:doubleAttribute name="a_double_attr">
<gen:value>3.45</gen:value>
</gen:doubleAttribute>
<trans:lod3MultiSurface>
<gml:MultiSurface gml:id="id2">
<gml:surfaceMember>
<gml:Polygon gml:id="id3">
<gml:exterior>
<gml:LinearRing gml:id="id4">
<gml:posList>0 0 0 0 0.5 0 0 1 0 1 1 0 1 0 0 0 0 0</gml:posList>
</gml:LinearRing>
</gml:exterior>
</gml:Polygon>
</gml:surfaceMember>
</gml:MultiSurface>
</trans:lod3MultiSurface>
</trans:Road>
</cityObjectMember>
</CityModel>
22 changes: 13 additions & 9 deletions autotest/ogr/ogr_gml_read.py
View file
Expand Up @@ -733,25 +733,29 @@ def test_ogr_gml_15():


###############################################################################
# Read CityGML generic attributes
# Read CityGML generic attributes and reading 3D geometries by default


def test_ogr_gml_16():
def test_ogr_gml_city_gml():

if not gdaltest.have_gml_reader:
pytest.skip()

ds = ogr.Open("data/gml/citygml.gml")
lyr = ds.GetLayer(0)
assert lyr.GetGeomType() == ogr.wkbMultiPolygon25D
feat = lyr.GetNextFeature()

if (
feat.GetField("Name_") != "aname"
or feat.GetField("a_int_attr") != 2
or feat.GetField("a_double_attr") != 3.45
):
feat.DumpReadable()
pytest.fail("did not get expected values")
assert feat.GetField("Name_") == "aname"
assert feat.GetField("a_int_attr") == 2
assert feat.GetField("a_double_attr") == 3.45
assert (
feat.GetGeometryRef().ExportToIsoWkt()
== "MULTIPOLYGON Z (((0 0 0,0.0 0.5 0,0 1 0,1 1 0,1 0 0,0 0 0)))"
)
ds = None

gdal.Unlink("data/gml/citygml.gfs")


###############################################################################
Expand Down
3 changes: 3 additions & 0 deletions ogr/ogrsf_frmts/gml/gmlhandler.cpp
View file
Expand Up @@ -1370,6 +1370,9 @@ OGRErr GMLHandler::startElementTop(const char *pszName, int /*nLenName*/,
if (strcmp(pszName, "CityModel") == 0)
{
eAppSchemaType = APPSCHEMA_CITYGML;
// Default to 3D geometries for CityGML (#6989)
if (m_nSRSDimensionIfMissing == 0)
m_nSRSDimensionIfMissing = 3;
}
else if (strcmp(pszName, "AIXMBasicMessage") == 0)
{
Expand Down

0 comments on commit 17c7414

Please sign in to comment.