Changeset 13569

Timestamp:

01/22/08 15:19:46 (6 months ago)

Author:

warmerdam

Message:

update to include better axis testing (#2131)

Files:

• trunk/autotest/gdrivers/data/gmljp2_dtedsm_epsg_4326_axes.jp2 (added)
• trunk/autotest/gdrivers/jp2kak.py (modified) (4 diffs)

trunk/autotest/gdrivers/jp2kak.py

@@ -126 +126 @@
-###############################################################################
-# Test reading GMLJP2 file with srsName only on the Envelope, and lots of other
-
+
+
-
-def jp2kak_6():
@@ -133 +134 @@
-        return 'skip'
-
+    gdal.SetConfigOption( 'GDAL_IGNORE_AXIS_ORIENTATION', 'YES' )
+    
-    exp_wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
-
@@ -156 +159 @@
-    ds = None
-
+    gdal.SetConfigOption( 'GDAL_IGNORE_AXIS_ORIENTATION', 'NO' )
+    
+    return 'success'
+    
+###############################################################################
+# Test reading a file with axis orientation set properly for an alternate
+# axis order coordinate system (urn:...:EPSG::4326). 
+
+def jp2kak_7():
+
+    if gdaltest.jp2kak_drv is None:
+        return 'skip'
+
+    exp_wkt = 'GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.01745329251994328,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]]'
+
+    ds = gdal.Open( 'data/gmljp2_dtedsm_epsg_4326_axes.jp2' )
+    wkt = ds.GetProjection()
+
+    if wkt != exp_wkt:
+        gdaltest.post_reason( 'did not get expected WKT, should be WGS84' )
+        print 'got: ', wkt
+        print 'exp: ', exp_wkt
+        return 'fail'
+
+    gt = ds.GetGeoTransform()
+    gte = (42.999583333333369,0.008271349862259,0,
+           34.000416666666631,0,-0.008271349862259)
+    
+    if abs(gt[0] - gte[0]) > 0.0000001 or abs(gt[3] - gte[3]) > 0.000001 \
+       or abs(gt[1] - gte[1]) > 0.000000000005 \
+       or abs(gt[2] - gte[2]) > 0.000000000005 \
+       or abs(gt[4] - gte[4]) > 0.000000000005 \
+       or abs(gt[5] - gte[5]) > 0.000000000005:
+        gdaltest.post_reason( 'did not get expected geotransform' )
+        print 'got: ', gt
+        return 'fail'
+       
+    ds = None
+
-    return 'success'
-    
@@ -173 +215 @@
-    jp2kak_5,
-    jp2kak_6,
+    jp2kak_7,
-    jp2kak_cleanup ]
-