merge upstream (3dc7d063) · Commits · aflab / astrogeology / Autocnet

autocnet/fileio/io_gdal.py

+5 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,11 @@ class GeoDataset(object):

		@property
		def geotransform(self):
		"""
		Where the array is in the form:
		[top left x, w-e pixel resolution, x-rotation,
		top left y, y-rotation, n-s pixel resolution]
		"""
		if not getattr(self, '_geotransform', None):
		self._geotransform = self.dataset.GetGeoTransform()
		return self._geotransform

autocnet/fileio/tests/test_io_gdal.py

+8 −12

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ class TestMercator(unittest.TestCase):
		self.assertEqual(self.dataset.unit_type, '')

		def test_get_xy_extent(self):
		self.assertEqual(self.dataset.xy_extent, [(0.0, -3921610.0), (10667520.0, 3921610.0)])
		self.assertEqual(self.dataset.xy_extent, [(0.0, 3921610.0), (10667520.0, -3921610.0)])

		def test_get_no_data_value(self):
		self.assertEqual(self.dataset.no_data_value, 0.0)
		@@ -37,10 +37,10 @@ class TestMercator(unittest.TestCase):

		def test_xy_extent(self):
		xy_extent = self.dataset.xy_extent
		self.assertEqual(xy_extent, [(0.0, -3921610.0), (10667520.0, 3921610.0)])
		self.assertEqual(xy_extent, [(0.0, 3921610.0), (10667520.0, -3921610.0)])

		def test_latlon_extent(self):
		self.assertEqual(self.dataset.latlon_extent, [(90.0, 0.0), (-90.0, -150.4067721290261)])
		self.assertEqual(self.dataset.latlon_extent, [(-90.0, 0.0), (90.0, -150.4067721290261)])

		def test_spheroid(self):
		sphere = self.dataset.spheroid
		@@ -80,10 +80,6 @@ class TestMercator(unittest.TestCase):
		self.assertEqual(arr.shape, (1694, 2304))
		self.assertEqual(arr.dtype, np.float32)

		def test_read_clipped_array(self):
		arr = self.dataset.read_array(pixels=((0,0), (100,100)))
		self.assertEqual(arr.shape, (100,100))

		def test_read_array_set_dtype(self):
		arr = self.dataset.read_array(dtype='int8')
		self.assertEqual(arr.dtype, np.int8)
		@@ -101,7 +97,7 @@ class TestLambert(unittest.TestCase):
		self.assertEqual(self.dataset.unit_type, '')

		def test_get_xy_extent(self):
		self.assertEqual(self.dataset.xy_extent, [(-464400.0, -1571220.0), (460530.0, -506970.0)])
		self.assertEqual(self.dataset.xy_extent, [(-464400.0, -506970.0), (460530.0, -1571220.0)])

		def test_get_no_data_value(self):
		self.assertEqual(self.dataset.no_data_value, 0.0)
		@@ -123,10 +119,10 @@ class TestLambert(unittest.TestCase):

		def test_xy_extent(self):
		xy_extent = self.dataset.xy_extent
		self.assertEqual(xy_extent, [(-464400.0, -1571220.0), (460530.0, -506970.0)])
		self.assertEqual(xy_extent, [(-464400.0, -506970.0), (460530.0, -1571220.0)])

		def test_latlon_extent(self):
		self.assertEqual(self.dataset.latlon_extent, [(-89.98516988892511, -171.35800063907413), (-89.95883789218114, -178.8099427811737)])
		self.assertEqual(self.dataset.latlon_extent, [(-89.95903191125286, -140.8933768668104),(-89.98515758604582, -148.48059053073257)])

		class TestPolar(unittest.TestCase):
		def setUp(self):
		@@ -140,7 +136,7 @@ class TestPolar(unittest.TestCase):
		self.assertEqual(self.dataset.unit_type, '')

		def test_get_xy_extent(self):
		self.assertEqual(self.dataset.xy_extent, [(-2129800.0, -2129800.0), (2129800.0, 2129800.0)])
		self.assertEqual(self.dataset.xy_extent, [(-2129800.0, 2129800.0), (2129800.0, -2129800.0)])

		def test_get_no_data_value(self):
		self.assertEqual(self.dataset.no_data_value, 0.0)
		@@ -158,7 +154,7 @@ class TestPolar(unittest.TestCase):

		def test_xy_extent(self):
		xy_extent = self.dataset.xy_extent
		self.assertEqual(xy_extent, [(-2129800.0, -2129800.0), (2129800.0, 2129800.0)])
		self.assertEqual(xy_extent, [(-2129800.0, 2129800.0), (2129800.0, -2129800.0)])

		class TestWriter(unittest.TestCase):
		def setUp(self):

autocnet/matcher/outlier_detector.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ def distance_ratio(matches, ratio=0.8):
		# The distances from the unique points are identical
		mask[counter: counter + group_size] = False
		counter += group_size
		elif unique[1] / unique[0] < ratio:
		elif unique[0] / unique[1] < ratio:
		# The ratio test passes
		mask[counter] = True
		mask[counter + 1:counter + group_size] = False

functional_tests/test_two_image.py

+0 −2

Original line number	Diff line number	Diff line
		import os

		import unittest
		import numpy as np

		from autocnet.examples import get_path
		from autocnet.fileio.io_controlnetwork import to_isis
		from autocnet.fileio.io_controlnetwork import write_filelist
		from autocnet.graph.network import CandidateGraph
		from autocnet.matcher.matcher import FlannMatcher
		from autocnet.matcher import outlier_detector as od


		class TestTwoImageMatching(unittest.TestCase):