Commit 3b638ec6 authored by Jay's avatar Jay Committed by jay
Browse files

Fixes for GDAL 2.0.2 upgrade - looks like proj4 string formatting changes

parent 0ad69c80

.travis.yml

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ install: 


  # Install the non-conda packages if required, requirements.txt duplicates are ignored

  - conda install -c https://conda.anaconda.org/jlaura opencv3=3.0.0

  - conda install -c https://conda.anaconda.org/jlaura h5py

  - conda install -c https://conda.anaconda.org/jlaura gdal

  - conda install -c https://conda.anaconda.org/jlaura h5py gdal

  - conda install -c osgeo proj4

  - conda upgrade numpy

  - pip install -r requirements.txt

autocnet/fileio/tests/test_io_gdal.py

+3 −3
Original line number Diff line number Diff line
@@ -207,12 +207,12 @@ class TestWriter(unittest.TestCase): 
                    SPHEROID["Moon_2000_IAU_IAG",1737400,0]],

                PRIMEM["Reference_Meridian",0],

                UNIT["Degree",0.017453292519943295]],

            PROJECTION["Mercator_1SP"],

            PROJECTION["Mercator_2SP"],

            PARAMETER["central_meridian",180],

            PARAMETER["false_easting",0],

            PARAMETER["false_northing",0],

            UNIT["Meter",1],

            PARAMETER["latitude_of_origin",0.0]]"""

            PARAMETER["standard_parallel_1",0],

            UNIT["Meter",1]]"""

        dataset = io_gdal.GeoDataset('test.tif')

        test_srs = dataset.spatial_reference.__str__()

        self.assertEqual(test_srs.split(), expected_srs.split())

autocnet/fileio/tests/test_metadata.py

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class TestSRSProjectionExtraction(unittest.TestCase): 


    def test_projection_name(self):

        name = em.get_projection_name(self.srs)

        self.assertEqual(name, 'Mercator_1SP')

        self.assertEqual(name, 'Mercator_2SP')



    def test_axes_extract(self):

        smajor, sminor, invflattening = em.get_spheroid(self.srs)
@@ -46,7 +46,7 @@ class TestSRSProjectionExtraction(unittest.TestCase): 
        Check that proj4 is not supporting Moon2000_Mercator

        """

        proj4 = self.srs.ExportToProj4()

        self.assertEqual(proj4, '+proj=merc +lon_0=180 +k=1 +x_0=0 +y_0=0 +a=1737400 +b=1737400 +units=m +no_defs ')

        self.assertEqual(proj4, '+proj=merc +lon_0=180 +lat_ts=0 +x_0=0 +y_0=0 +a=1737400 +b=1737400 +units=m +no_defs ')



    def test_scale_factor(self):

        k = em.get_scale_factor(self.srs)
@@ -54,4 +54,4 @@ class TestSRSProjectionExtraction(unittest.TestCase): 


    def test_latitude_of_origin(self):

        lo = em.get_latitude_of_origin(self.srs)

        self.assertEqual(lo, 0.0)
 
        self.assertEqual(lo, 90.0)