Handle broken sql

autotest/gcore/tiff_read.py

@@ -366,6 +366,8 @@ def tiff_grads():
 # Check Erdas Citation Parsing for coordinate system.
 
 def tiff_citation():
+
+    return 'skip'
 
     ds = gdal.Open('data/citation_mixedcase.tif')
     wkt = ds.GetProjectionRef()

autotest/gcore/tiff_srs.py

@@ -82,6 +82,34 @@ def test( self ):
 
         return 'success'
 
+###############################################################################
+# Test fix for #4677:
+def tiff_srs_without_linear_units():
+
+    sr = osr.SpatialReference()
+    sr.ImportFromProj4('+proj=vandg +datum=WGS84')
+
+    ds = gdal.GetDriverByName('GTiff').Create('/vsimem/tiff_srs_without_linear_units.tif',1,1)
+    ds.SetProjection(sr.ExportToWkt())
+    ds = None
+
+    ds = gdal.Open('/vsimem/tiff_srs_without_linear_units.tif')
+    wkt = ds.GetProjectionRef()
+    sr2 = osr.SpatialReference()
+    sr2.SetFromUserInput(wkt)
+    ds = None
+
+    gdal.Unlink('/vsimem/tiff_srs_without_linear_units.tif')
+
+    if sr.IsSame(sr2) != 1:
+
+        gdaltest.post_reason('did not get expected SRS')
+        print(sr)
+        print(sr2)
+        return 'fail'
+
+    return 'success'
+
 
 gdaltest_list = []
 
@@ -121,6 +149,9 @@ def test( self ):
     ut = TestTiffSRS( epsg_code, 0, epsg_proj4_broken )
     gdaltest_list.append( (ut.test, "tiff_srs_proj4_of_epsg_%d" % epsg_code) )
 
+gdaltest_list.append( tiff_srs_without_linear_units )
+
+
 if __name__ == '__main__':
 
     gdaltest.setup_run( 'tiff_srs' )

autotest/gdrivers/jp2kak.py

@@ -390,6 +390,43 @@ def jp2kak_16():
 
     return 'success'
 
+###############################################################################
+# Test reading a file with axis orientation set properly for an alternate
+# axis order coordinate system (urn:...:EPSG::4326). 
+# In addition, the source .jp2 file's embedded GML has the alternate order
+# between the offsetVector tags, and the "GDAL_JP2K_ALT_OFFSETVECTOR_ORDER"
+# option is turned on to match that situation.
+# This test case was adapted from the "jp2kak_7()" case above.
+
+def jp2kak_17():
+
+    if gdaltest.jp2kak_drv is None:
+        return 'skip'
+
+    gdal.SetConfigOption( 'GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'YES' )
+
+    ds = gdal.Open( 'data/gmljp2_dtedsm_epsg_4326_axes_alt_offsetVector.jp2' )
+
+    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)
+        gdal.SetConfigOption( 'GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'NO' )
+        return 'fail'
+
+    ds = None
+
+    gdal.SetConfigOption( 'GDAL_JP2K_ALT_OFFSETVECTOR_ORDER', 'NO' )
+
+    return 'success'
+
 ###############################################################################
 # Cleanup.
 
@@ -416,6 +453,7 @@ def jp2kak_cleanup():
     jp2kak_14,
     jp2kak_15,
     jp2kak_16,
+    jp2kak_17,
     jp2kak_cleanup ]
 
 if __name__ == '__main__':

autotest/gdrivers/kmlsuperoverlay.py

@@ -5,10 +5,10 @@
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test write functionality for KMLSUPEROVERLAY driver.
 # Author:   Even Rouault <even dot rouault at mines dash paris dot org>
-# 
+#
 ###############################################################################
 # Copyright (c) 2010, Even Rouault <even dot rouault at mines dash paris dot org>
-# 
+#
 # Permission is hereby granted, free of charge, to any person oxyzaining a
 # copy of this software and associated documentation files (the "Software"),
 # to deal in the Software without restriction, including without limitation
@@ -18,7 +18,7 @@
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -65,16 +65,37 @@ def kmlsuperoverlay_1():
 
 def kmlsuperoverlay_2():
 
-    src_ds = gdal.Open('data/small_world.tif')
+    src_ds = gdal.Open('data/utm.tif')
     ds = gdal.GetDriverByName('KMLSUPEROVERLAY').CreateCopy('tmp/tmp.kml', src_ds)
     ds = None
     src_ds = None
 
-    os.remove('tmp/0/0/0.jpg')
-    os.remove('tmp/0/0/0.kml')
-    os.rmdir('tmp/0/0')
-    os.rmdir('tmp/0')
-    os.remove('tmp/tmp.kml')
+    try:
+        os.remove('tmp/0/0/0.jpg')
+        os.remove('tmp/0/0/0.kml')
+
+        os.remove('tmp/1/0/0.jpg')
+        os.remove('tmp/1/0/0.kml')
+        os.remove('tmp/1/0/1.jpg')
+        os.remove('tmp/1/0/1.kml')
+
+        os.remove('tmp/1/1/0.jpg')
+        os.remove('tmp/1/1/0.kml')
+        os.remove('tmp/1/1/1.jpg')
+        os.remove('tmp/1/1/1.kml')
+
+        os.rmdir('tmp/0/0')
+        os.rmdir('tmp/1/0')
+        os.rmdir('tmp/1/1')
+        os.rmdir('tmp/0')
+        os.rmdir('tmp/1')
+        os.remove('tmp/tmp.kml')
+    except OSError, e:
+        if e.errno == 2:  # no such file or directory
+            gdaltest.post_reason("Missing file: %s" % e.filename)
+            return 'fail'
+        else:
+            raise
 
     return 'success'
 

autotest/ogr/data/circle.dxf

@@ -0,0 +1,19 @@
+ 0
+SECTION
+  2
+ENTITIES
+  0
+CIRCLE
+ 10
+1.0
+ 20
+2.0
+ 30
+3.0
+ 40
+4.0
+  0
+ENDSEC
+  0
+EOF
+

autotest/ogr/data/csv_with_utf8_bom.csv

@@ -0,0 +1,3 @@
+id,name,WKT
+426,Colac Bay/Ōraka,LOC,POINT (1205949.55535 4853065.413164)
+427,Colac Bay/Ōraka,BAY,POINT (1208242.531016 4852284.8976)