Commit d25a599d authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #19063 -- Fixed version parameter of gml GeoQuerySet method 

Thanks lmisek@go2.pl for the report.
parent c76877c1

django/contrib/gis/db/models/query.py

+2 −2
Original line number Diff line number Diff line
@@ -194,9 +194,9 @@ class GeoQuerySet(QuerySet): 
            # PostGIS AsGML() aggregate function parameter order depends on the

            # version -- uggh.

            if backend.spatial_version > (1, 3, 1):

                procedure_fmt = '%(version)s,%(geo_col)s,%(precision)s'

                s['procedure_fmt'] = '%(version)s,%(geo_col)s,%(precision)s'

            else:

                procedure_fmt = '%(geo_col)s,%(precision)s,%(version)s'

                s['procedure_fmt'] = '%(geo_col)s,%(precision)s,%(version)s'

            s['procedure_args'] = {'precision' : precision, 'version' : version}



        return self._spatial_attribute('gml', s, **kwargs)

django/contrib/gis/tests/geoapp/tests.py

+3 −0
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ class GeoQuerySetTest(TestCase): 
        for ptown in [ptown1, ptown2]:

            self.assertTrue(gml_regex.match(ptown.gml))



        if postgis:

            self.assertIn('<gml:pos srsDimension="2">', City.objects.gml(version=3).get(name='Pueblo').gml)



    def test_kml(self):

        "Testing KML output from the database using GeoQuerySet.kml()."

        # Only PostGIS and Spatialite (>=2.4.0-RC4) support KML serialization