Django

Code

Changeset 7441

Show
Ignore:
Timestamp:
04/22/08 13:14:29 (2 months ago)
Author:
jbronn
Message:

gis: Updated KML tests for PostGIS 1.3.3 and GDAL tests to not perform close_rings test for versions 1.4.1 and below.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7028 r7441  
    22from models import Country, City, State, Feature 
    33from django.contrib.gis import gdal 
     4from django.contrib.gis.db.backend import SpatialBackend 
    45from django.contrib.gis.geos import * 
    56from django.contrib.gis.measure import Distance 
    …… 
    124125        self.assertRaises(TypeError, qs.kml, 'name') 
    125126 
     127        # The reference KML depends on the version of PostGIS used  
     128        # (the output stopped including altitude in 1.3.3). 
     129        major, minor1, minor2 = SpatialBackend.version 
     130        ref_kml1 = '<Point><coordinates>-104.609252,38.255001,0</coordinates></Point>' 
     131        ref_kml2 = '<Point><coordinates>-104.609252,38.255001</coordinates></Point>' 
     132        if major == 1: 
     133            if minor1 > 3 or (minor1 == 3 and minor2 >= 3): ref_kml = ref_kml2 
     134            else: ref_kml = ref_kml1 
     135        else: 
     136            ref_kml = ref_kml2 
     137 
    126138        # Ensuring the KML is as expected. 
    127139        ptown1 = City.objects.kml('point', precision=9).get(name='Pueblo') 
    128140        ptown2 = City.objects.kml(precision=9).get(name='Pueblo') 
    129141        for ptown in [ptown1, ptown2]: 
    130             self.assertEqual('<Point><coordinates>-104.609252,38.255001,0</coordinates></Point>', ptown.kml) 
     142            self.assertEqual(ref_kml, ptown.kml) 
    131143 
    132144    def test03b_gml(self): 

  • django/branches/gis/django/contrib/gis/tests/test_gdal_geom.py

    r7406 r7441  
    11import unittest 
    22from django.contrib.gis.gdal import OGRGeometry, OGRGeomType, \ 
    3     OGRException, OGRIndexError, SpatialReference, CoordTransform 
     3    OGRException, OGRIndexError, SpatialReference, CoordTransform, \ 
     4    gdal_version 
    45from django.contrib.gis.tests.geometries import * 
    56 
    …… 
    197198        print "\nEND - expecting IllegalArgumentException; safe to ignore.\n" 
    198199 
    199         # Closing the rings 
     200        # Closing the rings -- doesn't work on GDAL versions 1.4.1 and below: 
     201        # http://trac.osgeo.org/gdal/ticket/1673 
     202        major, minor1, minor2 = gdal_version().split('.') 
     203        if major == '1': 
     204            iminor1 = int(minor1) 
     205            if iminor1 < 4 or (iminor1 == 4 and minor2.startswith('1')): return 
    200206        poly.close_rings() 
    201207        self.assertEqual(10, poly.point_count) # Two closing points should've been added